}
}
+ // 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;
ResetGlobalAnim_Clicked();
}
- DrawEnvelopeRequestToScreen(drawing_target, drawing_stage);
-
if (gfx.cursor_mode_override != last_cursor_mode_override)
SetMouseCursor(gfx.cursor_mode);
}
part->init_event_state)
{
if (part->initial_anim_sync_frame > 0)
- {
- if (part->init_delay_counter > 0)
- part->initial_anim_sync_frame -= part->init_delay_counter - 1;
- else
- part->initial_anim_sync_frame = anim_sync_frame;
- }
+ 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)
if (c->position == POS_CE)
{
// calculate playfield position (with scrolling) for related CE tile
+ // (do not use FX/FY, which are incorrect during envelope requests)
+ int FX0 = 2 * TILEX_VAR; // same as FX during DRAW_TO_FIELDBUFFER
+ int FY0 = 2 * TILEY_VAR; // same as FY during DRAW_TO_FIELDBUFFER
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;
+ int sx = FX0 + SCREENX(part->tile_x) * TILEX_VAR;
+ int sy = FY0 + SCREENY(part->tile_y) * TILEY_VAR;
+ int cx = SX - REAL_SX;
+ int cy = SY - REAL_SY;
+ int x = sx - fx + cx;
+ int y = sy - fy + cy;
part->tile_xoffset += part->step_xoffset;
part->tile_yoffset += part->step_yoffset;
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;