From 65400fea2c72e94249949af1d56481c4e31a7b52 Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Wed, 20 Sep 2023 20:08:08 -0700 Subject: [PATCH] scripted_sequence: DropToFloor() after teleporting, and also only teleport in ::InitIdle when move mode is not 0 --- src/gs-entbase/server/scripted_sequence.qc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gs-entbase/server/scripted_sequence.qc b/src/gs-entbase/server/scripted_sequence.qc index 93b128a9..b9a681e2 100644 --- a/src/gs-entbase/server/scripted_sequence.qc +++ b/src/gs-entbase/server/scripted_sequence.qc @@ -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;