fixed ignoring clicks on global animations after executing event actions

[rocksndiamonds.git] / src / game_em / input.c

diff --git a/src/game_em/input.c b/src/game_em/input.c
index b2c79ac7f79e475cb4f34214bd0e897f4d6a0c62..4a2be29ec6809e7aeeea376dc1dd689bc8c79e48 100644 (file)
--- a/src/game_em/input.c
+++ b/src/game_em/input.c
@@ -119,6 +119,9 @@ void readjoy(byte action, struct PLAYER *ply)
   int north = 0, east = 0, south = 0, west = 0;
   int snap = 0, drop = 0;
 
+  if (game_em.use_single_button && action & (JOY_BUTTON_1 | JOY_BUTTON_2))
+    action |= JOY_BUTTON_1 | JOY_BUTTON_2;
+
   if (action & JOY_LEFT)
     west = 1;
 
@@ -158,6 +161,10 @@ void readjoy(byte action, struct PLAYER *ply)
       !ply->joy_s &&
       !ply->joy_w)
     ply->joy_snap = snap;
+
+  /* use bug with snap key (mainly TAS keys) sometimes moving the player */
+  if (game_em.use_snap_key_bug)
+    ply->joy_snap = snap;
 }
 
 void SaveEngineSnapshotValues_EM()