projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added event actions (by triggering gadgets) for global animations
[rocksndiamonds.git]
/
src
/
anim.c
diff --git
a/src/anim.c
b/src/anim.c
index 054c6a00764f533e0a78d8208d0e047ab6304220..d1ae06a105391ab6b4deda15d2199ce6ec1279fa 100644
(file)
--- a/
src/anim.c
+++ b/
src/anim.c
@@
-1438,6
+1438,16
@@
static void DoAnimationExt()
#endif
}
#endif
}
+static boolean DoGlobalAnim_EventAction(struct GlobalAnimPartControlInfo *part)
+{
+ int anim_event_action = part->control_info.anim_event_action;
+
+ if (anim_event_action == -1)
+ return FALSE;
+
+ return DoGadgetAction(anim_event_action);
+}
+
static void InitGlobalAnim_Clickable()
{
int mode_nr;
static void InitGlobalAnim_Clickable()
{
int mode_nr;
@@
-1495,6
+1505,9
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
if (!part->clickable)
continue;
if (!part->clickable)
continue;
+ if (part->state != ANIM_STATE_RUNNING)
+ continue;
+
// always handle "any" click events (clicking anywhere on screen) ...
if (isClickablePart(part, ANIM_EVENT_ANY))
anything_clicked = part->clicked = TRUE;
// always handle "any" click events (clicking anywhere on screen) ...
if (isClickablePart(part, ANIM_EVENT_ANY))
anything_clicked = part->clicked = TRUE;
@@
-1506,9
+1519,14
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
if (isClickedPart(part, mx, my, clicked))
{
#if 0
if (isClickedPart(part, mx, my, clicked))
{
#if 0
- printf("::: %d.%d CLICKED\n", anim_nr, part_nr);
+ printf("::: %d.%d CLICKED [%d]\n", anim_nr, part_nr,
+ part->control_info.anim_event_action);
#endif
#endif
+ // after executing event action, force click to be ignored
+ if (DoGlobalAnim_EventAction(part))
+ return TRUE;
+
any_part_clicked = TRUE;
if (isClickablePart(part, ANIM_EVENT_SELF))
any_part_clicked = TRUE;
if (isClickablePart(part, ANIM_EVENT_SELF))
@@
-1533,9
+1551,23
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
{
struct GlobalAnimPartControlInfo *part2 = &anim2->part[part2_nr];
{
struct GlobalAnimPartControlInfo *part2 = &anim2->part[part2_nr];
+ if (part2->state != ANIM_STATE_RUNNING)
+ continue;
+
if (isClickablePart(part2, mask))
if (isClickablePart(part2, mask))
+ {
anything_clicked = part2->clicked = TRUE;
anything_clicked = part2->clicked = TRUE;
+#if 0
+ printf("::: %d.%d TRIGGER CLICKED [%d]\n", anim2_nr, part2_nr,
+ part2->control_info.anim_event_action);
+#endif
+
+ // after executing event action, force click to be ignored
+ if (DoGlobalAnim_EventAction(part2))
+ return TRUE;
+ }
+
#if 0
struct GraphicInfo *c = &part2->control_info;
#if 0
struct GraphicInfo *c = &part2->control_info;