projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1c7bb35
)
fixed bug with resetting variable which may already be set
author
Holger Schemel
<info@artsoft.org>
Thu, 30 May 2019 18:38:04 +0000
(20:38 +0200)
committer
Holger Schemel
<info@artsoft.org>
Thu, 30 May 2019 18:38:13 +0000
(20:38 +0200)
src/anim.c
patch
|
blob
|
history
diff --git
a/src/anim.c
b/src/anim.c
index 9ab9f6dcf4356b4d9ec45300daed590a5103fa37..0aa1c0f4ff12a0970415d9c2b5f67f87429f8b04 100644
(file)
--- a/
src/anim.c
+++ b/
src/anim.c
@@
-1164,7
+1164,7
@@
static void InitGlobalAnim_Triggered(struct GlobalAnimPartControlInfo *part,
if (isClickablePart(part2, mask))
{
part2->triggered = TRUE;
if (isClickablePart(part2, mask))
{
part2->triggered = TRUE;
- *click_consumed
= clickConsumed(part);
// click was on "part"!
+ *click_consumed
|= clickConsumed(part);
// click was on "part"!
#if DEBUG_ANIM_EVENTS
printf("::: => %d.%d TRIGGERED BY %s OF %d.%d\n",
#if DEBUG_ANIM_EVENTS
printf("::: => %d.%d TRIGGERED BY %s OF %d.%d\n",
@@
-1804,7
+1804,7
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event)
#endif
part->clicked = TRUE;
#endif
part->clicked = TRUE;
- click_consumed = clickConsumed(part);
+ click_consumed
|
= clickConsumed(part);
}
// always handle "unclick:any" events (releasing anywhere on screen) ...
}
// always handle "unclick:any" events (releasing anywhere on screen) ...
@@
-1817,7
+1817,7
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event)
#endif
part->clicked = TRUE;
#endif
part->clicked = TRUE;
- click_consumed = clickConsumed(part);
+ click_consumed
|
= clickConsumed(part);
}
// ... but only handle the first (topmost) clickable animation
}
// ... but only handle the first (topmost) clickable animation
@@
-1837,7
+1837,7
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event)
any_event_action = TRUE;
// determine if mouse clicks should be blocked from other animations
any_event_action = TRUE;
// determine if mouse clicks should be blocked from other animations
- any_part_clicked = clickConsumed(part);
+ any_part_clicked
|
= clickConsumed(part);
if (isClickablePart(part, ANIM_EVENT_SELF))
{
if (isClickablePart(part, ANIM_EVENT_SELF))
{
@@
-1847,7
+1847,7
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event)
#endif
part->clicked = TRUE;
#endif
part->clicked = TRUE;
- click_consumed = clickConsumed(part);
+ click_consumed
|
= clickConsumed(part);
}
// check if this click is defined to trigger other animations
}
// check if this click is defined to trigger other animations