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 de1c40bff53c07c41cd9f4119c4cedfdcb1aef01..50cbba7b73521e650248525867e655b447f16e7e 100644
(file)
--- a/
src/anim.c
+++ b/
src/anim.c
@@
-1003,10
+1003,8
@@
static boolean isClickedPart(struct GlobalAnimPartControlInfo *part,
return TRUE;
}
return TRUE;
}
-static boolean
setPartClick
ed(struct GlobalAnimPartControlInfo *part)
+static boolean
clickConsum
ed(struct GlobalAnimPartControlInfo *part)
{
{
- part->clicked = TRUE;
-
return (part->control_info.style & STYLE_PASSTHROUGH ? FALSE : TRUE);
}
return (part->control_info.style & STYLE_PASSTHROUGH ? FALSE : TRUE);
}
@@
-1452,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()
@@
-1518,7
+1517,10
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
// always handle "any" click events (clicking anywhere on screen) ...
if (isClickablePart(part, ANIM_EVENT_ANY))
// always handle "any" click events (clicking anywhere on screen) ...
if (isClickablePart(part, ANIM_EVENT_ANY))
- anything_clicked = setPartClicked(part);
+ {
+ part->clicked = TRUE;
+ anything_clicked = clickConsumed(part);
+ }
// ... but only handle the first (topmost) clickable animation
if (any_part_clicked)
// ... but only handle the first (topmost) clickable animation
if (any_part_clicked)
@@
-1538,7
+1540,10
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
any_part_clicked = TRUE;
if (isClickablePart(part, ANIM_EVENT_SELF))
any_part_clicked = TRUE;
if (isClickablePart(part, ANIM_EVENT_SELF))
- anything_clicked = setPartClicked(part);
+ {
+ part->clicked = TRUE;
+ anything_clicked = clickConsumed(part);
+ }
// check if this click is defined to trigger other animations
int gic_anim_nr = part->old_anim_nr + 1; // X as in "anim_X"
// check if this click is defined to trigger other animations
int gic_anim_nr = part->old_anim_nr + 1; // X as in "anim_X"
@@
-1564,7
+1569,8
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
if (isClickablePart(part2, mask))
{
if (isClickablePart(part2, mask))
{
- setPartClicked(part2);
+ part2->clicked = TRUE;
+ anything_clicked = clickConsumed(part); // click was on "part"!
#if 0
printf("::: %d.%d TRIGGER CLICKED [%d]\n", anim2_nr, part2_nr,
#if 0
printf("::: %d.%d TRIGGER CLICKED [%d]\n", anim2_nr, part2_nr,
@@
-1595,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()