projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f7e45f2
)
added support for more event types that can trigger global animations
author
Holger Schemel
<info@artsoft.org>
Thu, 14 Mar 2019 00:55:36 +0000
(
01:55
+0100)
committer
Holger Schemel
<info@artsoft.org>
Thu, 14 Mar 2019 00:57:15 +0000
(
01:57
+0100)
src/anim.c
patch
|
blob
|
history
diff --git
a/src/anim.c
b/src/anim.c
index cb415db928da6663342e55362da38db7ead0caf5..933af1dec0b6d713bbc13567f2cf9b9f1147de0b 100644
(file)
--- a/
src/anim.c
+++ b/
src/anim.c
@@
-113,6
+113,7
@@
struct GlobalAnimPartControlInfo
boolean init_event_state;
boolean anim_event_state;
boolean init_event_state;
boolean anim_event_state;
+ boolean triggered;
boolean clickable;
boolean clicked;
boolean clickable;
boolean clicked;
@@
-1095,7
+1096,7
@@
static void InitGlobalAnim_Triggered(struct GlobalAnimPartControlInfo *part,
if (isClickablePart(part2, mask))
{
if (isClickablePart(part2, mask))
{
- part2->
click
ed = TRUE;
+ part2->
trigger
ed = TRUE;
*anything_clicked = clickConsumed(part); // click was on "part"!
#if 0
*anything_clicked = clickConsumed(part); // click was on "part"!
#if 0
@@
-1600,6
+1601,10
@@
static void InitGlobalAnim_Clickable(void)
{
struct GlobalAnimPartControlInfo *part = &anim->part[part_nr];
{
struct GlobalAnimPartControlInfo *part = &anim->part[part_nr];
+ if (part->triggered)
+ part->clicked = TRUE;
+
+ part->triggered = FALSE;
part->clickable = FALSE;
}
}
part->clickable = FALSE;
}
}