vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

NSItem: Position entity after everything else has spawned, to avoid entity lump ordering messing with droptofloor() calls

Browse source
This commit is contained in:
Marco Cawthorne 2023-11-15 00:14:06 -08:00
parent 038265dd64
commit 4790e9d230
Signed by: eukara
GPG key ID: CE2032F0A2882A22
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/shared/NSItem.qc
View file

@ -39,6 +39,19 @@ NSItem::Spawned(void)
void
NSItem::Respawn(void)
{
/* we need to delay the DropToFloor() by at least a frame.
otherwise they may just fall through an entity (func_wall, func_train etc.)
that came after this entity in the lump. */
static void AdjustSpawnPos(void) {
RestoreAngles();
SetOrigin(GetSpawnOrigin());
if (!m_bFloating) {
DropToFloor();
SetMovetype(MOVETYPE_TOSS);
}
}
SetSolid(SOLID_TRIGGER);
SetOrigin(GetSpawnOrigin());
botinfo = BOTINFO_WEAPON;
@ -54,12 +67,7 @@ NSItem::Respawn(void)
}
SetSize([-16,-16,0], [16,16,16]);
ReleaseThink();
if (!m_bFloating) {
DropToFloor();
SetMovetype(MOVETYPE_TOSS);
}
ScheduleThink(AdjustSpawnPos, 0.0f);
}
void