projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed stopping music if global anim music differs from current music
[rocksndiamonds.git]
/
src
/
events.c
diff --git
a/src/events.c
b/src/events.c
index 985dc2a2e2e84f775fbbf2e2e3a650a6c179fa6d..d9ba05860c5c30011bd6591314127116e1766af6 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-2204,6
+2204,9
@@
void HandleKey(Key key, int key_status)
// reset flag to ignore repeated "key pressed" events after key release
ignore_repeated_key = FALSE;
// reset flag to ignore repeated "key pressed" events after key release
ignore_repeated_key = FALSE;
+ // send key release event to global animation event handling
+ HandleGlobalAnimClicks(-1, -1, KEY_RELEASED, FALSE);
+
return;
}
return;
}
@@
-2553,14
+2556,14
@@
static void HandleTileCursor(int dx, int dy, int button)
{
int old_xpos = tile_cursor.xpos;
int old_ypos = tile_cursor.ypos;
{
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);
}
SetTileCursorTargetXY(new_xpos, new_ypos);
}
@@
-2614,12
+2617,15
@@
void HandleJoystick(void)
int up = joy & JOY_UP;
int down = joy & JOY_DOWN;
int button = joy & JOY_BUTTON;
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);
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;
{
// do not handle this button event anymore
return;