rnd-20060816-2-src
[rocksndiamonds.git] / src / screens.c
index 2a59fee7e3fb260faf150b12edf664bae2ebd589..05956c4c369b741eeed51faf4ae8138b61d0b6c7 100644 (file)
 #define SETUP_MODE_SHORTCUT_1          4
 #define SETUP_MODE_SHORTCUT_2          5
 #define SETUP_MODE_GRAPHICS            6
-#define SETUP_MODE_SOUND               7
-#define SETUP_MODE_ARTWORK             8
-#define SETUP_MODE_CHOOSE_GRAPHICS     9
-#define SETUP_MODE_CHOOSE_SOUNDS       10
-#define SETUP_MODE_CHOOSE_MUSIC                11
+#define SETUP_MODE_CHOOSE_SCREEN_MODE  7
+#define SETUP_MODE_SOUND               8
+#define SETUP_MODE_ARTWORK             9
+#define SETUP_MODE_CHOOSE_GRAPHICS     10
+#define SETUP_MODE_CHOOSE_SOUNDS       11
+#define SETUP_MODE_CHOOSE_MUSIC                12
 
-#define MAX_SETUP_MODES                        12
+#define MAX_SETUP_MODES                        13
 
 /* for input setup functions */
 #define SETUPINPUT_SCREEN_POS_START    0
 
 /* screens on the info screen */
 #define INFO_MODE_MAIN                 0
-#define INFO_MODE_ELEMENTS             1
-#define INFO_MODE_MUSIC                        2
-#define INFO_MODE_CREDITS              3
-#define INFO_MODE_PROGRAM              4
-#define INFO_MODE_LEVELSET             5
+#define INFO_MODE_TITLE                        1
+#define INFO_MODE_ELEMENTS             2
+#define INFO_MODE_MUSIC                        3
+#define INFO_MODE_CREDITS              4
+#define INFO_MODE_PROGRAM              5
+#define INFO_MODE_LEVELSET             6
 
-#define MAX_INFO_MODES                 6
+#define MAX_INFO_MODES                 7
 
 /* for various menu stuff  */
-#define MAX_INFO_ELEMENTS_ON_SCREEN    10
-#define MAX_MENU_ENTRIES_ON_SCREEN     (SCR_FIELDY - 2)
+#define MENU_SCREEN_START_XPOS         1
 #define MENU_SCREEN_START_YPOS         2
 #define MENU_SCREEN_VALUE_XPOS         14
 #define MENU_SCREEN_MAX_XPOS           (SCR_FIELDX - 1)
 #define MENU_TITLE1_YPOS               8
 #define MENU_TITLE2_YPOS               46
+#define MAX_INFO_ELEMENTS_ON_SCREEN    10
+#define MAX_MENU_ENTRIES_ON_SCREEN     (SCR_FIELDY - MENU_SCREEN_START_YPOS)
+#define MAX_MENU_TEXT_LENGTH_BIG       (MENU_SCREEN_VALUE_XPOS -       \
+                                        MENU_SCREEN_START_XPOS)
+#define MAX_MENU_TEXT_LENGTH_MEDIUM    (MAX_MENU_TEXT_LENGTH_BIG * 2)
 
 /* buttons and scrollbars identifiers */
-#define SCREEN_CTRL_ID_SCROLL_UP       0
-#define SCREEN_CTRL_ID_SCROLL_DOWN     1
-#define SCREEN_CTRL_ID_SCROLL_VERTICAL 2
+#define SCREEN_CTRL_ID_LAST_LEVEL      0
+#define SCREEN_CTRL_ID_NEXT_LEVEL      1
+#define SCREEN_CTRL_ID_LAST_PLAYER     2
+#define SCREEN_CTRL_ID_NEXT_PLAYER     3
+#define SCREEN_CTRL_ID_SCROLL_UP       4
+#define SCREEN_CTRL_ID_SCROLL_DOWN     5
+#define SCREEN_CTRL_ID_SCROLL_VERTICAL 6
+
+#define NUM_SCREEN_GADGETS             7
 
+#define NUM_SCREEN_MENUBUTTONS         4
 #define NUM_SCREEN_SCROLLBUTTONS       2
 #define NUM_SCREEN_SCROLLBARS          1
-#define NUM_SCREEN_GADGETS             3
+
+#define SCREEN_MASK_MAIN               (1 << 0)
+#define SCREEN_MASK_INPUT              (1 << 1)
+
+/* graphic position and size values for buttons and scrollbars */
+#define SC_MENUBUTTON_XSIZE            TILEX
+#define SC_MENUBUTTON_YSIZE            TILEY
+
+#define SC_SCROLLBUTTON_XSIZE          TILEX
+#define SC_SCROLLBUTTON_YSIZE          TILEY
+
+#define SC_SCROLLBAR_XPOS              (SXSIZE - SC_SCROLLBUTTON_XSIZE)
+
+#define SC_SCROLL_VERTICAL_XSIZE       SC_SCROLLBUTTON_XSIZE
+#define SC_SCROLL_VERTICAL_YSIZE       ((MAX_MENU_ENTRIES_ON_SCREEN - 2) * \
+                                        SC_SCROLLBUTTON_YSIZE)
+
+#define SC_SCROLL_UP_XPOS              SC_SCROLLBAR_XPOS
+#define SC_SCROLL_UP_YPOS              (2 * SC_SCROLLBUTTON_YSIZE)
+
+#define SC_SCROLL_VERTICAL_XPOS                SC_SCROLLBAR_XPOS
+#define SC_SCROLL_VERTICAL_YPOS                (SC_SCROLL_UP_YPOS + \
+                                        SC_SCROLLBUTTON_YSIZE)
+
+#define SC_SCROLL_DOWN_XPOS            SC_SCROLLBAR_XPOS
+#define SC_SCROLL_DOWN_YPOS            (SC_SCROLL_VERTICAL_YPOS + \
+                                        SC_SCROLL_VERTICAL_YSIZE)
+
+#define SC_BORDER_SIZE                 14
+
 
 /* forward declarations of internal functions */
 static void HandleScreenGadgets(struct GadgetInfo *);
@@ -80,6 +122,7 @@ static void HandleSetupScreen_Generic(int, int, int, int, int);
 static void HandleSetupScreen_Input(int, int, int, int, int);
 static void CustomizeKeyboard(int);
 static void CalibrateJoystick(int);
+static void execSetupGraphics(void);
 static void execSetupArtwork(void);
 static void HandleChooseTree(int, int, int, int, int, TreeInfo **);
 
@@ -87,20 +130,27 @@ static void DrawChooseLevel(void);
 static void DrawInfoScreen(void);
 static void DrawSetupScreen(void);
 
+static void DrawInfoScreenExt(int);
+static void DrawInfoScreen_NotAvailable(char *, char *);
 static void DrawInfoScreen_HelpAnim(int, int, boolean);
 static void DrawInfoScreen_HelpText(int, int, int, int);
 static void HandleInfoScreen_Main(int, int, int, int, int);
+static void HandleInfoScreen_TitleScreen(int);
 static void HandleInfoScreen_Elements(int);
 static void HandleInfoScreen_Music(int);
 static void HandleInfoScreen_Credits(int);
 static void HandleInfoScreen_Program(int);
 
-static void MapChooseTreeGadgets(TreeInfo *);
+static void MapScreenMenuGadgets(int);
+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 TreeInfo *screen_modes = NULL;
+static TreeInfo *screen_mode_current = NULL;
+
 #define DRAW_OFFSET_MODE(x)    (x >= GAME_MODE_MAIN &&                 \
                                 x <= GAME_MODE_SETUP ? x :             \
                                 x == GAME_MODE_PSEUDO_TYPENAME ?       \
@@ -173,93 +223,86 @@ static void drawChooseTreeCursor(int ypos, int color)
   game_status = last_game_status;      /* restore current game status */
 }
 
-static void PlayMenuSound()
+void DrawHeadline()
 {
-  int sound = menu.sound[game_status];
-
-  if (sound == SND_UNDEFINED)
-    return;
-
-  if (sound_info[sound].loop)
-    PlaySoundLoop(sound);
-  else
-    PlaySound(sound);
+  DrawTextSCentered(MENU_TITLE1_YPOS, FONT_TITLE_1, PROGRAM_TITLE_STRING);
+  DrawTextSCentered(MENU_TITLE2_YPOS, FONT_TITLE_2, PROGRAM_COPYRIGHT_STRING);
 }
 
-static void PlayMenuSoundIfLoop()
+static int getLastLevelButtonPos()
 {
-  int sound = menu.sound[game_status];
-
-  if (sound == SND_UNDEFINED)
-    return;
-
-  if (sound_info[sound].loop)
-    PlaySoundLoop(sound);
+  return 10;
 }
 
-static void PlayMenuMusic()
+static int getCurrentLevelTextPos()
 {
-  int music = menu.music[game_status];
-
-  if (music == MUS_UNDEFINED)
-    return;
+  return (getLastLevelButtonPos() + 1);
+}
 
-  PlayMusic(music);
+static int getNextLevelButtonPos()
+{
+  return getLastLevelButtonPos() + 3 + 1;
 }
 
-void DrawHeadline()
+static int getLevelRangeTextPos()
 {
-  DrawTextSCentered(MENU_TITLE1_YPOS, FONT_TITLE_1, PROGRAM_TITLE_STRING);
-  DrawTextSCentered(MENU_TITLE2_YPOS, FONT_TITLE_2, PROGRAM_COPYRIGHT_STRING);
+  return getNextLevelButtonPos() + 1;
 }
 
-static void ToggleFullscreenIfNeeded()
+void DrawTitleScreenImage(int nr)
 {
-  if (setup.fullscreen != video.fullscreen_enabled)
+  int graphic = IMG_TITLESCREEN_1 + nr;
+  Bitmap *bitmap = graphic_info[graphic].bitmap;
+  int width  = graphic_info[graphic].src_image_width;
+  int height = graphic_info[graphic].src_image_height;
+  int src_x = 0, src_y = 0;
+  int dst_x, dst_y;
+
+  if (bitmap == NULL)
+    return;
+
+  if (width > WIN_XSIZE)
   {
-    /* save old door content */
-    BlitBitmap(backbuffer, bitmap_db_door,
-              DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
+    /* image width too large for window => center image horizontally */
+    src_x = (width - WIN_XSIZE) / 2;
+    width = WIN_XSIZE;
+  }
 
-    /* toggle fullscreen */
-    ChangeVideoModeIfNeeded(setup.fullscreen);
-    setup.fullscreen = video.fullscreen_enabled;
+  if (height > WIN_YSIZE)
+  {
+    /* image height too large for window => center image vertically */
+    src_y = (height - WIN_YSIZE) / 2;
+    height = WIN_YSIZE;
+  }
 
-    /* redraw background to newly created backbuffer */
-    BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, backbuffer,
-              0,0, WIN_XSIZE,WIN_YSIZE, 0,0);
+  dst_x = (WIN_XSIZE - width) / 2;
+  dst_y = (WIN_YSIZE - height) / 2;
 
-    /* restore old door content */
-    BlitBitmap(bitmap_db_door, backbuffer,
-              DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
+  ClearRectangleOnBackground(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE);
 
-    redraw_mask = REDRAW_ALL;
-  }
-}
+  if (DrawingOnBackground(dst_x, dst_y))
+    BlitBitmapMasked(bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y);
+  else
+    BlitBitmap(bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y);
 
-static int getLastLevelButtonPos()
-{
-  return 10;
+  redraw_mask = REDRAW_ALL;
 }
 
-static int getCurrentLevelTextPos()
+void DrawTitleScreen()
 {
-  return (getLastLevelButtonPos() + 1);
-}
+  KeyboardAutoRepeatOff();
 
-static int getNextLevelButtonPos()
-{
-  return getLastLevelButtonPos() + 3 + 1;
-}
+  SetMainBackgroundImage(IMG_BACKGROUND_TITLE);
 
-static int getLevelRangeTextPos()
-{
-  return getNextLevelButtonPos() + 1;
+  HandleTitleScreen(0, 0, 0, 0, MB_MENU_INITIALIZE);
+
+  StopAnimation();
 }
 
-void DrawMainMenu()
+void DrawMainMenuExt(int redraw_mask, boolean do_fading)
 {
   static LevelDirTree *leveldir_last_valid = NULL;
+  boolean levelset_has_changed = FALSE;
   char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:");
 #if 1
   char *level_text = "Levelset";
@@ -280,6 +323,10 @@ void DrawMainMenu()
 
   audio.sound_deactivated = FALSE;
 
+#if 1
+  GetPlayerConfig();
+#endif
+
   /* needed if last screen was the playing screen, invoked from level editor */
   if (level_editor_test_game)
   {
@@ -299,6 +346,9 @@ void DrawMainMenu()
   if (!validLevelSeries(leveldir_current))
     leveldir_current = getFirstValidTreeInfoEntry(leveldir_last_valid);
 
+  if (leveldir_current != leveldir_last_valid)
+    levelset_has_changed = TRUE;
+
   /* store valid level series information */
   leveldir_last_valid = leveldir_current;
 
@@ -309,6 +359,16 @@ void DrawMainMenu()
   SetDrawtoField(DRAW_BACKBUFFER);
 #endif
 
+  if (setup.show_titlescreen &&
+      levelset_has_changed &&
+      graphic_info[IMG_TITLESCREEN_1].bitmap != NULL)
+  {
+    game_status = GAME_MODE_TITLE;
+    DrawTitleScreen();
+
+    return;
+  }
+
 #if 0
   /* map gadgets for main menu screen */
   MapTapeButtons();
@@ -318,7 +378,9 @@ void DrawMainMenu()
   if (setup.handicap && level_nr > leveldir_current->handicap_level)
     level_nr = leveldir_current->handicap_level;
 
+#if 0
   GetPlayerConfig();
+#endif
   LoadLevel(level_nr);
 
   SetMainBackgroundImage(IMG_BACKGROUND_MAIN);
@@ -363,7 +425,7 @@ void DrawMainMenu()
 #endif
 #endif
 
-  DrawMicroLevel(MICROLEVEL_XPOS, MICROLEVEL_YPOS, TRUE);
+  DrawPreviewLevel(TRUE);
 
 #if 1
 
@@ -407,6 +469,8 @@ void DrawMainMenu()
     initCursor(i, (i == 1 || i == 4 || i == 6 ? IMG_MENU_BUTTON_ENTER_MENU :
                   IMG_MENU_BUTTON));
 
+#if 0
+
 #if 1
   drawCursorXY(getLastLevelButtonPos(), 1, IMG_MENU_BUTTON_LAST_LEVEL);
   drawCursorXY(getNextLevelButtonPos(), 1, IMG_MENU_BUTTON_NEXT_LEVEL);
@@ -418,12 +482,18 @@ void DrawMainMenu()
   drawCursorXY(level_width / 32 + 4, 1, IMG_MENU_BUTTON_LEFT);
   drawCursorXY(level_width / 32 + 8, 1, IMG_MENU_BUTTON_RIGHT);
 #endif
+#endif
+
 #endif
 
   DrawTextSCentered(326, FONT_TITLE_2, "A Game by Artsoft Entertainment");
 
+#if 0
   FadeToFront();
+#endif
+#if 0
   InitAnimation();
+#endif
 
   HandleMainMenu(0, 0, 0, 0, MB_MENU_INITIALIZE);
 
@@ -435,12 +505,59 @@ void DrawMainMenu()
   PlayMenuSound();
   PlayMenuMusic();
 
+#if 0
+#if 1
   OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
+#else
+  if (fade_delay > 0)
+    OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+  else
+    OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
+#endif
+#endif
+
+#if 0
+  InitAnimation();
+#endif
 
 #if 1
+  /* create gadgets for main menu screen */
+  FreeScreenGadgets();
+  CreateScreenGadgets();
+
   /* map gadgets for main menu screen */
   MapTapeButtons();
+  MapScreenMenuGadgets(SCREEN_MASK_MAIN);
 #endif
+
+#if 1
+#if 1
+  if (do_fading)
+    FadeIn(redraw_mask);
+  else
+    BackToFront();
+#else
+  BackToFront();
+#endif
+#endif
+
+#if 1
+  InitAnimation();
+#endif
+
+#if 1
+  OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
+#endif
+}
+
+void DrawAndFadeInMainMenu(int redraw_mask)
+{
+  DrawMainMenuExt(redraw_mask, TRUE);
+}
+
+void DrawMainMenu()
+{
+  DrawMainMenuExt(REDRAW_ALL, FALSE);
 }
 
 #if 0
@@ -474,9 +591,165 @@ static void gotoTopLevelDir()
 }
 #endif
 
+void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
+{
+  static int title_nr = 0;
+  boolean return_to_main_menu = FALSE;
+  boolean use_fading_main_menu = TRUE;
+  boolean use_cross_fading = TRUE;
+
+  if (button == MB_MENU_INITIALIZE)
+  {
+    int last_game_status = game_status;        /* save current game status */
+    title_nr = 0;
+
+    if (game_status == GAME_MODE_INFO)
+    {
+      if (graphic_info[IMG_TITLESCREEN_1].bitmap == NULL)
+      {
+       DrawInfoScreen_NotAvailable("Title screen information:",
+                                   "No title screen for this level set.");
+
+       return;
+      }
+
+      FadeSoundsAndMusic();
+
+      FadeOut(REDRAW_ALL);
+    }
+
+    /* force TITLE music on title info screen */
+    game_status = GAME_MODE_TITLE;
+
+    PlayMenuSound();
+    PlayMenuMusic();
+
+    game_status = last_game_status;    /* restore current game status */
+
+    DrawTitleScreenImage(title_nr);
+
+    FadeIn(REDRAW_ALL);
+
+    return;
+  }
+  else if (button == MB_MENU_LEAVE)
+  {
+    return_to_main_menu = TRUE;
+    use_fading_main_menu = FALSE;
+  }
+  else if (button == MB_MENU_CHOICE)
+  {
+    if (game_status == GAME_MODE_INFO &&
+       graphic_info[IMG_TITLESCREEN_1].bitmap == NULL)
+    {
+      info_mode = INFO_MODE_MAIN;
+      DrawInfoScreen();
+
+      return;
+    }
+
+    title_nr++;
+
+    if (!use_cross_fading)
+      FadeOut(REDRAW_ALL);
+
+    if (title_nr < MAX_NUM_TITLE_SCREENS &&
+       graphic_info[IMG_TITLESCREEN_1 + title_nr].bitmap != NULL)
+    {
+      Bitmap *drawto_last = drawto;
+
+      if (use_cross_fading)
+       drawto = bitmap_db_cross;
+
+      DrawTitleScreenImage(title_nr);
+
+      drawto = drawto_last;
+
+      if (use_cross_fading)
+       FadeCross(REDRAW_ALL);
+      else
+       FadeIn(REDRAW_ALL);
+    }
+    else
+    {
+      FadeSoundsAndMusic();
+
+      FadeOut(REDRAW_ALL);
+
+      return_to_main_menu = TRUE;
+    }
+  }
+
+  if (return_to_main_menu)
+  {
+    RedrawBackground();
+
+    if (game_status == GAME_MODE_INFO)
+    {
+      OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
+      info_mode = INFO_MODE_MAIN;
+      DrawInfoScreenExt(use_fading_main_menu);
+    }
+    else       /* default: return to main menu */
+    {
+      OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
+      game_status = GAME_MODE_MAIN;
+      DrawMainMenuExt(REDRAW_ALL, use_fading_main_menu);
+    }
+  }
+}
+
+void HandleMainMenu_SelectLevel(int step, int direction)
+{
+  int old_level_nr = level_nr;
+  int new_level_nr;
+
+  new_level_nr = old_level_nr + step * direction;
+  if (new_level_nr < leveldir_current->first_level)
+    new_level_nr = leveldir_current->first_level;
+  if (new_level_nr > leveldir_current->last_level)
+    new_level_nr = leveldir_current->last_level;
+
+  if (setup.handicap && new_level_nr > leveldir_current->handicap_level)
+  {
+    /* skipping levels is only allowed when trying to skip single level */
+    if (setup.skip_levels && step == 1 &&
+       Request("Level still unsolved ! Skip despite handicap ?", REQ_ASK))
+    {
+      leveldir_current->handicap_level++;
+      SaveLevelSetup_SeriesInfo();
+    }
+
+    new_level_nr = leveldir_current->handicap_level;
+  }
+
+  if (new_level_nr != old_level_nr)
+  {
+    level_nr = new_level_nr;
+
+    DrawText(mSX + 11 * 32, mSY + 3 * 32, int2str(level_nr, 3), FONT_VALUE_1);
+
+    LoadLevel(level_nr);
+    DrawPreviewLevel(TRUE);
+
+    TapeErase();
+    LoadTape(level_nr);
+    DrawCompleteVideoDisplay();
+
+    /* needed because DrawPreviewLevel() takes some time */
+    BackToFront();
+    SyncDisplay();
+  }
+}
+
 void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 {
+#if 0
   static unsigned long level_delay = 0;
+  static unsigned long level_delay_value = GADGET_FRAME_DELAY;
+#endif
   static int choice = 5;
   int x = 0;
   int y = choice;
@@ -505,9 +778,24 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       y = choice + dy;
   }
 
+#if 0
+  /* start gadget delay with longer delay after first click on gadget */
+  if (button == 0)
+    pressed_delay_value = GADGET_FRAME_DELAY_FIRST;
+#endif
+
+#if 1
+
+  if (y == 1 && dx != 0 && button)
+  {
+    HandleMainMenu_SelectLevel(1, dx < 0 ? -1 : +1);
+  }
+
+#else
+
   if (y == 1 && ((x == 10 && level_nr > leveldir_current->first_level) ||
                 (x == 14 && level_nr < leveldir_current->last_level)) &&
-      button && DelayReached(&level_delay, GADGET_FRAME_DELAY))
+      button && DelayReached(&level_delay, level_delay_value))
   {
     int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
     int old_level_nr = level_nr;
@@ -540,18 +828,25 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
               FONT_VALUE_1);
 
       LoadLevel(level_nr);
-      DrawMicroLevel(MICROLEVEL_XPOS, MICROLEVEL_YPOS, TRUE);
+      DrawPreviewLevel(TRUE);
 
       TapeErase();
       LoadTape(level_nr);
       DrawCompleteVideoDisplay();
 
-      /* needed because DrawMicroLevel() takes some time */
+      /* needed because DrawPreviewLevel() takes some time */
       BackToFront();
       SyncDisplay();
+
       DelayReached(&level_delay, 0);   /* reset delay counter */
+#if 0
+      pressed_delay_value = GADGET_FRAME_DELAY_FIRST;
+#endif
     }
   }
+
+#endif
+
   else if (IN_VIS_FIELD(x, y) &&
           y >= 0 && y <= 7 && (y != 1 || x < 10))
   {
@@ -629,7 +924,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 
   if (game_status == GAME_MODE_MAIN)
   {
-    DrawMicroLevel(MICROLEVEL_XPOS, MICROLEVEL_YPOS, FALSE);
+    DrawPreviewLevel(FALSE);
     DoAnimation();
   }
 }
@@ -642,6 +937,12 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 static struct TokenInfo *info_info;
 static int num_info_info;
 
+static void execInfoTitleScreen()
+{
+  info_mode = INFO_MODE_TITLE;
+  DrawInfoScreen();
+}
+
 static void execInfoElements()
 {
   info_mode = INFO_MODE_ELEMENTS;
@@ -680,6 +981,7 @@ static void execExitInfo()
 
 static struct TokenInfo info_info_main[] =
 {
+  { TYPE_ENTER_SCREEN, execInfoTitleScreen,    "Title Screen"          },
   { TYPE_ENTER_SCREEN, execInfoElements,       "Elements Info"         },
   { TYPE_ENTER_SCREEN, execInfoMusic,          "Music Info"            },
   { TYPE_ENTER_SCREEN, execInfoCredits,        "Credits"               },
@@ -691,7 +993,7 @@ static struct TokenInfo info_info_main[] =
   { 0,                 NULL,                   NULL                    }
 };
 
-static void DrawInfoScreen_Main()
+static void DrawInfoScreen_Main(boolean do_fading)
 {
   int i;
 
@@ -711,14 +1013,15 @@ static void DrawInfoScreen_Main()
 
   for (i = 0; info_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++)
   {
+    int xpos = MENU_SCREEN_START_XPOS;
     int ypos = MENU_SCREEN_START_YPOS + i;
     int font_nr = FONT_MENU_1;
 
-    DrawText(mSX + 32, mSY + ypos * 32, info_info[i].text, font_nr);
+    DrawText(mSX + xpos * 32, mSY + ypos * 32, info_info[i].text, font_nr);
 
-    if (info_info[i].type & TYPE_ENTER_MENU)
+    if (info_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST))
       initCursor(i, IMG_MENU_BUTTON_ENTER_MENU);
-    else if (info_info[i].type & TYPE_LEAVE_MENU)
+    else if (info_info[i].type & (TYPE_LEAVE_MENU|TYPE_LEAVE_LIST))
       initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU);
     else if (info_info[i].type & ~TYPE_SKIP_ENTRY)
       initCursor(i, IMG_MENU_BUTTON);
@@ -726,6 +1029,22 @@ static void DrawInfoScreen_Main()
     num_info_info++;
   }
 
+#if 1
+
+  HandleInfoScreen_Main(0, 0, 0, 0, MB_MENU_INITIALIZE);
+
+  PlayMenuSound();
+  PlayMenuMusic();
+
+  if (do_fading)
+    FadeIn(REDRAW_ALL);
+  else
+    BackToFront();
+
+  InitAnimation();
+
+#else
+
   FadeToFront();
   InitAnimation();
 
@@ -733,6 +1052,7 @@ static void DrawInfoScreen_Main()
   PlayMenuMusic();
 
   HandleInfoScreen_Main(0, 0, 0, 0, MB_MENU_INITIALIZE);
+#endif
 }
 
 void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
@@ -778,7 +1098,7 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
   {
     if (dx)
     {
-      int menu_navigation_type = (dx < 0 ? TYPE_LEAVE_MENU : TYPE_ENTER_MENU);
+      int menu_navigation_type = (dx < 0 ? TYPE_LEAVE : TYPE_ENTER);
 
       if (info_info[choice].type & menu_navigation_type ||
          info_info[choice].type & TYPE_ENTER_SCREEN ||
@@ -808,7 +1128,7 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
     }
     else if (!(info_info[y].type & TYPE_GHOSTED))
     {
-      if (info_info[y].type & TYPE_ENTER_OR_LEAVE_MENU)
+      if (info_info[y].type & TYPE_ENTER_OR_LEAVE)
       {
        void (*menu_callback_function)(void) = info_info[choice].value;
 
@@ -818,6 +1138,24 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
   }
 }
 
+void DrawInfoScreen_NotAvailable(char *text_title, char *text_error)
+{
+  int ystart = 150;
+  int ybottom = SYSIZE - 20;
+
+  SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET);
+
+  ClearWindow();
+  DrawHeadline();
+
+  DrawTextSCentered(100, FONT_TEXT_1, text_title);
+
+  DrawTextSCentered(ybottom, FONT_TEXT_4,
+                   "Press any key or button for info menu");
+
+  DrawTextSCentered(ystart, FONT_TEXT_2, text_error);
+}
+
 void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init)
 {
   static int infoscreen_step[MAX_INFO_ELEMENTS_ON_SCREEN];
@@ -978,6 +1316,16 @@ void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos)
                  max_chars_per_line, max_lines_per_text);
 }
 
+void DrawInfoScreen_TitleScreen()
+{
+  DrawTitleScreen();
+}
+
+void HandleInfoScreen_TitleScreen(int button)
+{
+  HandleTitleScreen(0, 0, 0, 0, button);
+}
+
 void DrawInfoScreen_Elements()
 {
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS);
@@ -1103,6 +1451,7 @@ void HandleInfoScreen_Music(int button)
 
   if (button_released || button == MB_MENU_INITIALIZE)
   {
+    Bitmap *drawto_last = drawto;
     int y = 0;
 
     if (button != MB_MENU_INITIALIZE)
@@ -1119,6 +1468,9 @@ void HandleInfoScreen_Music(int button)
 
     FadeSoundsAndMusic();
 
+    if (button != MB_MENU_INITIALIZE)
+      drawto = bitmap_db_cross;
+
     ClearWindow();
     DrawHeadline();
 
@@ -1180,55 +1532,237 @@ void HandleInfoScreen_Music(int button)
 
     DrawTextSCentered(ybottom, FONT_TEXT_4,
                      "Press any key or button for next page");
+
+    drawto = drawto_last;
+
+    if (button != MB_MENU_INITIALIZE)
+      FadeCross(REDRAW_FIELD);
   }
 
   if (list != NULL && list->is_sound && sound_info[list->music].loop)
     PlaySoundLoop(list->music);
 }
 
-void DrawInfoScreen_Credits()
+static boolean DrawInfoScreen_CreditsScreen(int screen_nr)
 {
   int ystart = 150, ystep = 30;
   int ybottom = SYSIZE - 20;
 
-  SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_CREDITS);
-
-  FadeSoundsAndMusic();
-
   ClearWindow();
   DrawHeadline();
 
   DrawTextSCentered(100, FONT_TEXT_1, "Credits:");
-  DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2, "DOS port of the game:");
-  DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_3, "Guido Schulz");
-  DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_2, "Additional toons:");
-  DrawTextSCentered(ystart + 3 * ystep, FONT_TEXT_3, "Karl Hörnell");
-  DrawTextSCentered(ystart + 5 * ystep, FONT_TEXT_2,
-                   "...and many thanks to all contributors");
-  DrawTextSCentered(ystart + 6 * ystep, FONT_TEXT_2, "of new levels!");
+
+  if (screen_nr == 0)
+  {
+    DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2,
+                     "Special thanks to");
+    DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_3,
+                     "Peter Liepa");
+    DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_2,
+                     "for creating");
+    DrawTextSCentered(ystart + 3 * ystep, FONT_TEXT_3,
+                     "\"Boulder Dash\"");
+    DrawTextSCentered(ystart + 4 * ystep, FONT_TEXT_2,
+                     "in the year");
+    DrawTextSCentered(ystart + 5 * ystep, FONT_TEXT_3,
+                     "1984");
+    DrawTextSCentered(ystart + 6 * ystep, FONT_TEXT_2,
+                     "published by");
+    DrawTextSCentered(ystart + 7 * ystep, FONT_TEXT_3,
+                     "First Star Software");
+  }
+  else if (screen_nr == 1)
+  {
+    DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2,
+                     "Special thanks to");
+    DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_3,
+                     "Klaus Heinz & Volker Wertich");
+    DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_2,
+                     "for creating");
+    DrawTextSCentered(ystart + 3 * ystep, FONT_TEXT_3,
+                     "\"Emerald Mine\"");
+    DrawTextSCentered(ystart + 4 * ystep, FONT_TEXT_2,
+                     "in the year");
+    DrawTextSCentered(ystart + 5 * ystep, FONT_TEXT_3,
+                     "1987");
+    DrawTextSCentered(ystart + 6 * ystep, FONT_TEXT_2,
+                     "published by");
+    DrawTextSCentered(ystart + 7 * ystep, FONT_TEXT_3,
+                     "Kingsoft");
+  }
+  else if (screen_nr == 2)
+  {
+    DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2,
+                     "Special thanks to");
+    DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_3,
+                     "Michael Stopp & Philip Jespersen");
+    DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_2,
+                     "for creating");
+    DrawTextSCentered(ystart + 3 * ystep, FONT_TEXT_3,
+                     "\"Supaplex\"");
+    DrawTextSCentered(ystart + 4 * ystep, FONT_TEXT_2,
+                     "in the year");
+    DrawTextSCentered(ystart + 5 * ystep, FONT_TEXT_3,
+                     "1991");
+    DrawTextSCentered(ystart + 6 * ystep, FONT_TEXT_2,
+                     "published by");
+    DrawTextSCentered(ystart + 7 * ystep, FONT_TEXT_3,
+                     "Digital Integration");
+  }
+  else if (screen_nr == 3)
+  {
+    DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2,
+                     "Special thanks to");
+    DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_3,
+                     "Hiroyuki Imabayashi");
+    DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_2,
+                     "for creating");
+    DrawTextSCentered(ystart + 3 * ystep, FONT_TEXT_3,
+                     "\"Sokoban\"");
+    DrawTextSCentered(ystart + 4 * ystep, FONT_TEXT_2,
+                     "in the year");
+    DrawTextSCentered(ystart + 5 * ystep, FONT_TEXT_3,
+                     "1982");
+    DrawTextSCentered(ystart + 6 * ystep, FONT_TEXT_2,
+                     "published by");
+    DrawTextSCentered(ystart + 7 * ystep, FONT_TEXT_3,
+                     "Thinking Rabbit");
+  }
+  else if (screen_nr == 4)
+  {
+    DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2,
+                     "Special thanks to");
+    DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_3,
+                     "Alan Bond");
+    DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_2,
+                     "and");
+    DrawTextSCentered(ystart + 3 * ystep, FONT_TEXT_3,
+                     "Jürgen Bonhagen");
+    DrawTextSCentered(ystart + 4 * ystep, FONT_TEXT_2,
+                     "for the continuous creation");
+    DrawTextSCentered(ystart + 5 * ystep, FONT_TEXT_2,
+                     "of outstanding level sets");
+  }
+  else if (screen_nr == 5)
+  {
+    DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2,
+                     "Thanks to");
+    DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_3,
+                     "Peter Elzner");
+    DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_2,
+                     "for ideas and inspiration by");
+    DrawTextSCentered(ystart + 3 * ystep, FONT_TEXT_3,
+                     "Diamond Caves");
+
+    DrawTextSCentered(ystart + 5 * ystep, FONT_TEXT_2,
+                     "Thanks to");
+    DrawTextSCentered(ystart + 6 * ystep, FONT_TEXT_3,
+                     "Steffest");
+    DrawTextSCentered(ystart + 7 * ystep, FONT_TEXT_2,
+                     "for ideas and inspiration by");
+    DrawTextSCentered(ystart + 8 * ystep, FONT_TEXT_3,
+                     "DX-Boulderdash");
+  }
+  else if (screen_nr == 6)
+  {
+    DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2,
+                     "Thanks to");
+    DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_3,
+                     "David Tritscher");
+    DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_2,
+                     "for the new Emerald Mine engine");
+  }
+  else if (screen_nr == 7)
+  {
+    DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2,
+                     "Thanks to");
+    DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_3,
+                     "Guido Schulz");
+    DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_2,
+                     "for the initial DOS port");
+
+    DrawTextSCentered(ystart + 4 * ystep, FONT_TEXT_2,
+                     "Thanks to");
+    DrawTextSCentered(ystart + 5 * ystep, FONT_TEXT_3,
+                     "Karl Hörnell");
+    DrawTextSCentered(ystart + 6 * ystep, FONT_TEXT_2,
+                     "for some additional toons");
+  }
+  else if (screen_nr == 8)
+  {
+    DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2,
+                     "And not to forget:");
+    DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_2,
+                     "Many thanks to");
+    DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_3,
+                     "All those who contributed");
+    DrawTextSCentered(ystart + 3 * ystep, FONT_TEXT_3,
+                     "levels to this game");
+    DrawTextSCentered(ystart + 4 * ystep, FONT_TEXT_3,
+                     "since 1995");
+  }
+  else
+  {
+    return FALSE;
+  }
 
   DrawTextSCentered(ybottom, FONT_TEXT_4,
-                   "Press any key or button for info menu");
+                   "Press any key or button for next page");
+
+  return TRUE;
+}
+
+void DrawInfoScreen_Credits()
+{
+  SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_CREDITS);
+
+  FadeSoundsAndMusic();
+
+  HandleInfoScreen_Credits(MB_MENU_INITIALIZE);
 }
 
 void HandleInfoScreen_Credits(int button)
 {
-  int button_released = !button;
+  static int screen_nr = 0;
 
-  if (button == MB_MENU_LEAVE)
+  if (button == MB_MENU_INITIALIZE)
+  {
+    screen_nr = 0;
+
+    DrawInfoScreen_CreditsScreen(screen_nr);
+  }
+  else if (button == MB_MENU_LEAVE)
   {
     info_mode = INFO_MODE_MAIN;
     DrawInfoScreen();
 
     return;
   }
-
-  if (button_released)
+  else if (button == MB_MENU_CHOICE)
   {
-    FadeSoundsAndMusic();
+    Bitmap *drawto_last = drawto;
+    boolean show_screen;
 
-    info_mode = INFO_MODE_MAIN;
-    DrawInfoScreen();
+    screen_nr++;
+
+    drawto = bitmap_db_cross;
+
+    show_screen = DrawInfoScreen_CreditsScreen(screen_nr);
+
+    drawto = drawto_last;
+  
+    if (show_screen)
+    {
+      FadeCross(REDRAW_FIELD);
+    }
+    else
+    {
+      FadeSoundsAndMusic();
+
+      info_mode = INFO_MODE_MAIN;
+      DrawInfoScreen();
+    }
   }
   else
   {
@@ -1253,7 +1787,7 @@ void DrawInfoScreen_Program()
   DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_2,
                    "If you like it, send e-mail to:");
   DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_3,
-                   "info@artsoft.org");
+                   PROGRAM_EMAIL_STRING);
   DrawTextSCentered(ystart + 3 * ystep, FONT_TEXT_2,
                    "or SnailMail to:");
   DrawTextSCentered(ystart + 4 * ystep + 0, FONT_TEXT_3,
@@ -1264,12 +1798,15 @@ void DrawInfoScreen_Program()
                    "33604 Bielefeld");
   DrawTextSCentered(ystart + 4 * ystep + 60, FONT_TEXT_3,
                    "Germany");
-
   DrawTextSCentered(ystart + 7 * ystep, FONT_TEXT_2,
+                   "More information and levels:");
+  DrawTextSCentered(ystart + 8 * ystep, FONT_TEXT_3,
+                   PROGRAM_WEBSITE_STRING);
+  DrawTextSCentered(ystart + 9 * ystep, FONT_TEXT_2,
                    "If you have created new levels,");
-  DrawTextSCentered(ystart + 8 * ystep, FONT_TEXT_2,
+  DrawTextSCentered(ystart + 10 * ystep, FONT_TEXT_2,
                    "send them to me to include them!");
-  DrawTextSCentered(ystart + 9 * ystep, FONT_TEXT_2,
+  DrawTextSCentered(ystart + 11 * ystep, FONT_TEXT_2,
                    ":-)");
 
   DrawTextSCentered(ybottom, FONT_TEXT_4,
@@ -1359,11 +1896,13 @@ void HandleInfoScreen_LevelSet(int button)
   }
 }
 
-void DrawInfoScreen()
+static void DrawInfoScreenExt(boolean do_fading)
 {
   SetMainBackgroundImage(IMG_BACKGROUND_INFO);
 
-  if (info_mode == INFO_MODE_ELEMENTS)
+  if (info_mode == INFO_MODE_TITLE)
+    DrawInfoScreen_TitleScreen();
+  else if (info_mode == INFO_MODE_ELEMENTS)
     DrawInfoScreen_Elements();
   else if (info_mode == INFO_MODE_MUSIC)
     DrawInfoScreen_Music();
@@ -1374,18 +1913,27 @@ void DrawInfoScreen()
   else if (info_mode == INFO_MODE_LEVELSET)
     DrawInfoScreen_LevelSet();
   else
-    DrawInfoScreen_Main();
+    DrawInfoScreen_Main(do_fading);
 
-  if (info_mode != INFO_MODE_MUSIC)
+  if (info_mode != INFO_MODE_MAIN &&
+      info_mode != INFO_MODE_TITLE &&
+      info_mode != INFO_MODE_MUSIC)
   {
     PlayMenuSound();
     PlayMenuMusic();
   }
 }
 
+void DrawInfoScreen()
+{
+  DrawInfoScreenExt(0);
+}
+
 void HandleInfoScreen(int mx, int my, int dx, int dy, int button)
 {
-  if (info_mode == INFO_MODE_ELEMENTS)
+  if (info_mode == INFO_MODE_TITLE)
+    HandleInfoScreen_TitleScreen(button);
+  else if (info_mode == INFO_MODE_ELEMENTS)
     HandleInfoScreen_Elements(button);
   else if (info_mode == INFO_MODE_MUSIC)
     HandleInfoScreen_Music(button);
@@ -1476,7 +2024,7 @@ static void DrawChooseTree(TreeInfo **ti_ptr)
   ClearWindow();
 
   HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr);
-  MapChooseTreeGadgets(*ti_ptr);
+  MapScreenTreeGadgets(*ti_ptr);
 
   FadeToFront();
   InitAnimation();
@@ -1503,8 +2051,6 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
                               TreeInfo *ti)
 {
   int i;
-  char buffer[SCR_FIELDX * 2];
-  int max_buffer_len = (SCR_FIELDX - 2) * 2;
   char *title_string = NULL;
 #if 0
   int xoffset_sets = 16;
@@ -1527,11 +2073,7 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
 #endif
   int last_game_status = game_status;  /* save current game status */
 
-  title_string =
-    (ti->type == TREE_TYPE_LEVEL_DIR ? "Level Sets" :
-     ti->type == TREE_TYPE_GRAPHICS_DIR ? "Custom Graphics" :
-     ti->type == TREE_TYPE_SOUNDS_DIR ? "Custom Sounds" :
-     ti->type == TREE_TYPE_MUSIC_DIR ? "Custom Music" : "");
+  title_string = ti->infotext;
 
 #if 1
   DrawTextSCentered(mSY - SY + yoffset, FONT_TITLE_1, title_string);
@@ -1544,14 +2086,24 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
 
   /* clear tree list area, but not title or scrollbar */
   DrawBackground(mSX, mSY + MENU_SCREEN_START_YPOS * 32,
-                SXSIZE - 32 + menu.scrollbar_xoffset,
+                SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset,
                 MAX_MENU_ENTRIES_ON_SCREEN * 32);
 
   for (i = 0; i < num_page_entries; i++)
   {
     TreeInfo *node, *node_first;
     int entry_pos = first_entry + i;
+    int xpos = MENU_SCREEN_START_XPOS;
     int ypos = MENU_SCREEN_START_YPOS + i;
+    int startx = mSX + xpos * 32;
+    int starty = mSY + ypos * 32;
+    int font_nr = FONT_TEXT_1;
+    int font_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset;
+    int startx_text = startx + font_xoffset;
+    int startx_scrollbar = mSX + SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset;
+    int text_size = startx_scrollbar - startx_text;
+    int max_buffer_len = text_size / getFontWidth(font_nr);
+    char buffer[max_buffer_len + 1];
 
     node_first = getTreeInfoFirstGroupEntry(ti);
     node = getTreeInfoFromPos(node_first, entry_pos);
@@ -1559,7 +2111,7 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
     strncpy(buffer, node->name, max_buffer_len);
     buffer[max_buffer_len] = '\0';
 
-    DrawText(mSX + 32, mSY + ypos * 32, buffer, FONT_TEXT_1 + node->color);
+    DrawText(startx, starty, buffer, font_nr + node->color);
 
     if (node->parent_link)
       initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU);
@@ -1671,7 +2223,13 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
     }
     else if (game_status == GAME_MODE_SETUP)
     {
-      execSetupArtwork();
+      if (game_status == GAME_MODE_SETUP)
+      {
+       if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
+         execSetupGraphics();
+       else
+         execSetupArtwork();
+      }
     }
     else
     {
@@ -1824,7 +2382,10 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
        if (game_status == GAME_MODE_SETUP)
        {
-         execSetupArtwork();
+         if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
+           execSetupGraphics();
+         else
+           execSetupArtwork();
        }
        else
        {
@@ -1862,13 +2423,19 @@ void DrawHallOfFame(int highlight_position)
   if (highlight_position < 0) 
     LoadScore(level_nr);
 
+  FadeOut(REDRAW_FIELD);
+
+#if 0
   FadeToFront();
+#endif
   InitAnimation();
 
   PlayMenuSound();
   PlayMenuMusic();
 
   HandleHallOfFame(highlight_position, 0, 0, 0, MB_MENU_INITIALIZE);
+
+  FadeIn(REDRAW_FIELD);
 }
 
 static void drawHallOfFameList(int first_entry, int highlight_position)
@@ -1919,7 +2486,6 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
   static int first_entry = 0;
   static int highlight_position = 0;
   int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
-  int button_released = !button;
 
   if (button == MB_MENU_INITIALIZE)
   {
@@ -1955,12 +2521,23 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
       drawHallOfFameList(first_entry, highlight_position);
     }
   }
-  else if (button_released)
+  else if (button == MB_MENU_LEAVE)
   {
     FadeSound(SND_BACKGROUND_SCORES);
+
     game_status = GAME_MODE_MAIN;
+
     DrawMainMenu();
   }
+  else if (button == MB_MENU_CHOICE)
+  {
+    FadeSound(SND_BACKGROUND_SCORES);
+    FadeOut(REDRAW_FIELD);
+
+    game_status = GAME_MODE_MAIN;
+
+    DrawAndFadeInMainMenu(REDRAW_FIELD);
+  }
 
   if (game_status == GAME_MODE_SCORES)
     PlayMenuSoundIfLoop();
@@ -1976,6 +2553,7 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
 static struct TokenInfo *setup_info;
 static int num_setup_info;
 
+static char *screen_mode_text;
 static char *graphics_set_name;
 static char *sounds_set_name;
 static char *music_set_name;
@@ -2000,10 +2578,75 @@ static void execSetupEditor()
 
 static void execSetupGraphics()
 {
+  if (video.fullscreen_available && screen_modes == NULL)
+  {
+    int i;
+
+    for (i = 0; video.fullscreen_modes[i].width != -1; i++)
+    {
+      TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+      char identifier[32], name[32];
+      int x = video.fullscreen_modes[i].width;
+      int y = video.fullscreen_modes[i].height;
+      int xx, yy;
+
+      get_aspect_ratio_from_screen_mode(&video.fullscreen_modes[i], &xx, &yy);
+
+      ti->node_top = &screen_modes;
+      ti->sort_priority = x * 10000 + y;
+
+      sprintf(identifier, "%dx%d", x, y);
+      sprintf(name,     "%d x %d [%d:%d]", x, y, xx, yy);
+
+      setString(&ti->identifier, identifier);
+      setString(&ti->name, name);
+      setString(&ti->name_sorting, name);
+      setString(&ti->infotext, "Fullscreen Mode");
+
+      pushTreeInfo(&screen_modes, ti);
+    }
+
+    /* sort fullscreen modes to start with lowest available screen resolution */
+    sortTreeInfo(&screen_modes);
+
+    /* set current screen mode for fullscreen mode to configured setup value */
+    screen_mode_current = getTreeInfoFromIdentifier(screen_modes,
+                                                   setup.fullscreen_mode);
+
+    /* if that fails, set current screen mode to reliable default value */
+    if (screen_mode_current == NULL)
+      screen_mode_current = getTreeInfoFromIdentifier(screen_modes,
+                                                     DEFAULT_FULLSCREEN_MODE);
+
+    /* if that also fails, set current screen mode to first available mode */
+    if (screen_mode_current == NULL)
+      screen_mode_current = screen_modes;
+
+    if (screen_mode_current == NULL)
+      video.fullscreen_available = FALSE;
+  }
+
+  if (video.fullscreen_available)
+  {
+    setup.fullscreen_mode = screen_mode_current->identifier;
+
+    /* needed for displaying screen mode name instead of identifier */
+    screen_mode_text = screen_mode_current->name;
+  }
+
   setup_mode = SETUP_MODE_GRAPHICS;
   DrawSetupScreen();
 }
 
+static void execSetupChooseScreenMode()
+{
+  if (!video.fullscreen_available)
+    return;
+
+  setup_mode = SETUP_MODE_CHOOSE_SCREEN_MODE;
+  DrawSetupScreen();
+}
+
 static void execSetupSound()
 {
   setup_mode = SETUP_MODE_SOUND;
@@ -2109,6 +2752,7 @@ static struct TokenInfo setup_info_game[] =
 
 static struct TokenInfo setup_info_editor[] =
 {
+#if 0
   { TYPE_SWITCH,       &setup.editor.el_boulderdash,   "Boulder Dash:" },
   { TYPE_SWITCH,       &setup.editor.el_emerald_mine,  "Emerald Mine:" },
   { TYPE_SWITCH, &setup.editor.el_emerald_mine_club,   "Emerald Mine Club:" },
@@ -2117,12 +2761,22 @@ static struct TokenInfo setup_info_editor[] =
   { TYPE_SWITCH,       &setup.editor.el_supaplex,      "Supaplex:"     },
   { TYPE_SWITCH,       &setup.editor.el_diamond_caves, "Diamond Caves II:" },
   { TYPE_SWITCH,       &setup.editor.el_dx_boulderdash,"DX-Boulderdash:" },
+#endif
   { TYPE_SWITCH,       &setup.editor.el_chars,         "Text Characters:" },
   { TYPE_SWITCH,       &setup.editor.el_custom,  "Custom & Group Elements:" },
+#if 0
   { TYPE_SWITCH,       &setup.editor.el_headlines,     "Headlines:"    },
+#endif
   { TYPE_SWITCH, &setup.editor.el_user_defined, "User defined element list:" },
   { TYPE_SWITCH,       &setup.editor.el_dynamic,  "Dynamic level elements:" },
   { TYPE_EMPTY,                NULL,                   ""                      },
+#if 0
+  { TYPE_SWITCH,       &setup.editor.el_by_game,   "Show elements by game:" },
+  { TYPE_SWITCH,       &setup.editor.el_by_type,   "Show elements by type:" },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+#endif
+  { TYPE_SWITCH, &setup.editor.show_element_token,     "Show element token:" },
+  { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
 
   { 0,                 NULL,                   NULL                    }
@@ -2130,7 +2784,9 @@ static struct TokenInfo setup_info_editor[] =
 
 static struct TokenInfo setup_info_graphics[] =
 {
-  { TYPE_SWITCH,       &setup.fullscreen,      "Fullscreen Mode:"      },
+  { 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.soft_scrolling,  "Soft Scrolling:"       },
@@ -2139,7 +2795,8 @@ static struct TokenInfo setup_info_graphics[] =
 #endif
   { TYPE_SWITCH,       &setup.quick_switch,    "Quick Player Focus Switch:" },
   { TYPE_SWITCH,       &setup.quick_doors,     "Quick Menu Doors:"     },
-  { TYPE_SWITCH,       &setup.toons,           "Toons:"                },
+  { TYPE_SWITCH,       &setup.show_titlescreen,"Show Title Screens:"   },
+  { TYPE_SWITCH,       &setup.toons,           "Show Toons:"           },
   { TYPE_ECS_AGA,      &setup.prefer_aga_graphics,"EMC graphics preference:" },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
@@ -2160,11 +2817,11 @@ static struct TokenInfo setup_info_sound[] =
 
 static struct TokenInfo setup_info_artwork[] =
 {
-  { TYPE_ENTER_MENU,   execSetupChooseGraphics,"Custom Graphics"       },
+  { TYPE_ENTER_LIST,   execSetupChooseGraphics,"Custom Graphics:"      },
   { TYPE_STRING,       &graphics_set_name,     ""                      },
-  { TYPE_ENTER_MENU,   execSetupChooseSounds,  "Custom Sounds"         },
+  { TYPE_ENTER_LIST,   execSetupChooseSounds,  "Custom Sounds:"        },
   { TYPE_STRING,       &sounds_set_name,       ""                      },
-  { TYPE_ENTER_MENU,   execSetupChooseMusic,   "Custom Music"          },
+  { TYPE_ENTER_LIST,   execSetupChooseMusic,   "Custom Music:"         },
   { TYPE_STRING,       &music_set_name,        ""                      },
   { TYPE_EMPTY,                NULL,                   ""                      },
 #if 1
@@ -2265,12 +2922,42 @@ static Key getSetupKey()
   return key;
 }
 
+static int getSetupTextFont(int type)
+{
+  if (type & (TYPE_SWITCH |
+             TYPE_YES_NO |
+             TYPE_STRING |
+             TYPE_ECS_AGA |
+             TYPE_KEYTEXT |
+             TYPE_ENTER_LIST))
+    return FONT_MENU_2;
+  else
+    return FONT_MENU_1;
+}
+
+static int getSetupValueFont(int type, void *value)
+{
+  if (type & TYPE_KEY)
+    return (type & TYPE_QUERY ? FONT_INPUT_1_ACTIVE : FONT_VALUE_1);
+  else if (type & TYPE_STRING)
+    return FONT_VALUE_2;
+  else if (type & TYPE_ECS_AGA)
+    return FONT_VALUE_1;
+  else if (type & TYPE_BOOLEAN_STYLE)
+    return (*(boolean *)value ? FONT_OPTION_ON : FONT_OPTION_OFF);
+  else
+    return FONT_VALUE_1;
+}
+
 static void drawSetupValue(int pos)
 {
+  boolean font_draw_xoffset_modified = FALSE;
+  int font_draw_xoffset_old = -1;
   int xpos = MENU_SCREEN_VALUE_XPOS;
   int ypos = MENU_SCREEN_START_YPOS + pos;
-  int font_nr = FONT_VALUE_1;
-  int font_width = getFontWidth(font_nr);
+  int startx = mSX + xpos * 32;
+  int starty = mSY + ypos * 32;
+  int font_nr, font_width;
   int type = setup_info[pos].type;
   void *value = setup_info[pos].value;
   char *value_string = getSetupValue(type, value);
@@ -2282,7 +2969,7 @@ static void drawSetupValue(int pos)
   if (type & TYPE_KEY)
   {
 #if 1
-    xpos = 1;
+    xpos = MENU_SCREEN_START_XPOS;
 #else
     xpos = 3;
 #endif
@@ -2290,42 +2977,99 @@ static void drawSetupValue(int pos)
     if (type & TYPE_QUERY)
     {
       value_string = "<press key>";
+#if 0
       font_nr = FONT_INPUT_1_ACTIVE;
+#endif
     }
   }
   else if (type & TYPE_STRING)
   {
     int max_value_len = (SCR_FIELDX - 2) * 2;
 
-    xpos = 1;
+    xpos = MENU_SCREEN_START_XPOS;
+#if 0
     font_nr = FONT_VALUE_2;
+#endif
 
     if (strlen(value_string) > max_value_len)
       value_string[max_value_len] = '\0';
   }
   else if (type & TYPE_ECS_AGA)
   {
+#if 0
     font_nr = FONT_VALUE_1;
+#endif
   }
   else if (type & TYPE_BOOLEAN_STYLE)
   {
+#if 0
     font_nr = (*(boolean *)value ? FONT_OPTION_ON : FONT_OPTION_OFF);
+#endif
+  }
+
+  startx = mSX + xpos * 32;
+  starty = mSY + ypos * 32;
+  font_nr = getSetupValueFont(type, value);
+  font_width = getFontWidth(font_nr);
+
+  /* downward compatibility correction for Juergen Bonhagen's menu settings */
+  if (setup_mode != SETUP_MODE_INPUT)
+  {
+    int check_font_nr = FONT_OPTION_ON; /* known font that needs correction */
+    int font1_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset;
+    int font2_xoffset = getFontBitmapInfo(check_font_nr)->draw_xoffset;
+    int text_startx = mSX + MENU_SCREEN_START_XPOS * 32;
+    int text_font_nr = getSetupTextFont(FONT_MENU_2);
+    int text_font_xoffset = getFontBitmapInfo(text_font_nr)->draw_xoffset;
+    int text_width = MAX_MENU_TEXT_LENGTH_MEDIUM * getFontWidth(text_font_nr);
+    boolean correct_font_draw_xoffset = FALSE;
+
+    if (xpos == MENU_SCREEN_START_XPOS &&
+       startx + font1_xoffset < text_startx + text_font_xoffset)
+      correct_font_draw_xoffset = TRUE;
+
+    if (xpos == MENU_SCREEN_VALUE_XPOS &&
+       startx + font2_xoffset < text_startx + text_width + text_font_xoffset)
+      correct_font_draw_xoffset = TRUE;
+
+#if 0
+    printf("::: %d + %d < %d + %d + %d\n",
+          startx, font_xoffset, text_startx, text_width, text_font_xoffset);
+    printf("::: => need correction == %d\n", correct_font_draw_xoffset);
+#endif
+
+    /* check if setup value would overlap with setup text when printed */
+    /* (this can happen for extreme/wrong values for font draw offset) */
+    if (correct_font_draw_xoffset)
+    {
+      font_draw_xoffset_old = getFontBitmapInfo(font_nr)->draw_xoffset;
+      font_draw_xoffset_modified = TRUE;
+
+      if (type & TYPE_KEY)
+       getFontBitmapInfo(font_nr)->draw_xoffset += 2 * getFontWidth(font_nr);
+      else if (!(type & TYPE_STRING))
+       getFontBitmapInfo(font_nr)->draw_xoffset = text_font_xoffset + 20 -
+         MAX_MENU_TEXT_LENGTH_MEDIUM * (16 - getFontWidth(text_font_nr));
+    }
   }
 
 #if 1
   for (i = 0; i <= MENU_SCREEN_MAX_XPOS - xpos; i++)
-    DrawText(mSX + xpos * 32 + i * font_width, mSY + ypos * 32, " ", font_nr);
+    DrawText(startx + i * font_width, starty, " ", font_nr);
 #else
 #if 1
   for (i = xpos; i <= MENU_SCREEN_MAX_XPOS; i++)
-    DrawText(mSX + i * 32, mSY + ypos * 32, " ", font_nr);
+    DrawText(mSX + i * 32, starty, " ", font_nr);
 #else
-  DrawText(mSX + xpos * 32, mSY + ypos * 32,
+  DrawText(startx, starty,
           (xpos == 3 ? "              " : "   "), font_nr);
 #endif
 #endif
 
-  DrawText(mSX + xpos * 32, mSY + ypos * 32, value_string, font_nr);
+  DrawText(startx, starty, value_string, font_nr);
+
+  if (font_draw_xoffset_modified)
+    getFontBitmapInfo(font_nr)->draw_xoffset = font_draw_xoffset_old;
 }
 
 static void changeSetupValue(int pos)
@@ -2411,16 +3155,25 @@ static void DrawSetupScreen_Generic()
   for (i = 0; setup_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++)
   {
     void *value_ptr = setup_info[i].value;
+    int xpos = MENU_SCREEN_START_XPOS;
     int ypos = MENU_SCREEN_START_YPOS + i;
+#if 1
+    int font_nr;
+#else
     int font_nr = FONT_MENU_1;
+#endif
 
     /* set some entries to "unchangeable" according to other variables */
     if ((value_ptr == &setup.sound_simple && !audio.sound_available) ||
        (value_ptr == &setup.sound_loops  && !audio.loops_available) ||
        (value_ptr == &setup.sound_music  && !audio.music_available) ||
-       (value_ptr == &setup.fullscreen   && !video.fullscreen_available))
+       (value_ptr == &setup.fullscreen   && !video.fullscreen_available) ||
+       (value_ptr == &screen_mode_text   && !video.fullscreen_available))
       setup_info[i].type |= TYPE_GHOSTED;
 
+#if 1
+    font_nr = getSetupTextFont(setup_info[i].type);
+#else
 #if 1
     if (setup_info[i].type & (TYPE_SWITCH |
                              TYPE_YES_NO |
@@ -2431,13 +3184,14 @@ static void DrawSetupScreen_Generic()
 #else
     if (setup_info[i].type & TYPE_STRING)
       font_nr = FONT_MENU_2;
+#endif
 #endif
 
-    DrawText(mSX + 32, mSY + ypos * 32, setup_info[i].text, font_nr);
+    DrawText(mSX + xpos * 32, mSY + ypos * 32, setup_info[i].text, font_nr);
 
-    if (setup_info[i].type & TYPE_ENTER_MENU)
+    if (setup_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST))
       initCursor(i, IMG_MENU_BUTTON_ENTER_MENU);
-    else if (setup_info[i].type & TYPE_LEAVE_MENU)
+    else if (setup_info[i].type & (TYPE_LEAVE_MENU|TYPE_LEAVE_LIST))
       initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU);
     else if (setup_info[i].type & ~TYPE_SKIP_ENTRY)
       initCursor(i, IMG_MENU_BUTTON);
@@ -2474,6 +3228,7 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
     choice_store[setup_mode] = choice;
 
     drawCursor(choice, FC_RED);
+
     return;
   }
   else if (button == MB_MENU_LEAVE)
@@ -2485,6 +3240,7 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
        void (*menu_callback_function)(void) = setup_info[y].value;
 
        menu_callback_function();
+
        break;  /* absolutely needed because function changes 'setup_info'! */
       }
     }
@@ -2501,7 +3257,7 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
   {
     if (dx)
     {
-      int menu_navigation_type = (dx < 0 ? TYPE_LEAVE_MENU : TYPE_ENTER_MENU);
+      int menu_navigation_type = (dx < 0 ? TYPE_LEAVE : TYPE_ENTER);
 
       if (setup_info[choice].type & menu_navigation_type ||
          setup_info[choice].type & TYPE_BOOLEAN_STYLE)
@@ -2516,6 +3272,44 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
       y += dy;
   }
 
+#if 1
+  if (IN_VIS_FIELD(x, y) && y >= 0 && y < num_setup_info)
+  {
+    if (button)
+    {
+      if (y != choice && setup_info[y].type & ~TYPE_SKIP_ENTRY)
+      {
+       drawCursor(y, FC_RED);
+       drawCursor(choice, FC_BLUE);
+       choice = choice_store[setup_mode] = y;
+      }
+    }
+    else if (!(setup_info[y].type & TYPE_GHOSTED))
+    {
+      /* when selecting key headline, execute function for key value change */
+      if (setup_info[y].type & TYPE_KEYTEXT &&
+         setup_info[y + 1].type & TYPE_KEY)
+       y++;
+
+      /* when selecting string value, execute function for list selection */
+      if (setup_info[y].type & TYPE_STRING && y > 0 &&
+         setup_info[y - 1].type & TYPE_ENTER_LIST)
+       y--;
+
+      if (setup_info[y].type & TYPE_ENTER_OR_LEAVE)
+      {
+       void (*menu_callback_function)(void) = setup_info[y].value;
+
+       menu_callback_function();
+      }
+      else
+      {
+       if (setup_info[y].type & TYPE_VALUE)
+         changeSetupValue(y);
+      }
+    }
+  }
+#else
   if (IN_VIS_FIELD(x, y) &&
       y >= 0 && y < num_setup_info && setup_info[y].type & ~TYPE_SKIP_ENTRY)
   {
@@ -2530,7 +3324,7 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
     }
     else if (!(setup_info[y].type & TYPE_GHOSTED))
     {
-      if (setup_info[y].type & TYPE_ENTER_OR_LEAVE_MENU)
+      if (setup_info[y].type & TYPE_ENTER_OR_LEAVE)
       {
        void (*menu_callback_function)(void) = setup_info[choice].value;
 
@@ -2547,6 +3341,7 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
       }
     }
   }
+#endif
 }
 
 void DrawSetupScreen_Input()
@@ -2564,8 +3359,10 @@ void DrawSetupScreen_Input()
   initCursor(2,  IMG_MENU_BUTTON_ENTER_MENU);
   initCursor(13, IMG_MENU_BUTTON_LEAVE_MENU);
 
+#if 0
   drawCursorXY(10, 0, IMG_MENU_BUTTON_LEFT);
   drawCursorXY(12, 0, IMG_MENU_BUTTON_RIGHT);
+#endif
 
   DrawText(mSX + 32, mSY +  2 * 32, "Player:", FONT_MENU_1);
   DrawText(mSX + 32, mSY +  3 * 32, "Device:", FONT_MENU_1);
@@ -2579,6 +3376,15 @@ void DrawSetupScreen_Input()
                    "Joysticks deactivated on this screen");
 #endif
 
+#if 1
+  /* create gadgets for setup input menu screen */
+  FreeScreenGadgets();
+  CreateScreenGadgets();
+
+  /* map gadgets for setup input menu screen */
+  MapScreenMenuGadgets(SCREEN_MASK_INPUT);
+#endif
+
   HandleSetupScreen_Input(0, 0, 0, 0, MB_MENU_INITIALIZE);
   FadeToFront();
   InitAnimation();
@@ -2682,10 +3488,30 @@ static void drawPlayerSetupInputInfo(int player_nr)
   }
 }
 
+static int input_player_nr = 0;
+
+void HandleSetupScreen_Input_Player(int step, int direction)
+{
+  int old_player_nr = input_player_nr;
+  int new_player_nr;
+
+  new_player_nr = old_player_nr + step * direction;
+  if (new_player_nr < 0)
+    new_player_nr = 0;
+  if (new_player_nr > MAX_PLAYERS - 1)
+    new_player_nr = MAX_PLAYERS - 1;
+
+  if (new_player_nr != old_player_nr)
+  {
+    input_player_nr = new_player_nr;
+
+    drawPlayerSetupInputInfo(input_player_nr);
+  }
+}
+
 void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
 {
   static int choice = 0;
-  static int player_nr = 0;
   int x = 0;
   int y = choice;
   int pos_start  = SETUPINPUT_SCREEN_POS_START;
@@ -2695,7 +3521,7 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
 
   if (button == MB_MENU_INITIALIZE)
   {
-    drawPlayerSetupInputInfo(player_nr);
+    drawPlayerSetupInputInfo(input_player_nr);
     drawCursor(choice, FC_RED);
 
     return;
@@ -2729,6 +3555,15 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
       y = (dy > 0 ? pos_empty2 + 1 : pos_empty1 - 1);
   }
 
+#if 1
+
+  if (y == 0 && dx != 0 && button)
+  {
+    HandleSetupScreen_Input_Player(1, dx < 0 ? -1 : +1);
+  }
+
+#else
+
   if (IN_VIS_FIELD(x, y) &&
       y == 0 && ((x < 10 && !button) || ((x == 10 || x == 12) && button)))
   {
@@ -2737,10 +3572,14 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
     if (!DelayReached(&delay, GADGET_FRAME_DELAY))
       return;
 
-    player_nr = (player_nr + (x == 10 ? -1 : +1) + MAX_PLAYERS) % MAX_PLAYERS;
+    input_player_nr =
+      (input_player_nr + (x == 10 ? -1 : +1) + MAX_PLAYERS) % MAX_PLAYERS;
 
-    drawPlayerSetupInputInfo(player_nr);
+    drawPlayerSetupInputInfo(input_player_nr);
   }
+
+#endif
+
   else if (IN_VIS_FIELD(x, y) &&
           y >= pos_start && y <= pos_end &&
           !(y >= pos_empty1 && y <= pos_empty2))
@@ -2758,14 +3597,14 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
     {
       if (y == 1)
       {
-       char *device_name = setup.input[player_nr].joy.device_name;
+       char *device_name = setup.input[input_player_nr].joy.device_name;
 
-       if (!setup.input[player_nr].use_joystick)
+       if (!setup.input[input_player_nr].use_joystick)
        {
          int new_device_nr = (dx >= 0 ? 0 : MAX_PLAYERS - 1);
 
          setJoystickDeviceToNr(device_name, new_device_nr);
-         setup.input[player_nr].use_joystick = TRUE;
+         setup.input[input_player_nr].use_joystick = TRUE;
        }
        else
        {
@@ -2773,22 +3612,22 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
          int new_device_nr = device_nr + (dx >= 0 ? +1 : -1);
 
          if (new_device_nr < 0 || new_device_nr >= MAX_PLAYERS)
-           setup.input[player_nr].use_joystick = FALSE;
+           setup.input[input_player_nr].use_joystick = FALSE;
          else
            setJoystickDeviceToNr(device_name, new_device_nr);
        }
 
-       drawPlayerSetupInputInfo(player_nr);
+       drawPlayerSetupInputInfo(input_player_nr);
       }
       else if (y == 2)
       {
-       if (setup.input[player_nr].use_joystick)
+       if (setup.input[input_player_nr].use_joystick)
        {
          InitJoysticks();
-         CalibrateJoystick(player_nr);
+         CalibrateJoystick(input_player_nr);
        }
        else
-         CustomizeKeyboard(player_nr);
+         CustomizeKeyboard(input_player_nr);
       }
       else if (y == pos_end)
       {
@@ -3154,6 +3993,8 @@ void DrawSetupScreen()
 
   if (setup_mode == SETUP_MODE_INPUT)
     DrawSetupScreen_Input();
+  else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
+    DrawChooseTree(&screen_mode_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)
     DrawChooseTree(&artwork.gfx_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS)
@@ -3171,6 +4012,8 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 {
   if (setup_mode == SETUP_MODE_INPUT)
     HandleSetupScreen_Input(mx, my, dx, dy, button);
+  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_GRAPHICS)
     HandleChooseTree(mx, my, dx, dy, button, &artwork.gfx_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS)
@@ -3194,25 +4037,76 @@ void HandleGameActions()
     AutoPlayTape();    /* continue automatically playing next tape */
 }
 
+
 /* ---------- new screen button stuff -------------------------------------- */
 
-/* graphic position and size values for buttons and scrollbars */
-#define SC_SCROLLBUTTON_XSIZE          TILEX
-#define SC_SCROLLBUTTON_YSIZE          TILEY
+static void getScreenMenuButtonPos(int *x, int *y, int gadget_id)
+{
+  switch (gadget_id)
+  {
+    case SCREEN_CTRL_ID_LAST_LEVEL:
+      *x = mSX + TILEX * getLastLevelButtonPos();
+      *y = mSY + TILEY * (MENU_SCREEN_START_YPOS + 1);
+      break;
 
-#define SC_SCROLL_VERTICAL_XSIZE       SC_SCROLLBUTTON_XSIZE
-#define SC_SCROLL_VERTICAL_YSIZE       ((MAX_MENU_ENTRIES_ON_SCREEN - 2) * \
-                                        SC_SCROLLBUTTON_YSIZE)
-#define SC_SCROLL_UP_XPOS              (SXSIZE - SC_SCROLLBUTTON_XSIZE)
-#define SC_SCROLL_UP_YPOS              (2 * SC_SCROLLBUTTON_YSIZE)
-#define SC_SCROLL_VERTICAL_XPOS                SC_SCROLL_UP_XPOS
-#define SC_SCROLL_VERTICAL_YPOS                (SC_SCROLL_UP_YPOS + \
-                                        SC_SCROLLBUTTON_YSIZE)
-#define SC_SCROLL_DOWN_XPOS            SC_SCROLL_UP_XPOS
-#define SC_SCROLL_DOWN_YPOS            (SC_SCROLL_VERTICAL_YPOS + \
-                                        SC_SCROLL_VERTICAL_YSIZE)
+    case SCREEN_CTRL_ID_NEXT_LEVEL:
+      *x = mSX + TILEX * getNextLevelButtonPos();
+      *y = mSY + TILEY * (MENU_SCREEN_START_YPOS + 1);
+      break;
 
-#define SC_BORDER_SIZE                 14
+    case SCREEN_CTRL_ID_LAST_PLAYER:
+      *x = mSX + TILEX * 10;
+      *y = mSY + TILEY * MENU_SCREEN_START_YPOS;
+      break;
+
+    case SCREEN_CTRL_ID_NEXT_PLAYER:
+      *x = mSX + TILEX * 12;
+      *y = mSY + TILEY * MENU_SCREEN_START_YPOS;
+      break;
+
+    default:
+      Error(ERR_EXIT, "unknown gadget ID %d", gadget_id);
+  }
+}
+
+static struct
+{
+  int gfx_unpressed, gfx_pressed;
+  void (*get_gadget_position)(int *, int *, int);
+  int gadget_id;
+  int screen_mask;
+  char *infotext;
+} menubutton_info[NUM_SCREEN_MENUBUTTONS] =
+{
+  {
+    IMG_MENU_BUTTON_LAST_LEVEL, IMG_MENU_BUTTON_LAST_LEVEL_ACTIVE,
+    getScreenMenuButtonPos,
+    SCREEN_CTRL_ID_LAST_LEVEL,
+    SCREEN_MASK_MAIN,
+    "last level"
+  },
+  {
+    IMG_MENU_BUTTON_NEXT_LEVEL, IMG_MENU_BUTTON_NEXT_LEVEL_ACTIVE,
+    getScreenMenuButtonPos,
+    SCREEN_CTRL_ID_NEXT_LEVEL,
+    SCREEN_MASK_MAIN,
+    "next level"
+  },
+  {
+    IMG_MENU_BUTTON_LEFT, IMG_MENU_BUTTON_LEFT_ACTIVE,
+    getScreenMenuButtonPos,
+    SCREEN_CTRL_ID_LAST_PLAYER,
+    SCREEN_MASK_INPUT,
+    "last player"
+  },
+  {
+    IMG_MENU_BUTTON_RIGHT, IMG_MENU_BUTTON_RIGHT_ACTIVE,
+    getScreenMenuButtonPos,
+    SCREEN_CTRL_ID_NEXT_PLAYER,
+    SCREEN_MASK_INPUT,
+    "next player"
+  },
+};
 
 static struct
 {
@@ -3264,6 +4158,59 @@ static struct
   }
 };
 
+static void CreateScreenMenubuttons()
+{
+  struct GadgetInfo *gi;
+  unsigned long event_mask;
+  int i;
+
+  for (i = 0; i < NUM_SCREEN_MENUBUTTONS; i++)
+  {
+    Bitmap *gd_bitmap_unpressed, *gd_bitmap_pressed;
+    int gfx_unpressed, gfx_pressed;
+    int x, y, width, height;
+    int gd_x1, gd_x2, gd_y1, gd_y2;
+    int id = menubutton_info[i].gadget_id;
+
+    event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
+
+    menubutton_info[i].get_gadget_position(&x, &y, id);
+
+    width = SC_MENUBUTTON_XSIZE;
+    height = SC_MENUBUTTON_YSIZE;
+
+    gfx_unpressed = menubutton_info[i].gfx_unpressed;
+    gfx_pressed   = menubutton_info[i].gfx_pressed;
+    gd_bitmap_unpressed = graphic_info[gfx_unpressed].bitmap;
+    gd_bitmap_pressed   = graphic_info[gfx_pressed].bitmap;
+    gd_x1 = graphic_info[gfx_unpressed].src_x;
+    gd_y1 = graphic_info[gfx_unpressed].src_y;
+    gd_x2 = graphic_info[gfx_pressed].src_x;
+    gd_y2 = graphic_info[gfx_pressed].src_y;
+
+    gi = CreateGadget(GDI_CUSTOM_ID, id,
+                     GDI_CUSTOM_TYPE_ID, i,
+                     GDI_INFO_TEXT, menubutton_info[i].infotext,
+                     GDI_X, x,
+                     GDI_Y, y,
+                     GDI_WIDTH, width,
+                     GDI_HEIGHT, height,
+                     GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
+                     GDI_STATE, GD_BUTTON_UNPRESSED,
+                     GDI_DESIGN_UNPRESSED, gd_bitmap_unpressed, gd_x1, gd_y1,
+                     GDI_DESIGN_PRESSED, gd_bitmap_pressed, gd_x2, gd_y2,
+                     GDI_DIRECT_DRAW, FALSE,
+                     GDI_EVENT_MASK, event_mask,
+                     GDI_CALLBACK_ACTION, HandleScreenGadgets,
+                     GDI_END);
+
+    if (gi == NULL)
+      Error(ERR_EXIT, "cannot create gadget");
+
+    screen_gadget[id] = gi;
+  }
+}
+
 static void CreateScreenScrollbuttons()
 {
   struct GadgetInfo *gi;
@@ -3382,6 +4329,10 @@ static void CreateScreenScrollbars()
                      GDI_SCROLLBAR_ITEMS_MAX, items_max,
                      GDI_SCROLLBAR_ITEMS_VISIBLE, items_visible,
                      GDI_SCROLLBAR_ITEM_POSITION, item_position,
+                     GDI_WHEEL_AREA_X, 0,
+                     GDI_WHEEL_AREA_Y, 0,
+                     GDI_WHEEL_AREA_WIDTH, WIN_XSIZE,
+                     GDI_WHEEL_AREA_HEIGHT, WIN_YSIZE,
                      GDI_STATE, GD_BUTTON_UNPRESSED,
                      GDI_DESIGN_UNPRESSED, gd_bitmap_unpressed, gd_x1, gd_y1,
                      GDI_DESIGN_PRESSED, gd_bitmap_pressed, gd_x2, gd_y2,
@@ -3423,6 +4374,8 @@ void CreateScreenGadgets()
   }
 #endif
 
+  CreateScreenMenubuttons();
+
   /* force LEVELS draw offset for scrollbar / scrollbutton gadgets */
   game_status = GAME_MODE_LEVELS;
 
@@ -3451,37 +4404,59 @@ void FreeScreenGadgets()
     FreeGadget(screen_gadget[i]);
 }
 
-void MapChooseTreeGadgets(TreeInfo *ti)
+void MapScreenMenuGadgets(int screen_mask)
 {
-  int num_entries = numTreeInfoInGroup(ti);
   int i;
 
-  if (num_entries <= NUM_MENU_ENTRIES_ON_SCREEN)
-    return;
-
-  for (i = 0; i < NUM_SCREEN_GADGETS; i++)
-    MapGadget(screen_gadget[i]);
+  for (i = 0; i < NUM_SCREEN_MENUBUTTONS; i++)
+    if (screen_mask & menubutton_info[i].screen_mask)
+      MapGadget(screen_gadget[menubutton_info[i].gadget_id]);
 }
 
-#if 0
-void UnmapChooseTreeGadgets()
+void MapScreenTreeGadgets(TreeInfo *ti)
 {
+  int num_entries = numTreeInfoInGroup(ti);
   int i;
 
-  for (i = 0; i < NUM_SCREEN_GADGETS; i++)
-    UnmapGadget(screen_gadget[i]);
+  if (num_entries <= NUM_MENU_ENTRIES_ON_SCREEN)
+    return;
+
+  for (i = 0; i < NUM_SCREEN_SCROLLBUTTONS; i++)
+    MapGadget(screen_gadget[scrollbutton_info[i].gadget_id]);
+
+  for (i = 0; i < NUM_SCREEN_SCROLLBARS; i++)
+    MapGadget(screen_gadget[scrollbar_info[i].gadget_id]);
 }
-#endif
 
 static void HandleScreenGadgets(struct GadgetInfo *gi)
 {
   int id = gi->custom_id;
+  int button = gi->event.button;
+  int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
 
+#if 0
   if (game_status != GAME_MODE_LEVELS && game_status != GAME_MODE_SETUP)
     return;
+#endif
 
   switch (id)
   {
+    case SCREEN_CTRL_ID_LAST_LEVEL:
+      HandleMainMenu_SelectLevel(step, -1);
+      break;
+
+    case SCREEN_CTRL_ID_NEXT_LEVEL:
+      HandleMainMenu_SelectLevel(step, +1);
+      break;
+
+    case SCREEN_CTRL_ID_LAST_PLAYER:
+      HandleSetupScreen_Input_Player(step, -1);
+      break;
+
+    case SCREEN_CTRL_ID_NEXT_PLAYER:
+      HandleSetupScreen_Input_Player(step, +1);
+      break;
+
     case SCREEN_CTRL_ID_SCROLL_UP:
       if (game_status == GAME_MODE_LEVELS)
        HandleChooseLevel(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);