projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f93552d
)
cleanup of (boolean) animation event state handling
author
Holger Schemel
<info@artsoft.org>
Tue, 12 Mar 2019 21:14:13 +0000
(22:14 +0100)
committer
Holger Schemel
<info@artsoft.org>
Tue, 12 Mar 2019 21:14:13 +0000
(22:14 +0100)
src/anim.c
patch
|
blob
|
history
diff --git
a/src/anim.c
b/src/anim.c
index 861364d727e4606a7ff284cb9f0893eb85a0f7c9..4ea38b41afbb98bbd52e2566cb95ee3226e84b45 100644
(file)
--- a/
src/anim.c
+++ b/
src/anim.c
@@
-1073,8
+1073,8
@@
static int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part,
part->anim_delay_counter =
(c->anim_delay_fixed + GetSimpleRandom(c->anim_delay_random));
part->anim_delay_counter =
(c->anim_delay_fixed + GetSimpleRandom(c->anim_delay_random));
- part->init_event_state =
GetGlobalAnimEventValue(c->init_event, 0
);
- part->anim_event_state =
GetGlobalAnimEventValue(c->anim_event, 0
);
+ part->init_event_state =
(c->init_event != ANIM_EVENT_UNDEFINED
);
+ part->anim_event_state =
(c->anim_event != ANIM_EVENT_UNDEFINED
);
part->initial_anim_sync_frame =
(g->anim_global_sync ? 0 : anim_sync_frame + part->init_delay_counter);
part->initial_anim_sync_frame =
(g->anim_global_sync ? 0 : anim_sync_frame + part->init_delay_counter);
@@
-1161,27
+1161,27
@@
static int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part,
part->step_yoffset = c->step_yoffset;
if (part->init_delay_counter == 0 &&
part->step_yoffset = c->step_yoffset;
if (part->init_delay_counter == 0 &&
-
part->init_event_state == ANIM_EVENT_NONE
)
+
!part->init_event_state
)
PlayGlobalAnimSoundAndMusic(part);
}
if (part->clicked &&
PlayGlobalAnimSoundAndMusic(part);
}
if (part->clicked &&
- part->init_event_state
!= ANIM_EVENT_NONE
)
+ part->init_event_state)
{
if (part->initial_anim_sync_frame > 0)
part->initial_anim_sync_frame -= part->init_delay_counter - 1;
part->init_delay_counter = 1;
{
if (part->initial_anim_sync_frame > 0)
part->initial_anim_sync_frame -= part->init_delay_counter - 1;
part->init_delay_counter = 1;
- part->init_event_state =
ANIM_EVENT_NON
E;
+ part->init_event_state =
FALS
E;
part->clicked = FALSE;
}
if (part->clicked &&
part->clicked = FALSE;
}
if (part->clicked &&
- part->anim_event_state
!= ANIM_EVENT_NONE
)
+ part->anim_event_state)
{
part->anim_delay_counter = 1;
{
part->anim_delay_counter = 1;
- part->anim_event_state =
ANIM_EVENT_NON
E;
+ part->anim_event_state =
FALS
E;
part->clicked = FALSE;
}
part->clicked = FALSE;
}
@@
-1192,7
+1192,7
@@
static int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part,
if (part->init_delay_counter == 0)
{
if (part->init_delay_counter == 0)
{
- part->init_event_state =
ANIM_EVENT_NON
E;
+ part->init_event_state =
FALS
E;
PlayGlobalAnimSoundAndMusic(part);
}
PlayGlobalAnimSoundAndMusic(part);
}
@@
-1200,7
+1200,7
@@
static int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part,
return ANIM_STATE_WAITING;
}
return ANIM_STATE_WAITING;
}
- if (part->init_event_state
!= ANIM_EVENT_NONE
)
+ if (part->init_event_state)
return ANIM_STATE_WAITING;
// animation part is now running/visible and therefore clickable
return ANIM_STATE_WAITING;
// animation part is now running/visible and therefore clickable
@@
-1213,7
+1213,7
@@
static int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part,
(part->y >= part->viewport_height && part->step_yoffset >= 0))
{
// do not wait for "anim" events for off-screen animations
(part->y >= part->viewport_height && part->step_yoffset >= 0))
{
// do not wait for "anim" events for off-screen animations
- part->anim_event_state =
ANIM_EVENT_NON
E;
+ part->anim_event_state =
FALS
E;
// do not stop animation before "anim" or "post" counter are finished
if (part->anim_delay_counter == 0 &&
// do not stop animation before "anim" or "post" counter are finished
if (part->anim_delay_counter == 0 &&
@@
-1238,7
+1238,7
@@
static int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part,
if (part->anim_delay_counter == 0)
{
if (part->anim_delay_counter == 0)
{
- part->anim_event_state =
ANIM_EVENT_NON
E;
+ part->anim_event_state =
FALS
E;
StopGlobalAnimSoundAndMusic(part);
StopGlobalAnimSoundAndMusic(part);