int x, y;
int step_xoffset, step_yoffset;
+ int tile_x, tile_y;
+ int tile_xoffset, tile_yoffset;
+
unsigned int initial_anim_sync_frame;
unsigned int anim_random_frame;
}
}
+ // when restarting global animations, do not redraw them, but stop here
+ if (drawing_stage == DRAW_GLOBAL_ANIM_STAGE_RESTART)
+ return;
+
if (global.anim_status == GAME_MODE_LOADING)
return;
static boolean isClickablePart(struct GlobalAnimPartControlInfo *part, int mask)
{
struct GraphicInfo *c = &part->control_info;
- int num_init_events = GetGlobalAnimEventValueCount(c->init_event);
- int num_anim_events = GetGlobalAnimEventValueCount(c->anim_event);
int i;
- for (i = 0; i < num_init_events; i++)
+ if (part->init_event_state)
{
- int init_event = GetGlobalAnimEventValue(c->init_event, i);
+ int num_init_events = GetGlobalAnimEventValueCount(c->init_event);
- if (checkGlobalAnimEvent(init_event, mask))
- return TRUE;
+ for (i = 0; i < num_init_events; i++)
+ {
+ int init_event = GetGlobalAnimEventValue(c->init_event, i);
+
+ if (checkGlobalAnimEvent(init_event, mask))
+ return TRUE;
+ }
}
- for (i = 0; i < num_anim_events; i++)
+ if (part->anim_event_state)
{
- int anim_event = GetGlobalAnimEventValue(c->anim_event, i);
+ int num_anim_events = GetGlobalAnimEventValueCount(c->anim_event);
- if (checkGlobalAnimEvent(anim_event, mask))
- return TRUE;
+ for (i = 0; i < num_anim_events; i++)
+ {
+ int anim_event = GetGlobalAnimEventValue(c->anim_event, i);
+
+ if (checkGlobalAnimEvent(anim_event, mask))
+ return TRUE;
+ }
}
return FALSE;
}
}
-static void InitGlobalAnim_Triggered_ByCustomElement(int nr, int page)
+static void InitGlobalAnim_Triggered_ByCustomElement(int nr, int page,
+ int x, int y)
{
struct GlobalAnimControlInfo *ctrl = &global_anim_ctrl[GAME_MODE_PLAYING];
if (!(part2->state & ANIM_STATE_RUNNING))
continue;
- if (isClickablePart(part2, mask))
+ if (isClickablePart(part2, mask) && !part2->triggered)
{
+ struct GraphicInfo *c = &part2->control_info;
+
+ if (c->position == POS_CE)
+ {
+ // store CE tile and offset position to handle scrolling
+ part2->tile_x = x;
+ part2->tile_y = y;
+ part2->tile_xoffset = c->x;
+ part2->tile_yoffset = c->y;
+
+ // restart animation (by using current sync frame)
+ part2->initial_anim_sync_frame = anim_sync_frame;
+ }
+
part2->triggered = TRUE;
+ // do not trigger any other animation if CE change event was consumed
+ if (c->style == STYLE_CONSUME_CE_EVENT)
+ return;
+
#if 0
Debug("anim:InitGlobalAnim_Triggered_ByCustomElement",
"%d.%d TRIGGERED BY CE %d", anim2_nr, part2_nr, nr + 1);
part->init_event_state)
{
if (part->initial_anim_sync_frame > 0)
- part->initial_anim_sync_frame -= part->init_delay_counter - 1;
+ part->initial_anim_sync_frame = anim_sync_frame;
part->init_delay_counter = 1;
part->init_event_state = FALSE;
HandleGlobalAnimDelay(part, ANIM_DELAY_INIT, "START [INIT_DELAY]");
HandleGlobalAnimEvent(part, ANIM_EVENT_START, "START [ANIM]");
- }
- return ANIM_STATE_WAITING;
+ // continue with state ANIM_STATE_RUNNING (set below)
+ }
+ else
+ {
+ return ANIM_STATE_WAITING;
+ }
}
if (part->init_event_state)
}
#endif
- part->x += part->step_xoffset;
- part->y += part->step_yoffset;
+ if (c->position == POS_CE)
+ {
+ // calculate playfield position (with scrolling) for related CE tile
+ int fx = getFieldbufferOffsetX_RND(ScreenMovDir, ScreenGfxPos);
+ int fy = getFieldbufferOffsetY_RND(ScreenMovDir, ScreenGfxPos);
+ int sx = FX + SCREENX(part->tile_x) * TILEX_VAR;
+ int sy = FY + SCREENY(part->tile_y) * TILEY_VAR;
+ int x = sx - fx;
+ int y = sy - fy;
+
+ part->tile_xoffset += part->step_xoffset;
+ part->tile_yoffset += part->step_yoffset;
+
+ part->x = x + part->tile_xoffset;
+ part->y = y + part->tile_yoffset;
+ }
+ else
+ {
+ part->x += part->step_xoffset;
+ part->y += part->step_yoffset;
+ }
anim->last_x = part->x;
anim->last_y = part->y;
global.anim_status = status;
// force restarting global animations by changed global animation status
- SDLRedrawWindow();
+ DrawGlobalAnimationsExt(DRAW_TO_SCREEN, DRAW_GLOBAL_ANIM_STAGE_RESTART);
global.anim_status = anim_status_last;
}
+void SetAnimStatusBeforeFading(int status)
+{
+ anim_status_last_before_fading = status;
+}
+
boolean HandleGlobalAnimClicks(int mx, int my, int button, boolean force_click)
{
static boolean click_consumed = FALSE;
return anim_sync_frame;
}
-void HandleGlobalAnimEventByElementChange(int element, int page)
+void HandleGlobalAnimEventByElementChange(int element, int page, int x, int y)
{
if (!IS_CUSTOM_ELEMENT(element))
return;
// custom element stored as 0 to 255, change page stored as 1 to 32
- InitGlobalAnim_Triggered_ByCustomElement(element - EL_CUSTOM_START, page + 1);
+ InitGlobalAnim_Triggered_ByCustomElement(element - EL_CUSTOM_START, page + 1,
+ x, y);
}