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

scripted_sequence: DropToFloor() after teleporting, and also only teleport in ::InitIdle when move mode is not 0

Browse source
This commit is contained in:
Marco Cawthorne 2023-09-20 20:08:08 -07:00
parent e93dc09805
commit 65400fea2c
Signed by: eukara
GPG key ID: CE2032F0A2882A22
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gs-entbase/server/scripted_sequence.qc
View file

@ -274,6 +274,7 @@ scripted_sequence::RunOnEntity(entity targ)
return;
} else if (m_iMove == SS_INSTANTANEOUS) {
setorigin(f, this.origin);
f.DropToFloor();
NSLog("\tType: SS_INSTANTANEOUS (%i)", m_iMove);
} else if (m_iMove == SS_TURNTOFACE) {
NSLog("\tType: SS_TURNTOFACE (%i)", m_iMove);
@ -366,8 +367,11 @@ scripted_sequence::InitIdle(void)
return;
}
}
setorigin(f, origin);
/* FIXME: does this filter apply to other types as well? */
if (m_iMove != SS_NO)
setorigin(f, origin);
f.m_flSequenceEnd = frameforname(f.modelindex, m_strIdleAnim);
f.m_iSequenceState = SEQUENCESTATE_ENDING;
f.m_vecSequenceAngle = angles;