rnd-20070420-2-src
[rocksndiamonds.git] / src / screens.c
index 6654499152ebcf2fcd03d05b0936dc8ea6f2b288..4989985a00d967c5406722e4185957d874848049 100644 (file)
 #include "init.h"
 #include "config.h"
 
-/* screens in the setup menu */
-#define SETUP_MODE_MAIN                        0
-#define SETUP_MODE_GAME                        1
-#define SETUP_MODE_CHOOSE_GAME_SPEED   2
-#define SETUP_MODE_EDITOR              3
-#define SETUP_MODE_INPUT               4
-#define SETUP_MODE_SHORTCUT_1          5
-#define SETUP_MODE_SHORTCUT_2          6
-#define SETUP_MODE_GRAPHICS            7
-#define SETUP_MODE_CHOOSE_SCREEN_MODE  8
-#define SETUP_MODE_SOUND               9
-#define SETUP_MODE_ARTWORK             10
-#define SETUP_MODE_CHOOSE_GRAPHICS     11
-#define SETUP_MODE_CHOOSE_SOUNDS       12
-#define SETUP_MODE_CHOOSE_MUSIC                13
-
-#define MAX_SETUP_MODES                        14
-
-/* for input setup functions */
-#define SETUPINPUT_SCREEN_POS_START    0
-#define SETUPINPUT_SCREEN_POS_END      (SCR_FIELDY - 4)
-#define SETUPINPUT_SCREEN_POS_EMPTY1   (SETUPINPUT_SCREEN_POS_START + 3)
-#define SETUPINPUT_SCREEN_POS_EMPTY2   (SETUPINPUT_SCREEN_POS_END - 1)
-
 /* screens on the info screen */
 #define INFO_MODE_MAIN                 0
 #define INFO_MODE_TITLE                        1
 
 #define MAX_INFO_MODES                 8
 
+/* screens on the setup screen */
+#define SETUP_MODE_MAIN                        0
+#define SETUP_MODE_GAME                        1
+#define SETUP_MODE_EDITOR              2
+#define SETUP_MODE_GRAPHICS            3
+#define SETUP_MODE_SOUND               4
+#define SETUP_MODE_ARTWORK             5
+#define SETUP_MODE_INPUT               6
+#define SETUP_MODE_SHORTCUTS_1         7
+#define SETUP_MODE_SHORTCUTS_2         8
+
+/* sub-screens on the setup screen (generic) */
+#define SETUP_MODE_CHOOSE_ARTWORK      9
+#define SETUP_MODE_CHOOSE_OTHER                10
+
+/* sub-screens on the setup screen (specific) */
+#define SETUP_MODE_CHOOSE_GAME_SPEED   11
+#define SETUP_MODE_CHOOSE_SCREEN_MODE  12
+#define SETUP_MODE_CHOOSE_SCROLL_DELAY 13
+#define SETUP_MODE_CHOOSE_GRAPHICS     14
+#define SETUP_MODE_CHOOSE_SOUNDS       15
+#define SETUP_MODE_CHOOSE_MUSIC                16
+
+#define MAX_SETUP_MODES                        17
+
+/* for input setup functions */
+#define SETUPINPUT_SCREEN_POS_START    0
+#define SETUPINPUT_SCREEN_POS_END      (SCR_FIELDY - 4)
+#define SETUPINPUT_SCREEN_POS_EMPTY1   (SETUPINPUT_SCREEN_POS_START + 3)
+#define SETUPINPUT_SCREEN_POS_EMPTY2   (SETUPINPUT_SCREEN_POS_END - 1)
+
 /* for various menu stuff  */
 #define MENU_SCREEN_START_XPOS         1
 #define MENU_SCREEN_START_YPOS         2
 
 #define SC_BORDER_SIZE                 14
 
+#if 0
 /* other useful macro definitions */
 #define BUTTON_GRAPHIC_ACTIVE(g)                                              \
        (g == IMG_MENU_BUTTON_LEFT       ? IMG_MENU_BUTTON_LEFT_ACTIVE       : \
          g == IMG_MENU_BUTTON_ENTER_MENU ? IMG_MENU_BUTTON_ENTER_MENU_ACTIVE : \
          g == IMG_MENU_BUTTON_PREV_LEVEL ? IMG_MENU_BUTTON_PREV_LEVEL_ACTIVE : \
          g == IMG_MENU_BUTTON_NEXT_LEVEL ? IMG_MENU_BUTTON_NEXT_LEVEL_ACTIVE : \
+         g == IMG_MENU_BUTTON_NAME       ? IMG_MENU_BUTTON_NAME_ACTIVE       : \
+         g == IMG_MENU_BUTTON_LEVELS     ? IMG_MENU_BUTTON_LEVELS_ACTIVE     : \
+         g == IMG_MENU_BUTTON_SCORES     ? IMG_MENU_BUTTON_SCORES_ACTIVE     : \
+         g == IMG_MENU_BUTTON_EDITOR     ? IMG_MENU_BUTTON_EDITOR_ACTIVE     : \
+         g == IMG_MENU_BUTTON_INFO       ? IMG_MENU_BUTTON_INFO_ACTIVE       : \
+         g == IMG_MENU_BUTTON_GAME       ? IMG_MENU_BUTTON_GAME_ACTIVE       : \
+         g == IMG_MENU_BUTTON_SETUP      ? IMG_MENU_BUTTON_SETUP_ACTIVE      : \
+         g == IMG_MENU_BUTTON_QUIT       ? IMG_MENU_BUTTON_QUIT_ACTIVE       : \
          IMG_MENU_BUTTON_ACTIVE)
+#endif
 
 
 /* forward declarations of internal functions */
@@ -164,12 +181,15 @@ static void MapScreenTreeGadgets(TreeInfo *);
 
 static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
 
-static int setup_mode = SETUP_MODE_MAIN;
 static int info_mode = INFO_MODE_MAIN;
+static int setup_mode = SETUP_MODE_MAIN;
 
 static TreeInfo *screen_modes = NULL;
 static TreeInfo *screen_mode_current = NULL;
 
+static TreeInfo *scroll_delays = NULL;
+static TreeInfo *scroll_delay_current = NULL;
+
 static TreeInfo *game_speeds = NULL;
 static TreeInfo *game_speed_current = NULL;
 
@@ -204,15 +224,42 @@ static struct
   {    -1,     NULL                            },
 };
 
+static struct
+{
+  int value;
+  char *text;
+} scroll_delays_list[] =
+{
+  {    0,      "0 Tiles (No Scroll Delay)"     },
+  {    1,      "1 Tile"                        },
+  {    2,      "2 Tiles"                       },
+  {    3,      "3 Tiles (Default)"             },
+  {    4,      "4 Tiles"                       },
+  {    5,      "5 Tiles"                       },
+  {    6,      "6 Tiles"                       },
+  {    7,      "7 Tiles"                       },
+  {    8,      "8 Tiles (Maximum Scroll Delay)"},
+
+  {    -1,     NULL                            },
+};
+
 #define DRAW_MODE(s)           ((s) >= GAME_MODE_MAIN &&               \
                                 (s) <= GAME_MODE_SETUP ? (s) :         \
                                 (s) == GAME_MODE_PSEUDO_TYPENAME ?     \
                                 GAME_MODE_MAIN : GAME_MODE_DEFAULT)
 
+/* (there are no draw offset definitions needed for INFO_MODE_TITLE) */
 #define DRAW_MODE_INFO(i)      ((i) >= INFO_MODE_ELEMENTS &&           \
                                 (i) <= INFO_MODE_LEVELSET ? (i) :      \
                                 INFO_MODE_MAIN)
 
+#define DRAW_MODE_SETUP(i)     ((i) >= SETUP_MODE_MAIN &&              \
+                                (i) <= SETUP_MODE_SHORTCUTS_2 ? (i) :  \
+                                (i) >= SETUP_MODE_CHOOSE_GRAPHICS &&   \
+                                (i) <= SETUP_MODE_CHOOSE_MUSIC ?       \
+                                SETUP_MODE_CHOOSE_ARTWORK :            \
+                                SETUP_MODE_CHOOSE_OTHER)
+
 #define DRAW_XOFFSET_INFO(i)   (DRAW_MODE_INFO(i) == INFO_MODE_MAIN ?  \
                                 menu.draw_xoffset[GAME_MODE_INFO] :    \
                                 menu.draw_xoffset_info[DRAW_MODE_INFO(i)])
@@ -220,11 +267,22 @@ static struct
                                 menu.draw_yoffset[GAME_MODE_INFO] :    \
                                 menu.draw_yoffset_info[DRAW_MODE_INFO(i)])
 
+#define DRAW_XOFFSET_SETUP(i)  (DRAW_MODE_SETUP(i) == SETUP_MODE_MAIN ? \
+                                menu.draw_xoffset[GAME_MODE_SETUP] :   \
+                                menu.draw_xoffset_setup[DRAW_MODE_SETUP(i)])
+#define DRAW_YOFFSET_SETUP(i)  (DRAW_MODE_SETUP(i) == SETUP_MODE_MAIN ? \
+                                menu.draw_yoffset[GAME_MODE_SETUP] :   \
+                                menu.draw_yoffset_setup[DRAW_MODE_SETUP(i)])
+
 #define DRAW_XOFFSET(s)                ((s) == GAME_MODE_INFO ?                \
                                 DRAW_XOFFSET_INFO(info_mode) :         \
+                                (s) == GAME_MODE_SETUP ?               \
+                                DRAW_XOFFSET_SETUP(setup_mode) :       \
                                 menu.draw_xoffset[DRAW_MODE(s)])
 #define DRAW_YOFFSET(s)                ((s) == GAME_MODE_INFO ?                \
                                 DRAW_YOFFSET_INFO(info_mode) :         \
+                                (s) == GAME_MODE_SETUP ?               \
+                                DRAW_YOFFSET_SETUP(setup_mode) :       \
                                 menu.draw_yoffset[DRAW_MODE(s)])
 
 #define mSX                    (SX + DRAW_XOFFSET(game_status))
@@ -328,49 +386,49 @@ static struct MainControlInfo main_controls[] =
 {
   {
     MAIN_CONTROL_NAME,
-    &menu.main.button.name,            IMG_MENU_BUTTON,
+    &menu.main.button.name,            IMG_MENU_BUTTON_NAME,
     &menu.main.text.name,              &main_text_name,
     &menu.main.input.name,             &setup.player_name,
   },
   {
     MAIN_CONTROL_LEVELS,
-    &menu.main.button.levels,          IMG_MENU_BUTTON_ENTER_MENU,
+    &menu.main.button.levels,          IMG_MENU_BUTTON_LEVELS,
     &menu.main.text.levels,            &main_text_levels,
     NULL,                              NULL,
   },
   {
     MAIN_CONTROL_SCORES,
-    &menu.main.button.scores,          IMG_MENU_BUTTON,
+    &menu.main.button.scores,          IMG_MENU_BUTTON_SCORES,
     &menu.main.text.scores,            &main_text_scores,
     NULL,                              NULL,
   },
   {
     MAIN_CONTROL_EDITOR,
-    &menu.main.button.editor,          IMG_MENU_BUTTON,
+    &menu.main.button.editor,          IMG_MENU_BUTTON_EDITOR,
     &menu.main.text.editor,            &main_text_editor,
     NULL,                              NULL,
   },
   {
     MAIN_CONTROL_INFO,
-    &menu.main.button.info,            IMG_MENU_BUTTON_ENTER_MENU,
+    &menu.main.button.info,            IMG_MENU_BUTTON_INFO,
     &menu.main.text.info,              &main_text_info,
     NULL,                              NULL,
   },
   {
     MAIN_CONTROL_GAME,
-    &menu.main.button.game,            IMG_MENU_BUTTON,
+    &menu.main.button.game,            IMG_MENU_BUTTON_GAME,
     &menu.main.text.game,              &main_text_game,
     NULL,                              NULL,
   },
   {
     MAIN_CONTROL_SETUP,
-    &menu.main.button.setup,           IMG_MENU_BUTTON_ENTER_MENU,
+    &menu.main.button.setup,           IMG_MENU_BUTTON_SETUP,
     &menu.main.text.setup,             &main_text_setup,
     NULL,                              NULL,
   },
   {
     MAIN_CONTROL_QUIT,
-    &menu.main.button.quit,            IMG_MENU_BUTTON,
+    &menu.main.button.quit,            IMG_MENU_BUTTON_QUIT,
     &menu.main.text.quit,              &main_text_quit,
     NULL,                              NULL,
   },
@@ -614,8 +672,8 @@ static struct TitleFadingInfo getTitleFading(struct TitleControlInfo *tci)
     ti = (initial ? title_initial_default : title_default);
 
     /* override default settings with image config settings, if defined */
-    if (graphic_info[graphic].anim_mode != ANIM_DEFAULT)
-      ti.anim_mode = graphic_info[graphic].anim_mode;
+    if (graphic_info[graphic].fade_mode != FADE_MODE_DEFAULT)
+      ti.fade_mode = graphic_info[graphic].fade_mode;
     if (graphic_info[graphic].fade_delay > -1)
       ti.fade_delay = graphic_info[graphic].fade_delay;
     if (graphic_info[graphic].post_delay > -1)
@@ -627,22 +685,24 @@ static struct TitleFadingInfo getTitleFading(struct TitleControlInfo *tci)
   {
     if (initial)
     {
-      ti.anim_mode  = titlemessage_initial[nr].anim_mode;
+      ti.fade_mode  = titlemessage_initial[nr].fade_mode;
       ti.fade_delay = titlemessage_initial[nr].fade_delay;
       ti.post_delay = titlemessage_initial[nr].post_delay;
       ti.auto_delay = titlemessage_initial[nr].auto_delay;
     }
     else
     {
-      ti.anim_mode  = titlemessage[nr].anim_mode;
+      ti.fade_mode  = titlemessage[nr].fade_mode;
       ti.fade_delay = titlemessage[nr].fade_delay;
       ti.post_delay = titlemessage[nr].post_delay;
       ti.auto_delay = titlemessage[nr].auto_delay;
     }
   }
 
+#if 0
   if (ti.anim_mode == ANIM_NONE)
     ti.fade_delay = ti.post_delay = 0;
+#endif
 
   return ti;
 }
@@ -733,9 +793,13 @@ static void InitializeMainControls()
 
   /* set main control text values to dynamically determined values */
   sprintf(main_text_name,         "%s",   local_team_mode ? "Team:" : "Name:");
-  sprintf(main_text_first_level,  "%03d", leveldir_current->first_level);
-  sprintf(main_text_last_level,   "%03d", leveldir_current->last_level);
-  sprintf(main_text_level_number, "%s",   int2str(level_nr, 3));
+
+  strcpy(main_text_first_level,  int2str(leveldir_current->first_level,
+                                        menu.main.text.first_level.size));
+  strcpy(main_text_last_level,   int2str(leveldir_current->last_level,
+                                        menu.main.text.last_level.size));
+  strcpy(main_text_level_number, int2str(level_nr,
+                                        menu.main.text.level_number.size));
 
   main_text_level_year         = leveldir_current->year;
   main_text_level_imported_from        = leveldir_current->imported_from;
@@ -867,7 +931,7 @@ static void DrawCursorAndText_Main_Ext(int nr, boolean active_text,
 
       if (active_text)
       {
-       button_graphic = BUTTON_GRAPHIC_ACTIVE(button_graphic);
+       button_graphic = BUTTON_ACTIVE(button_graphic);
        font_text = FONT_ACTIVE(font_text);
       }
 
@@ -977,7 +1041,7 @@ static void drawCursorExt(int xpos, int ypos, boolean active, int graphic)
   }
 
   if (active)
-    graphic = BUTTON_GRAPHIC_ACTIVE(graphic);
+    graphic = BUTTON_ACTIVE(graphic);
 
   DrawBackgroundForGraphic(x, y, TILEX, TILEY, graphic);
   DrawGraphicThruMaskExt(drawto, x, y, graphic, 0);
@@ -1002,8 +1066,10 @@ static void drawChooseTreeCursor(int ypos, boolean active)
 {
   int last_game_status = game_status;  /* save current game status */
 
+#if 0
   /* force LEVELS draw offset on artwork setup screen */
   game_status = GAME_MODE_LEVELS;
+#endif
 
   drawCursorExt(0, ypos, active, -1);
 
@@ -1228,6 +1294,32 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
   title = title_default;
 #endif
 
+#if 0
+  {
+    int graphicA = element_info[EL_EM_DYNAMITE_ACTIVE].special_graphic[GFX_SPECIAL_ARG_EDITOR];
+    int graphicB = element_info[EL_EM_DYNAMITE_ACTIVE].special_graphic[GFX_SPECIAL_ARG_PANEL];
+    int graphic1 = element_info[EL_CONVEYOR_BELT_1_MIDDLE].special_graphic[GFX_SPECIAL_ARG_EDITOR];
+    int graphic2 = element_info[EL_CONVEYOR_BELT_1_MIDDLE_ACTIVE].special_graphic[GFX_SPECIAL_ARG_EDITOR];
+
+    printf("::: %d [%d] -> %d, %d [%d, %d]\n",
+          graphicA, graphicB,
+          graphic_info[graphicA].src_x,
+          graphic_info[graphicA].src_y,
+          graphic1, graphic2);
+  }
+#endif
+
+#if 0
+  printf("::: %d, %d\n", fading.anim_mode == ANIM_CROSSFADE,
+        redraw_mask == REDRAW_ALL);
+#endif
+
+  FadeSetLeaveScreen();
+
+#if 1
+  FadeOut(redraw_mask);
+#endif
+
   UnmapAllGadgets();
   FadeSoundsAndMusic();
 
@@ -1273,7 +1365,7 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
   SetDrawtoField(DRAW_BACKBUFFER);
 #endif
 
-#if 1
+#if 0
   if (levelset_has_changed)
     fading = title_default;
 #endif
@@ -1313,6 +1405,32 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
   LoadLevel(level_nr);
 
   SetMainBackgroundImage(IMG_BACKGROUND_MAIN);
+
+#if 0
+  FadeOut(redraw_mask);
+#endif
+
+#if 1
+  if (redraw_mask == REDRAW_ALL)
+  {
+#if 0
+    int door_state = GetDoorState();
+#endif
+
+    RedrawBackground();
+
+    // OpenDoor(door_state | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
+#if 0
+#if 1
+    OpenDoor(DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+#else
+    OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+#endif
+#endif
+  }
+#endif
+
   ClearWindow();
 
 #if 1
@@ -1402,12 +1520,45 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
   FreeScreenGadgets();
   CreateScreenGadgets();
 
+#if 0
+  BlitBitmap(drawto, window, VX, VY, VXSIZE, VYSIZE, VX, VY);
+  Delay(3000);
+#endif
+
   /* map gadgets for main menu screen */
   MapTapeButtons();
   MapScreenMenuGadgets(SCREEN_MASK_MAIN);
 
+#if 0
   DrawMaskedBorder(REDRAW_ALL);
+#endif
 
+#if 1
+  if (redraw_mask == REDRAW_ALL)
+  {
+    int door_state = GetDoorState();
+
+    OpenDoor(door_state | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+  }
+#endif
+
+#if 0
+ {
+   game_status = GAME_MODE_PSEUDO_PREVIEW;
+
+   DrawText(20, 400, "text_3.PREVIEW", FONT_TEXT_3);
+   DrawText(20, 420, "text_4.PREVIEW", FONT_TEXT_4);
+
+   game_status = GAME_MODE_MAIN;
+
+   DrawText(20, 440, "text_3.MAIN", FONT_TEXT_3);
+   DrawText(20, 460, "text_4.MAIN", FONT_TEXT_4);
+ }
+#endif
+
+#if 1
+  FadeIn(redraw_mask);
+#else
 #if 1
   if (!do_fading)
     BackToFront();
@@ -1421,9 +1572,10 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
   else
     BackToFront();
 #endif
+#endif
 
 #if 1
-  fading = menu.navigation;
+  FadeSetEnterMenu();
 #else
   fading = title_default;
 #endif
@@ -1491,12 +1643,14 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
 #endif
 #endif
   struct TitleControlInfo *tci;
+  struct TitleFadingInfo fading_default;
+  struct TitleFadingInfo fading_last = fading;
   struct TitleFadingInfo fading_next;
   int sound, music;
 
   if (button == MB_MENU_INITIALIZE)
   {
-#if 1
+#if 0
     boolean use_cross_fading = (fading.anim_mode == ANIM_CROSSFADE);
 #endif
 
@@ -1523,9 +1677,11 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
        DrawInfoScreen_NotAvailable("Title screen information:",
                                    "No title screen for this level set.");
 
+#if 0
        /* use default settings for fading, but always disable auto delay */
        fading = title_default;
        fading.auto_delay = -1;
+#endif
 
        return;
       }
@@ -1533,11 +1689,6 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
       FadeSoundsAndMusic();
 
 #if 1
-      if (use_cross_fading)
-       FadeCrossSaveBackbuffer();
-      else
-       FadeOut(REDRAW_ALL);
-#else
       FadeOut(REDRAW_ALL);
 #endif
     }
@@ -1547,7 +1698,24 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
     else
       DrawTitleScreenMessage(tci->local_nr, tci->initial);
 
-    fading = getTitleFading(tci);
+    fading_default = (tci->initial ? title_initial_default : title_default);
+
+    fading = fading_next = getTitleFading(tci);
+
+#if 1
+#if 1
+    if (!(fading_last.fade_mode & FADE_TYPE_TRANSFORM) &&
+       fading_next.fade_mode & FADE_TYPE_TRANSFORM)
+    {
+      fading.fade_mode = FADE_MODE_FADE;
+      fading.fade_delay = fading_default.fade_delay;
+    }
+#else
+    if (fading_last.fade_mode != FADE_MODE_CROSSFADE &&
+       fading_next.fade_mode == FADE_MODE_CROSSFADE)
+      fading.fade_mode = FADE_MODE_FADE;
+#endif
+#endif
 
 #if 1
     sound = getTitleSound(tci);
@@ -1564,22 +1732,26 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
 
     SetMouseCursor(CURSOR_NONE);
 
+    // printf("::: mode: %d, delay: %d\n", fading.fade_mode, fading.fade_delay);
+
 #if 1
-    if (use_cross_fading)
-      FadeCross(REDRAW_ALL);
-    else
-      FadeIn(REDRAW_ALL);
-#else
     FadeIn(REDRAW_ALL);
 #endif
 
+    fading = fading_next;
+
     DelayReached(&title_delay, 0);     /* reset delay counter */
 
     return;
   }
 
+#if 1
+  if (fading.auto_delay > 0 && DelayReached(&title_delay, fading.auto_delay))
+    button = MB_MENU_CHOICE;
+#else
   if (fading.auto_delay > -1 && DelayReached(&title_delay, fading.auto_delay))
     button = MB_MENU_CHOICE;
+#endif
 
   if (button == MB_MENU_LEAVE)
   {
@@ -1588,13 +1760,17 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
   }
   else if (button == MB_MENU_CHOICE)
   {
-#if 1
+#if 0
     boolean use_cross_fading = (fading.anim_mode == ANIM_CROSSFADE);
 #endif
 
     if (game_status == GAME_MODE_INFO && num_title_screens == 0)
     {
+#if 0
       FadeOut(REDRAW_FIELD);
+#endif
+
+      FadeSetEnterScreen();
 
       info_mode = INFO_MODE_MAIN;
       DrawAndFadeInInfoScreen(REDRAW_FIELD);
@@ -1634,10 +1810,9 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
       if (music == MUS_UNDEFINED || music != last_music)
        FadeMusic();
 
-      if (use_cross_fading)
-       FadeCrossSaveBackbuffer();
-      else
-       FadeOut(REDRAW_ALL);
+#if 1
+      FadeOut(REDRAW_ALL);
+#endif
 
       if (tci->is_image)
        DrawTitleScreenImage(tci->local_nr, tci->initial);
@@ -1659,14 +1834,25 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
       last_music = music;
 #endif
 
+#if 0
+      printf("::: %d -> %d\n", fading.fade_mode, fading_next.fade_mode);
+#endif
+
+#if 1
       /* last screen already faded out, next screen has no animation */
-      if (!use_cross_fading && fading_next.anim_mode == ANIM_NONE)
+      if (!(fading.fade_mode & FADE_TYPE_TRANSFORM) &&
+         fading_next.fade_mode == FADE_MODE_NONE)
        fading = fading_next;
+#else
+      /* last screen already faded out, next screen has no animation */
+      if (fading.fade_mode      != FADE_MODE_CROSSFADE &&
+         fading_next.fade_mode == FADE_MODE_NONE)
+       fading = fading_next;
+#endif
 
-      if (use_cross_fading)
-       FadeCross(REDRAW_ALL);
-      else
-       FadeIn(REDRAW_ALL);
+#if 1
+      FadeIn(REDRAW_ALL);
+#endif
 
       fading = fading_next;
 
@@ -1676,19 +1862,20 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
     {
       FadeSoundsAndMusic();
 
+#if 0
 #if 1
       {
 #if 0
        boolean use_cross_fading = (fading.anim_mode == ANIM_CROSSFADE);
 #endif
 
-       if (use_cross_fading)
-         FadeCrossSaveBackbuffer();
-       else
-         FadeOut(REDRAW_ALL);
+#if 1
+       FadeOut(REDRAW_ALL);
+#endif
       }
 #else
       FadeOut(REDRAW_ALL);
+#endif
 #endif
 
       return_to_main_menu = TRUE;
@@ -1697,20 +1884,26 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
 
   if (return_to_main_menu)
   {
+#if 0
     RedrawBackground();
+#endif
 
     SetMouseCursor(CURSOR_DEFAULT);
 
     if (game_status == GAME_MODE_INFO)
     {
+#if 0
       OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+#endif
 
       info_mode = INFO_MODE_MAIN;
       DrawInfoScreenExt(REDRAW_ALL, use_fading_main_menu);
     }
     else       /* default: return to main menu */
     {
+#if 0
       OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+#endif
 
       game_status = GAME_MODE_MAIN;
       DrawMainMenuExt(REDRAW_ALL, use_fading_main_menu);
@@ -1752,7 +1945,8 @@ void HandleMainMenu_SelectLevel(int step, int direction)
 
 #if 1
     DrawText(mSX + mci->pos_text->x, mSY + mci->pos_text->y,
-            int2str(level_nr, 3), mci->pos_text->font);
+            int2str(level_nr, menu.main.text.level_number.size),
+            mci->pos_text->font);
 #else
     DrawText(mSX + 11 * 32, mSY + 3 * 32, int2str(level_nr, 3), FONT_VALUE_1);
 #endif
@@ -1868,6 +2062,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 
        game_status = GAME_MODE_EDITOR;
 
+       FadeSetEnterScreen();
+
        DrawLevelEd();
       }
       else if (pos == MAIN_CONTROL_INFO)
@@ -1875,6 +2071,10 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
        game_status = GAME_MODE_INFO;
        info_mode = INFO_MODE_MAIN;
 
+#if 0
+       fading = menu.navigation;
+#endif
+
        DrawInfoScreen();
       }
       else if (pos == MAIN_CONTROL_GAME)
@@ -1968,6 +2168,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
        if (leveldir_first)
        {
          game_status = GAME_MODE_LEVELS;
+
          SaveLevelSetup_LastSeries();
          SaveLevelSetup_SeriesInfo();
 
@@ -2038,50 +2239,86 @@ static int num_info_info;
 
 static void execInfoTitleScreen()
 {
+#if 0
+  FadeSetEnterScreen();
+#endif
+
   info_mode = INFO_MODE_TITLE;
   DrawInfoScreen();
 }
 
 static void execInfoElements()
 {
+#if 0
+  FadeSetEnterScreen();
+#endif
+
   info_mode = INFO_MODE_ELEMENTS;
   DrawInfoScreen();
 }
 
 static void execInfoMusic()
 {
+#if 0
+  FadeSetEnterScreen();
+#endif
+
   info_mode = INFO_MODE_MUSIC;
   DrawInfoScreen();
 }
 
 static void execInfoCredits()
 {
+#if 0
+  FadeSetEnterScreen();
+#endif
+
   info_mode = INFO_MODE_CREDITS;
   DrawInfoScreen();
 }
 
 static void execInfoProgram()
 {
+#if 0
+  FadeSetEnterScreen();
+#endif
+
   info_mode = INFO_MODE_PROGRAM;
   DrawInfoScreen();
 }
 
 static void execInfoVersion()
 {
+#if 0
+  FadeSetEnterScreen();
+#endif
+
   info_mode = INFO_MODE_VERSION;
   DrawInfoScreen();
 }
 
 static void execInfoLevelSet()
 {
+#if 0
+  FadeSetEnterScreen();
+#endif
+
   info_mode = INFO_MODE_LEVELSET;
   DrawInfoScreen();
 }
 
 static void execExitInfo()
 {
+#if 0
+  FadeSetLeaveMenu();
+#endif
+
   game_status = GAME_MODE_MAIN;
+#if 1
+  DrawMainMenuExt(REDRAW_FIELD, FALSE);
+#else
   DrawMainMenu();
+#endif
 }
 
 static struct TokenInfo info_info_main[] =
@@ -2121,6 +2358,23 @@ static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading)
   UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
 
+  /* (needed after displaying title screens which disable auto repeat) */
+  KeyboardAutoRepeatOn();
+
+  FadeSetLeaveScreen();
+
+#if 1
+  FadeOut(redraw_mask);
+#endif
+
+#if 1
+  if (redraw_mask == REDRAW_ALL)
+  {
+    RedrawBackground();
+    OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+  }
+#endif
+
   ClearWindow();
 
   DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Info Screen");
@@ -2157,8 +2411,11 @@ static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading)
   PlayMenuSound();
   PlayMenuMusic();
 
-  DrawMaskedBorder(REDRAW_ALL);
+  DrawMaskedBorder(redraw_mask);
 
+#if 1
+  FadeIn(redraw_mask);
+#else
 #if 1
   if (!do_fading)
     BackToFront();
@@ -2171,6 +2428,7 @@ static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading)
     FadeIn(redraw_mask);
   else
     BackToFront();
+#endif
 #endif
 
   InitAnimation();
@@ -2207,6 +2465,8 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
       {
        void (*menu_callback_function)(void) = info_info[y].value;
 
+       FadeSetLeaveMenu();
+
        menu_callback_function();
 
        break;  /* absolutely needed because function changes 'info_info'! */
@@ -2269,6 +2529,8 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
       {
        void (*menu_callback_function)(void) = info_info[choice].value;
 
+       FadeSetFromType(info_info[y].type);
+
        menu_callback_function();
       }
     }
@@ -2289,7 +2551,9 @@ void DrawInfoScreen_NotAvailable(char *text_title, char *text_error)
 
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET);
 
+#if 1
   FadeOut(REDRAW_FIELD);
+#endif
 
   ClearWindow();
   DrawHeadline();
@@ -2300,7 +2564,9 @@ void DrawInfoScreen_NotAvailable(char *text_title, char *text_error)
   DrawTextSCentered(ybottom, FONT_TEXT_4,
                    "Press any key or button for info menu");
 
+#if 1
   FadeIn(REDRAW_FIELD);
+#endif
 }
 
 void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init)
@@ -2489,14 +2755,18 @@ void DrawInfoScreen_Elements()
 {
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS);
 
+#if 1
   FadeOut(REDRAW_FIELD);
+#endif
 
   LoadHelpAnimInfo();
   LoadHelpTextInfo();
 
   HandleInfoScreen_Elements(MB_MENU_INITIALIZE);
 
+#if 1
   FadeIn(REDRAW_FIELD);
+#endif
 
   InitAnimation();
 }
@@ -2552,7 +2822,10 @@ void HandleInfoScreen_Elements(int button)
     if (page >= num_pages)
     {
       FadeSoundsAndMusic();
+
+#if 0
       FadeOut(REDRAW_FIELD);
+#endif
 
       info_mode = INFO_MODE_MAIN;
       DrawAndFadeInInfoScreen(REDRAW_FIELD);
@@ -2582,7 +2855,9 @@ void DrawInfoScreen_Music()
 {
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_MUSIC);
 
+#if 1
   FadeOut(REDRAW_FIELD);
+#endif
 
   ClearWindow();
   DrawHeadline();
@@ -2591,7 +2866,9 @@ void DrawInfoScreen_Music()
 
   HandleInfoScreen_Music(MB_MENU_INITIALIZE);
 
+#if 1
   FadeIn(REDRAW_FIELD);
+#endif
 }
 
 void HandleInfoScreen_Music(int button)
@@ -2649,7 +2926,10 @@ void HandleInfoScreen_Music(int button)
     if (list == NULL)
     {
       FadeSoundsAndMusic();
+
+#if 0
       FadeOut(REDRAW_FIELD);
+#endif
 
       info_mode = INFO_MODE_MAIN;
       DrawAndFadeInInfoScreen(REDRAW_FIELD);
@@ -2915,11 +3195,15 @@ void DrawInfoScreen_Credits()
 
   FadeSoundsAndMusic();
 
+#if 1
   FadeOut(REDRAW_FIELD);
+#endif
 
   HandleInfoScreen_Credits(MB_MENU_INITIALIZE);
 
+#if 1
   FadeIn(REDRAW_FIELD);
+#endif
 }
 
 void HandleInfoScreen_Credits(int button)
@@ -2960,7 +3244,10 @@ void HandleInfoScreen_Credits(int button)
     else
     {
       FadeSoundsAndMusic();
+
+#if 0
       FadeOut(REDRAW_FIELD);
+#endif
 
       info_mode = INFO_MODE_MAIN;
       DrawAndFadeInInfoScreen(REDRAW_FIELD);
@@ -2981,7 +3268,9 @@ void DrawInfoScreen_Program()
 
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_PROGRAM);
 
+#if 1
   FadeOut(REDRAW_FIELD);
+#endif
 
   ClearWindow();
   DrawHeadline();
@@ -3018,7 +3307,9 @@ void DrawInfoScreen_Program()
   DrawTextSCentered(ybottom, FONT_TEXT_4,
                    "Press any key or button for info menu");
 
+#if 1
   FadeIn(REDRAW_FIELD);
+#endif
 }
 
 void HandleInfoScreen_Program(int button)
@@ -3037,7 +3328,10 @@ void HandleInfoScreen_Program(int button)
     PlaySound(SND_MENU_ITEM_SELECTING);
 
     FadeSoundsAndMusic();
+
+#if 0
     FadeOut(REDRAW_FIELD);
+#endif
 
     info_mode = INFO_MODE_MAIN;
     DrawAndFadeInInfoScreen(REDRAW_FIELD);
@@ -3069,7 +3363,9 @@ void DrawInfoScreen_Version()
 
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION);
 
+#if 1
   FadeOut(REDRAW_FIELD);
+#endif
 
   ClearWindow();
   DrawHeadline();
@@ -3180,7 +3476,9 @@ void DrawInfoScreen_Version()
   DrawTextSCentered(ybottom, FONT_TEXT_4,
                    "Press any key or button for info menu");
 
+#if 1
   FadeIn(REDRAW_FIELD);
+#endif
 }
 
 void HandleInfoScreen_Version(int button)
@@ -3199,7 +3497,10 @@ void HandleInfoScreen_Version(int button)
     PlaySound(SND_MENU_ITEM_SELECTING);
 
     FadeSoundsAndMusic();
+
+#if 0
     FadeOut(REDRAW_FIELD);
+#endif
 
     info_mode = INFO_MODE_MAIN;
     DrawAndFadeInInfoScreen(REDRAW_FIELD);
@@ -3229,7 +3530,9 @@ void DrawInfoScreen_LevelSet()
 
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET);
 
+#if 1
   FadeOut(REDRAW_FIELD);
+#endif
 
   ClearWindow();
   DrawHeadline();
@@ -3247,7 +3550,9 @@ void DrawInfoScreen_LevelSet()
   DrawTextCentered(mSY + SYSIZE - 20, FONT_TEXT_4,
                   "Press any key or button for info menu");
 
+#if 1
   FadeIn(REDRAW_FIELD);
+#endif
 }
 
 void HandleInfoScreen_LevelSet(int button)
@@ -3266,7 +3571,10 @@ void HandleInfoScreen_LevelSet(int button)
     PlaySound(SND_MENU_ITEM_SELECTING);
 
     FadeSoundsAndMusic();
+
+#if 0
     FadeOut(REDRAW_FIELD);
+#endif
 
     info_mode = INFO_MODE_MAIN;
     DrawAndFadeInInfoScreen(REDRAW_FIELD);
@@ -3314,9 +3622,7 @@ void DrawAndFadeInInfoScreen(int redraw_mask)
 
 void DrawInfoScreen()
 {
-  fading = menu.destination;
-
-  DrawInfoScreenExt(REDRAW_ALL, FALSE);
+  DrawInfoScreenExt(REDRAW_FIELD, FALSE);
 }
 
 void HandleInfoScreen(int mx, int my, int dx, int dy, int button)
@@ -3482,12 +3788,19 @@ static void DrawChooseTree(TreeInfo **ti_ptr)
 
   CloseDoor(DOOR_CLOSE_2);
 
+#if 1
+  FadeOut(REDRAW_FIELD);
+#endif
+
   ClearWindow();
 
   HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr);
   MapScreenTreeGadgets(*ti_ptr);
 
-  FadeToFront();
+#if 1
+  FadeIn(REDRAW_FIELD);
+#endif
+
   InitAnimation();
 }
 
@@ -3523,8 +3836,10 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
 
   DrawTextSCentered(mSY - SY + yoffset, FONT_TITLE_1, title_string);
 
+#if 0
   /* force LEVELS font on artwork setup screen */
   game_status = GAME_MODE_LEVELS;
+#endif
 
 #if 1
   /* clear tree list area, but not title or scrollbar */
@@ -3618,8 +3933,10 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
   int last_game_status = game_status;  /* save current game status */
   boolean position_set_by_scrollbar = (dx == 999);
 
+#if 0
   /* force LEVELS draw offset on choose level and artwork setup screen */
   game_status = GAME_MODE_LEVELS;
+#endif
 
   if (num_entries <= NUM_MENU_ENTRIES_ON_SCREEN)
     num_page_entries = num_entries;
@@ -3662,6 +3979,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
   }
   else if (button == MB_MENU_LEAVE)
   {
+    FadeSetLeaveMenu();
+
     PlaySound(SND_MENU_ITEM_SELECTING);
 
     if (ti->node_parent)
@@ -3673,7 +3992,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
     {
       if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED)
        execSetupGame();
-      else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
+      else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE ||
+              setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
        execSetupGraphics();
       else
        execSetupArtwork();
@@ -3681,7 +4001,11 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
     else
     {
       game_status = GAME_MODE_MAIN;
+#if 1
+      DrawMainMenuExt(REDRAW_FIELD, FALSE);
+#else
       DrawMainMenu();
+#endif
     }
 
     return;
@@ -3691,8 +4015,10 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
   {
     int last_game_status = game_status;        /* save current game status */
 
+#if 0
     /* force LEVELS draw offset on artwork setup screen */
     game_status = GAME_MODE_LEVELS;
+#endif
 
     x = (mx - mSX) / 32;
     y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS;
@@ -3763,6 +4089,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
     if (node_cursor->node_group)
     {
+      FadeSetEnterMenu();
+
       PlaySound(SND_MENU_ITEM_SELECTING);
 
       node_cursor->cl_first = ti->cl_first;
@@ -3775,6 +4103,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
   }
   else if (dx == -1 && ti->node_parent)
   {
+    FadeSetLeaveMenu();
+
     PlaySound(SND_MENU_ITEM_SELECTING);
 
     *ti_ptr = ti->node_parent;
@@ -3813,6 +4143,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
       if (node_cursor->node_group)
       {
+       FadeSetEnterMenu();
+
        node_cursor->cl_first = ti->cl_first;
        node_cursor->cl_cursor = ti->cl_cursor;
        *ti_ptr = node_cursor->node_group;
@@ -3820,11 +4152,15 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
       }
       else if (node_cursor->parent_link)
       {
+       FadeSetLeaveMenu();
+
        *ti_ptr = node_cursor->node_parent;
        DrawChooseTree(ti_ptr);
       }
       else
       {
+       FadeSetEnterScreen();
+
        node_cursor->cl_first = ti->cl_first;
        node_cursor->cl_cursor = ti->cl_cursor;
        *ti_ptr = node_cursor;
@@ -3842,7 +4178,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
        {
          if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED)
            execSetupGame();
-         else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
+         else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE ||
+                  setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
            execSetupGraphics();
          else
            execSetupArtwork();
@@ -3892,7 +4229,13 @@ void DrawHallOfFame(int highlight_position)
   if (highlight_position < 0) 
     LoadScore(level_nr);
 
+  FadeSetEnterScreen();
+
+  // printf("::: %d: %d\n", game_status, menu.enter_screen[game_status]);
+
+#if 1
   FadeOut(REDRAW_FIELD);
+#endif
 
   InitAnimation();
 
@@ -3901,7 +4244,9 @@ void DrawHallOfFame(int highlight_position)
 
   HandleHallOfFame(highlight_position, 0, 0, 0, MB_MENU_INITIALIZE);
 
+#if 1
   FadeIn(REDRAW_FIELD);
+#endif
 }
 
 static void drawHallOfFameList(int first_entry, int highlight_position)
@@ -3996,7 +4341,10 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
     PlaySound(SND_MENU_ITEM_SELECTING);
 
     FadeSound(SND_BACKGROUND_SCORES);
+
+#if 0
     FadeOut(REDRAW_FIELD);
+#endif
 
     game_status = GAME_MODE_MAIN;
 
@@ -4018,6 +4366,7 @@ static struct TokenInfo *setup_info;
 static int num_setup_info;
 
 static char *screen_mode_text;
+static char *scroll_delay_text;
 static char *game_speed_text;
 static char *graphics_set_name;
 static char *sounds_set_name;
@@ -4025,12 +4374,20 @@ static char *music_set_name;
 
 static void execSetupMain()
 {
+#if 0
+  FadeSetLeaveMenu();
+#endif
+
   setup_mode = SETUP_MODE_MAIN;
   DrawSetupScreen();
 }
 
 static void execSetupGame()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   if (game_speeds == NULL)
   {
     int i;
@@ -4084,18 +4441,30 @@ static void execSetupGame()
 
 static void execSetupChooseGameSpeed()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   setup_mode = SETUP_MODE_CHOOSE_GAME_SPEED;
   DrawSetupScreen();
 }
 
 static void execSetupEditor()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   setup_mode = SETUP_MODE_EDITOR;
   DrawSetupScreen();
 }
 
 static void execSetupGraphics()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   if (video.fullscreen_available && screen_modes == NULL)
   {
     int i;
@@ -4152,12 +4521,65 @@ static void execSetupGraphics()
     screen_mode_text = screen_mode_current->name;
   }
 
+#if 1
+  if (scroll_delays == NULL)
+  {
+    int i;
+
+    for (i = 0; scroll_delays_list[i].value != -1; i++)
+    {
+      TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+      char identifier[32], name[32];
+      int value = scroll_delays_list[i].value;
+      char *text = scroll_delays_list[i].text;
+
+      ti->node_top = &scroll_delays;
+      ti->sort_priority = value;
+
+      sprintf(identifier, "%d", value);
+      sprintf(name, "%s", text);
+
+      setString(&ti->identifier, identifier);
+      setString(&ti->name, name);
+      setString(&ti->name_sorting, name);
+      setString(&ti->infotext, "Scroll Delay");
+
+      pushTreeInfo(&scroll_delays, ti);
+    }
+
+    /* sort scroll delay values to start with lowest scroll delay value */
+    sortTreeInfo(&scroll_delays);
+
+    /* set current scroll delay value to configured scroll delay value */
+    scroll_delay_current =
+      getTreeInfoFromIdentifier(scroll_delays,i_to_a(setup.scroll_delay_value));
+
+    /* if that fails, set current scroll delay to reliable default value */
+    if (scroll_delay_current == NULL)
+      scroll_delay_current =
+       getTreeInfoFromIdentifier(scroll_delays, i_to_a(STD_SCROLL_DELAY));
+
+    /* if that also fails, set current scroll delay to first available value */
+    if (scroll_delay_current == NULL)
+      scroll_delay_current = scroll_delays;
+  }
+
+  setup.scroll_delay_value = atoi(scroll_delay_current->identifier);
+
+  /* needed for displaying scroll delay text instead of identifier */
+  scroll_delay_text = scroll_delay_current->name;
+#endif
+
   setup_mode = SETUP_MODE_GRAPHICS;
   DrawSetupScreen();
 }
 
 static void execSetupChooseScreenMode()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   if (!video.fullscreen_available)
     return;
 
@@ -4165,14 +4587,32 @@ static void execSetupChooseScreenMode()
   DrawSetupScreen();
 }
 
+static void execSetupChooseScrollDelay()
+{
+#if 0
+  FadeSetEnterMenu();
+#endif
+
+  setup_mode = SETUP_MODE_CHOOSE_SCROLL_DELAY;
+  DrawSetupScreen();
+}
+
 static void execSetupSound()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   setup_mode = SETUP_MODE_SOUND;
   DrawSetupScreen();
 }
 
 static void execSetupArtwork()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   setup.graphics_set = artwork.gfx_current->identifier;
   setup.sounds_set = artwork.snd_current->identifier;
   setup.music_set = artwork.mus_current->identifier;
@@ -4191,44 +4631,76 @@ static void execSetupArtwork()
 
 static void execSetupChooseGraphics()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   setup_mode = SETUP_MODE_CHOOSE_GRAPHICS;
   DrawSetupScreen();
 }
 
 static void execSetupChooseSounds()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   setup_mode = SETUP_MODE_CHOOSE_SOUNDS;
   DrawSetupScreen();
 }
 
 static void execSetupChooseMusic()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   setup_mode = SETUP_MODE_CHOOSE_MUSIC;
   DrawSetupScreen();
 }
 
 static void execSetupInput()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   setup_mode = SETUP_MODE_INPUT;
   DrawSetupScreen();
 }
 
-static void execSetupShortcut1()
+static void execSetupShortcuts1()
 {
-  setup_mode = SETUP_MODE_SHORTCUT_1;
+#if 0
+  FadeSetEnterMenu();
+#endif
+
+  setup_mode = SETUP_MODE_SHORTCUTS_1;
   DrawSetupScreen();
 }
 
-static void execSetupShortcut2()
+static void execSetupShortcuts2()
 {
-  setup_mode = SETUP_MODE_SHORTCUT_2;
+#if 0
+  FadeSetEnterMenu();
+#endif
+
+  setup_mode = SETUP_MODE_SHORTCUTS_2;
   DrawSetupScreen();
 }
 
 static void execExitSetup()
 {
+#if 0
+  FadeSetLeaveMenu();
+#endif
+
   game_status = GAME_MODE_MAIN;
+#if 1
+  DrawMainMenuExt(REDRAW_FIELD, FALSE);
+#else
   DrawMainMenu();
+#endif
 }
 
 static void execSaveAndExitSetup()
@@ -4245,8 +4717,8 @@ static struct TokenInfo setup_info_main[] =
   { TYPE_ENTER_MENU,   execSetupSound,         "Sound & Music"         },
   { TYPE_ENTER_MENU,   execSetupArtwork,       "Custom Artwork"        },
   { TYPE_ENTER_MENU,   execSetupInput,         "Input Devices"         },
-  { TYPE_ENTER_MENU,   execSetupShortcut1,     "Key Shortcuts 1"       },
-  { TYPE_ENTER_MENU,   execSetupShortcut2,     "Key Shortcuts 2"       },
+  { TYPE_ENTER_MENU,   execSetupShortcuts1,    "Key Shortcuts 1"       },
+  { TYPE_ENTER_MENU,   execSetupShortcuts2,    "Key Shortcuts 2"       },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_LEAVE_MENU,   execExitSetup,          "Exit"                  },
   { TYPE_LEAVE_MENU,   execSaveAndExitSetup,   "Save and Exit"         },
@@ -4308,7 +4780,11 @@ static struct TokenInfo setup_info_graphics[] =
   { TYPE_SWITCH,       &setup.fullscreen,      "Fullscreen:"           },
   { TYPE_ENTER_LIST,   execSetupChooseScreenMode, "Fullscreen Mode:"   },
   { TYPE_STRING,       &screen_mode_text,      ""                      },
-  { TYPE_SWITCH,       &setup.scroll_delay,    "Delayed Scrolling:"    },
+#if 0
+  { TYPE_SWITCH,       &setup.scroll_delay,    "Scroll Delay:"         },
+#endif
+  { TYPE_ENTER_LIST,   execSetupChooseScrollDelay, "Scroll Delay Value:" },
+  { TYPE_STRING,       &scroll_delay_text,     ""                      },
 #if 0
   { TYPE_SWITCH,       &setup.soft_scrolling,  "Soft Scrolling:"       },
   { TYPE_SWITCH,       &setup.double_buffering,"Double-Buffering:"     },
@@ -4381,7 +4857,7 @@ static struct TokenInfo setup_info_input[] =
   { 0,                 NULL,                   NULL                    }
 };
 
-static struct TokenInfo setup_info_shortcut_1[] =
+static struct TokenInfo setup_info_shortcuts_1[] =
 {
   { TYPE_KEYTEXT,      NULL,           "Quick Save Game to Tape:",     },
   { TYPE_KEY,          &setup.shortcut.save_game, ""                   },
@@ -4398,7 +4874,7 @@ static struct TokenInfo setup_info_shortcut_1[] =
   { 0,                 NULL,                   NULL                    }
 };
 
-static struct TokenInfo setup_info_shortcut_2[] =
+static struct TokenInfo setup_info_shortcuts_2[] =
 {
   { TYPE_KEYTEXT,      NULL,           "Set Focus to Player 1:",       },
   { TYPE_KEY,          &setup.shortcut.focus_player[0], ""             },
@@ -4623,6 +5099,10 @@ static void DrawSetupScreen_Generic()
   UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
 
+#if 1
+  FadeOut(REDRAW_FIELD);
+#endif
+
   ClearWindow();
 
   if (setup_mode == SETUP_MODE_MAIN)
@@ -4655,14 +5135,14 @@ static void DrawSetupScreen_Generic()
     setup_info = setup_info_artwork;
     title_string = "Custom Artwork";
   }
-  else if (setup_mode == SETUP_MODE_SHORTCUT_1)
+  else if (setup_mode == SETUP_MODE_SHORTCUTS_1)
   {
-    setup_info = setup_info_shortcut_1;
+    setup_info = setup_info_shortcuts_1;
     title_string = "Setup Shortcuts";
   }
-  else if (setup_mode == SETUP_MODE_SHORTCUT_2)
+  else if (setup_mode == SETUP_MODE_SHORTCUTS_2)
   {
-    setup_info = setup_info_shortcut_2;
+    setup_info = setup_info_shortcuts_2;
     title_string = "Setup Shortcuts";
   }
 
@@ -4713,9 +5193,18 @@ static void DrawSetupScreen_Generic()
                    "Joysticks deactivated in setup menu");
 #endif
 
-  FadeToFront();
+#if 1
+  HandleSetupScreen_Generic(0, 0, 0, 0, MB_MENU_INITIALIZE);
+#endif
+
+#if 1
+  FadeIn(REDRAW_FIELD);
+#endif
+
   InitAnimation();
+#if 0
   HandleSetupScreen_Generic(0, 0, 0, 0, MB_MENU_INITIALIZE);
+#endif
 }
 
 void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
@@ -4751,6 +5240,8 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
       {
        void (*menu_callback_function)(void) = setup_info[y].value;
 
+       FadeSetLeaveMenu();
+
        menu_callback_function();
 
        break;  /* absolutely needed because function changes 'setup_info'! */
@@ -4821,6 +5312,8 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
       {
        void (*menu_callback_function)(void) = setup_info[y].value;
 
+       FadeSetFromType(setup_info[y].type);
+
        menu_callback_function();
       }
       else
@@ -4838,6 +5331,10 @@ void DrawSetupScreen_Input()
   int i;
 #endif
 
+#if 1
+  FadeOut(REDRAW_FIELD);
+#endif
+
   ClearWindow();
 
 #if 1
@@ -4885,7 +5382,11 @@ void DrawSetupScreen_Input()
   MapScreenMenuGadgets(SCREEN_MASK_INPUT);
 
   HandleSetupScreen_Input(0, 0, 0, 0, MB_MENU_INITIALIZE);
-  FadeToFront();
+
+#if 1
+  FadeIn(REDRAW_FIELD);
+#endif
+
   InitAnimation();
 }
 
@@ -5127,6 +5628,8 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
       {
        InitJoysticks();
 
+       FadeSetLeaveMenu();
+
        setup_mode = SETUP_MODE_MAIN;
        DrawSetupScreen();
       }
@@ -5157,12 +5660,17 @@ void CustomizeKeyboard(int player_nr)
   /* read existing key bindings from player setup */
   custom_key = setup.input[player_nr].key;
 
+  FadeSetEnterMenu();
+  FadeOut(REDRAW_FIELD);
+
   ClearWindow();
 
   DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Keyboard Input");
 
+#if 0
   BackToFront();
   InitAnimation();
+#endif
 
   step_nr = 0;
   DrawText(mSX, mSY + (2 + 2 * step_nr) * 32,
@@ -5172,6 +5680,12 @@ void CustomizeKeyboard(int player_nr)
   DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32,
           getKeyNameFromKey(*customize_step[step_nr].key), FONT_VALUE_OLD);
 
+#if 1
+  FadeIn(REDRAW_FIELD);
+
+  InitAnimation();
+#endif
+
   while (!finished)
   {
     if (PendingEvent())                /* got event */
@@ -5188,6 +5702,9 @@ void CustomizeKeyboard(int player_nr)
 
            if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6))
            {
+             if (key == KSYM_Escape)
+               FadeSkipNextFadeIn();
+
              finished = TRUE;
              break;
            }
@@ -5286,6 +5803,9 @@ static boolean CalibrateJoystickMain(int player_nr)
   if (joystick_fd < 0 || !setup.input[player_nr].use_joystick)
     return FALSE;
 
+  FadeSetEnterMenu();
+  FadeOut(REDRAW_FIELD);
+
   ClearWindow();
 
   for (y = 0; y < 3; y++)
@@ -5317,7 +5837,12 @@ static boolean CalibrateJoystickMain(int player_nr)
   new_joystick_ymiddle = joy_y;
 
   DrawGraphic(xpos + last_x, ypos + last_y, IMG_MENU_CALIBRATE_RED, 0);
+
+#if 1
+  FadeIn(REDRAW_FIELD);
+#else
   BackToFront();
+#endif
 
   while (Joystick(player_nr) & JOY_BUTTON);    /* wait for released button */
   InitAnimation();
@@ -5341,6 +5866,7 @@ static boolean CalibrateJoystickMain(int player_nr)
              break;
 
            case KSYM_Escape:
+             FadeSkipNextFadeIn();
              result = 0;
              break;
 
@@ -5487,6 +6013,8 @@ void DrawSetupScreen()
     DrawChooseTree(&game_speed_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
     DrawChooseTree(&screen_mode_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
+    DrawChooseTree(&scroll_delay_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)
     DrawChooseTree(&artwork.gfx_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS)
@@ -5514,6 +6042,8 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
     HandleChooseTree(mx, my, dx, dy, button, &game_speed_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
     HandleChooseTree(mx, my, dx, dy, button, &screen_mode_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
+    HandleChooseTree(mx, my, dx, dy, button, &scroll_delay_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)
     HandleChooseTree(mx, my, dx, dy, button, &artwork.gfx_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS)
@@ -5895,8 +6425,10 @@ void CreateScreenGadgets()
 
   CreateScreenMenubuttons();
 
+#if 0
   /* force LEVELS draw offset for scrollbar / scrollbutton gadgets */
   game_status = GAME_MODE_LEVELS;
+#endif
 
   CreateScreenScrollbuttons();
   CreateScreenScrollbars();