fixed sending button press/release events to animation event handling

[rocksndiamonds.git] / src / events.c

diff --git a/src/events.c b/src/events.c
index 2810e84f11643b1cb09a99bde0faf69efb90dafc..648b035f0a9e1702dfa22fc5cfe30aed15fdca4e 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -2556,10 +2556,10 @@ static void HandleTileCursor(int dx, int dy, int button)
     int new_xpos = tile_cursor.xpos + dx;
     int new_ypos = tile_cursor.ypos + dy;
 
-    if (!IN_LEV_FIELD(new_xpos, old_ypos))
+    if (!IN_LEV_FIELD(new_xpos, old_ypos) || !IN_SCR_FIELD(new_xpos, old_ypos))
       new_xpos = old_xpos;
 
-    if (!IN_LEV_FIELD(old_xpos, new_ypos))
+    if (!IN_LEV_FIELD(old_xpos, new_ypos) || !IN_SCR_FIELD(old_xpos, new_ypos))
       new_ypos = old_ypos;
 
     SetTileCursorTargetXY(new_xpos, new_ypos);
@@ -2614,12 +2614,15 @@ void HandleJoystick(void)
   int up       = joy & JOY_UP;
   int down     = joy & JOY_DOWN;
   int button   = joy & JOY_BUTTON;
-  int newbutton        = (AnyJoystickButton() == JOY_BUTTON_NEW_PRESSED);
+  int anybutton = AnyJoystickButton();
+  int newbutton        = (anybutton == JOY_BUTTON_NEW_PRESSED);
   int dx       = (left ? -1    : right ? 1     : 0);
   int dy       = (up   ? -1    : down  ? 1     : 0);
   boolean use_delay_value_first = (joytest != joytest_last);
+  boolean new_button_event = (anybutton == JOY_BUTTON_NEW_PRESSED ||
+                             anybutton == JOY_BUTTON_NEW_RELEASED);
 
-  if (HandleGlobalAnimClicks(-1, -1, newbutton, FALSE))
+  if (new_button_event && HandleGlobalAnimClicks(-1, -1, newbutton, FALSE))
   {
     // do not handle this button event anymore
     return;