Fixed issues with Actor crouch mode

OpenXRay · Sep 1, 2019 · f8424c4 · f8424c4
1 parent c1a1d06
commit f8424c4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/xrGame/Actor.cpp b/src/xrGame/Actor.cpp
@@ -1233,7 +1233,7 @@ void CActor::shedule_Update(u32 DT)
             mstate_wishful &= ~mcFwd;
             mstate_wishful &= ~mcBack;
             extern bool g_bAutoClearCrouch;
-            if (!psActorFlags.test(AF_CROUCH_TOGGLE) || g_bAutoClearCrouch)
+            if (g_bAutoClearCrouch)
                 mstate_wishful &= ~mcCrouch;
         }
     }

diff --git a/src/xrGame/ActorInput.cpp b/src/xrGame/ActorInput.cpp
@@ -107,12 +107,11 @@ void CActor::IR_OnKeyboardPress(int cmd)
     }
     break;
     case kCROUCH_TOGGLE:
-        if (!psActorFlags.test(AF_CROUCH_TOGGLE))
-            g_bAutoClearCrouch = !g_bAutoClearCrouch;
-        [[fallthrough]];
     case kCROUCH:
     {
-        if (psActorFlags.test(AF_CROUCH_TOGGLE) || !g_bAutoClearCrouch)
+        if (psActorFlags.test(AF_CROUCH_TOGGLE) || cmd == kCROUCH_TOGGLE)
+            g_bAutoClearCrouch = !g_bAutoClearCrouch;
+        if (!g_bAutoClearCrouch)
             mstate_wishful ^= mcCrouch;
     }
     break;
@@ -267,7 +266,8 @@ void CActor::IR_OnKeyboardRelease(int cmd)
                 g_PerformDrop();
             break;
         case kCROUCH:
-            g_bAutoClearCrouch = true;
+            if (!psActorFlags.test(AF_CROUCH_TOGGLE))
+                g_bAutoClearCrouch = true;
             break;
         }
     }