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
/
anim.c
diff --git
a/src/anim.c
b/src/anim.c
index 0043a3e9c864c6b516e6183540c9dff26426de0d..50cbba7b73521e650248525867e655b447f16e7e 100644
(file)
--- a/
src/anim.c
+++ b/
src/anim.c
@@
-1450,7
+1450,8
@@
static boolean DoGlobalAnim_EventAction(struct GlobalAnimPartControlInfo *part)
if (anim_event_action == -1)
return FALSE;
if (anim_event_action == -1)
return FALSE;
- return DoGadgetAction(anim_event_action);
+ return (DoGadgetAction(anim_event_action) ||
+ DoScreenAction(anim_event_action));
}
static void InitGlobalAnim_Clickable()
}
static void InitGlobalAnim_Clickable()
@@
-1600,7
+1601,7
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
}
}
}
}
- return
anything_clicked
;
+ return
(anything_clicked || any_event_action)
;
}
static void ResetGlobalAnim_Clickable()
}
static void ResetGlobalAnim_Clickable()