int x, y;
int step_xoffset, step_yoffset;
- boolean restart;
- boolean waiting;
- boolean running;
-
unsigned int initial_anim_sync_frame;
- unsigned int step_frames, step_frames_value;
unsigned int step_delay, step_delay_value;
unsigned int init_delay, init_delay_value;
unsigned int anim_delay, anim_delay_value;
unsigned int post_delay, post_delay_value;
+
+ int state;
};
struct GlobalAnimMainControlInfo
boolean has_base;
- boolean restart;
- boolean waiting;
- boolean running;
-
unsigned int init_delay, init_delay_value;
+
+ int state;
};
struct GlobalAnimControlInfo
anim->has_base = FALSE;
- anim->restart = FALSE;
- anim->waiting = FALSE;
- anim->running = FALSE;
-
anim->init_delay = 0;
anim->init_delay_value = 0;
+ anim->state = ANIM_STATE_INACTIVE;
+
part_nr = 0;
for (i = 0; i < num_toons; i++)
part->control_info.x = ARG_UNDEFINED_VALUE;
part->control_info.y = ARG_UNDEFINED_VALUE;
- part->restart = FALSE;
- part->waiting = FALSE;
- part->running = FALSE;
-
- part->step_frames = 0;
- part->step_frames_value = graphic_info[control].step_frames;
-
part->step_delay = 0;
part->step_delay_value = graphic_info[control].step_delay;
+ part->state = ANIM_STATE_INACTIVE;
+
anim->num_parts++;
part_nr++;
}
anim->has_base = FALSE;
- anim->restart = FALSE;
- anim->waiting = FALSE;
- anim->running = FALSE;
-
anim->init_delay = 0;
anim->init_delay_value = 0;
+ anim->state = ANIM_STATE_INACTIVE;
+
part_nr = 0;
for (p = 0; p < NUM_GLOBAL_ANIM_PARTS_ALL; p++)
part->graphic_info = graphic_info[graphic];
part->control_info = graphic_info[control];
- part->restart = FALSE;
- part->waiting = FALSE;
- part->running = FALSE;
-
- part->step_frames = 0;
- part->step_frames_value = graphic_info[control].step_frames;
-
part->step_delay = 0;
part->step_delay_value = graphic_info[control].step_delay;
+ part->state = ANIM_STATE_INACTIVE;
+
if (p < GLOBAL_ANIM_ID_PART_BASE)
{
anim->num_parts++;
int part_first, part_last;
int part_nr;
- if (!anim->running)
+ if (!(anim->state & ANIM_STATE_RUNNING))
continue;
part_first = part_last = anim->active_part_nr;
int sync_frame;
int frame;
- if (!part->running)
+ if (!(part->state & ANIM_STATE_RUNNING))
continue;
if (part->x < 0)
}
}
-boolean HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part,
- boolean restart)
+int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part, int state)
{
struct GraphicInfo *g = &part->graphic_info;
struct GraphicInfo *c = &part->control_info;
- if (restart)
+ if (state & ANIM_STATE_RESTART)
{
ResetDelayCounterExt(&part->step_delay, anim_sync_frame);
- part->initial_anim_sync_frame = (g->anim_global_sync ? 0 : anim_sync_frame);
- part->step_frames = 0;
+ part->init_delay_value =
+ (c->init_delay_fixed + GetSimpleRandom(c->init_delay_random));
+
+ part->anim_delay_value =
+ (c->anim_delay_fixed + GetSimpleRandom(c->anim_delay_random));
+
+ part->initial_anim_sync_frame =
+ (g->anim_global_sync ? 0 : anim_sync_frame + part->init_delay_value);
if (c->direction & MV_HORIZONTAL)
{
part->step_yoffset = c->step_yoffset;
}
+ if (part->init_delay_value > 0)
+ {
+ part->init_delay_value--;
+
+ return ANIM_STATE_WAITING;
+ }
+
if ((part->x <= -g->width && part->step_xoffset <= 0) ||
(part->x >= FULL_SXSIZE && part->step_xoffset >= 0) ||
(part->y <= -g->height && part->step_yoffset <= 0) ||
(part->y >= FULL_SYSIZE && part->step_yoffset >= 0))
- return TRUE;
+ return ANIM_STATE_RESTART;
+
+ if (part->anim_delay_value > 0)
+ {
+ part->anim_delay_value--;
- if (part->step_frames_value != ARG_UNDEFINED_VALUE &&
- part->step_frames >= part->step_frames_value)
- return TRUE;
+ if (part->anim_delay_value == 0)
+ return ANIM_STATE_RESTART | ANIM_STATE_RUNNING;
+ }
if (!DelayReachedExt(&part->step_delay, part->step_delay_value,
anim_sync_frame))
- return FALSE;
+ return ANIM_STATE_RUNNING;
#if 0
{
part->x += part->step_xoffset;
part->y += part->step_yoffset;
- part->step_frames++;
-
- return FALSE;
+ return ANIM_STATE_RUNNING;
}
void HandleGlobalAnim_Main(struct GlobalAnimMainControlInfo *anim, int action)
{
struct GlobalAnimPartControlInfo *part;
struct GraphicInfo *c = &anim->control_info;
- struct GraphicInfo *cp;
boolean skip = FALSE;
#if 0
action == ANIM_CONTINUE ? "ANIM_CONTINUE" :
action == ANIM_STOP ? "ANIM_STOP" : "(should not happen)"),
anim->nr,
- anim->restart, anim->waiting, anim->running,
+ anim->state & ANIM_STATE_RESTART,
+ anim->state & ANIM_STATE_WAITING,
+ anim->state & ANIM_STATE_RUNNING,
anim->num_parts);
#endif
switch (action)
{
case ANIM_START:
- anim->restart = TRUE;
- anim->waiting = FALSE;
- anim->running = FALSE;
+ anim->state = ANIM_STATE_RESTART;
anim->part_counter = 0;
anim->active_part_nr = 0;
skip = TRUE;
break;
case ANIM_CONTINUE:
- if (!anim->restart &&
- !anim->waiting &&
- !anim->running)
+ if (anim->state == ANIM_STATE_INACTIVE)
skip = TRUE;
break;
case ANIM_STOP:
- anim->restart = FALSE;
- anim->waiting = FALSE;
- anim->running = FALSE;
+ anim->state = ANIM_STATE_INACTIVE;
skip = TRUE;
break;
for (i = 0; i < num_parts; i++)
{
part = &anim->part[i];
- cp = &part->control_info;
switch (action)
{
case ANIM_START:
- anim->running = TRUE;
-
- part->restart = TRUE;
- part->waiting = FALSE;
- part->running = FALSE;
+ anim->state = ANIM_STATE_RUNNING;
+ part->state = ANIM_STATE_RESTART;
skip = TRUE;
break;
case ANIM_CONTINUE:
- if (!part->restart &&
- !part->waiting &&
- !part->running)
+ if (part->state == ANIM_STATE_INACTIVE)
skip = TRUE;
break;
case ANIM_STOP:
- part->restart = FALSE;
- part->waiting = FALSE;
- part->running = FALSE;
+ part->state = ANIM_STATE_INACTIVE;
skip = TRUE;
break;
if (skip)
continue;
- if (part->restart)
- {
-#if 0
- printf("::: RESTART %d.%d\n", part->anim_nr, part->nr);
-#endif
-
- if (!part->waiting)
- {
-#if 0
- printf("::: WAITING %d.%d\n", part->anim_nr, part->nr);
-#endif
-
- ResetDelayCounterExt(&part->init_delay, anim_sync_frame);
-
- part->init_delay_value =
- (cp->init_delay_fixed + GetSimpleRandom(cp->init_delay_random));
-
- part->waiting = TRUE;
- }
-
- if (!DelayReachedExt(&part->init_delay, part->init_delay_value,
- anim_sync_frame))
- return;
-
-#if 0
- printf("::: RUNNING %d.%d\n", part->anim_nr, part->nr);
-#endif
-
- part->waiting = FALSE;
- part->running = TRUE;
- }
-
-#if 0
- printf("::: DO PART %d.%d [%d, %d, %d] [%d]\n", part->anim_nr, part->nr,
- part->restart, part->waiting, part->running,
- anim->running);
-#endif
-
- part->restart = HandleGlobalAnim_Part(part, part->restart);
-
- if (part->restart)
- part->running = FALSE;
+ part->state = HandleGlobalAnim_Part(part, part->state);
}
return;
if (skip)
return;
- if (anim->restart && !anim->waiting) // directly after restart
+ if (anim->state & ANIM_STATE_RESTART) // directly after restart
anim->active_part_nr = getGlobalAnimationPart(anim);
part = &anim->part[anim->active_part_nr];
- if (anim->restart)
- {
- if (!anim->waiting)
- {
- cp = &part->control_info;
-
- ResetDelayCounterExt(&part->init_delay, anim_sync_frame);
-
- part->init_delay_value =
- (cp->init_delay_fixed + GetSimpleRandom(cp->init_delay_random));
-
- anim->waiting = TRUE;
- }
+ part->state = ANIM_STATE_RUNNING;
- if (!DelayReachedExt(&part->init_delay, part->init_delay_value,
- anim_sync_frame))
- return;
-
- anim->waiting = FALSE;
- anim->running = TRUE;
- }
-
- part->running = TRUE;
-
- anim->restart = HandleGlobalAnim_Part(part, anim->restart);
-
- if (anim->restart)
- {
- anim->running = FALSE;
+ anim->state = HandleGlobalAnim_Part(part, anim->state);
+ if (anim->state & ANIM_STATE_RESTART)
anim->part_counter++;
- }
}
void HandleGlobalAnim_Mode(struct GlobalAnimControlInfo *ctrl, int action)
projects / rocksndiamonds.git / blobdiff