projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added ignoring gadgets if click already caused animation event action
[rocksndiamonds.git]
/
src
/
events.c
diff --git
a/src/events.c
b/src/events.c
index b21f3706fef27c21a7d176820c7a117733aa0066..146689f614be357b1d1f6687d9bc1d5331103bd7 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-1554,16
+1554,16
@@
void HandleButton(int mx, int my, int button, int button_nr)
strEqual(setup.touch.control_type, TOUCH_CONTROL_FOLLOW_FINGER));
#endif
strEqual(setup.touch.control_type, TOUCH_CONTROL_FOLLOW_FINGER));
#endif
- if (
handle_gadgets && HandleGadget
s(mx, my, button))
+ if (
HandleGlobalAnimClick
s(mx, my, button))
{
/* do not handle this button event anymore */
{
/* do not handle this button event anymore */
-
mx = my = -32; /* force mouse event to be outside screen tiles
*/
+
return; /* force mouse event not to be handled at all
*/
}
}
- if (
HandleGlobalAnimClick
s(mx, my, button))
+ if (
handle_gadgets && HandleGadget
s(mx, my, button))
{
/* do not handle this button event anymore */
{
/* do not handle this button event anymore */
-
return; /* force mouse event not to be handled at all
*/
+
mx = my = -32; /* force mouse event to be outside screen tiles
*/
}
if (button_hold && game_status == GAME_MODE_PLAYING && tape.pausing)
}
if (button_hold && game_status == GAME_MODE_PLAYING && tape.pausing)