projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5d31861
)
renamed variable (old name did not describe its use anymore)
author
Holger Schemel
<info@artsoft.org>
Thu, 30 May 2019 18:06:44 +0000
(20:06 +0200)
committer
Holger Schemel
<info@artsoft.org>
Thu, 30 May 2019 18:07:16 +0000
(20:07 +0200)
src/anim.c
patch
|
blob
|
history
diff --git
a/src/anim.c
b/src/anim.c
index 28af9c0027e8bcfc19d8285eab6abb5d14855bb1..9ab9f6dcf4356b4d9ec45300daed590a5103fa37 100644
(file)
--- a/
src/anim.c
+++ b/
src/anim.c
@@
-1134,7
+1134,7
@@
static boolean clickConsumed(struct GlobalAnimPartControlInfo *part)
}
static void InitGlobalAnim_Triggered(struct GlobalAnimPartControlInfo *part,
}
static void InitGlobalAnim_Triggered(struct GlobalAnimPartControlInfo *part,
- boolean *
anything_click
ed,
+ boolean *
click_consum
ed,
boolean *any_event_action,
int event_value, char *info_text)
{
boolean *any_event_action,
int event_value, char *info_text)
{
@@
-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;
- *
anything_clicked = 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",
@@
-1214,11
+1214,11
@@
static void HandleGlobalAnimEvent(struct GlobalAnimPartControlInfo *part,
printf("::: %d.%d %s\n", part->old_anim_nr + 1, part->old_nr + 1, info_text);
#endif
printf("::: %d.%d %s\n", part->old_anim_nr + 1, part->old_nr + 1, info_text);
#endif
- boolean
anything_click
ed = FALSE;
+ boolean
click_consum
ed = FALSE;
boolean any_event_action = FALSE;
// check if this event is defined to trigger other animations
boolean any_event_action = FALSE;
// check if this event is defined to trigger other animations
- InitGlobalAnim_Triggered(part, &
anything_click
ed, &any_event_action,
+ InitGlobalAnim_Triggered(part, &
click_consum
ed, &any_event_action,
event_value, info_text);
}
event_value, info_text);
}
@@
-1759,7
+1759,7
@@
static void InitGlobalAnim_Clickable(void)
static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event)
{
static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event)
{
- boolean
anything_click
ed = FALSE;
+ boolean
click_consum
ed = FALSE;
boolean any_part_clicked = FALSE;
boolean any_event_action = FALSE;
int mode_nr;
boolean any_part_clicked = FALSE;
boolean any_event_action = FALSE;
int mode_nr;
@@
-1804,7
+1804,7
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event)
#endif
part->clicked = TRUE;
#endif
part->clicked = TRUE;
-
anything_click
ed = clickConsumed(part);
+
click_consum
ed = 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;
-
anything_click
ed = clickConsumed(part);
+
click_consum
ed = clickConsumed(part);
}
// ... but only handle the first (topmost) clickable animation
}
// ... but only handle the first (topmost) clickable animation
@@
-1847,18
+1847,18
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event)
#endif
part->clicked = TRUE;
#endif
part->clicked = TRUE;
-
anything_click
ed = clickConsumed(part);
+
click_consum
ed = clickConsumed(part);
}
// check if this click is defined to trigger other animations
}
// check if this click is defined to trigger other animations
- InitGlobalAnim_Triggered(part, &
anything_click
ed, &any_event_action,
+ InitGlobalAnim_Triggered(part, &
click_consum
ed, &any_event_action,
ANIM_EVENT_CLICK, "CLICK");
}
}
}
}
ANIM_EVENT_CLICK, "CLICK");
}
}
}
}
- if (
anything_click
ed)
+ if (
click_consum
ed)
{
handle_click = TRUE;
{
handle_click = TRUE;
@@
-1867,7
+1867,7
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event)
handle_click = FALSE;
}
handle_click = FALSE;
}
- return (
anything_click
ed || any_event_action);
+ return (
click_consum
ed || any_event_action);
}
static void ResetGlobalAnim_Clickable(void)
}
static void ResetGlobalAnim_Clickable(void)