projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
70fe541
)
fixed handling passthrough option for clickable global animations
author
Holger Schemel
<info@artsoft.org>
Sun, 10 Jun 2018 13:52:16 +0000
(15:52 +0200)
committer
Holger Schemel
<info@artsoft.org>
Sun, 17 Jun 2018 22:02:49 +0000
(
00:02
+0200)
src/anim.c
patch
|
blob
|
history
diff --git
a/src/anim.c
b/src/anim.c
index de1c40bff53c07c41cd9f4119c4cedfdcb1aef01..0043a3e9c864c6b516e6183540c9dff26426de0d 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);
}
@@
-1518,7
+1516,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
+1539,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
+1568,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,