From: Holger Schemel <info@artsoft.org>
Date: Thu, 7 Sep 2017 18:32:52 +0000 (+0200)
Subject: fixed bug with TAS snap keys sometimes moving the player (EM engine only)
X-Git-Tag: 4.0.1.0~16
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=c138430b14041bf340d371fd3cd27e727c4c50c1;p=rocksndiamonds.git

fixed bug with TAS snap keys sometimes moving the player (EM engine only)
---

diff --git a/src/game_em/input.c b/src/game_em/input.c
index 4028f19a..b2c79ac7 100644
--- a/src/game_em/input.c
+++ b/src/game_em/input.c
@@ -137,16 +137,27 @@ void readjoy(byte action, struct PLAYER *ply)
   if (action & JOY_BUTTON_2)
     drop = 1;
 
-  ply->joy_snap = snap;
+  /* always update drop action */
   ply->joy_drop = drop;
 
-  if (ply->joy_stick || (north | east | south | west))
+  if (ply->joy_stick || (north | east | south | west))	/* (no "| snap"!) */
   {
     ply->joy_n = north;
     ply->joy_e = east;
     ply->joy_s = south;
     ply->joy_w = west;
+
+    /* when storing last action, only update snap action with direction */
+    /* (prevents clearing direction if snapping stopped before frame 7) */
+    ply->joy_snap = snap;
   }
+
+  /* if no direction was stored before, allow setting snap to current state */
+  if (!ply->joy_n &&
+      !ply->joy_e &&
+      !ply->joy_s &&
+      !ply->joy_w)
+    ply->joy_snap = snap;
 }
 
 void SaveEngineSnapshotValues_EM()