projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed unused code (list of score entries is never empty)
[rocksndiamonds.git]
/
src
/
anim.c
diff --git
a/src/anim.c
b/src/anim.c
index 7f6691f0fac1f6c82a4fc7909fa457c97b3b9175..50075c832ab8b42b4993c7c8fa7f7871aeac831c 100644
(file)
--- a/
src/anim.c
+++ b/
src/anim.c
@@
-124,7
+124,8
@@
struct GlobalAnimPartControlInfo
unsigned int initial_anim_sync_frame;
unsigned int anim_random_frame;
unsigned int initial_anim_sync_frame;
unsigned int anim_random_frame;
- unsigned int step_delay, step_delay_value;
+
+ DelayCounter step_delay;
int init_delay_counter;
int anim_delay_counter;
int init_delay_counter;
int anim_delay_counter;
@@
-410,7
+411,8
@@
static void InitToonControls(void)
int sound = SND_UNDEFINED;
int music = MUS_UNDEFINED;
int graphic = IMG_TOON_1 + i;
int sound = SND_UNDEFINED;
int music = MUS_UNDEFINED;
int graphic = IMG_TOON_1 + i;
- int control = graphic;
+
+ control = graphic;
part->nr = part_nr;
part->anim_nr = anim_nr;
part->nr = part_nr;
part->anim_nr = anim_nr;
@@
-436,8
+438,8
@@
static void InitToonControls(void)
part->initial_anim_sync_frame = 0;
part->anim_random_frame = -1;
part->initial_anim_sync_frame = 0;
part->anim_random_frame = -1;
- part->step_delay = 0;
- part->step_delay
_
value = graphic_info[control].step_delay;
+ part->step_delay
.count
= 0;
+ part->step_delay
.
value = graphic_info[control].step_delay;
part->state = ANIM_STATE_INACTIVE;
part->last_anim_status = -1;
part->state = ANIM_STATE_INACTIVE;
part->last_anim_status = -1;
@@
-543,8
+545,8
@@
static void InitGlobalAnimControls(void)
part->initial_anim_sync_frame = 0;
part->anim_random_frame = -1;
part->initial_anim_sync_frame = 0;
part->anim_random_frame = -1;
- part->step_delay = 0;
- part->step_delay
_
value = graphic_info[control].step_delay;
+ part->step_delay
.count
= 0;
+ part->step_delay
.
value = graphic_info[control].step_delay;
part->state = ANIM_STATE_INACTIVE;
part->last_anim_status = -1;
part->state = ANIM_STATE_INACTIVE;
part->last_anim_status = -1;
@@
-1175,12
+1177,12
@@
static boolean isClickedPart(struct GlobalAnimPartControlInfo *part,
static boolean clickBlocked(struct GlobalAnimPartControlInfo *part)
{
static boolean clickBlocked(struct GlobalAnimPartControlInfo *part)
{
- return (
part->control_info.style & STYLE_BLOCK
? TRUE : FALSE);
+ return (
(part->control_info.style & STYLE_BLOCK)
? TRUE : FALSE);
}
static boolean clickConsumed(struct GlobalAnimPartControlInfo *part)
{
}
static boolean clickConsumed(struct GlobalAnimPartControlInfo *part)
{
- return (
part->control_info.style & STYLE_PASSTHROUGH
? FALSE : TRUE);
+ return (
(part->control_info.style & STYLE_PASSTHROUGH)
? FALSE : TRUE);
}
static void InitGlobalAnim_Triggered(struct GlobalAnimPartControlInfo *part,
}
static void InitGlobalAnim_Triggered(struct GlobalAnimPartControlInfo *part,
@@
-1313,7
+1315,8
@@
static int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part,
part->anim_event_state = (c->anim_event != ANIM_EVENT_UNDEFINED);
part->initial_anim_sync_frame =
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);
+ (g->anim_global_sync || g->anim_global_anim_sync ? 0 :
+ anim_sync_frame + part->init_delay_counter);
// do not re-initialize random animation frame after fade-in
if (part->anim_random_frame == -1)
// do not re-initialize random animation frame after fade-in
if (part->anim_random_frame == -1)
@@
-1531,8
+1534,7
@@
static int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part,
// special case to prevent expiring loop sounds when playing
PlayGlobalAnimSoundIfLoop(part);
// special case to prevent expiring loop sounds when playing
PlayGlobalAnimSoundIfLoop(part);
- if (!DelayReachedExt(&part->step_delay, part->step_delay_value,
- anim_sync_frame))
+ if (!DelayReachedExt(&part->step_delay, anim_sync_frame))
return ANIM_STATE_RUNNING;
#if 0
return ANIM_STATE_RUNNING;
#if 0
@@
-1981,3
+1983,8
@@
boolean HandleGlobalAnimClicks(int mx, int my, int button, boolean force_click)
return click_consumed_current;
}
return click_consumed_current;
}
+
+int getGlobalAnimSyncFrame(void)
+{
+ return anim_sync_frame;
+}