projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added handling global animations when showing envelope during tape replay
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index e33344dd6b23cd1a64bd06a2f84d4d8924836fc0..741ce7fdf4ca1a5cc94bb07e43ccf871442fcaea 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-2846,7
+2846,7
@@
void ShowEnvelope(int envelope_nr)
AnimateEnvelope(envelope_nr, main_anim_mode, ACTION_OPENING);
if (tape.playing)
AnimateEnvelope(envelope_nr, main_anim_mode, ACTION_OPENING);
if (tape.playing)
- Delay(wait_delay_value);
+ Delay
_WithScreenUpdates
(wait_delay_value);
else
WaitForEventToContinue();
else
WaitForEventToContinue();
@@
-4333,6
+4333,12
@@
static int RequestHandleEvents(unsigned int req_state)
button_status = MB_RELEASED;
}
button_status = MB_RELEASED;
}
+ if (HandleGlobalAnimClicks(mx, my, button_status, FALSE))
+ {
+ // do not handle this button event anymore
+ continue; // force mouse event not to be handled at all
+ }
+
// this sets 'request_gadget_id'
HandleGadgets(mx, my, button_status);
// this sets 'request_gadget_id'
HandleGadgets(mx, my, button_status);