yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-01 13:40:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

game: use dynamic definitions as defaults

Browse source
This commit is contained in:
Denis Pauk 2024-09-29 11:35:16 +03:00
parent d443fdc092
commit 473a4f3adc
1 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/game/g_spawn.c
View file

@ -71,14 +71,21 @@ static dynamicentity_t *dynamicentities;
static int ndynamicentities; static int ndynamicentities;
static void static void
DynamicSpawn(edict_t *self, dynamicentity_t *data) DynamicSpawnUpdate(edict_t *self, dynamicentity_t *data)
{ {
self->movetype = MOVETYPE_NONE; /* update properties by dynamic properties */
self->solid = SOLID_BBOX;
self->s.modelindex = gi.modelindex(data->model_path); self->s.modelindex = gi.modelindex(data->model_path);
VectorCopy(data->mins, self->mins); VectorCopy(data->mins, self->mins);
VectorCopy(data->maxs, self->maxs); VectorCopy(data->maxs, self->maxs);
}
static void
DynamicSpawn(edict_t *self)
{
/* All other properties could be updated in DynamicSpawnUpdate */
self->movetype = MOVETYPE_NONE;
self->solid = SOLID_BBOX;
gi.linkentity(self); gi.linkentity(self);
} }
@ -154,7 +161,7 @@ ED_CallSpawn(edict_t *ent)
{ {
spawn_t *s; spawn_t *s;
gitem_t *item; gitem_t *item;
int i; int i, dyn_id;
if (!ent) if (!ent)
{ {
@ -187,6 +194,18 @@ ED_CallSpawn(edict_t *ent)
ent->classname = (FindItem("Plasma Beam"))->classname; ent->classname = (FindItem("Plasma Beam"))->classname;
} }
/* search dynamic definitions */
dyn_id = -1;
if (dynamicentities && ndynamicentities)
{
dyn_id = DynamicSpawnSearch(ent->classname);
if (dyn_id >= 0)
{
DynamicSpawnUpdate(ent, &dynamicentities[dyn_id]);
}
}
/* check item spawn functions */ /* check item spawn functions */
for (i = 0, item = itemlist; i < game.num_items; i++, item++) for (i = 0, item = itemlist; i < game.num_items; i++, item++)
{ {
@ -214,15 +233,12 @@ ED_CallSpawn(edict_t *ent)
} }
} }
if (dynamicentities && ndynamicentities) if (dyn_id >= 0 && dynamicentities[dyn_id].model_path[0])
{ {
i = DynamicSpawnSearch(ent->classname); /* spawn only if know model */
if (i >= 0) DynamicSpawn(ent);
{
DynamicSpawn(ent, &dynamicentities[i]);
return; return;
}
} }
/* SiN entity could have model path as model field */ /* SiN entity could have model path as model field */
@ -239,7 +255,8 @@ ED_CallSpawn(edict_t *ent)
if (gi.FS_LoadFile(self.model_path, NULL) > 4) if (gi.FS_LoadFile(self.model_path, NULL) > 4)
{ {
DynamicSpawn(ent, &self); DynamicSpawnUpdate(ent, &self);
DynamicSpawn(ent);
return; return;
} }
} }