renamed variables which changed their meaning after recent changes
[rocksndiamonds.git] / src / tools.c
index 3dcf88af26d04ebdcc2cff721e38734d10bcdc03..76fa6c484a282c8a2170ac80b5a997b7d66d6e46 100644 (file)
@@ -17,7 +17,7 @@
 #include "init.h"
 #include "game.h"
 #include "events.h"
-#include "cartoons.h"
+#include "anim.h"
 #include "network.h"
 #include "tape.h"
 #include "screens.h"
@@ -66,83 +66,83 @@ static struct DoorPartControlInfo door_part_controls[] =
 {
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_1,
+    IMG_GFX_DOOR_1_PART_1,
     &door_1.part_1
   },
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_2,
+    IMG_GFX_DOOR_1_PART_2,
     &door_1.part_2
   },
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_3,
+    IMG_GFX_DOOR_1_PART_3,
     &door_1.part_3
   },
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_4,
+    IMG_GFX_DOOR_1_PART_4,
     &door_1.part_4
   },
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_5,
+    IMG_GFX_DOOR_1_PART_5,
     &door_1.part_5
   },
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_6,
+    IMG_GFX_DOOR_1_PART_6,
     &door_1.part_6
   },
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_7,
+    IMG_GFX_DOOR_1_PART_7,
     &door_1.part_7
   },
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_8,
+    IMG_GFX_DOOR_1_PART_8,
     &door_1.part_8
   },
 
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_1,
+    IMG_GFX_DOOR_2_PART_1,
     &door_2.part_1
   },
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_2,
+    IMG_GFX_DOOR_2_PART_2,
     &door_2.part_2
   },
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_3,
+    IMG_GFX_DOOR_2_PART_3,
     &door_2.part_3
   },
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_4,
+    IMG_GFX_DOOR_2_PART_4,
     &door_2.part_4
   },
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_5,
+    IMG_GFX_DOOR_2_PART_5,
     &door_2.part_5
   },
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_6,
+    IMG_GFX_DOOR_2_PART_6,
     &door_2.part_6
   },
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_7,
+    IMG_GFX_DOOR_2_PART_7,
     &door_2.part_7
   },
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_8,
+    IMG_GFX_DOOR_2_PART_8,
     &door_2.part_8
   },
 
@@ -174,9 +174,6 @@ static int el_act2crm(int, int);
 static struct GadgetInfo *tool_gadget[NUM_TOOL_BUTTONS];
 static int request_gadget_id = -1;
 
-static unsigned int sync_frame_delay = 0;
-static unsigned int sync_frame_delay_value = GAME_FRAME_DELAY;
-
 static char *print_if_not_empty(int element)
 {
   static char *s = NULL;
@@ -237,7 +234,7 @@ void DumpTile(int x, int y)
 
 void SetDrawtoField(int mode)
 {
-  if (mode == DRAW_FIELDBUFFER)
+  if (mode == DRAW_TO_FIELDBUFFER)
   {
     FX = 2 * TILEX_VAR;
     FY = 2 * TILEY_VAR;
@@ -248,7 +245,7 @@ void SetDrawtoField(int mode)
 
     drawto_field = fieldbuffer;
   }
-  else /* DRAW_BACKBUFFER */
+  else /* DRAW_TO_BACKBUFFER */
   {
     FX = SX;
     FY = SY;
@@ -297,7 +294,7 @@ static void DrawMaskedBorderExt_Rect(int x, int y, int width, int height,
   if (x == -1 && y == -1)
     return;
 
-  if (draw_target == DRAW_BORDER_TO_SCREEN)
+  if (draw_target == DRAW_TO_SCREEN)
     BlitToScreenMasked(src_bitmap, x, y, width, height, x, y);
   else
     BlitBitmapMasked(src_bitmap, dst_bitmap, x, y, width, height, x, y);
@@ -305,7 +302,7 @@ static void DrawMaskedBorderExt_Rect(int x, int y, int width, int height,
 
 static void DrawMaskedBorderExt_FIELD(int draw_target)
 {
-  if (global.border_status >= GAME_MODE_TITLE &&
+  if (global.border_status >= GAME_MODE_MAIN &&
       global.border_status <= GAME_MODE_PLAYING &&
       border.draw_masked[global.border_status])
     DrawMaskedBorderExt_Rect(REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE,
@@ -315,7 +312,7 @@ static void DrawMaskedBorderExt_FIELD(int draw_target)
 static void DrawMaskedBorderExt_DOOR_1(int draw_target)
 {
   // when drawing to backbuffer, never draw border over open doors
-  if (draw_target == DRAW_BORDER_TO_BACKBUFFER &&
+  if (draw_target == DRAW_TO_BACKBUFFER &&
       (GetDoorState() & DOOR_OPEN_1))
     return;
 
@@ -328,7 +325,7 @@ static void DrawMaskedBorderExt_DOOR_1(int draw_target)
 static void DrawMaskedBorderExt_DOOR_2(int draw_target)
 {
   // when drawing to backbuffer, never draw border over open doors
-  if (draw_target == DRAW_BORDER_TO_BACKBUFFER &&
+  if (draw_target == DRAW_TO_BACKBUFFER &&
       (GetDoorState() & DOOR_OPEN_2))
     return;
 
@@ -353,8 +350,8 @@ static void DrawMaskedBorderExt_ALL(int draw_target)
 static void DrawMaskedBorderExt(int redraw_mask, int draw_target)
 {
   /* never draw masked screen borders on borderless screens */
-  if (game_status == GAME_MODE_LOADING ||
-      game_status == GAME_MODE_TITLE)
+  if (global.border_status == GAME_MODE_LOADING ||
+      global.border_status == GAME_MODE_TITLE)
     return;
 
   if (redraw_mask & REDRAW_ALL)
@@ -374,17 +371,18 @@ static void DrawMaskedBorderExt(int redraw_mask, int draw_target)
 
 void DrawMaskedBorder_FIELD()
 {
-  DrawMaskedBorderExt_FIELD(DRAW_BORDER_TO_BACKBUFFER);
+  DrawMaskedBorderExt_FIELD(DRAW_TO_BACKBUFFER);
 }
 
 void DrawMaskedBorder(int redraw_mask)
 {
-  DrawMaskedBorderExt(redraw_mask, DRAW_BORDER_TO_BACKBUFFER);
+  DrawMaskedBorderExt(redraw_mask, DRAW_TO_BACKBUFFER);
 }
 
 void DrawMaskedBorderToTarget(int draw_target)
 {
-  if (draw_target == DRAW_BORDER_TO_SCREEN)
+  if (draw_target == DRAW_TO_BACKBUFFER ||
+      draw_target == DRAW_TO_SCREEN)
   {
     DrawMaskedBorderExt(REDRAW_ALL, draw_target);
   }
@@ -392,12 +390,12 @@ void DrawMaskedBorderToTarget(int draw_target)
   {
     int last_border_status = global.border_status;
 
-    if (draw_target == DRAW_BORDER_TO_FADE_SOURCE)
+    if (draw_target == DRAW_TO_FADE_SOURCE)
     {
       global.border_status = gfx.fade_border_source_status;
       gfx.masked_border_bitmap_ptr = gfx.fade_bitmap_source;
     }
-    else
+    else if (draw_target == DRAW_TO_FADE_TARGET)
     {
       global.border_status = gfx.fade_border_target_status;
       gfx.masked_border_bitmap_ptr = gfx.fade_bitmap_target;
@@ -589,26 +587,21 @@ void BackToFront()
 #endif
 }
 
-static void FadeCrossSaveBackbuffer()
+void BackToFront_WithFrameDelay(unsigned int frame_delay_value)
 {
-  BlitBitmap(backbuffer, bitmap_db_cross, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
-}
+  unsigned int frame_delay_value_old = GetVideoFrameDelay();
 
-static void FadeCrossRestoreBackbuffer()
-{
-  int redraw_mask_last = redraw_mask;
+  SetVideoFrameDelay(frame_delay_value);
 
-  BlitBitmap(bitmap_db_cross, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
+  BackToFront();
 
-  // do not change redraw mask when restoring backbuffer after cross-fading
-  redraw_mask = redraw_mask_last;
+  SetVideoFrameDelay(frame_delay_value_old);
 }
 
 static void FadeExt(int fade_mask, int fade_mode, int fade_type)
 {
   static int fade_type_skip = FADE_TYPE_NONE;
   void (*draw_border_function)(void) = NULL;
-  Bitmap *bitmap = (fade_mode & FADE_TYPE_TRANSFORM ? bitmap_db_cross : NULL);
   int x, y, width, height;
   int fade_delay, post_delay;
 
@@ -623,18 +616,8 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type)
       return;
     }
 
-#if 1
-    FadeCrossSaveBackbuffer();
-#endif
-
     if (fading.fade_mode & FADE_TYPE_TRANSFORM)
-    {
-#if 0
-      FadeCrossSaveBackbuffer();
-#endif
-
       return;
-    }
   }
 
   redraw_mask |= fade_mask;
@@ -697,17 +680,22 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type)
     return;
   }
 
-  FadeRectangle(bitmap, x, y, width, height, fade_mode, fade_delay, post_delay,
+  FadeRectangle(x, y, width, height, fade_mode, fade_delay, post_delay,
                draw_border_function);
 
-  if (fade_type == FADE_TYPE_FADE_OUT)
-    FadeCrossRestoreBackbuffer();
-
   redraw_mask &= ~fade_mask;
 }
 
 static void SetScreenStates_BeforeFadingIn()
 {
+  // temporarily set screen mode for animations to screen after fading in
+  global.anim_status = global.anim_status_next;
+
+  // store backbuffer with all animations that will be started after fading in
+  PrepareFadeBitmap(DRAW_TO_FADE_TARGET);
+
+  // set screen mode for animations back to fading
+  global.anim_status = GAME_MODE_PSEUDO_FADING;
 }
 
 static void SetScreenStates_AfterFadingIn()
@@ -727,7 +715,11 @@ static void SetScreenStates_BeforeFadingOut()
   // store new target screen (to use correct masked border for fading)
   gfx.fade_border_target_status = game_status;
 
+  // set screen mode for animations to fading
   global.anim_status = GAME_MODE_PSEUDO_FADING;
+
+  // store backbuffer with all animations that will be stopped for fading out
+  PrepareFadeBitmap(DRAW_TO_FADE_SOURCE);
 }
 
 static void SetScreenStates_AfterFadingOut()
@@ -1032,7 +1024,7 @@ static void RedrawGlobalBorderIfNeeded()
 
   // copy current draw buffer to later copy back areas that have not changed
   if (game_status_last != GAME_MODE_TITLE)
-    BlitBitmap(backbuffer, bitmap_db_store, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
+    BlitBitmap(backbuffer, bitmap_db_store_1, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
 
   if (CheckIfGlobalBorderRedrawIsNeeded())
   {
@@ -1045,20 +1037,20 @@ static void RedrawGlobalBorderIfNeeded()
     if (real_sx_last != -1 && real_sy_last != -1 &&
        REAL_SX != -1 && REAL_SY != -1 &&
        full_sxsize_last == FULL_SXSIZE && full_sysize_last == FULL_SYSIZE)
-      BlitBitmap(bitmap_db_store, backbuffer,
+      BlitBitmap(bitmap_db_store_1, backbuffer,
                 real_sx_last, real_sy_last, FULL_SXSIZE, FULL_SYSIZE,
                 REAL_SX, REAL_SY);
 
     if (dx_last != -1 && dy_last != -1 &&
        DX != -1 && DY != -1 &&
        dxsize_last == DXSIZE && dysize_last == DYSIZE)
-      BlitBitmap(bitmap_db_store, backbuffer,
+      BlitBitmap(bitmap_db_store_1, backbuffer,
                 dx_last, dy_last, DXSIZE, DYSIZE, DX, DY);
 
     if (vx_last != -1 && vy_last != -1 &&
        VX != -1 && VY != -1 &&
        vxsize_last == VXSIZE && vysize_last == VYSIZE)
-      BlitBitmap(bitmap_db_store, backbuffer,
+      BlitBitmap(bitmap_db_store_1, backbuffer,
                 vx_last, vy_last, VXSIZE, VYSIZE, VX, VY);
 
     redraw_mask = REDRAW_ALL;
@@ -1094,11 +1086,11 @@ void ClearField()
   if (game_status == GAME_MODE_PLAYING)
   {
     ClearRectangle(fieldbuffer, 0, 0, FXSIZE, FYSIZE);
-    SetDrawtoField(DRAW_FIELDBUFFER);
+    SetDrawtoField(DRAW_TO_FIELDBUFFER);
   }
   else
   {
-    SetDrawtoField(DRAW_BACKBUFFER);
+    SetDrawtoField(DRAW_TO_BACKBUFFER);
   }
 }
 
@@ -2291,11 +2283,11 @@ void AnimateEnvelope(int envelope_nr, int anim_mode, int action)
     int sy = SY + (SYSIZE - ysize * font_height) / 2;
     int xx, yy;
 
-    SetDrawtoField(DRAW_FIELDBUFFER);
+    SetDrawtoField(DRAW_TO_FIELDBUFFER);
 
     BlitScreenToBitmap(backbuffer);
 
-    SetDrawtoField(DRAW_BACKBUFFER);
+    SetDrawtoField(DRAW_TO_BACKBUFFER);
 
     for (yy = 0; yy < ysize; yy++)
       for (xx = 0; xx < xsize; xx++)
@@ -2352,7 +2344,7 @@ void ShowEnvelope(int envelope_nr)
 
   game.envelope_active = FALSE;
 
-  SetDrawtoField(DRAW_FIELDBUFFER);
+  SetDrawtoField(DRAW_TO_FIELDBUFFER);
 
   redraw_mask |= REDRAW_FIELD;
   BackToFront();
@@ -2427,7 +2419,6 @@ static void setRequestPosition(int *x, int *y, boolean add_border_size)
 
 void DrawEnvelopeRequest(char *text)
 {
-  int last_game_status = game_status;  /* save current game status */
   char *text_final = text;
   char *text_door_style = NULL;
   int graphic = IMG_BACKGROUND_REQUEST;
@@ -2495,19 +2486,19 @@ void DrawEnvelopeRequest(char *text)
                                  tile_size, tile_size);
 
   /* force DOOR font inside door area */
-  SetGameStatus(GAME_MODE_PSEUDO_DOOR);
+  SetFontStatus(GAME_MODE_PSEUDO_DOOR);
 
   DrawTextBuffer(sx + sx_offset, sy + sy_offset, text_final, font_nr,
                 line_length, -1, max_lines, line_spacing, mask_mode,
                 request.autowrap, request.centered, FALSE);
 
-  SetGameStatus(last_game_status);     /* restore current game status */
+  ResetFontStatus();
 
   for (i = 0; i < NUM_TOOL_BUTTONS; i++)
     RedrawGadget(tool_gadget[i]);
 
   // store readily prepared envelope request for later use when animating
-  BlitBitmap(backbuffer, bitmap_db_cross, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
+  BlitBitmap(backbuffer, bitmap_db_store_2, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
 
   if (text_door_style)
     free(text_door_style);
@@ -2568,7 +2559,7 @@ void AnimateEnvelopeRequest(int anim_mode, int action)
     setRequestPosition(&src_x, &src_y, FALSE);
     setRequestPositionExt(&dst_x, &dst_y, width, height, FALSE);
 
-    BlitBitmap(bitmap_db_store, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
+    BlitBitmap(bitmap_db_store_1, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
 
     for (yy = 0; yy < 2; yy++)
     {
@@ -2582,17 +2573,16 @@ void AnimateEnvelopeRequest(int anim_mode, int action)
        int yy_size = (yy ? tile_size : ysize_size_top);
 
        if (draw_masked)
-         BlitBitmapMasked(bitmap_db_cross, backbuffer,
+         BlitBitmapMasked(bitmap_db_store_2, backbuffer,
                           src_xx, src_yy, xx_size, yy_size, dst_xx, dst_yy);
        else
-         BlitBitmap(bitmap_db_cross, backbuffer,
+         BlitBitmap(bitmap_db_store_2, backbuffer,
                     src_xx, src_yy, xx_size, yy_size, dst_xx, dst_yy);
       }
     }
 
     redraw_mask |= REDRAW_FIELD;
 
-    DoAnimation();
     BackToFront();
 
     SkipUntilDelayReached(&anim_delay, anim_delay_value, &i, last_frame);
@@ -2613,13 +2603,13 @@ void ShowEnvelopeRequest(char *text, unsigned int req_state, int action)
   if (game_status == GAME_MODE_PLAYING)
     BlitScreenToBitmap(backbuffer);
 
-  SetDrawtoField(DRAW_BACKBUFFER);
+  SetDrawtoField(DRAW_TO_BACKBUFFER);
 
   // SetDrawBackgroundMask(REDRAW_NONE);
 
   if (action == ACTION_OPENING)
   {
-    BlitBitmap(backbuffer, bitmap_db_store, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
+    BlitBitmap(backbuffer, bitmap_db_store_1, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
 
     if (req_state & REQ_ASK)
     {
@@ -2639,9 +2629,6 @@ void ShowEnvelopeRequest(char *text, unsigned int req_state, int action)
     }
 
     DrawEnvelopeRequest(text);
-
-    if (game_status != GAME_MODE_MAIN)
-      InitAnimation();
   }
 
   game.envelope_active = TRUE; /* needed for RedrawPlayfield() events */
@@ -2669,26 +2656,18 @@ void ShowEnvelopeRequest(char *text, unsigned int req_state, int action)
   game.envelope_active = FALSE;
 
   if (action == ACTION_CLOSING)
-  {
-    if (game_status != GAME_MODE_MAIN)
-      StopAnimation();
-
-    BlitBitmap(bitmap_db_store, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
-  }
+    BlitBitmap(bitmap_db_store_1, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
 
   // SetDrawBackgroundMask(last_draw_background_mask);
 
   redraw_mask |= REDRAW_FIELD;
 
-  if (game_status == GAME_MODE_MAIN)
-    DoAnimation();
-
   BackToFront();
 
   if (action == ACTION_CLOSING &&
       game_status == GAME_MODE_PLAYING &&
       level.game_engine_type == GAME_ENGINE_TYPE_RND)
-    SetDrawtoField(DRAW_FIELDBUFFER);
+    SetDrawtoField(DRAW_TO_FIELDBUFFER);
 }
 
 void DrawPreviewElement(int dst_x, int dst_y, int element, int tilesize)
@@ -2860,7 +2839,6 @@ static void DrawPreviewLevelExt(boolean restart)
   boolean show_level_border = (BorderElement != EL_EMPTY);
   int level_xsize = lev_fieldx + (show_level_border ? 2 : 0);
   int level_ysize = lev_fieldy + (show_level_border ? 2 : 0);
-  int last_game_status = game_status;          /* save current game status */
 
   if (restart)
   {
@@ -2906,8 +2884,6 @@ static void DrawPreviewLevelExt(boolean restart)
        DrawTextSAligned(pos->x, pos->y, label_text, font_nr, pos->align);
     }
 
-    SetGameStatus(last_game_status);   /* restore current game status */
-
     return;
   }
 
@@ -3007,8 +2983,6 @@ static void DrawPreviewLevelExt(boolean restart)
 
     DrawPreviewLevelLabelExt(label_state);
   }
-
-  SetGameStatus(last_game_status);     /* restore current game status */
 }
 
 void DrawPreviewLevelInitial()
@@ -3550,9 +3524,7 @@ void WaitForEventToContinue()
       still_wait = FALSE;
     }
 
-    DoAnimation();
-
-    WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
+    BackToFront();
   }
 }
 
@@ -3580,16 +3552,16 @@ static int RequestHandleEvents(unsigned int req_state)
   {
     if (level_solved)
     {
-      SetDrawtoField(DRAW_FIELDBUFFER);
+      SetDrawtoField(DRAW_TO_FIELDBUFFER);
 
       HandleGameActions();
 
-      SetDrawtoField(DRAW_BACKBUFFER);
+      SetDrawtoField(DRAW_TO_BACKBUFFER);
 
       if (global.use_envelope_request)
       {
        /* copy current state of request area to middle of playfield area */
-       BlitBitmap(bitmap_db_cross, drawto, sx, sy, width, height, sx, sy);
+       BlitBitmap(bitmap_db_store_2, drawto, sx, sy, width, height, sx, sy);
       }
     }
 
@@ -3717,17 +3689,11 @@ static int RequestHandleEvents(unsigned int req_state)
       if (global.use_envelope_request)
       {
        /* copy back current state of pressed buttons inside request area */
-       BlitBitmap(drawto, bitmap_db_cross, sx, sy, width, height, sx, sy);
+       BlitBitmap(drawto, bitmap_db_store_2, sx, sy, width, height, sx, sy);
       }
     }
-    else
-    {
-      DoAnimation();
-    }
 
     BackToFront();
-
-    WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
   }
 
   return result;
@@ -3736,7 +3702,6 @@ static int RequestHandleEvents(unsigned int req_state)
 static boolean RequestDoor(char *text, unsigned int req_state)
 {
   unsigned int old_door_state;
-  int last_game_status = game_status;  /* save current game status */
   int max_request_line_len = MAX_REQUEST_LINE_FONT1_LEN;
   int font_nr = FONT_TEXT_2;
   char *text_ptr;
@@ -3793,7 +3758,7 @@ static boolean RequestDoor(char *text, unsigned int req_state)
   DrawBackground(DX, DY, DXSIZE, DYSIZE);
 
   /* force DOOR font inside door area */
-  SetGameStatus(GAME_MODE_PSEUDO_DOOR);
+  SetFontStatus(GAME_MODE_PSEUDO_DOOR);
 
   /* write text for request */
   for (text_ptr = text, ty = 0; ty < MAX_REQUEST_LINES; ty++)
@@ -3833,7 +3798,7 @@ static boolean RequestDoor(char *text, unsigned int req_state)
     // text_ptr += tl + (tc == ' ' || tc == '?' || tc == '!' ? 1 : 0);
   }
 
-  SetGameStatus(last_game_status);     /* restore current game status */
+  ResetFontStatus();
 
   if (req_state & REQ_ASK)
   {
@@ -3872,17 +3837,11 @@ static boolean RequestDoor(char *text, unsigned int req_state)
     return FALSE;
   }
 
-  if (game_status != GAME_MODE_MAIN)
-    InitAnimation();
-
   SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
 
   // ---------- handle request buttons ----------
   result = RequestHandleEvents(req_state);
 
-  if (game_status != GAME_MODE_MAIN)
-    StopAnimation();
-
   UnmapToolButtons();
 
   if (!(req_state & REQ_STAY_OPEN))
@@ -3977,9 +3936,6 @@ static boolean RequestEnvelope(char *text, unsigned int req_state)
   // ---------- handle request buttons ----------
   result = RequestHandleEvents(req_state);
 
-  if (game_status != GAME_MODE_MAIN)
-    StopAnimation();
-
   UnmapToolButtons();
 
   ShowEnvelopeRequest(text, req_state, ACTION_CLOSING);
@@ -4043,8 +3999,8 @@ void InitGraphicCompatibilityInfo_Doors()
   }
   doors[] =
   {
-    { DOOR_1,  IMG_DOOR_1_GFX_PART_1,  IMG_DOOR_1_GFX_PART_8,  &door_1 },
-    { DOOR_2,  IMG_DOOR_2_GFX_PART_1,  IMG_DOOR_2_GFX_PART_8,  &door_2 },
+    { DOOR_1,  IMG_GFX_DOOR_1_PART_1,  IMG_GFX_DOOR_1_PART_8,  &door_1 },
+    { DOOR_2,  IMG_GFX_DOOR_2_PART_1,  IMG_GFX_DOOR_2_PART_8,  &door_2 },
 
     { -1,      -1,                     -1,                     NULL    }
   };
@@ -4573,9 +4529,6 @@ unsigned int MoveDoor(unsigned int door_state)
       {
        BackToFront();
 
-       if (game_status == GAME_MODE_MAIN)
-         DoAnimation();
-
        SkipUntilDelayReached(&door_delay, door_delay_value, &k, last_frame);
 
        current_move_delay += max_step_delay;
@@ -4690,31 +4643,31 @@ static struct
 } toolbutton_info[NUM_TOOL_BUTTONS] =
 {
   {
-    IMG_REQUEST_BUTTON_GFX_YES,                &request.button.yes,
+    IMG_GFX_REQUEST_BUTTON_YES,                &request.button.yes,
     TOOL_CTRL_ID_YES,                  "yes"
   },
   {
-    IMG_REQUEST_BUTTON_GFX_NO,         &request.button.no,
+    IMG_GFX_REQUEST_BUTTON_NO,         &request.button.no,
     TOOL_CTRL_ID_NO,                   "no"
   },
   {
-    IMG_REQUEST_BUTTON_GFX_CONFIRM,    &request.button.confirm,
+    IMG_GFX_REQUEST_BUTTON_CONFIRM,    &request.button.confirm,
     TOOL_CTRL_ID_CONFIRM,              "confirm"
   },
   {
-    IMG_REQUEST_BUTTON_GFX_PLAYER_1,   &request.button.player_1,
+    IMG_GFX_REQUEST_BUTTON_PLAYER_1,   &request.button.player_1,
     TOOL_CTRL_ID_PLAYER_1,             "player 1"
   },
   {
-    IMG_REQUEST_BUTTON_GFX_PLAYER_2,   &request.button.player_2,
+    IMG_GFX_REQUEST_BUTTON_PLAYER_2,   &request.button.player_2,
     TOOL_CTRL_ID_PLAYER_2,             "player 2"
   },
   {
-    IMG_REQUEST_BUTTON_GFX_PLAYER_3,   &request.button.player_3,
+    IMG_GFX_REQUEST_BUTTON_PLAYER_3,   &request.button.player_3,
     TOOL_CTRL_ID_PLAYER_3,             "player 3"
   },
   {
-    IMG_REQUEST_BUTTON_GFX_PLAYER_4,   &request.button.player_4,
+    IMG_GFX_REQUEST_BUTTON_PLAYER_4,   &request.button.player_4,
     TOOL_CTRL_ID_PLAYER_4,             "player 4"
   }
 };
@@ -8210,9 +8163,6 @@ void ToggleFullscreenOrChangeWindowScalingIfNeeded()
 {
   boolean change_fullscreen = (setup.fullscreen !=
                               video.fullscreen_enabled);
-  boolean change_fullscreen_mode = (video.fullscreen_enabled &&
-                                   !strEqual(setup.fullscreen_mode,
-                                             video.fullscreen_mode_current));
   boolean change_window_scaling_percent = (!video.fullscreen_enabled &&
                                           setup.window_scaling_percent !=
                                           video.window_scaling_percent);
@@ -8242,7 +8192,6 @@ void ToggleFullscreenOrChangeWindowScalingIfNeeded()
 #endif
 
   if (change_fullscreen ||
-      change_fullscreen_mode ||
       change_window_scaling_percent)
   {
     Bitmap *tmp_backbuffer = CreateBitmap(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH);
@@ -8250,12 +8199,6 @@ void ToggleFullscreenOrChangeWindowScalingIfNeeded()
     /* save backbuffer content which gets lost when toggling fullscreen mode */
     BlitBitmap(backbuffer, tmp_backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
 
-    if (change_fullscreen_mode)
-    {
-      /* keep fullscreen, but change fullscreen mode (screen resolution) */
-      video.fullscreen_enabled = FALSE;                /* force new fullscreen mode */
-    }
-
     if (change_window_scaling_percent)
     {
       /* keep window mode, but change window scaling */
@@ -8291,11 +8234,48 @@ void JoinRectangles(int *x, int *y, int *width, int *height,
   *height = MAX(*height, height2);
 }
 
+void SetAnimStatus(int anim_status_new)
+{
+  if (anim_status_new == GAME_MODE_MAIN)
+    anim_status_new = GAME_MODE_PSEUDO_MAINONLY;
+
+  global.anim_status_next = anim_status_new;
+
+  // directly set screen modes that are entered without fading
+  if ((global.anim_status      == GAME_MODE_PSEUDO_MAINONLY &&
+       global.anim_status_next == GAME_MODE_PSEUDO_TYPENAME) ||
+      (global.anim_status      == GAME_MODE_PSEUDO_TYPENAME &&
+       global.anim_status_next == GAME_MODE_PSEUDO_MAINONLY))
+    global.anim_status = global.anim_status_next;
+}
+
 void SetGameStatus(int game_status_new)
 {
   game_status = game_status_new;
 
-  global.anim_status_next = game_status;
+  SetAnimStatus(game_status_new);
+}
+
+void SetFontStatus(int game_status_new)
+{
+  static int last_game_status = -1;
+
+  if (game_status_new != -1)
+  {
+    // set game status for font use after storing last game status
+    last_game_status = game_status;
+    game_status = game_status_new;
+  }
+  else
+  {
+    // reset game status after font use from last stored game status
+    game_status = last_game_status;
+  }
+}
+
+void ResetFontStatus()
+{
+  SetFontStatus(-1);
 }
 
 void ChangeViewportPropertiesIfNeeded()
@@ -8342,7 +8322,7 @@ void ChangeViewportPropertiesIfNeeded()
   int new_scr_fieldy_buffers = new_sysize / new_tilesize_var;
   boolean init_gfx_buffers = FALSE;
   boolean init_video_buffer = FALSE;
-  boolean init_gadgets_and_toons = FALSE;
+  boolean init_gadgets_and_anims = FALSE;
   boolean init_em_graphics = FALSE;
 
   if (new_win_xsize != WIN_XSIZE ||
@@ -8353,7 +8333,7 @@ void ChangeViewportPropertiesIfNeeded()
 
     init_video_buffer = TRUE;
     init_gfx_buffers = TRUE;
-    init_gadgets_and_toons = TRUE;
+    init_gadgets_and_anims = TRUE;
 
     // printf("::: video: init_video_buffer, init_gfx_buffers\n");
   }
@@ -8468,10 +8448,10 @@ void ChangeViewportPropertiesIfNeeded()
     TILESIZE_VAR = new_tilesize_var;
 
     init_gfx_buffers = TRUE;
-    init_gadgets_and_toons = TRUE;
+    init_gadgets_and_anims = TRUE;
 
     // printf("::: viewports: init_gfx_buffers\n");
-    // printf("::: viewports: init_gadgets_and_toons\n");
+    // printf("::: viewports: init_gadgets_and_anims\n");
   }
 
   if (init_gfx_buffers)
@@ -8498,12 +8478,11 @@ void ChangeViewportPropertiesIfNeeded()
     InitImageTextures();
   }
 
-  if (init_gadgets_and_toons)
+  if (init_gadgets_and_anims)
   {
-    // printf("::: init_gadgets_and_toons\n");
+    // printf("::: init_gadgets_and_anims\n");
 
     InitGadgets();
-    InitToons();
     InitGlobalAnimations();
   }