Always Run + Run = Walk (heretic) (#550)

* Always Run + Run = Walk (heretic) * Simplify heretic walk logic
fabiangreffrath · Mar 23, 2020 · 44eff69 · 44eff69 · fabiangreffrath · Mar 23, 2020
1 parent 15ad8be
commit 44eff69
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/heretic/g_game.c b/src/heretic/g_game.c
@@ -307,9 +307,11 @@ void G_BuildTiccmd(ticcmd_t *cmd, int maketic)
 
     strafe = gamekeydown[key_strafe] || mousebuttons[mousebstrafe]
         || joybuttons[joybstrafe];
-    speed = joybspeed >= MAX_JOY_BUTTONS
-         || gamekeydown[key_speed]
-         || joybuttons[joybspeed];
+
+    // [crispy] when "always run" is active,
+    // pressing the "run" key will result in walking
+    speed = (joybspeed >= MAX_JOY_BUTTONS)
+        ^ (gamekeydown[key_speed] || joybuttons[joybspeed]);
 
     // haleyjd: removed externdriver crap