yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-16 17:11:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

game: rerelease port carrier CreateFlyMonster use

Browse source
This commit is contained in:
Denis Pauk 2024-02-25 15:18:49 +02:00
parent 4870c1cc62
commit 0326d45cf8
5 changed files with 29 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/game/g_spawn.c
View file

@ -1099,6 +1099,31 @@ CreateMonster(vec3_t origin, vec3_t angles, char *classname)
return newEnt;
}
static void
DetermineBBox(char *classname, vec3_t mins, vec3_t maxs)
{
edict_t *newEnt;
if (!classname)
{
return;
}
newEnt = G_Spawn();
VectorCopy(vec3_origin, newEnt->s.origin);
VectorCopy(vec3_origin, newEnt->s.angles);
newEnt->classname = ED_NewString(classname);
newEnt->monsterinfo.aiflags |= AI_DO_NOT_COUNT;
ED_CallSpawn(newEnt);
VectorCopy(newEnt->mins, mins);
VectorCopy(newEnt->maxs, maxs);
G_FreeEdict(newEnt);
}
edict_t *
CreateFlyMonster(vec3_t origin, vec3_t angles, vec3_t mins,
vec3_t maxs, char *classname)
@ -1350,32 +1375,6 @@ CheckGroundSpawnPoint(vec3_t origin, vec3_t entMins, vec3_t entMaxs,
return false;
}
void
DetermineBBox(char *classname, vec3_t mins, vec3_t maxs)
{
edict_t *newEnt;
if (!classname)
{
return;
}
newEnt = G_Spawn();
VectorCopy(vec3_origin, newEnt->s.origin);
VectorCopy(vec3_origin, newEnt->s.angles);
newEnt->classname = ED_NewString(classname);
newEnt->monsterinfo.aiflags |= AI_DO_NOT_COUNT;
ED_CallSpawn(newEnt);
VectorCopy(newEnt->mins, mins);
VectorCopy(newEnt->maxs, maxs);
G_FreeEdict(newEnt);
}
void
spawngrow_think(edict_t *self)
{

1
src/game/header/local.h
View file

@ -1083,7 +1083,6 @@ qboolean FindSpawnPoint(vec3_t startpoint, vec3_t mins, vec3_t maxs,
qboolean CheckSpawnPoint(vec3_t origin, vec3_t mins, vec3_t maxs);
qboolean CheckGroundSpawnPoint(vec3_t origin, vec3_t entMins, vec3_t entMaxs,
float height, float gravity);
void DetermineBBox(char *classname, vec3_t mins, vec3_t maxs);
void SpawnGrow_Spawn(vec3_t startpos, int size);
void Widowlegs_Spawn(vec3_t startpos, vec3_t angles);
void ThrowSmallStuff(edict_t *self, vec3_t point);

6
src/game/monster/carrier/carrier.c
View file

@ -467,11 +467,13 @@ CarrierSpawn(edict_t *self)
/* the second flier should be a kamikaze flyer */
if (mytime != 2)
{
ent = CreateMonster(spawnpoint, self->s.angles, "monster_flyer");
ent = CreateFlyMonster(spawnpoint, self->s.angles,
flyer_mins, flyer_maxs, "monster_flyer");
}
else
{
ent = CreateMonster(spawnpoint, self->s.angles, "monster_kamikaze");
ent = CreateFlyMonster(spawnpoint, self->s.angles,
flyer_mins, flyer_maxs, "monster_kamikaze");
}
if (!ent)

3
src/game/savegame/tables/gamefunc_decs.h
View file

@ -27,8 +27,6 @@
*/
extern byte P_DamageModifier ( edict_t * ent ) ;
extern edict_t * CreateFlyMonster ( vec3_t origin , vec3_t angles , vec3_t mins , vec3_t maxs , char * classname ) ;
extern edict_t * CreateGroundMonster ( vec3_t origin , vec3_t angles , vec3_t entMins , vec3_t entMaxs , char * classname , int height ) ;
extern edict_t * CreateMonster ( vec3_t origin , vec3_t angles , char * classname ) ;
extern edict_t * DoRandomRespawn ( edict_t * ent ) ;
extern edict_t * Drop_Item ( edict_t * ent , gitem_t * item ) ;
@ -208,7 +206,6 @@ extern void DBall_SpeedTouch ( edict_t * self , edict_t * other , cplane_t * pla
extern void DeathmatchScoreboard(edict_t *ent) ;
extern void DeathmatchScoreboardMessage ( edict_t * ent , edict_t * killer ) ;
extern void Defender_Launch ( edict_t * self ) ;
extern void DetermineBBox ( char * classname , vec3_t mins , vec3_t maxs ) ;
extern void DoRespawn ( edict_t * ent ) ;
extern void Door_Activate ( edict_t * self , edict_t * other , edict_t * activator ) ;
extern void Drop_Ammo ( edict_t * ent , gitem_t * item ) ;

3
src/game/savegame/tables/gamefunc_list.h
View file

@ -77,8 +77,6 @@
{"ClipGibVelocity", (byte *)ClipGibVelocity},
{"CopyToBodyQue", (byte *)CopyToBodyQue},
{"CountPlayers", (byte *)CountPlayers},
{"CreateFlyMonster", (byte *)CreateFlyMonster},
{"CreateGroundMonster", (byte *)CreateGroundMonster},
{"CreateMonster", (byte *)CreateMonster},
{"DBall_BallDie", (byte *)DBall_BallDie},
{"DBall_BallPain", (byte *)DBall_BallPain},
@ -95,7 +93,6 @@
{"DBall_SpeedTouch", (byte *)DBall_SpeedTouch},
{"DeathmatchScoreboardMessage", (byte *)DeathmatchScoreboardMessage},
{"Defender_Launch", (byte *)Defender_Launch},
{"DetermineBBox", (byte *)DetermineBBox},
{"DoRandomRespawn", (byte *)DoRandomRespawn},
{"DoRespawn", (byte *)DoRespawn},
{"Door_Activate", (byte *)Door_Activate},