static int old_mx = 0, old_my = 0;
boolean button_hold = FALSE;
boolean handle_gadgets = TRUE;
+ int game_status_last = game_status;
if (button_nr < 0)
{
if (handle_gadgets && HandleGadgets(mx, my, button))
{
- // do not handle this button event anymore
+ // do not handle this button event anymore with position on screen
mx = my = -32; // force mouse event to be outside screen tiles
+
+ // do not handle this button event anymore if game status has changed
+ if (game_status != game_status_last)
+ return;
}
if (button_hold && game_status == GAME_MODE_PLAYING && tape.pausing)
{
int old_xpos = tile_cursor.xpos;
int old_ypos = tile_cursor.ypos;
- int new_xpos = old_xpos;
- int new_ypos = old_ypos;
+ int new_xpos = tile_cursor.xpos + dx;
+ int new_ypos = tile_cursor.ypos + dy;
- if (IN_LEV_FIELD(old_xpos + dx, old_ypos))
- new_xpos = old_xpos + dx;
+ 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, old_ypos + dy))
- new_ypos = old_ypos + dy;
+ if (!IN_LEV_FIELD(old_xpos, new_ypos) || !IN_SCR_FIELD(old_xpos, new_ypos))
+ new_ypos = old_ypos;
SetTileCursorTargetXY(new_xpos, new_ypos);
}