projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
completely refactored client and server side network protocol code
[rocksndiamonds.git]
/
src
/
anim.c
diff --git
a/src/anim.c
b/src/anim.c
index 81441829e8694ef2b0fb8f44b27cb8443fe45e9e..0a278aa35cb36a97983be9ea1cc7b62934bb3799 100644
(file)
--- a/
src/anim.c
+++ b/
src/anim.c
@@
-14,6
+14,8
@@
#include "anim.h"
#include "main.h"
#include "tools.h"
#include "anim.h"
#include "main.h"
#include "tools.h"
+#include "events.h"
+#include "screens.h"
/* values for global toon animation definition */
/* values for global toon animation definition */
@@
-1451,7
+1453,8
@@
static boolean DoGlobalAnim_EventAction(struct GlobalAnimPartControlInfo *part)
return FALSE;
boolean action_executed = (DoGadgetAction(anim_event_action) ||
return FALSE;
boolean action_executed = (DoGadgetAction(anim_event_action) ||
- DoScreenAction(anim_event_action));
+ DoScreenAction(anim_event_action) ||
+ DoKeysymAction(anim_event_action));
// check if further actions are allowed to be executed
if (part->control_info.style & STYLE_MULTIPLE_ACTIONS)
// check if further actions are allowed to be executed
if (part->control_info.style & STYLE_MULTIPLE_ACTIONS)
@@
-1543,7
+1546,8
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
if (!any_event_action && DoGlobalAnim_EventAction(part))
any_event_action = TRUE;
if (!any_event_action && DoGlobalAnim_EventAction(part))
any_event_action = TRUE;
- any_part_clicked = TRUE;
+ // determine if mouse clicks should be blocked from other animations
+ any_part_clicked = clickConsumed(part);
if (isClickablePart(part, ANIM_EVENT_SELF))
{
if (isClickablePart(part, ANIM_EVENT_SELF))
{