From a67dbff603eac7fc89354897dfc8776133edcc4f Mon Sep 17 00:00:00 2001 From: smallmodel <15067410+smallmodel@users.noreply.github.com> Date: Fri, 23 Feb 2024 21:12:23 +0100 Subject: [PATCH] Reset state to STAND when the player has no physics --- code/fgame/player.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp index d80e454a..8fa3d7e5 100644 --- a/code/fgame/player.cpp +++ b/code/fgame/player.cpp @@ -9979,6 +9979,10 @@ void Player::EventGetCurrentDMWeaponType(Event *ev) void Player::PhysicsOff(Event *ev) { + // Added in 2.0 + // Reset the state to STAND before disabling physics + EvaluateState(statemap_Torso->FindState("STAND"), statemap_Legs->FindState("STAND")); + flags |= FL_IMMOBILE; }