projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed variable
[rocksndiamonds.git]
/
src
/
anim.c
diff --git
a/src/anim.c
b/src/anim.c
index eefb5a1dba076afd59842c4f05459dec1ab1e465..ff44369c1576c827007e44e8460f02affb2538be 100644
(file)
--- a/
src/anim.c
+++ b/
src/anim.c
@@
-1635,12
+1635,14
@@
static void DoAnimationExt(void)
static boolean DoGlobalAnim_EventAction(struct GlobalAnimPartControlInfo *part)
{
static boolean DoGlobalAnim_EventAction(struct GlobalAnimPartControlInfo *part)
{
- int anim_event_action = part->control_info.anim_event_action;
+ int event_action = (part->init_event_state ?
+ part->control_info.init_event_action :
+ part->control_info.anim_event_action);
- if (
anim_event_action == -1
)
+ if (
event_action == ANIM_EVENT_ACTION_NONE
)
return FALSE;
return FALSE;
- PushUserEvent(USEREVENT_ANIM_EVENT_ACTION,
anim_
event_action, 0);
+ PushUserEvent(USEREVENT_ANIM_EVENT_ACTION, event_action, 0);
// check if further actions are allowed to be executed
if (part->control_info.style & STYLE_MULTIPLE_ACTIONS)
// check if further actions are allowed to be executed
if (part->control_info.style & STYLE_MULTIPLE_ACTIONS)