rnd-20031202-1-src
[rocksndiamonds.git] / src / screens.c
index 285aa2cf0a97e74cd7d77cb913381aa196af814b..015cbd48aa4d4804936fa0b6b8f288728bc13760 100644 (file)
 #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_ELEMENTS             1
+#define INFO_MODE_MUSIC                        2
+#define INFO_MODE_CREDITS              3
+#define INFO_MODE_PROGRAM              4
+#define INFO_MODE_LEVELSET             5
+
+#define MAX_INFO_MODES                 6
+
 /* for various menu stuff  */
+#define MAX_INFO_ELEMENTS_ON_SCREEN    10
 #define MAX_MENU_ENTRIES_ON_SCREEN     (SCR_FIELDY - 2)
 #define MENU_SCREEN_START_YPOS         2
 #define MENU_SCREEN_VALUE_XPOS         14
@@ -68,18 +79,34 @@ static void CalibrateJoystick(int);
 static void execSetupArtwork(void);
 static void HandleChooseTree(int, int, int, int, int, TreeInfo **);
 
+static void DrawChooseLevel(void);
+static void DrawInfoScreen(void);
+static void DrawSetupScreen(void);
+
+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_Elements(int);
+static void HandleInfoScreen_Music(int);
+static void HandleInfoScreen_Credits(int);
+static void HandleInfoScreen_Program(int);
+
+static void MapChooseTreeGadgets(TreeInfo *);
+
 static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
 static int setup_mode = SETUP_MODE_MAIN;
+static int info_mode = INFO_MODE_MAIN;
 
-#if 0
-static int mSX = SX;
-static int mSY = SY;
-#else
-#define mSX (SX + (game_status == MAINMENU ? global.menu_draw_xoffset_MAIN : \
-                  global.menu_draw_xoffset))
-#define mSY (SY + (game_status == MAINMENU ? global.menu_draw_yoffset_MAIN : \
-                  global.menu_draw_yoffset))
-#endif
+#define mSX (SX + (game_status >= GAME_MODE_MAIN &&    \
+                  game_status <= GAME_MODE_SETUP ?     \
+                  menu.draw_xoffset[game_status] : menu.draw_xoffset_default))
+#define mSY (SY + (game_status >= GAME_MODE_MAIN &&    \
+                  game_status <= GAME_MODE_SETUP ?     \
+                  menu.draw_yoffset[game_status] : menu.draw_yoffset_default))
+
+#define NUM_MENU_ENTRIES_ON_SCREEN (menu.list_size[game_status] > 2 ?  \
+                                   menu.list_size[game_status] :       \
+                                   MAX_MENU_ENTRIES_ON_SCREEN)
 
 #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
 #define NUM_SCROLLBAR_BITMAPS          2
@@ -106,8 +133,9 @@ static void drawCursorExt(int xpos, int ypos, int color, int graphic)
 
   ypos += MENU_SCREEN_START_YPOS;
 
-  DrawBackground(SX + xpos * 32, SY + ypos * 32, TILEX, TILEY);
-  DrawGraphicThruMask(xpos, ypos, graphic, 0);
+  DrawBackground(mSX + xpos * TILEX, mSY + ypos * TILEY, TILEX, TILEY);
+  DrawGraphicThruMaskExt(drawto, mSX + xpos * TILEX, mSY + ypos * TILEY,
+                        graphic, 0);
 }
 
 static void initCursor(int ypos, int graphic)
@@ -125,29 +153,61 @@ static void drawCursorXY(int xpos, int ypos, int graphic)
   drawCursorExt(xpos, ypos, -1, graphic);
 }
 
-static void PlaySound_Menu_Start(int sound)
+static void drawChooseTreeCursor(int ypos, int color)
+{
+  int last_game_status = game_status;  /* save current game status */
+
+  /* force LEVELS draw offset on artwork setup screen */
+  game_status = GAME_MODE_LEVELS;
+
+  drawCursorExt(0, ypos, color, 0);
+
+  game_status = last_game_status;      /* restore current game status */
+}
+
+static void PlayMenuSound()
 {
+  int sound = menu.sound[game_status];
+
+  if (sound == SND_UNDEFINED)
+    return;
+
   if (sound_info[sound].loop)
     PlaySoundLoop(sound);
   else
     PlaySound(sound);
 }
 
-static void PlaySound_Menu_Continue(int sound)
+static void PlayMenuSoundIfLoop()
 {
+  int sound = menu.sound[game_status];
+
+  if (sound == SND_UNDEFINED)
+    return;
+
   if (sound_info[sound].loop)
     PlaySoundLoop(sound);
 }
 
+static void PlayMenuMusic()
+{
+  int music = menu.music[game_status];
+
+  if (music == MUS_UNDEFINED)
+    return;
+
+  PlayMusic(music);
+}
+
 void DrawHeadline()
 {
-  int font1_xsize = getFontWidth(FONT_TITLE_1);
-  int font2_xsize = getFontWidth(FONT_TITLE_2);
-  int x1 = SX + (SXSIZE - strlen(PROGRAM_TITLE_STRING)   * font1_xsize) / 2;
-  int x2 = SX + (SXSIZE - strlen(WINDOW_SUBTITLE_STRING) * font2_xsize) / 2;
+  int text1_width = getTextWidth(PROGRAM_TITLE_STRING,     FONT_TITLE_1);
+  int text2_width = getTextWidth(PROGRAM_COPYRIGHT_STRING, FONT_TITLE_2);
+  int x1 = SX + (SXSIZE - text1_width) / 2;
+  int x2 = SX + (SXSIZE - text2_width) / 2;
 
-  DrawText(x1, SY + 8,  PROGRAM_TITLE_STRING,   FONT_TITLE_1);
-  DrawText(x2, SY + 46, WINDOW_SUBTITLE_STRING, FONT_TITLE_2);
+  DrawText(x1, SY + 8,  PROGRAM_TITLE_STRING,     FONT_TITLE_1);
+  DrawText(x2, SY + 46, PROGRAM_COPYRIGHT_STRING, FONT_TITLE_2);
 }
 
 static void ToggleFullscreenIfNeeded()
@@ -178,16 +238,12 @@ void DrawMainMenu()
 {
   static LevelDirTree *leveldir_last_valid = NULL;
   char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:");
-  int name_width = getFontWidth(FONT_MENU_1) * strlen("Name:");
+  int name_width  = getTextWidth("Name:",  FONT_MENU_1);
+  int level_width = getTextWidth("Level:", FONT_MENU_1);
   int i;
 
-#if 0
-  mSX = SX + global.menu_draw_xoffset;
-  mSY = SY + global.menu_draw_yoffset;
-#endif
-
   UnmapAllGadgets();
-  FadeSounds();
+  FadeSoundsAndMusic();
 
   KeyboardAutoRepeatOn();
   ActivateJoystick();
@@ -200,8 +256,9 @@ void DrawMainMenu()
   /* needed if last screen was the playing screen, invoked from level editor */
   if (level_editor_test_game)
   {
-    game_status = LEVELED;
+    game_status = GAME_MODE_EDITOR;
     DrawLevelEd();
+
     return;
   }
 
@@ -211,6 +268,13 @@ void DrawMainMenu()
   /* needed if last screen was the setup screen and fullscreen state changed */
   ToggleFullscreenIfNeeded();
 
+  /* leveldir_current may be invalid (level group, parent link) */
+  if (!validLevelSeries(leveldir_current))
+    leveldir_current = getFirstValidTreeInfoEntry(leveldir_last_valid);
+
+  /* store valid level series information */
+  leveldir_last_valid = leveldir_current;
+
   /* needed if last screen (level choice) changed graphics, sounds or music */
   ReloadCustomArtwork();
 
@@ -221,13 +285,6 @@ void DrawMainMenu()
   /* map gadgets for main menu screen */
   MapTapeButtons();
 
-  /* leveldir_current may be invalid (level group, parent link) */
-  if (!validLevelSeries(leveldir_current))
-    leveldir_current = getFirstValidTreeInfoEntry(leveldir_last_valid);
-
-  /* store valid level series information */
-  leveldir_last_valid = leveldir_current;
-
   /* level_nr may have been set to value over handicap with level editor */
   if (setup.handicap && level_nr > leveldir_current->handicap_level)
     level_nr = leveldir_current->handicap_level;
@@ -240,56 +297,55 @@ void DrawMainMenu()
 
   DrawHeadline();
 
-  DrawText(mSX + 32,    mSY + 2*32, name_text, FONT_MENU_1);
-  DrawText(mSX + 32 + name_width, mSY + 2*32, setup.player_name, FONT_INPUT);
-  DrawText(mSX + 32,    mSY + 3*32, "Level:", FONT_MENU_1);
-  DrawText(mSX + 11 * 32, mSY + 3*32, int2str(level_nr,3), FONT_VALUE_1);
-  DrawText(mSX + 32,    mSY + 4*32, "Hall Of Fame", FONT_MENU_1);
-  DrawText(mSX + 32,    mSY + 5*32, "Level Creator", FONT_MENU_1);
-  DrawText(mSY + 32,    mSY + 6*32, "Info Screen", FONT_MENU_1);
-  DrawText(mSX + 32,    mSY + 7*32, "Start Game", FONT_MENU_1);
-  DrawText(mSX + 32,    mSY + 8*32, "Setup", FONT_MENU_1);
-  DrawText(mSX + 32,    mSY + 9*32, "Quit", FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 2*32, name_text, FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 3*32, "Level:", FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 4*32, "Hall Of Fame", FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 5*32, "Level Creator", FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 6*32, "Info Screen", FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 7*32, "Start Game", FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 8*32, "Setup", FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 9*32, "Quit", FONT_MENU_1);
+
+  DrawText(mSX + 32 + name_width, mSY + 2*32, setup.player_name, FONT_INPUT_1);
+  DrawText(mSX + level_width + 5 * 32, mSY + 3*32, int2str(level_nr,3),
+          FONT_VALUE_1);
 
   DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE);
 
-  DrawTextF(7*32 + 6, 3*32 + 9, FONT_TEXT_3, "%d-%d",
-           leveldir_current->first_level,
-           leveldir_current->last_level);
+  DrawTextF(mSX + 32 + level_width - 2, mSY + 3*32 + 1, FONT_TEXT_3, "%d-%d",
+           leveldir_current->first_level, leveldir_current->last_level);
 
   if (leveldir_current->readonly)
   {
-    DrawTextF(15*32 + 6, 3*32 + 9 - 7, FONT_TEXT_3, "READ");
-    DrawTextF(15*32 + 6, 3*32 + 9 + 7, FONT_TEXT_3, "ONLY");
+    DrawTextS(mSX + level_width + 9 * 32 - 2,
+             mSY + 3 * 32 + 1 - 7, FONT_TEXT_3, "READ");
+    DrawTextS(mSX + level_width + 9 * 32 - 2,
+             mSY + 3 * 32 + 1 + 7, FONT_TEXT_3, "ONLY");
   }
 
-  for(i=0; i<8; i++)
-    initCursor(i, (i == 1 || i == 6 ? IMG_MENU_BUTTON_RIGHT :IMG_MENU_BUTTON));
+  for (i = 0; i < 8; i++)
+    initCursor(i, (i == 1 || i == 4 || i == 6 ? IMG_MENU_BUTTON_RIGHT :
+                  IMG_MENU_BUTTON));
 
-#if 0
-  DrawGraphic(10, 3, IMG_MENU_BUTTON_LEFT, 0);
-  DrawGraphic(14, 3, IMG_MENU_BUTTON_RIGHT, 0);
-#else
-  drawCursorXY(10, 1, IMG_MENU_BUTTON_LEFT);
-  drawCursorXY(14, 1, IMG_MENU_BUTTON_RIGHT);
-#endif
+  drawCursorXY(level_width/32 + 4, 1, IMG_MENU_BUTTON_LEFT);
+  drawCursorXY(level_width/32 + 8, 1, IMG_MENU_BUTTON_RIGHT);
 
   DrawText(SX + 56, SY + 326, "A Game by Artsoft Entertainment", FONT_TITLE_2);
 
   FadeToFront();
   InitAnimation();
-  HandleMainMenu(0,0, 0,0, MB_MENU_INITIALIZE);
+
+  HandleMainMenu(0, 0, 0, 0, MB_MENU_INITIALIZE);
 
   TapeStop();
   if (TAPE_IS_EMPTY(tape))
     LoadTape(level_nr);
   DrawCompleteVideoDisplay();
 
-  OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
+  PlayMenuSound();
+  PlayMenuMusic();
 
-#if 0
-  ClearEventQueue();
-#endif
+  OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
 }
 
 static void gotoTopLevelDir()
@@ -305,10 +361,10 @@ static void gotoTopLevelDir()
       int num_page_entries;
       int cl_first, cl_cursor;
 
-      if (num_leveldirs <= MAX_MENU_ENTRIES_ON_SCREEN)
+      if (num_leveldirs <= NUM_MENU_ENTRIES_ON_SCREEN)
        num_page_entries = num_leveldirs;
       else
-       num_page_entries = MAX_MENU_ENTRIES_ON_SCREEN - 1;
+       num_page_entries = NUM_MENU_ENTRIES_ON_SCREEN;
 
       cl_first = MAX(0, leveldir_pos - num_page_entries + 1);
       cl_cursor = leveldir_pos - cl_first;
@@ -323,7 +379,7 @@ static void gotoTopLevelDir()
 
 void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 {
-  static int choice = 0;
+  static int choice = 5;
   int x = 0;
   int y = choice;
 
@@ -335,8 +391,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 
   if (mx || my)                /* mouse input */
   {
-    x = (mx - SX) / 32;
-    y = (my - SY) / 32 - MENU_SCREEN_START_YPOS;
+    x = (mx - mSX) / 32;
+    y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS;
   }
   else if (dx || dy)   /* keyboard input */
   {
@@ -352,7 +408,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
   {
     static unsigned long level_delay = 0;
     int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
-    int new_level_nr, old_level_nr = level_nr;
+    int old_level_nr = level_nr;
+    int new_level_nr;
 
     new_level_nr = level_nr + (x == 10 ? -step : +step);
     if (new_level_nr < leveldir_current->first_level)
@@ -363,27 +420,29 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
     if (setup.handicap && new_level_nr > leveldir_current->handicap_level)
       new_level_nr = leveldir_current->handicap_level;
 
-    if (old_level_nr == new_level_nr ||
-       !DelayReached(&level_delay, GADGET_FRAME_DELAY))
-      goto out;
-
-    level_nr = new_level_nr;
+    if (new_level_nr != old_level_nr &&
+       DelayReached(&level_delay, GADGET_FRAME_DELAY))
+    {
+      level_nr = new_level_nr;
 
-    DrawText(mSX + 11 * 32, mSY + 3 * 32, int2str(level_nr, 3), FONT_VALUE_1);
+      DrawText(mSX + 11 * 32, mSY + 3 * 32, int2str(level_nr, 3),
+              FONT_VALUE_1);
 
-    LoadLevel(level_nr);
-    DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE);
+      LoadLevel(level_nr);
+      DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE);
 
-    TapeErase();
-    LoadTape(level_nr);
-    DrawCompleteVideoDisplay();
+      TapeErase();
+      LoadTape(level_nr);
+      DrawCompleteVideoDisplay();
 
-    /* needed because DrawMicroLevel() takes some time */
-    BackToFront();
-    SyncDisplay();
-    DelayReached(&level_delay, 0);     /* reset delay counter */
+      /* needed because DrawMicroLevel() takes some time */
+      BackToFront();
+      SyncDisplay();
+      DelayReached(&level_delay, 0);   /* reset delay counter */
+    }
   }
-  else if (x == 0 && y >= 0 && y <= 7)
+  else if (IN_VIS_FIELD(x, y) &&
+          y >= 0 && y <= 7 && (y != 1 || x < 10))
   {
     if (button)
     {
@@ -398,14 +457,14 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
     {
       if (y == 0)
       {
-       game_status = TYPENAME;
+       game_status = GAME_MODE_PSEUDO_TYPENAME;
        HandleTypeName(strlen(setup.player_name), 0);
       }
       else if (y == 1)
       {
        if (leveldir_first)
        {
-         game_status = CHOOSELEVEL;
+         game_status = GAME_MODE_LEVELS;
          SaveLevelSetup_LastSeries();
          SaveLevelSetup_SeriesInfo();
 
@@ -416,7 +475,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       }
       else if (y == 2)
       {
-       game_status = HALLOFFAME;
+       game_status = GAME_MODE_SCORES;
        DrawHallOfFame(-1);
       }
       else if (y == 3)
@@ -424,13 +483,14 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
        if (leveldir_current->readonly &&
            strcmp(setup.player_name, "Artsoft") != 0)
          Request("This level is read only !", REQ_CONFIRM);
-       game_status = LEVELED;
+       game_status = GAME_MODE_EDITOR;
        DrawLevelEd();
       }
       else if (y == 4)
       {
-       game_status = HELPSCREEN;
-       DrawHelpScreen();
+       game_status = GAME_MODE_INFO;
+       info_mode = INFO_MODE_MAIN;
+       DrawInfoScreen();
       }
       else if (y == 5)
       {
@@ -443,14 +503,14 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
        else
 #endif
        {
-         game_status = PLAYING;
+         game_status = GAME_MODE_PLAYING;
          StopAnimation();
          InitGame();
        }
       }
       else if (y == 6)
       {
-       game_status = SETUP;
+       game_status = GAME_MODE_SETUP;
        setup_mode = SETUP_MODE_MAIN;
        DrawSetupScreen();
       }
@@ -459,16 +519,12 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
        SaveLevelSetup_LastSeries();
        SaveLevelSetup_SeriesInfo();
         if (Request("Do you really want to quit ?", REQ_ASK | REQ_STAY_CLOSED))
-         game_status = EXITGAME;
+         game_status = GAME_MODE_QUIT;
       }
     }
   }
 
-  BackToFront();
-
-  out:
-
-  if (game_status == MAINMENU)
+  if (game_status == GAME_MODE_MAIN)
   {
     DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, FALSE);
     DoAnimation();
@@ -476,630 +532,548 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 }
 
 
-#define MAX_HELPSCREEN_ELS     10
-#define HA_NEXT                        -999
-#define HA_END                 -1000
+/* ========================================================================= */
+/* info screen functions                                                     */
+/* ========================================================================= */
 
-static long helpscreen_state;
-static int helpscreen_step[MAX_HELPSCREEN_ELS];
-static int helpscreen_frame[MAX_HELPSCREEN_ELS];
-#if 0
-static int OLD_helpscreen_action[] =
-{
-  GFX_SPIELER1_DOWN,4,2,
-  GFX_SPIELER1_UP,4,2,
-  GFX_SPIELER1_LEFT,4,2,
-  GFX_SPIELER1_RIGHT,4,2,
-  GFX_SPIELER1_PUSH_LEFT,4,2,
-  GFX_SPIELER1_PUSH_RIGHT,4,2,                                 HA_NEXT,
-  GFX_ERDREICH,1,100,                                          HA_NEXT,
-  GFX_LEERRAUM,1,100,                                          HA_NEXT,
-  GFX_MORAST_LEER,1,100,                                       HA_NEXT,
-  GFX_BETON,1,100,                                             HA_NEXT,
-  GFX_MAUERWERK,1,100,                                         HA_NEXT,
-  GFX_MAUER_L1,  3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10,
-  GFX_MAUER_R1,  3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10,
-  GFX_MAUER_UP,  3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10,
-  GFX_MAUER_DOWN,3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10,   HA_NEXT,
-  GFX_UNSICHTBAR,1,100,                                                HA_NEXT,
-  GFX_FELSBODEN,1,100,                                         HA_NEXT,
-  GFX_CHAR_A,30,4, GFX_CHAR_AUSRUF,32,4,                       HA_NEXT,
-  GFX_EDELSTEIN,2,5,                                           HA_NEXT,
-  GFX_DIAMANT,2,5,                                             HA_NEXT,
-  GFX_EDELSTEIN_BD,2,5,                                                HA_NEXT,
-  GFX_EDELSTEIN_GELB,2,5, GFX_EDELSTEIN_ROT,2,5,
-  GFX_EDELSTEIN_LILA,2,5,                                      HA_NEXT,
-  GFX_FELSBROCKEN,4,5,                                         HA_NEXT,
-  GFX_BOMBE,1,50, GFX_EXPLOSION,8,1, GFX_LEERRAUM,1,10,                HA_NEXT,
-  GFX_KOKOSNUSS,1,50, GFX_CRACKINGNUT,3,1, GFX_EDELSTEIN,1,10, HA_NEXT,
-  GFX_ERZ_EDEL,1,50, GFX_EXPLOSION,8,1, GFX_EDELSTEIN,1,10,    HA_NEXT,
-  GFX_ERZ_DIAM,1,50, GFX_EXPLOSION,8,1, GFX_DIAMANT,1,10,      HA_NEXT,
-  GFX_ERZ_EDEL_BD,1,50, GFX_EXPLOSION,8,1,GFX_EDELSTEIN_BD,1,10,HA_NEXT,
-  GFX_ERZ_EDEL_GELB,1,50, GFX_EXPLOSION,8,1,
-  GFX_EDELSTEIN_GELB,1,10, GFX_ERZ_EDEL_ROT,1,50,
-  GFX_EXPLOSION,8,1, GFX_EDELSTEIN_ROT,1,10,
-  GFX_ERZ_EDEL_LILA,1,50, GFX_EXPLOSION,8,1,
-  GFX_EDELSTEIN_LILA,1,10,                                     HA_NEXT,
-  GFX_GEBLUBBER,4,4,                                           HA_NEXT,
-  GFX_SCHLUESSEL1,4,25,                                                HA_NEXT,
-  GFX_PFORTE1,4,25,                                            HA_NEXT,
-  GFX_PFORTE1X,4,25,                                           HA_NEXT,
-  GFX_DYNAMIT_AUS,1,100,                                       HA_NEXT,
-  GFX_DYNAMIT,7,6, GFX_EXPLOSION,8,1, GFX_LEERRAUM,1,10,       HA_NEXT,
-  GFX_DYNABOMB+0,4,3, GFX_DYNABOMB+3,1,3, GFX_DYNABOMB+2,1,3,
-  GFX_DYNABOMB+1,1,3, GFX_DYNABOMB+0,1,3, GFX_EXPLOSION,8,1,
-  GFX_LEERRAUM,1,10,                                           HA_NEXT,
-  GFX_DYNABOMB_NR,1,100,                                       HA_NEXT,
-  GFX_DYNABOMB_SZ,1,100,                                       HA_NEXT,
-  GFX_FLIEGER+4,1,3, GFX_FLIEGER+0,1,3, GFX_FLIEGER+4,1,3,
-  GFX_FLIEGER+5,1,3, GFX_FLIEGER+1,1,3, GFX_FLIEGER+5,1,3,
-  GFX_FLIEGER+6,1,3, GFX_FLIEGER+2,1,3, GFX_FLIEGER+6,1,3,
-  GFX_FLIEGER+7,1,3, GFX_FLIEGER+3,1,3, GFX_FLIEGER+7,1,3,     HA_NEXT,
-  GFX_KAEFER+4,1,1, GFX_KAEFER+0,1,1, GFX_KAEFER+4,1,1,
-  GFX_KAEFER+5,1,1, GFX_KAEFER+1,1,1, GFX_KAEFER+5,1,1,
-  GFX_KAEFER+6,1,1, GFX_KAEFER+2,1,1, GFX_KAEFER+6,1,1,
-  GFX_KAEFER+7,1,1, GFX_KAEFER+3,1,1, GFX_KAEFER+7,1,1,                HA_NEXT,
-  GFX_BUTTERFLY,2,2,                                           HA_NEXT,
-  GFX_FIREFLY,2,2,                                             HA_NEXT,
-  GFX_PACMAN+0,1,3, GFX_PACMAN+4,1,2, GFX_PACMAN+0,1,3,
-  GFX_PACMAN+1,1,3, GFX_PACMAN+5,1,2, GFX_PACMAN+1,1,3,
-  GFX_PACMAN+2,1,3, GFX_PACMAN+6,1,2, GFX_PACMAN+2,1,3,
-  GFX_PACMAN+3,1,3, GFX_PACMAN+7,1,2, GFX_PACMAN+3,1,3,                HA_NEXT,
-  GFX_MAMPFER+0,4,1, GFX_MAMPFER+3,1,1, GFX_MAMPFER+2,1,1,
-  GFX_MAMPFER+1,1,1, GFX_MAMPFER+0,1,1,                                HA_NEXT,
-  GFX_MAMPFER2+0,4,1, GFX_MAMPFER2+3,1,1, GFX_MAMPFER2+2,1,1,
-  GFX_MAMPFER2+1,1,1, GFX_MAMPFER2+0,1,1,                      HA_NEXT,
-  GFX_ROBOT+0,4,1, GFX_ROBOT+3,1,1, GFX_ROBOT+2,1,1,
-  GFX_ROBOT+1,1,1, GFX_ROBOT+0,1,1,                            HA_NEXT,
-  GFX_MOLE_DOWN,4,2,
-  GFX_MOLE_UP,4,2,
-  GFX_MOLE_LEFT,4,2,
-  GFX_MOLE_RIGHT,4,2,                                          HA_NEXT,
-  GFX_PINGUIN_DOWN,4,2,
-  GFX_PINGUIN_UP,4,2,
-  GFX_PINGUIN_LEFT,4,2,
-  GFX_PINGUIN_RIGHT,4,2,                                       HA_NEXT,
-  GFX_SCHWEIN_DOWN,4,2,
-  GFX_SCHWEIN_UP,4,2,
-  GFX_SCHWEIN_LEFT,4,2,
-  GFX_SCHWEIN_RIGHT,4,2,                                       HA_NEXT,
-  GFX_DRACHE_DOWN,4,2,
-  GFX_DRACHE_UP,4,2,
-  GFX_DRACHE_LEFT,4,2,
-  GFX_DRACHE_RIGHT,4,2,                                                HA_NEXT,
-  GFX_SONDE_START,8,1,                                         HA_NEXT,
-  GFX_ABLENK,4,1,                                              HA_NEXT,
-  GFX_BIRNE_AUS,1,25, GFX_BIRNE_EIN,1,25,                      HA_NEXT,
-  GFX_ZEIT_VOLL,1,25, GFX_ZEIT_LEER,1,25,                      HA_NEXT,
-  GFX_TROPFEN,1,25, GFX_AMOEBING,4,1, GFX_AMOEBE_LEBT,1,10,    HA_NEXT,
-  GFX_AMOEBE_TOT+2,2,50, GFX_AMOEBE_TOT,2,50,                  HA_NEXT,
-  GFX_AMOEBE_LEBT,4,40,                                                HA_NEXT,
-  GFX_AMOEBE_LEBT,1,10,        GFX_AMOEBING,4,2,                       HA_NEXT,
-  GFX_AMOEBE_LEBT,1,25, GFX_AMOEBE_TOT,1,25, GFX_EXPLOSION,8,1,
-  GFX_DIAMANT,1,10,                                            HA_NEXT,
-  GFX_LIFE,1,100,                                              HA_NEXT,
-  GFX_LIFE_ASYNC,1,100,                                                HA_NEXT,
-  GFX_MAGIC_WALL_OFF,4,2,                                      HA_NEXT,
-  GFX_MAGIC_WALL_BD_OFF,4,2,                                   HA_NEXT,
-  GFX_AUSGANG_ZU,1,100, GFX_AUSGANG_ACT,4,2,
-  GFX_AUSGANG_AUF+0,4,2, GFX_AUSGANG_AUF+3,1,2,
-  GFX_AUSGANG_AUF+2,1,2, GFX_AUSGANG_AUF+1,1,2,                        HA_NEXT,
-  GFX_AUSGANG_AUF+0,4,2, GFX_AUSGANG_AUF+3,1,2,
-  GFX_AUSGANG_AUF+2,1,2, GFX_AUSGANG_AUF+1,1,2,                        HA_NEXT,
-  GFX_SOKOBAN_OBJEKT,1,100,                                    HA_NEXT,
-  GFX_SOKOBAN_FELD_LEER,1,100,                                 HA_NEXT,
-  GFX_SOKOBAN_FELD_VOLL,1,100,                                 HA_NEXT,
-  GFX_SPEED_PILL,1,100,                                                HA_NEXT,
-  HA_END
-};
-#endif
+static struct TokenInfo *info_info;
+static int num_info_info;
 
-static int helpscreen_action[] =
+static void execInfoElements()
 {
-  IMG_PLAYER_1_MOVING_DOWN,            16,
-  IMG_PLAYER_1_MOVING_UP,              16,
-  IMG_PLAYER_1_MOVING_LEFT,            16,
-  IMG_PLAYER_1_MOVING_RIGHT,           16,
-  IMG_PLAYER_1_PUSHING_LEFT,           16,
-  IMG_PLAYER_1_PUSHING_RIGHT,          16,                     HA_NEXT,
+  info_mode = INFO_MODE_ELEMENTS;
+  DrawInfoScreen();
+}
 
-  IMG_SAND,                            -1,                     HA_NEXT,
+static void execInfoMusic()
+{
+  info_mode = INFO_MODE_MUSIC;
+  DrawInfoScreen();
+}
 
-  IMG_EMPTY_SPACE,                     -1,                     HA_NEXT,
+static void execInfoCredits()
+{
+  info_mode = INFO_MODE_CREDITS;
+  DrawInfoScreen();
+}
 
-  IMG_QUICKSAND_EMPTY,                 -1,                     HA_NEXT,
+static void execInfoProgram()
+{
+  info_mode = INFO_MODE_PROGRAM;
+  DrawInfoScreen();
+}
 
-  IMG_STEELWALL,                       -1,                     HA_NEXT,
+static void execInfoLevelSet()
+{
+  info_mode = INFO_MODE_LEVELSET;
+  DrawInfoScreen();
+}
 
-  IMG_WALL,                            -1,                     HA_NEXT,
+static void execExitInfo()
+{
+  game_status = GAME_MODE_MAIN;
+  DrawMainMenu();
+}
 
-  IMG_EXPANDABLE_WALL_GROWING_LEFT,    20,
-  IMG_WALL,                            50,
-  IMG_EMPTY_SPACE,                     20,
-  IMG_EXPANDABLE_WALL_GROWING_RIGHT,   20,
-  IMG_WALL,                            50,
-  IMG_EMPTY_SPACE,                     20,
-  IMG_EXPANDABLE_WALL_GROWING_UP,      20,
-  IMG_WALL,                            50,
-  IMG_EMPTY_SPACE,                     20,
-  IMG_EXPANDABLE_WALL_GROWING_DOWN,    20,
-  IMG_WALL,                            50,
-  IMG_EMPTY_SPACE,                     20,                     HA_NEXT,
+static struct TokenInfo info_info_main[] =
+{
+  { TYPE_ENTER_SCREEN, execInfoElements,       "Elements Info"         },
+  { TYPE_ENTER_SCREEN, execInfoMusic,          "Music Info"            },
+  { TYPE_ENTER_SCREEN, execInfoCredits,        "Credits"               },
+  { TYPE_ENTER_SCREEN, execInfoProgram,        "Program Info"          },
+  { TYPE_ENTER_SCREEN, execInfoLevelSet,       "Level Set Info"        },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_LEAVE_MENU,   execExitInfo,           "Exit"                  },
 
-  IMG_INVISIBLE_WALL,                  -1,                     HA_NEXT,
+  { 0,                 NULL,                   NULL                    }
+};
 
-  IMG_WALL_CRUMBLED,                   -1,                     HA_NEXT,
+static void DrawInfoScreen_Main()
+{
+  int i;
 
-  IMG_INFO_FONT_EM_1,                  160,
-  IMG_INFO_FONT_EM_2,                  160,
-  IMG_INFO_FONT_EM_3,                  160,
-  IMG_INFO_FONT_EM_4,                  160,
-  IMG_INFO_FONT_EM_5,                  40,                     HA_NEXT,
+  UnmapAllGadgets();
+  CloseDoor(DOOR_CLOSE_2);
 
-  IMG_EMERALD,                         -1,                     HA_NEXT,
+  ClearWindow();
 
-  IMG_DIAMOND,                         -1,                     HA_NEXT,
+  DrawText(mSX + 16, mSY + 16, "Info Screen", FONT_TITLE_1);
 
-  IMG_BD_DIAMOND,                      -1,                     HA_NEXT,
+  info_info = info_info_main;
+  num_info_info = 0;
 
-  IMG_EMERALD_YELLOW,                  50,
-  IMG_EMERALD_RED,                     50,
-  IMG_EMERALD_PURPLE,                  50,                     HA_NEXT,
+  for (i = 0; info_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++)
+  {
+    int ypos = MENU_SCREEN_START_YPOS + i;
+    int font_nr = FONT_MENU_1;
 
-  IMG_BD_ROCK,                         -1,                     HA_NEXT,
+    DrawText(mSX + 32, mSY + ypos * 32, info_info[i].text, font_nr);
 
-  IMG_BOMB,                            100,
-  IMG_EXPLOSION,                       16,
-  IMG_EMPTY_SPACE,                     10,                     HA_NEXT,
+    if (info_info[i].type & TYPE_ENTER_MENU)
+      initCursor(i, IMG_MENU_BUTTON_RIGHT);
+    else if (info_info[i].type & TYPE_LEAVE_MENU)
+      initCursor(i, IMG_MENU_BUTTON_LEFT);
+    else if (info_info[i].type & ~TYPE_SKIP_ENTRY)
+      initCursor(i, IMG_MENU_BUTTON);
 
-  IMG_NUT,                             100,
-  IMG_NUT_BREAKING,                    6,
-  IMG_EMERALD,                         20,                     HA_NEXT,
+    num_info_info++;
+  }
 
-  IMG_WALL_EMERALD,                    100,
-  IMG_EXPLOSION,                       16,
-  IMG_EMERALD,                         20,                     HA_NEXT,
+  FadeToFront();
+  InitAnimation();
 
-  IMG_WALL_DIAMOND,                    100,
-  IMG_EXPLOSION,                       16,
-  IMG_DIAMOND,                         20,                     HA_NEXT,
+  PlayMenuSound();
+  PlayMenuMusic();
 
-  IMG_WALL_BD_DIAMOND,                         100,
-  IMG_EXPLOSION,                       16,
-  IMG_BD_DIAMOND,                      20,                     HA_NEXT,
+  HandleInfoScreen_Main(0, 0, 0, 0, MB_MENU_INITIALIZE);
+}
 
-  IMG_WALL_EMERALD_YELLOW,             100,
-  IMG_EXPLOSION,                       16,
-  IMG_EMERALD_YELLOW,                  20,
-  IMG_WALL_EMERALD_RED,                        100,
-  IMG_EXPLOSION,                       16,
-  IMG_EMERALD_RED,                     20,
-  IMG_WALL_EMERALD_PURPLE,             100,
-  IMG_EXPLOSION,                       16,
-  IMG_EMERALD_PURPLE,                  20,                     HA_NEXT,
+void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
+{
+  static int choice_store[MAX_INFO_MODES];
+  int choice = choice_store[info_mode];                /* always starts with 0 */
+  int x = 0;
+  int y = choice;
 
-  IMG_ACID,                            -1,                     HA_NEXT,
+  if (button == MB_MENU_INITIALIZE)
+  {
+    /* advance to first valid menu entry */
+    while (choice < num_info_info &&
+          info_info[choice].type & TYPE_SKIP_ENTRY)
+      choice++;
+    choice_store[info_mode] = choice;
 
-  IMG_KEY_1,                           50,
-  IMG_KEY_2,                           50,
-  IMG_KEY_3,                           50,
-  IMG_KEY_4,                           50,                     HA_NEXT,
+    drawCursor(choice, FC_RED);
+    return;
+  }
+  else if (button == MB_MENU_LEAVE)
+  {
+    for (y = 0; y < num_info_info; y++)
+    {
+      if (info_info[y].type & TYPE_LEAVE_MENU)
+      {
+       void (*menu_callback_function)(void) = info_info[y].value;
 
-  IMG_GATE_1,                          50,
-  IMG_GATE_2,                          50,
-  IMG_GATE_3,                          50,
-  IMG_GATE_4,                          50,                     HA_NEXT,
+       menu_callback_function();
+       break;  /* absolutely needed because function changes 'info_info'! */
+      }
+    }
 
-  IMG_GATE_1_GRAY,                     50,
-  IMG_GATE_2_GRAY,                     50,
-  IMG_GATE_3_GRAY,                     50,
-  IMG_GATE_4_GRAY,                     50,                     HA_NEXT,
+    return;
+  }
 
-  IMG_DYNAMITE,                                -1,                     HA_NEXT,
+  if (mx || my)                /* mouse input */
+  {
+    x = (mx - mSX) / 32;
+    y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS;
+  }
+  else if (dx || dy)   /* keyboard input */
+  {
+    if (dx)
+    {
+      int menu_navigation_type = (dx < 0 ? TYPE_LEAVE_MENU : TYPE_ENTER_MENU);
+
+      if (info_info[choice].type & menu_navigation_type ||
+         info_info[choice].type & TYPE_ENTER_SCREEN ||
+         info_info[choice].type & TYPE_BOOLEAN_STYLE)
+       button = MB_MENU_CHOICE;
+    }
+    else if (dy)
+      y = choice + dy;
+
+    /* jump to next non-empty menu entry (up or down) */
+    while (y > 0 && y < num_info_info - 1 &&
+          info_info[y].type & TYPE_SKIP_ENTRY)
+      y += dy;
+  }
+
+  if (IN_VIS_FIELD(x, y) &&
+      y >= 0 && y < num_info_info && info_info[y].type & ~TYPE_SKIP_ENTRY)
+  {
+    if (button)
+    {
+      if (y != choice)
+      {
+       drawCursor(y, FC_RED);
+       drawCursor(choice, FC_BLUE);
+       choice = choice_store[info_mode] = y;
+      }
+    }
+    else if (!(info_info[y].type & TYPE_GHOSTED))
+    {
+      if (info_info[y].type & TYPE_ENTER_OR_LEAVE_MENU)
+      {
+       void (*menu_callback_function)(void) = info_info[choice].value;
 
-  IMG_DYNAMITE_ACTIVE,                 96,
-  IMG_EXPLOSION,                       16,
-  IMG_EMPTY_SPACE,                     20,                     HA_NEXT,
+       menu_callback_function();
+      }
+    }
+  }
+}
 
-  IMG_DYNABOMB_ACTIVE,                 100,
-  IMG_EXPLOSION,                       16,
-  IMG_EMPTY_SPACE,                     20,                     HA_NEXT,
+void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init)
+{
+  static int infoscreen_step[MAX_INFO_ELEMENTS_ON_SCREEN];
+  static int infoscreen_frame[MAX_INFO_ELEMENTS_ON_SCREEN];
+  int xstart = mSX + 16;
+  int ystart = mSY + 64 + 2 * 32;
+  int ystep = TILEY + 4;
+  int element, action, direction;
+  int graphic;
+  int delay;
+  int sync_frame;
+  int i, j;
 
-  EL_DYNABOMB_INCREASE_NUMBER,         -1,                     HA_NEXT,
+  if (init)
+  {
+    for (i = 0; i < MAX_INFO_ELEMENTS_ON_SCREEN; i++)
+      infoscreen_step[i] = infoscreen_frame[i] = 0;
 
-  EL_DYNABOMB_INCREASE_SIZE,           -1,                     HA_NEXT,
+    SetMainBackgroundImage(IMG_BACKGROUND_INFO);
+    ClearWindow();
+    DrawHeadline();
 
-  IMG_SPACESHIP_RIGHT,                 16,
-  IMG_SPACESHIP_UP,                    16,
-  IMG_SPACESHIP_LEFT,                  16,
-  IMG_SPACESHIP_DOWN,                  16,                     HA_NEXT,
+    DrawTextSCentered(100, FONT_TEXT_1, "The Game Elements:");
 
-  IMG_BUG_RIGHT,                       16,
-  IMG_BUG_UP,                          16,
-  IMG_BUG_LEFT,                                16,
-  IMG_BUG_DOWN,                                16,                     HA_NEXT,
+    DrawTextSCentered(SYSIZE - 20, FONT_TEXT_4,
+                     "Press any key or button for next page");
 
-  IMG_BD_BUTTERFLY,                    -1,                     HA_NEXT,
+    FrameCounter = 0;
+  }
 
-  IMG_BD_FIREFLY,                      -1,                     HA_NEXT,
+  i = j = 0;
+  while (helpanim_info[j].element != HELPANIM_LIST_END)
+  {
+    if (i >= start + MAX_INFO_ELEMENTS_ON_SCREEN ||
+       i >= max_anims)
+      break;
+    else if (i < start)
+    {
+      while (helpanim_info[j].element != HELPANIM_LIST_NEXT)
+       j++;
 
-  IMG_PACMAN_RIGHT,                    16,
-  IMG_PACMAN_UP,                       16,
-  IMG_PACMAN_LEFT,                     16,
-  IMG_PACMAN_DOWN,                     16,                     HA_NEXT,
+      j++;
+      i++;
 
-  IMG_YAMYAM,                          -1,                     HA_NEXT,
+      continue;
+    }
 
-  IMG_DARK_YAMYAM,                     -1,                     HA_NEXT,
+    j += infoscreen_step[i - start];
 
-  IMG_ROBOT,                           -1,                     HA_NEXT,
+    element = helpanim_info[j].element;
+    action = helpanim_info[j].action;
+    direction = helpanim_info[j].direction;
 
-  IMG_MOLE_MOVING_RIGHT,               16,
-  IMG_MOLE_MOVING_UP,                  16,
-  IMG_MOLE_MOVING_LEFT,                        16,
-  IMG_MOLE_MOVING_DOWN,                        16,                     HA_NEXT,
+    if (action != -1 && direction != -1)
+      graphic = el_act_dir2img(element, action, direction);
+    else if (action != -1)
+      graphic = el_act2img(element, action);
+    else if (direction != -1)
+      graphic = el_act2img(element, direction);
+    else
+      graphic = el2img(element);
 
-  IMG_PENGUIN_MOVING_RIGHT,            16,
-  IMG_PENGUIN_MOVING_UP,               16,
-  IMG_PENGUIN_MOVING_LEFT,             16,
-  IMG_PENGUIN_MOVING_DOWN,             16,                     HA_NEXT,
+    delay = helpanim_info[j++].delay;
 
-  IMG_PIG_MOVING_RIGHT,                        16,
-  IMG_PIG_MOVING_UP,                   16,
-  IMG_PIG_MOVING_LEFT,                 16,
-  IMG_PIG_MOVING_DOWN,                 16,                     HA_NEXT,
+    if (delay == -1)
+      delay = 1000000;
 
-  IMG_DRAGON_MOVING_RIGHT,             16,
-  IMG_DRAGON_MOVING_UP,                        16,
-  IMG_DRAGON_MOVING_LEFT,              16,
-  IMG_DRAGON_MOVING_DOWN,              16,                     HA_NEXT,
+    if (infoscreen_frame[i - start] == 0)
+    {
+      sync_frame = 0;
+      infoscreen_frame[i - start] = delay - 1;
+    }
+    else
+    {
+      sync_frame = delay - infoscreen_frame[i - start];
+      infoscreen_frame[i - start]--;
+    }
 
-  IMG_SATELLITE,                       -1,                     HA_NEXT,
+    if (helpanim_info[j].element == -1)
+    {
+      if (!infoscreen_frame[i - start])
+       infoscreen_step[i - start] = 0;
+    }
+    else
+    {
+      if (!infoscreen_frame[i - start])
+       infoscreen_step[i - start]++;
+      while (helpanim_info[j].element != -1)
+       j++;
+    }
 
-  IMG_ROBOT_WHEEL,                     50,
-  IMG_ROBOT_WHEEL_ACTIVE,              100,                    HA_NEXT,
+    j++;
 
-  IMG_LAMP,                            50,
-  IMG_LAMP_ACTIVE,                     50,                     HA_NEXT,
+    ClearRectangleOnBackground(drawto, xstart, ystart + (i - start) * ystep,
+                              TILEX, TILEY);
+    DrawGraphicAnimationExt(drawto, xstart, ystart + (i - start) * ystep,
+                           graphic, sync_frame, USE_MASKING);
 
-  IMG_TIME_ORB_FULL,                   50,
-  IMG_TIME_ORB_EMPTY,                  50,                     HA_NEXT,
+    if (init)
+      DrawInfoScreen_HelpText(element, action, direction, i - start);
 
-  IMG_AMOEBA_DROP,                     50,
-  IMG_AMOEBA_GROWING,                  6,
-  IMG_AMOEBA_WET,                      20,                     HA_NEXT,
+    i++;
+  }
 
-  IMG_AMOEBA_DEAD,                     -1,                     HA_NEXT,
+  redraw_mask |= REDRAW_FIELD;
 
-  IMG_AMOEBA_WET,                      -1,                     HA_NEXT,
+  FrameCounter++;
+}
 
-  IMG_AMOEBA_WET,                      100,
-  IMG_AMOEBA_GROWING,                  6,                      HA_NEXT,
+static char *getHelpText(int element, int action, int direction)
+{
+  char token[MAX_LINE_LEN];
 
-  IMG_AMOEBA_FULL,                     50,
-  IMG_AMOEBA_DEAD,                     50,
-  IMG_EXPLOSION,                       16,
-  IMG_DIAMOND,                         20,                     HA_NEXT,
+  strcpy(token, element_info[element].token_name);
 
-  IMG_GAME_OF_LIFE,                    -1,                     HA_NEXT,
+  if (action != -1)
+    strcat(token, element_action_info[action].suffix);
 
-  IMG_BIOMAZE,                         -1,                     HA_NEXT,
+  if (direction != -1)
+    strcat(token, element_direction_info[MV_DIR_BIT(direction)].suffix);
 
-  IMG_MAGIC_WALL_ACTIVE,               -1,                     HA_NEXT,
+  return getHashEntry(helptext_info, token);
+}
 
-  IMG_BD_MAGIC_WALL_ACTIVE,            -1,                     HA_NEXT,
+void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos)
+{
+#if 0
+  int font_nr = FONT_TEXT_2;
+#else
+  int font_nr = FONT_LEVEL_NUMBER;
+#endif
+  int font_width = getFontWidth(font_nr);
+  int sx = mSX + MINI_TILEX + TILEX + MINI_TILEX;
+  int sy = mSY + 65 + 2 * 32 + 1;
+  int ystep = TILEY + 4;
+  int pad_x = sx - SX;
+  int max_chars_per_line = (SXSIZE - pad_x - MINI_TILEX) / font_width;
+  int max_lines_per_text = 2;    
+  char *text = NULL;
 
-  IMG_EXIT_CLOSED,                     200,
-  IMG_EXIT_OPENING,                    16,
-  IMG_EXIT_OPEN,                       100,                    HA_NEXT,
+  if (action != -1 && direction != -1)         /* element.action.direction */
+    text = getHelpText(element, action, direction);
 
-  IMG_EXIT_OPEN,                       -1,                     HA_NEXT,
+  if (text == NULL && action != -1)            /* element.action */
+    text = getHelpText(element, action, -1);
 
-  IMG_SOKOBAN_OBJECT,                  -1,                     HA_NEXT,
+  if (text == NULL && direction != -1)         /* element.direction */
+    text = getHelpText(element, -1, direction);
 
-  IMG_SOKOBAN_FIELD_EMPTY,             -1,                     HA_NEXT,
+  if (text == NULL)                            /* base element */
+    text = getHelpText(element, -1, -1);
 
-  IMG_SOKOBAN_FIELD_FULL,              -1,                     HA_NEXT,
+  if (text == NULL)                            /* not found */
+    text = "No description available";
 
-  IMG_SPEED_PILL,                      -1,                     HA_NEXT,
+  if (strlen(text) <= max_chars_per_line)      /* only one line of text */
+    sy += getFontHeight(font_nr) / 2;
 
-  HA_END
-};
-static char *helpscreen_eltext[][2] =
-{
- {"THE HERO:",                         "(Is _this_ guy good old Rockford?)"},
- {"Normal sand:",                      "You can dig through it"},
- {"Empty field:",                      "You can walk through it"},
- {"Quicksand: You cannot pass it,",    "but rocks can fall through it"},
- {"Massive Wall:",                     "Nothing can go through it"},
- {"Normal Wall: You can't go through", "it, but you can bomb it away"},
- {"Growing Wall: Grows in several di-",        "rections if there is an empty field"},
- {"Invisible Wall: Behaves like normal","wall, but is invisible"},
- {"Old Wall: Like normal wall, but",   "some things can fall down from it"},
- {"Letter Wall: Looks like a letter,", "behaves like a normal wall"},
- {"Emerald: You must collect enough of","them to finish a level"},
- {"Diamond: Counts as 3 emeralds, but",        "can be destroyed by rocks"},
- {"Diamond (BD style): Counts like one","emerald and behaves a bit different"},
- {"Colorful Gems:",                    "Seem to behave like Emeralds"},
- {"Rock: Smashes several things;",     "Can be moved by the player"},
- {"Bomb: You can move it, but be",     "careful when dropping it"},
- {"Nut: Throw a rock on it to open it;","Each nut contains an emerald"},
- {"Wall with an emerald inside:",      "Bomb the wall away to get it"},
- {"Wall with a diamond inside:",       "Bomb the wall away to get it"},
- {"Wall with BD style diamond inside:",        "Bomb the wall away to get it"},
- {"Wall with colorful gem inside:",    "Bomb the wall away to get it"},
- {"Acid: Things that fall in are gone",        "forever (including our hero)"},
- {"Key: Opens the door that has the",  "same color (red/yellow/green/blue)"},
- {"Door: Can be opened by the key",    "with the same color"},
- {"Door: You have to find out the",    "right color of the key for it"},
- {"Dynamite: Collect it and use it to",        "destroy walls or kill enemies"},
- {"Dynamite: This one explodes after", "a few seconds"},
- {"Dyna Bomb: Explodes in 4 directions","with variable explosion size"},
- {"Dyna Bomb: Increases the number of",        "dyna bombs available at a time"},
- {"Dyna Bomb: Increases the size of",  "explosion of dyna bombs"},
- {"Spaceship: Moves at the left side", "of walls; don't touch it!"},
- {"Bug: Moves at the right side",      "of walls; don't touch it!"},
- {"Butterfly: Moves at the right side",        "of walls; don't touch it!"},
- {"Firefly: Moves at the left side",   "of walls; don't touch it!"},
- {"Pacman: Eats the amoeba and you,",  "if you're not careful"},
- {"Cruncher: Eats diamonds and you,",  "if you're not careful"},
- {"Cruncher (BD style):",              "Eats almost everything"},
- {"Robot: Tries to kill the player",   ""},
- {"The mole: Eats the amoeba and turns","empty space into normal sand"},
- {"The penguin: Guide him to the exit,","but keep him away from monsters!"},
- {"The Pig: Harmless, but eats all",   "gems it can get"},
- {"The Dragon: Breathes fire,",                "especially to some monsters"},
- {"Sonde: Follows you everywhere;",    "harmless, but may block your way"},
- {"Magic Wheel: Touch it to get rid of","the robots for some seconds"},
- {"Light Bulb: All of them must be",   "switched on to finish a level"},
- {"Extra Time Orb: Adds some seconds", "to the time available for the level"},
- {"Amoeba Drop: Grows to an amoeba on",        "the ground - don't touch it"},
- {"Dead Amoeba: Does not grow, but",   "can still kill bugs and spaceships"},
- {"Normal Amoeba: Grows through empty",        "fields, sand and quicksand"},
- {"Dropping Amoeba: This one makes",   "drops that grow to a new amoeba"},
- {"Living Amoeba (BD style): Contains",        "other element, when surrounded"},
- {"Game Of Life: Behaves like the well","known 'Game Of Life' (2333 style)"},
- {"Biomaze: A bit like the 'Game Of",  "Life', but builds crazy mazes"},
- {"Magic Wall: Changes rocks, emeralds","and diamonds when they pass it"},
- {"Magic Wall (BD style):",            "Changes rocks and BD style diamonds"},
- {"Exit door: Opens if you have enough","emeralds to finish the level"},
- {"Open exit door: Enter here to leave","the level and exit the actual game"},
- {"Sokoban element: Object which must", "be pushed to an empty field"},
- {"Sokoban element: Empty field where", "a Sokoban object can be placed on"},
- {"Sokoban element: Field with object", "which can be pushed away"},
- {"Speed pill: Lets the player run",    "twice as fast as normally"},
-};
-static int num_helpscreen_els = sizeof(helpscreen_eltext) / (2*sizeof(char *));
+  DrawTextWrapped(sx, sy + ypos * ystep, text, font_nr,
+                 max_chars_per_line, max_lines_per_text);
+}
 
-static char *helpscreen_music[][3] =
+void DrawInfoScreen_Elements()
 {
-  { "Alchemy",                 "Ian Boddy",            "Drive" },
-  { "The Chase",               "Propaganda",           "A Secret Wish" },
-  { "Network 23",              "Tangerine Dream",      "Exit" },
-  { "Czardasz",                        "Robert Pieculewicz",   "Czardasz" },
-  { "21st Century Common Man", "Tangerine Dream",      "Tyger" },
-  { "Voyager",                 "The Alan Parsons Project","Pyramid" },
-  { "Twilight Painter",                "Tangerine Dream",      "Heartbreakers" }
-};
-static int num_helpscreen_music = 7;
-static int helpscreen_musicpos;
+  LoadHelpAnimInfo();
+  LoadHelpTextInfo();
 
-#if 0
-void OLD_DrawHelpScreenElAction(int start)
+  HandleInfoScreen_Elements(MB_MENU_INITIALIZE);
+
+  FadeToFront();
+  InitAnimation();
+}
+
+void HandleInfoScreen_Elements(int button)
 {
-  int i = 0, j = 0;
-  int frame, graphic;
-  int xstart = SX+16, ystart = SY+64+2*32, ystep = TILEY+4;
+  static unsigned long info_delay = 0;
+  static int num_anims;
+  static int num_pages;
+  static int page;
+  int anims_per_page = MAX_INFO_ELEMENTS_ON_SCREEN;
+  int button_released = !button;
+  int i;
 
-  while(helpscreen_action[j] != HA_END)
+  if (button == MB_MENU_INITIALIZE)
   {
-    if (i>=start+MAX_HELPSCREEN_ELS || i>=num_helpscreen_els)
-      break;
-    else if (i<start || helpscreen_delay[i-start])
-    {
-      if (i>=start && helpscreen_delay[i-start])
-       helpscreen_delay[i-start]--;
+    boolean new_element = TRUE;
 
-      while(helpscreen_action[j] != HA_NEXT)
-       j++;
-      j++;
-      i++;
-      continue;
+    num_anims = 0;
+    for (i = 0; helpanim_info[i].element != HELPANIM_LIST_END; i++)
+    {
+      if (helpanim_info[i].element == HELPANIM_LIST_NEXT)
+       new_element = TRUE;
+      else if (new_element)
+      {
+       num_anims++;
+       new_element = FALSE;
+      }
     }
 
-    j += 3*helpscreen_step[i-start];
-    graphic = helpscreen_action[j++];
+    num_pages = (num_anims + anims_per_page - 1) / anims_per_page;
+    page = 0;
+  }
+  else if (button == MB_MENU_LEAVE)
+  {
+    info_mode = INFO_MODE_MAIN;
+    DrawInfoScreen();
 
-    if (helpscreen_frame[i-start])
-    {
-      frame = helpscreen_action[j++] - helpscreen_frame[i-start];
-      helpscreen_frame[i-start]--;
-    }
-    else
-    {
-      frame = 0;
-      helpscreen_frame[i-start] = helpscreen_action[j++]-1;
-    }
+    return;
+  }
 
-    helpscreen_delay[i-start] = helpscreen_action[j++] - 1;
+  if (button_released || button == MB_MENU_INITIALIZE)
+  {
+    if (button != MB_MENU_INITIALIZE)
+      page++;
 
-    if (helpscreen_action[j] == HA_NEXT)
+    if (page >= num_pages)
     {
-      if (!helpscreen_frame[i-start])
-       helpscreen_step[i-start] = 0;
-    }
-    else
-    {
-      if (!helpscreen_frame[i-start])
-       helpscreen_step[i-start]++;
-      while(helpscreen_action[j] != HA_NEXT)
-       j++;
+      FadeSoundsAndMusic();
+
+      info_mode = INFO_MODE_MAIN;
+      DrawInfoScreen();
+
+      return;
     }
-    j++;
 
-    DrawOldGraphicExt(drawto, xstart, ystart+(i-start)*ystep, graphic+frame);
-    i++;
+    DrawInfoScreen_HelpAnim(page * anims_per_page, num_anims, TRUE);
   }
-
-  for(i=2;i<16;i++)
+  else
   {
-    MarkTileDirty(0,i);
-    MarkTileDirty(1,i);
+    if (DelayReached(&info_delay, GAME_FRAME_DELAY))
+      if (page < num_pages)
+       DrawInfoScreen_HelpAnim(page * anims_per_page, num_anims, FALSE);
+
+    PlayMenuSoundIfLoop();
   }
 }
-#endif
 
-void DrawHelpScreenElAction(int start)
+void DrawInfoScreen_Music()
 {
-  int i = 0, j = 0;
-  int xstart = mSX + 16;
-  int ystart = mSY + 64 + 2 * 32;
-  int ystep = TILEY + 4;
-  int graphic;
-  int frame_count;
-  int sync_frame;
-  int frame;
+  ClearWindow();
+  DrawHeadline();
 
-  while (helpscreen_action[j] != HA_END)
-  {
-    if (i >= start + MAX_HELPSCREEN_ELS || i >= num_helpscreen_els)
-      break;
-    else if (i < start)
-    {
-      while (helpscreen_action[j] != HA_NEXT)
-       j++;
+  LoadMusicInfo();
 
-      j++;
-      i++;
+  HandleInfoScreen_Music(MB_MENU_INITIALIZE);
+}
 
-      continue;
-    }
+void HandleInfoScreen_Music(int button)
+{
+  static struct MusicFileInfo *list = NULL;
+  int ystart = 150, ystep = 30;
+  int ybottom = SYSIZE - 20;
+  int button_released = !button;
 
-    j += 2 * helpscreen_step[i-start];
-    graphic = helpscreen_action[j++];
-    frame_count = helpscreen_action[j++];
-    if (frame_count == -1)
-      frame_count = 1000000;
+  if (button == MB_MENU_INITIALIZE)
+  {
+    list = music_file_info;
 
-    if (helpscreen_frame[i-start] == 0)
+    if (list == NULL)
     {
-      sync_frame = 0;
-      helpscreen_frame[i-start] = frame_count - 1;
-    }
-    else
-    {
-      sync_frame = frame_count - helpscreen_frame[i-start];
-      helpscreen_frame[i-start]--;
-    }
+      FadeSoundsAndMusic();
 
-    if (helpscreen_action[j] == HA_NEXT)
-    {
-      if (!helpscreen_frame[i-start])
-       helpscreen_step[i-start] = 0;
-    }
-    else
-    {
-      if (!helpscreen_frame[i-start])
-       helpscreen_step[i-start]++;
-      while(helpscreen_action[j] != HA_NEXT)
-       j++;
-    }
-    j++;
+      ClearWindow();
+      DrawHeadline();
+
+      DrawTextSCentered(100, FONT_TEXT_1, "No music info for this level set.");
 
-    frame = getGraphicAnimationFrame(graphic, sync_frame);
+      DrawTextSCentered(ybottom, FONT_TEXT_4,
+                       "Press any key or button for info menu");
 
-    DrawGraphicExt(drawto, xstart, ystart + (i-start) * ystep,
-                  graphic, frame);
+      return;
+    }
+  }
+  else if (button == MB_MENU_LEAVE)
+  {
+    info_mode = INFO_MODE_MAIN;
+    DrawInfoScreen();
 
-    i++;
+    return;
   }
 
-  for(i=2; i<16; i++)
+  if (button_released || button == MB_MENU_INITIALIZE)
   {
-    MarkTileDirty(0, i);
-    MarkTileDirty(1, i);
-  }
+    if (list == NULL)
+    {
+      info_mode = INFO_MODE_MAIN;
+      DrawInfoScreen();
 
-  FrameCounter++;
-}
+      return;
+    }
 
-void DrawHelpScreenElText(int start)
-{
-  int i;
-  int xstart = mSX + 56, ystart = mSY + 65 + 2 * 32, ystep = TILEY + 4;
-  int ybottom = SYSIZE - 20;
+    FadeSoundsAndMusic();
 
-  SetMainBackgroundImage(IMG_BACKGROUND_INFO);
-  ClearWindow();
-  DrawHeadline();
+    ClearWindow();
+    DrawHeadline();
 
-  DrawTextFCentered(100, FONT_TEXT_1, "The game elements:");
+    DrawTextSCentered(100, FONT_TEXT_1, "The Game Background Music:");
 
-  for(i=start; i < start + MAX_HELPSCREEN_ELS && i < num_helpscreen_els; i++)
-  {
-    DrawText(xstart,
-            ystart + (i - start) * ystep + (*helpscreen_eltext[i][1] ? 0 : 8),
-            helpscreen_eltext[i][0], FONT_TEXT_2);
-    DrawText(xstart, ystart + (i - start) * ystep + 16,
-            helpscreen_eltext[i][1], FONT_TEXT_2);
-  }
+    DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2, "Excerpt from");
+    DrawTextFCentered(ystart + 1 * ystep, FONT_TEXT_3, "\"%s\"", list->title);
+    DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_2, "by");
+    DrawTextFCentered(ystart + 3 * ystep, FONT_TEXT_3, "%s", list->artist);
+    DrawTextSCentered(ystart + 4 * ystep, FONT_TEXT_2, "from the album");
+    DrawTextFCentered(ystart + 5 * ystep, FONT_TEXT_3, "\"%s\"", list->album);
+
+    DrawTextSCentered(ybottom, FONT_TEXT_4,
+                     "Press any key or button for next page");
+
+    PlayMusic(list->music);
 
-  DrawTextFCentered(ybottom, FONT_TEXT_4,
-                   "Press any key or button for next page");
+    list = list->next;
+  }
 }
 
-void DrawHelpScreenMusicText(int num)
+void DrawInfoScreen_Credits()
 {
   int ystart = 150, ystep = 30;
   int ybottom = SYSIZE - 20;
 
-  FadeSounds();
+  FadeSoundsAndMusic();
+
   ClearWindow();
   DrawHeadline();
 
-  DrawTextFCentered(100, FONT_TEXT_1, "The game background music loops:");
-
-  DrawTextFCentered(ystart + 0 * ystep, FONT_TEXT_2, "Excerpt from");
-  DrawTextFCentered(ystart + 1 * ystep, FONT_TEXT_3,
-                   "\"%s\"", helpscreen_music[num][0]);
-  DrawTextFCentered(ystart + 2 * ystep, FONT_TEXT_2, "by");
-  DrawTextFCentered(ystart + 3 * ystep, FONT_TEXT_3,
-                   "%s", helpscreen_music[num][1]);
-  DrawTextFCentered(ystart + 4 * ystep, FONT_TEXT_2, "from the album");
-  DrawTextFCentered(ystart + 5 * ystep, FONT_TEXT_3,
-                   "\"%s\"", helpscreen_music[num][2]);
-
-  DrawTextFCentered(ybottom, FONT_TEXT_4,
-                   "Press any key or button for next page");
+  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 0
-  PlaySoundLoop(background_loop[num]);
-#endif
+  DrawTextSCentered(ybottom, FONT_TEXT_4,
+                   "Press any key or button for info menu");
 }
 
-void DrawHelpScreenCreditsText()
+void HandleInfoScreen_Credits(int button)
 {
-  int ystart = 150, ystep = 30;
-  int ybottom = SYSIZE - 20;
+  int button_released = !button;
 
-  FadeSounds();
-  ClearWindow();
-  DrawHeadline();
+  if (button == MB_MENU_LEAVE)
+  {
+    info_mode = INFO_MODE_MAIN;
+    DrawInfoScreen();
 
-  DrawTextFCentered(100, FONT_TEXT_1, "Credits:");
-  DrawTextFCentered(ystart + 0 * ystep, FONT_TEXT_2, "DOS port of the game:");
-  DrawTextFCentered(ystart + 1 * ystep, FONT_TEXT_3, "Guido Schulz");
-  DrawTextFCentered(ystart + 2 * ystep, FONT_TEXT_2, "Additional toons:");
-  DrawTextFCentered(ystart + 3 * ystep, FONT_TEXT_3, "Karl Hörnell");
-  DrawTextFCentered(ystart + 5 * ystep, FONT_TEXT_2,
-                   "...and many thanks to all contributors");
-  DrawTextFCentered(ystart + 6 * ystep, FONT_TEXT_2, "of new levels!");
+    return;
+  }
 
-  DrawTextFCentered(ybottom, FONT_TEXT_4,
-                   "Press any key or button for next page");
+  if (button_released)
+  {
+    FadeSoundsAndMusic();
+
+    info_mode = INFO_MODE_MAIN;
+    DrawInfoScreen();
+  }
+  else
+  {
+    PlayMenuSoundIfLoop();
+  }
 }
 
-void DrawHelpScreenContactText()
+void DrawInfoScreen_Program()
 {
   int ystart = 150, ystep = 30;
   int ybottom = SYSIZE - 20;
@@ -1107,134 +1081,172 @@ void DrawHelpScreenContactText()
   ClearWindow();
   DrawHeadline();
 
-  DrawTextFCentered(100, FONT_TEXT_1, "Program information:");
+  DrawTextSCentered(100, FONT_TEXT_1, "Program Information:");
 
-  DrawTextFCentered(ystart + 0 * ystep, FONT_TEXT_2,
+  DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2,
                    "This game is Freeware!");
-  DrawTextFCentered(ystart + 1 * ystep, FONT_TEXT_2,
+  DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_2,
                    "If you like it, send e-mail to:");
-  DrawTextFCentered(ystart + 2 * ystep, FONT_TEXT_3,
+  DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_3,
                    "info@artsoft.org");
-  DrawTextFCentered(ystart + 3 * ystep, FONT_TEXT_2,
+  DrawTextSCentered(ystart + 3 * ystep, FONT_TEXT_2,
                    "or SnailMail to:");
-  DrawTextFCentered(ystart + 4 * ystep + 0, FONT_TEXT_3,
+  DrawTextSCentered(ystart + 4 * ystep + 0, FONT_TEXT_3,
                    "Holger Schemel");
-  DrawTextFCentered(ystart + 4 * ystep + 20, FONT_TEXT_3,
+  DrawTextSCentered(ystart + 4 * ystep + 20, FONT_TEXT_3,
                    "Detmolder Strasse 189");
-  DrawTextFCentered(ystart + 4 * ystep + 40, FONT_TEXT_3,
+  DrawTextSCentered(ystart + 4 * ystep + 40, FONT_TEXT_3,
                    "33604 Bielefeld");
-  DrawTextFCentered(ystart + 4 * ystep + 60, FONT_TEXT_3,
+  DrawTextSCentered(ystart + 4 * ystep + 60, FONT_TEXT_3,
                    "Germany");
 
-  DrawTextFCentered(ystart + 7 * ystep, FONT_TEXT_2,
+  DrawTextSCentered(ystart + 7 * ystep, FONT_TEXT_2,
                    "If you have created new levels,");
-  DrawTextFCentered(ystart + 8 * ystep, FONT_TEXT_2,
+  DrawTextSCentered(ystart + 8 * ystep, FONT_TEXT_2,
                    "send them to me to include them!");
-  DrawTextFCentered(ystart + 9 * ystep, FONT_TEXT_2,
+  DrawTextSCentered(ystart + 9 * ystep, FONT_TEXT_2,
                    ":-)");
 
-  DrawTextFCentered(ybottom, FONT_TEXT_4,
-                   "Press any key or button for main menu");
+  DrawTextSCentered(ybottom, FONT_TEXT_4,
+                   "Press any key or button for info menu");
 }
 
-void DrawHelpScreen()
+void HandleInfoScreen_Program(int button)
 {
-  int i;
+  int button_released = !button;
 
-  UnmapAllGadgets();
-  CloseDoor(DOOR_CLOSE_2);
+  if (button == MB_MENU_LEAVE)
+  {
+    info_mode = INFO_MODE_MAIN;
+    DrawInfoScreen();
 
-  for(i=0;i<MAX_HELPSCREEN_ELS;i++)
-    helpscreen_step[i] = helpscreen_frame[i] = 0;
-  helpscreen_musicpos = 0;
-  helpscreen_state = 0;
+    return;
+  }
 
-  DrawHelpScreenElText(0);
-  DrawHelpScreenElAction(0);
+  if (button_released)
+  {
+    FadeSoundsAndMusic();
 
-  FadeToFront();
-  InitAnimation();
+    info_mode = INFO_MODE_MAIN;
+    DrawInfoScreen();
+  }
+  else
+  {
+    PlayMenuSoundIfLoop();
+  }
+}
 
+void DrawInfoScreen_LevelSet()
+{
+  int ystart = 150;
+  int ybottom = SYSIZE - 20;
+  char *filename = getLevelSetInfoFilename();
 #if 0
-  PlaySoundLoop(SND_MENU_INFO_SCREEN);
+  int font_nr = FONT_TEXT_2;
 #else
-  PlaySound_Menu_Start(SND_MENU_INFO_SCREEN);
+  int font_nr = FONT_LEVEL_NUMBER;
 #endif
+  int font_width = getFontWidth(font_nr);
+  int font_height = getFontHeight(font_nr);
+  int pad_x = 32;
+  int pad_y = ystart;
+  int sx = SX + pad_x;
+  int sy = SY + pad_y;
+  int max_chars_per_line = (SXSIZE - 2 * pad_x) / font_width;
+  int max_lines_per_screen = (SYSIZE - pad_y) / font_height - 1;
+
+  ClearWindow();
+  DrawHeadline();
+
+  DrawTextSCentered(100, FONT_TEXT_1, "Level Set Information:");
+
+  DrawTextSCentered(ybottom, FONT_TEXT_4,
+                   "Press any key or button for info menu");
+
+  if (filename != NULL)
+    DrawTextFromFile(sx, sy, filename, font_nr, max_chars_per_line,
+                    max_lines_per_screen);
+  else
+    DrawTextSCentered(ystart, FONT_TEXT_2,
+                     "No information for this level set.");
 }
 
-void HandleHelpScreen(int button)
+void HandleInfoScreen_LevelSet(int button)
 {
-  static unsigned long hs_delay = 0;
-  int num_helpscreen_els_pages =
-    (num_helpscreen_els + MAX_HELPSCREEN_ELS-1) / MAX_HELPSCREEN_ELS;
   int button_released = !button;
-  int i;
 
-  if (button_released)
+  if (button == MB_MENU_LEAVE)
   {
-    if (helpscreen_state < num_helpscreen_els_pages - 1)
-    {
-      for(i=0;i<MAX_HELPSCREEN_ELS;i++)
-       helpscreen_step[i] = helpscreen_frame[i] = 0;
-      helpscreen_state++;
+    info_mode = INFO_MODE_MAIN;
+    DrawInfoScreen();
 
-      FrameCounter = 0;
-      DrawHelpScreenElText(helpscreen_state * MAX_HELPSCREEN_ELS);
-      DrawHelpScreenElAction(helpscreen_state * MAX_HELPSCREEN_ELS);
-    }
-    else if (helpscreen_state <
-            num_helpscreen_els_pages + num_helpscreen_music - 1)
-    {
-      helpscreen_state++;
-      DrawHelpScreenMusicText(helpscreen_state - num_helpscreen_els_pages);
-    }
-    else if (helpscreen_state ==
-            num_helpscreen_els_pages + num_helpscreen_music - 1)
-    {
-      helpscreen_state++;
-      DrawHelpScreenCreditsText();
-    }
-    else if (helpscreen_state ==
-            num_helpscreen_els_pages + num_helpscreen_music)
-    {
-      helpscreen_state++;
-      DrawHelpScreenContactText();
-    }
-    else
-    {
-      FadeSounds();
+    return;
+  }
 
-      game_status = MAINMENU;
-      DrawMainMenu();
-    }
+  if (button_released)
+  {
+    FadeSoundsAndMusic();
+
+    info_mode = INFO_MODE_MAIN;
+    DrawInfoScreen();
   }
   else
   {
-    if (DelayReached(&hs_delay, GAME_FRAME_DELAY))
-    {
-      if (helpscreen_state < num_helpscreen_els_pages)
-       DrawHelpScreenElAction(helpscreen_state * MAX_HELPSCREEN_ELS);
-    }
+    PlayMenuSoundIfLoop();
+  }
+}
 
-    /* !!! workaround for playing "music" that is really a sound loop (and
-       must therefore periodically be reactivated with the current sound
-       engine !!! */
-#if 0
-    PlaySoundLoop(SND_MENU_INFO_SCREEN);
-#else
-    PlaySound_Menu_Continue(SND_MENU_INFO_SCREEN);
-#endif
+void DrawInfoScreen()
+{
+  SetMainBackgroundImage(IMG_BACKGROUND_INFO);
 
-    DoAnimation();
+  if (info_mode == INFO_MODE_ELEMENTS)
+    DrawInfoScreen_Elements();
+  else if (info_mode == INFO_MODE_MUSIC)
+    DrawInfoScreen_Music();
+  else if (info_mode == INFO_MODE_CREDITS)
+    DrawInfoScreen_Credits();
+  else if (info_mode == INFO_MODE_PROGRAM)
+    DrawInfoScreen_Program();
+  else if (info_mode == INFO_MODE_LEVELSET)
+    DrawInfoScreen_LevelSet();
+  else
+    DrawInfoScreen_Main();
+
+  if (info_mode != INFO_MODE_MUSIC)
+  {
+    PlayMenuSound();
+    PlayMenuMusic();
   }
+}
 
-  BackToFront();
+void HandleInfoScreen(int mx, int my, int dx, int dy, int button)
+{
+  if (info_mode == INFO_MODE_ELEMENTS)
+    HandleInfoScreen_Elements(button);
+  else if (info_mode == INFO_MODE_MUSIC)
+    HandleInfoScreen_Music(button);
+  else if (info_mode == INFO_MODE_CREDITS)
+    HandleInfoScreen_Credits(button);
+  else if (info_mode == INFO_MODE_PROGRAM)
+    HandleInfoScreen_Program(button);
+  else if (info_mode == INFO_MODE_LEVELSET)
+    HandleInfoScreen_LevelSet(button);
+  else
+    HandleInfoScreen_Main(mx, my, dx, dy, button);
+
+  DoAnimation();
 }
 
+
+/* ========================================================================= */
+/* type name functions                                                       */
+/* ========================================================================= */
+
 void HandleTypeName(int newxpos, Key key)
 {
   static int xpos = 0, ypos = 2;
-  int font_width = getFontWidth(FONT_INPUT_ACTIVE);
+  int font_width = getFontWidth(FONT_INPUT_1_ACTIVE);
   int name_width = getFontWidth(FONT_MENU_1) * strlen("Name:");
   int startx = mSX + 32 + name_width;
   int starty = mSY + ypos * 32;
@@ -1243,8 +1255,8 @@ void HandleTypeName(int newxpos, Key key)
   {
     xpos = newxpos;
 
-    DrawText(startx, starty, setup.player_name, FONT_INPUT_ACTIVE);
-    DrawText(startx + xpos * font_width, starty, "_", FONT_INPUT_ACTIVE);
+    DrawText(startx, starty, setup.player_name, FONT_INPUT_1_ACTIVE);
+    DrawText(startx + xpos * font_width, starty, "_", FONT_INPUT_1_ACTIVE);
 
     return;
   }
@@ -1264,36 +1276,43 @@ void HandleTypeName(int newxpos, Key key)
     setup.player_name[xpos + 1] = 0;
     xpos++;
 
-    DrawText(startx, starty, setup.player_name, FONT_INPUT_ACTIVE);
-    DrawText(startx + xpos * font_width, starty, "_", FONT_INPUT_ACTIVE);
+    DrawText(startx, starty, setup.player_name, FONT_INPUT_1_ACTIVE);
+    DrawText(startx + xpos * font_width, starty, "_", FONT_INPUT_1_ACTIVE);
   }
   else if ((key == KSYM_Delete || key == KSYM_BackSpace) && xpos > 0)
   {
     xpos--;
     setup.player_name[xpos] = 0;
 
-    DrawText(startx + xpos * font_width, starty, "_ ", FONT_INPUT_ACTIVE);
+    DrawText(startx + xpos * font_width, starty, "_ ", FONT_INPUT_1_ACTIVE);
   }
   else if (key == KSYM_Return && xpos > 0)
   {
-    DrawText(startx, starty, setup.player_name, FONT_INPUT);
-    DrawText(startx + xpos * font_width, starty, " ", FONT_INPUT_ACTIVE);
+    DrawText(startx, starty, setup.player_name, FONT_INPUT_1);
+    DrawText(startx + xpos * font_width, starty, " ", FONT_INPUT_1_ACTIVE);
 
     SaveSetup();
-    game_status = MAINMENU;
+    game_status = GAME_MODE_MAIN;
   }
-
-  BackToFront();
 }
 
+
+/* ========================================================================= */
+/* tree menu functions                                                       */
+/* ========================================================================= */
+
 static void DrawChooseTree(TreeInfo **ti_ptr)
 {
   UnmapAllGadgets();
+
+  FreeScreenGadgets();
+  CreateScreenGadgets();
+
   CloseDoor(DOOR_CLOSE_2);
 
   ClearWindow();
 
-  HandleChooseTree(0,0, 0,0, MB_MENU_INITIALIZE, ti_ptr);
+  HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr);
   MapChooseTreeGadgets(*ti_ptr);
 
   FadeToFront();
@@ -1306,13 +1325,14 @@ static void AdjustChooseTreeScrollbar(int id, int first_entry, TreeInfo *ti)
   int items_max, items_visible, item_position;
 
   items_max = numTreeInfoInGroup(ti);
-  items_visible = MAX_MENU_ENTRIES_ON_SCREEN - 1;
+  items_visible = NUM_MENU_ENTRIES_ON_SCREEN;
   item_position = first_entry;
 
   if (item_position > items_max - items_visible)
     item_position = items_max - items_visible;
 
   ModifyGadget(gi, GDI_SCROLLBAR_ITEMS_MAX, items_max,
+              GDI_SCROLLBAR_ITEMS_VISIBLE, items_visible,
               GDI_SCROLLBAR_ITEM_POSITION, item_position, GDI_END);
 }
 
@@ -1322,25 +1342,30 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
   int i;
   char buffer[SCR_FIELDX * 2];
   int max_buffer_len = (SCR_FIELDX - 2) * 2;
-  int num_entries = numTreeInfoInGroup(ti);
   char *title_string = NULL;
-  int offset = (ti->type == TREE_TYPE_LEVEL_DIR ? 0 : 16);
+  int xoffset_setup = 16;
+  int yoffset_setup = 16;
+  int xoffset = (ti->type == TREE_TYPE_LEVEL_DIR ? 0 : xoffset_setup);
+  int yoffset = (ti->type == TREE_TYPE_LEVEL_DIR ? 0 : yoffset_setup);
   int last_game_status = game_status;  /* save current game status */
 
-  DrawBackground(SX, SY, SXSIZE - 32, SYSIZE);
-  redraw_mask |= REDRAW_FIELD;
-
   title_string =
     (ti->type == TREE_TYPE_LEVEL_DIR ? "Level Directories" :
      ti->type == TREE_TYPE_GRAPHICS_DIR ? "Custom Graphics" :
      ti->type == TREE_TYPE_SOUNDS_DIR ? "Custom Sounds" :
      ti->type == TREE_TYPE_MUSIC_DIR ? "Custom Music" : "");
 
-  DrawText(SX + offset, SY + offset, title_string, FONT_TITLE_1);
+  DrawText(SX + xoffset, SY + yoffset, title_string, FONT_TITLE_1);
 
-  game_status = CHOOSELEVEL;   /* force LEVELS font on artwork setup screen */
+  /* force LEVELS font on artwork setup screen */
+  game_status = GAME_MODE_LEVELS;
 
-  for(i=0; i<num_page_entries; i++)
+  /* clear tree list area, but not title or scrollbar */
+  DrawBackground(mSX, mSY + MENU_SCREEN_START_YPOS * 32,
+                SXSIZE - 32 + 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;
@@ -1362,23 +1387,9 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
       initCursor(i, IMG_MENU_BUTTON);
   }
 
-  if (first_entry > 0)
-  {
-    int ypos = 1;
-
-    DrawBackground(SX, SY + ypos * 32, TILEX, TILEY);
-    DrawGraphicThruMask(0, ypos, IMG_MENU_BUTTON_UP, 0);
-  }
-
-  if (first_entry + num_page_entries < num_entries)
-  {
-    int ypos = MAX_MENU_ENTRIES_ON_SCREEN + 1;
-
-    DrawBackground(SX, SY + ypos * 32, TILEX, TILEY);
-    DrawGraphicThruMask(0, ypos, IMG_MENU_BUTTON_DOWN, 0);
-  }
-
   game_status = last_game_status;      /* restore current game status */
+
+  redraw_mask |= REDRAW_FIELD;
 }
 
 static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti)
@@ -1406,35 +1417,49 @@ static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti)
 
   /* let BackToFront() redraw only what is needed */
   redraw_mask = last_redraw_mask | REDRAW_TILES;
-  for (x=0; x<SCR_FIELDX; x++)
+  for (x = 0; x < SCR_FIELDX; x++)
     MarkTileDirty(x, 1);
 }
 
 static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
                             TreeInfo **ti_ptr)
 {
-  static unsigned long choose_delay = 0;
   TreeInfo *ti = *ti_ptr;
   int x = 0;
   int y = ti->cl_cursor;
   int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
   int num_entries = numTreeInfoInGroup(ti);
   int num_page_entries;
+  int last_game_status = game_status;  /* save current game status */
 
-  if (num_entries <= MAX_MENU_ENTRIES_ON_SCREEN)
+  /* force LEVELS draw offset on choose level and artwork setup screen */
+  game_status = GAME_MODE_LEVELS;
+
+  if (num_entries <= NUM_MENU_ENTRIES_ON_SCREEN)
     num_page_entries = num_entries;
   else
-    num_page_entries = MAX_MENU_ENTRIES_ON_SCREEN - 1;
+    num_page_entries = NUM_MENU_ENTRIES_ON_SCREEN;
+
+  game_status = last_game_status;      /* restore current game status */
 
   if (button == MB_MENU_INITIALIZE)
   {
+    int num_entries = numTreeInfoInGroup(ti);
     int entry_pos = posTreeInfo(ti);
 
     if (ti->cl_first == -1)
     {
+      /* only on initialization */
+      ti->cl_first = MAX(0, entry_pos - num_page_entries + 1);
+      ti->cl_cursor = entry_pos - ti->cl_first;
+    }
+    else if (ti->cl_cursor >= num_page_entries ||
+            (num_entries > num_page_entries &&
+             num_entries - ti->cl_first < num_page_entries))
+    {
+      /* only after change of list size (by custom graphic configuration) */
       ti->cl_first = MAX(0, entry_pos - num_page_entries + 1);
-      ti->cl_cursor =
-       entry_pos - ti->cl_first;
+      ti->cl_cursor = entry_pos - ti->cl_first;
     }
 
     if (dx == 999)     /* first entry is set by scrollbar position */
@@ -1445,7 +1470,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
     drawChooseTreeList(ti->cl_first, num_page_entries, ti);
     drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti);
-    drawCursor(ti->cl_cursor, FC_RED);
+    drawChooseTreeCursor(ti->cl_cursor, FC_RED);
+
     return;
   }
   else if (button == MB_MENU_LEAVE)
@@ -1455,13 +1481,13 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
       *ti_ptr = ti->node_parent;
       DrawChooseTree(ti_ptr);
     }
-    else if (game_status == SETUP)
+    else if (game_status == GAME_MODE_SETUP)
     {
       execSetupArtwork();
     }
     else
     {
-      game_status = MAINMENU;
+      game_status = GAME_MODE_MAIN;
       DrawMainMenu();
     }
 
@@ -1470,55 +1496,66 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
   if (mx || my)                /* mouse input */
   {
-    x = (mx - SX) / 32;
-    y = (my - SY) / 32 - MENU_SCREEN_START_YPOS;
-  }
-  else if (dx || dy)   /* keyboard input */
-  {
-    if (dy)
-      y = ti->cl_cursor + dy;
+    int last_game_status = game_status;        /* save current game status */
 
-    if (ABS(dy) == SCR_FIELDY) /* handle KSYM_Page_Up, KSYM_Page_Down */
-    {
-      dy = SIGN(dy);
-      step = num_page_entries - 1;
-      y = (dy < 0 ? -1 : num_page_entries);
-    }
-  }
+    /* force LEVELS draw offset on artwork setup screen */
+    game_status = GAME_MODE_LEVELS;
 
-  if (x == 0 && y == -1)
-  {
-    if (ti->cl_first > 0 &&
-       (dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY)))
-    {
-      ti->cl_first -= step;
-      if (ti->cl_first < 0)
-       ti->cl_first = 0;
+    x = (mx - mSX) / 32;
+    y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS;
 
-      drawChooseTreeList(ti->cl_first, num_page_entries, ti);
-      drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti);
-      drawCursor(ti->cl_cursor, FC_RED);
-      AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
-                               ti->cl_first, ti);
-      return;
-    }
+    game_status = last_game_status;    /* restore current game status */
   }
-  else if (x == 0 && y > num_page_entries - 1)
+  else if (dx || dy)   /* keyboard or scrollbar/scrollbutton input */
   {
-    if (ti->cl_first + num_page_entries < num_entries &&
-       (dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY)))
+    /* move cursor instead of scrolling when already at start/end of list */
+    if (dy == -1 * SCROLL_LINE && ti->cl_first == 0)
+      dy = -1;
+    else if (dy == +1 * SCROLL_LINE &&
+            ti->cl_first + num_page_entries == num_entries)
+      dy = 1;
+
+    /* handle scrolling screen one line or page */
+    if (ti->cl_cursor + dy < 0 ||
+       ti->cl_cursor + dy > num_page_entries - 1)
     {
-      ti->cl_first += step;
-      if (ti->cl_first + num_page_entries > num_entries)
-       ti->cl_first = MAX(0, num_entries - num_page_entries);
+      if (ABS(dy) == SCROLL_PAGE)
+       step = num_page_entries - 1;
+
+      if (dy < 0 && ti->cl_first > 0)
+      {
+       /* scroll page/line up */
+
+       ti->cl_first -= step;
+       if (ti->cl_first < 0)
+         ti->cl_first = 0;
+
+       drawChooseTreeList(ti->cl_first, num_page_entries, ti);
+       drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti);
+       drawChooseTreeCursor(ti->cl_cursor, FC_RED);
+       AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
+                                 ti->cl_first, ti);
+      }
+      else if (dy > 0 && ti->cl_first + num_page_entries < num_entries)
+      {
+       /* scroll page/line down */
+
+       ti->cl_first += step;
+       if (ti->cl_first + num_page_entries > num_entries)
+         ti->cl_first = MAX(0, num_entries - num_page_entries);
+
+       drawChooseTreeList(ti->cl_first, num_page_entries, ti);
+       drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti);
+       drawChooseTreeCursor(ti->cl_cursor, FC_RED);
+       AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
+                                 ti->cl_first, ti);
+      }
 
-      drawChooseTreeList(ti->cl_first, num_page_entries, ti);
-      drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti);
-      drawCursor(ti->cl_cursor, FC_RED);
-      AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
-                               ti->cl_first, ti);
       return;
     }
+
+    /* handle moving cursor one line */
+    y = ti->cl_cursor + dy;
   }
 
   if (dx == 1)
@@ -1535,6 +1572,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
       node_cursor->cl_cursor = ti->cl_cursor;
       *ti_ptr = node_cursor->node_group;
       DrawChooseTree(ti_ptr);
+
       return;
     }
   }
@@ -1542,17 +1580,20 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
   {
     *ti_ptr = ti->node_parent;
     DrawChooseTree(ti_ptr);
+
     return;
   }
 
-  if (x == 0 && y >= 0 && y < num_page_entries)
+  if (IN_VIS_FIELD(x, y) &&
+      mx < screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x &&
+      y >= 0 && y < num_page_entries)
   {
     if (button)
     {
       if (y != ti->cl_cursor)
       {
-       drawCursor(y, FC_RED);
-       drawCursor(ti->cl_cursor, FC_BLUE);
+       drawChooseTreeCursor(y, FC_RED);
+       drawChooseTreeCursor(ti->cl_cursor, FC_BLUE);
        drawChooseTreeInfo(ti->cl_first + y, ti);
        ti->cl_cursor = y;
       }
@@ -1592,23 +1633,18 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
          TapeErase();
        }
 
-       if (game_status == SETUP)
+       if (game_status == GAME_MODE_SETUP)
        {
          execSetupArtwork();
        }
        else
        {
-         game_status = MAINMENU;
+         game_status = GAME_MODE_MAIN;
          DrawMainMenu();
        }
       }
     }
   }
-
-  BackToFront();
-
-  if (game_status == CHOOSELEVEL || game_status == SETUP)
-    DoAnimation();
 }
 
 void DrawChooseLevel()
@@ -1616,17 +1652,22 @@ void DrawChooseLevel()
   SetMainBackgroundImage(IMG_BACKGROUND_LEVELS);
 
   DrawChooseTree(&leveldir_current);
+
+  PlayMenuSound();
+  PlayMenuMusic();
 }
 
 void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 {
   HandleChooseTree(mx, my, dx, dy, button, &leveldir_current);
+
+  DoAnimation();
 }
 
 void DrawHallOfFame(int highlight_position)
 {
   UnmapAllGadgets();
-  FadeSounds();
+  FadeSoundsAndMusic();
   CloseDoor(DOOR_CLOSE_2);
 
   if (highlight_position < 0) 
@@ -1635,13 +1676,10 @@ void DrawHallOfFame(int highlight_position)
   FadeToFront();
   InitAnimation();
 
-  HandleHallOfFame(highlight_position,0, 0,0, MB_MENU_INITIALIZE);
+  PlayMenuSound();
+  PlayMenuMusic();
 
-#if 0
-  PlaySound(SND_MENU_HALL_OF_FAME);
-#else
-  PlaySound_Menu_Start(SND_MENU_HALL_OF_FAME);
-#endif
+  HandleHallOfFame(highlight_position, 0, 0, 0, MB_MENU_INITIALIZE);
 }
 
 static void drawHallOfFameList(int first_entry, int highlight_position)
@@ -1654,20 +1692,28 @@ static void drawHallOfFameList(int first_entry, int highlight_position)
   DrawText(mSX + 80, mSY + 8, "Hall Of Fame", FONT_TITLE_1);
   DrawTextFCentered(46, FONT_TITLE_2, "HighScores of Level %d", level_nr);
 
-  for(i=0; i<MAX_MENU_ENTRIES_ON_SCREEN; i++)
+  for (i = 0; i < NUM_MENU_ENTRIES_ON_SCREEN; i++)
   {
     int entry = first_entry + i;
-
-    DrawText(mSX, mSY + 64 + i * 32, "..................................",
-            (entry == highlight_position ? FONT_TEXT_4 : FONT_TEXT_2));
-    DrawText(mSX, mSY + 64 + i * 32, int2str(entry + 1, 3),
-            (entry == highlight_position ? FONT_TEXT_4 : FONT_TEXT_2));
-    DrawText(mSX + 64, mSY + 64 + i * 32, highscore[entry].Name,
-            (entry == highlight_position ? FONT_TEXT_3 : FONT_TEXT_1));
-    DrawText(mSX + 14 * 32 + 16, mSY + 64 + i * 32,
-            int2str(highscore[entry].Score, 5),
-            (entry == highlight_position ? FONT_TEXT_4 : FONT_TEXT_2));
+    boolean active = (entry == highlight_position);
+    int font_nr1 = (active ? FONT_TEXT_1_ACTIVE : FONT_TEXT_1);
+    int font_nr2 = (active ? FONT_TEXT_2_ACTIVE : FONT_TEXT_2);
+    int font_nr3 = (active ? FONT_TEXT_3_ACTIVE : FONT_TEXT_3);
+    int font_nr4 = (active ? FONT_TEXT_4_ACTIVE : FONT_TEXT_4);
+    int dx1 = 3 * getFontWidth(font_nr1);
+    int dx2 = dx1 + getFontWidth(font_nr1);
+    int dx3 = dx2 + 25 * getFontWidth(font_nr3);
+    int sy = mSY + 64 + i * 32;
+
+    DrawText(mSX, sy, int2str(entry + 1, 3), font_nr1);
+    DrawText(mSX + dx1, sy, ".", font_nr1);
+    DrawText(mSX + dx2, sy, ".........................", font_nr3);
+    if (strcmp(highscore[entry].Name, EMPTY_PLAYER_NAME) != 0)
+      DrawText(mSX + dx2, sy, highscore[entry].Name, font_nr2);
+    DrawText(mSX + dx3, sy, int2str(highscore[entry].Score, 5), font_nr4);
   }
+
+  redraw_mask |= REDRAW_FIELD;
 }
 
 void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
@@ -1682,11 +1728,12 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
     first_entry = 0;
     highlight_position = mx;
     drawHallOfFameList(first_entry, highlight_position);
+
     return;
   }
 
-  if (ABS(dy) == SCR_FIELDY)   /* handle KSYM_Page_Up, KSYM_Page_Down */
-    step = MAX_MENU_ENTRIES_ON_SCREEN - 1;
+  if (ABS(dy) == SCROLL_PAGE)          /* handle scrolling one page */
+    step = NUM_MENU_ENTRIES_ON_SCREEN - 1;
 
   if (dy < 0)
   {
@@ -1697,38 +1744,30 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
        first_entry = 0;
 
       drawHallOfFameList(first_entry, highlight_position);
-      return;
     }
   }
   else if (dy > 0)
   {
-    if (first_entry + MAX_MENU_ENTRIES_ON_SCREEN < MAX_SCORE_ENTRIES)
+    if (first_entry + NUM_MENU_ENTRIES_ON_SCREEN < MAX_SCORE_ENTRIES)
     {
       first_entry += step;
-      if (first_entry + MAX_MENU_ENTRIES_ON_SCREEN > MAX_SCORE_ENTRIES)
-       first_entry = MAX(0, MAX_SCORE_ENTRIES - MAX_MENU_ENTRIES_ON_SCREEN);
+      if (first_entry + NUM_MENU_ENTRIES_ON_SCREEN > MAX_SCORE_ENTRIES)
+       first_entry = MAX(0, MAX_SCORE_ENTRIES - NUM_MENU_ENTRIES_ON_SCREEN);
 
       drawHallOfFameList(first_entry, highlight_position);
-      return;
     }
   }
-
-  if (button_released)
+  else if (button_released)
   {
-    FadeSound(SND_MENU_HALL_OF_FAME);
-    game_status = MAINMENU;
+    FadeSound(SND_BACKGROUND_SCORES);
+    game_status = GAME_MODE_MAIN;
     DrawMainMenu();
   }
 
-  BackToFront();
+  if (game_status == GAME_MODE_SCORES)
+    PlayMenuSoundIfLoop();
 
-  if (game_status == HALLOFFAME)
-  {
-    DoAnimation();
-#if 1
-    PlaySound_Menu_Continue(SND_MENU_HALL_OF_FAME);
-#endif
-  }
+  DoAnimation();
 }
 
 
@@ -1775,13 +1814,13 @@ static void execSetupSound()
 
 static void execSetupArtwork()
 {
-  /* needed if last screen (setup choice) changed graphics, sounds or music */
-  ReloadCustomArtwork();
-
   setup.graphics_set = artwork.gfx_current->identifier;
   setup.sounds_set = artwork.snd_current->identifier;
   setup.music_set = artwork.mus_current->identifier;
 
+  /* needed if last screen (setup choice) changed graphics, sounds or music */
+  ReloadCustomArtwork();
+
   /* needed for displaying artwork name instead of artwork identifier */
   graphics_set_name = artwork.gfx_current->name;
   sounds_set_name = artwork.snd_current->name;
@@ -1823,7 +1862,7 @@ static void execSetupShortcut()
 
 static void execExitSetup()
 {
-  game_status = MAINMENU;
+  game_status = GAME_MODE_MAIN;
   DrawMainMenu();
 }
 
@@ -1845,6 +1884,7 @@ static struct TokenInfo setup_info_main[] =
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_LEAVE_MENU,   execExitSetup,          "Exit"                  },
   { TYPE_LEAVE_MENU,   execSaveAndExitSetup,   "Save and Exit"         },
+
   { 0,                 NULL,                   NULL                    }
 };
 
@@ -1856,6 +1896,7 @@ static struct TokenInfo setup_info_game[] =
   { TYPE_SWITCH,       &setup.autorecord,      "Auto-Record:"          },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
+
   { 0,                 NULL,                   NULL                    }
 };
 
@@ -1871,8 +1912,12 @@ static struct TokenInfo setup_info_editor[] =
   { TYPE_SWITCH,       &setup.editor.el_dx_boulderdash,"DX Boulderd.:" },
   { TYPE_SWITCH,       &setup.editor.el_chars,         "Characters:"   },
   { TYPE_SWITCH,       &setup.editor.el_custom,        "Custom:"       },
+  { TYPE_SWITCH,       &setup.editor.el_custom_more,   "More Custom:"  },
+  { TYPE_SWITCH,       &setup.editor.el_headlines,     "Headlines:"    },
+  { TYPE_SWITCH,       &setup.editor.el_user_defined,  "User defined:" },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
+
   { 0,                 NULL,                   NULL                    }
 };
 
@@ -1889,18 +1934,18 @@ static struct TokenInfo setup_info_graphics[] =
   { TYPE_SWITCH,       &setup.toons,           "Toons:"                },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
+
   { 0,                 NULL,                   NULL                    }
 };
 
 static struct TokenInfo setup_info_sound[] =
 {
-  { TYPE_SWITCH,       &setup.sound,           "Sound:",               },
-  { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_SWITCH,       &setup.sound_simple,    "Simple Sound:"         },
   { TYPE_SWITCH,       &setup.sound_loops,     "Sound Loops:"          },
   { TYPE_SWITCH,       &setup.sound_music,     "Game Music:"           },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
+
   { 0,                 NULL,                   NULL                    }
 };
 
@@ -1919,6 +1964,7 @@ static struct TokenInfo setup_info_artwork[] =
   { TYPE_YES_NO,       &setup.override_level_music,    "Music:"        },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
+
   { 0,                 NULL,                   NULL                    }
 };
 
@@ -1934,6 +1980,7 @@ static struct TokenInfo setup_info_shortcut[] =
   { TYPE_YES_NO,       &setup.ask_on_escape,   "Ask on Esc:"           },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
+
   { 0,                 NULL,                   NULL                    }
 };
 
@@ -1974,8 +2021,8 @@ static Key getSetupKey()
       }
     }
 
-    BackToFront();
     DoAnimation();
+    BackToFront();
 
     /* don't eat all CPU time */
     Delay(10);
@@ -1989,23 +2036,25 @@ static void drawSetupValue(int pos)
   int xpos = MENU_SCREEN_VALUE_XPOS;
   int ypos = MENU_SCREEN_START_YPOS + pos;
   int font_nr = FONT_VALUE_1;
-  char *value_string = getSetupValue(setup_info[pos].type & ~TYPE_GHOSTED,
-                                    setup_info[pos].value);
+  int type = setup_info[pos].type;
+  void *value = setup_info[pos].value;
+  char *value_string = (!(type & TYPE_GHOSTED) ? getSetupValue(type, value) :
+                       "n/a");
 
   if (value_string == NULL)
     return;
 
-  if (setup_info[pos].type & TYPE_KEY)
+  if (type & TYPE_KEY)
   {
     xpos = 3;
 
-    if (setup_info[pos].type & TYPE_QUERY)
+    if (type & TYPE_QUERY)
     {
       value_string = "<press key>";
-      font_nr = FONT_INPUT_ACTIVE;
+      font_nr = FONT_INPUT_1_ACTIVE;
     }
   }
-  else if (setup_info[pos].type & TYPE_STRING)
+  else if (type & TYPE_STRING)
   {
     int max_value_len = (SCR_FIELDX - 2) * 2;
 
@@ -2015,9 +2064,10 @@ static void drawSetupValue(int pos)
     if (strlen(value_string) > max_value_len)
       value_string[max_value_len] = '\0';
   }
-  else if (setup_info[pos].type & TYPE_BOOLEAN_STYLE &&
-          !*(boolean *)(setup_info[pos].value))
-    font_nr = FONT_OPTION_OFF;
+  else if (type & TYPE_BOOLEAN_STYLE)
+  {
+    font_nr = (*(boolean *)value ? FONT_OPTION_ON : FONT_OPTION_OFF);
+  }
 
   DrawText(mSX + xpos * 32, mSY + ypos * 32,
           (xpos == 3 ? "              " : "   "), font_nr);
@@ -2095,17 +2145,17 @@ static void DrawSetupScreen_Generic()
   DrawText(mSX + 16, mSY + 16, title_string, FONT_TITLE_1);
 
   num_setup_info = 0;
-  for(i=0; setup_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++)
+  for (i = 0; setup_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++)
   {
     void *value_ptr = setup_info[i].value;
     int ypos = MENU_SCREEN_START_YPOS + i;
     int font_nr = FONT_MENU_1;
 
     /* set some entries to "unchangeable" according to other variables */
-    if ((value_ptr == &setup.sound       && !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))
+    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))
       setup_info[i].type |= TYPE_GHOSTED;
 
     if (setup_info[i].type & TYPE_STRING)
@@ -2128,7 +2178,7 @@ static void DrawSetupScreen_Generic()
 
   FadeToFront();
   InitAnimation();
-  HandleSetupScreen_Generic(0,0,0,0,MB_MENU_INITIALIZE);
+  HandleSetupScreen_Generic(0, 0, 0, 0, MB_MENU_INITIALIZE);
 }
 
 void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
@@ -2142,7 +2192,7 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
   {
     /* advance to first valid menu entry */
     while (choice < num_setup_info &&
-          (setup_info[choice].type & TYPE_SKIP_ENTRY))
+          setup_info[choice].type & TYPE_SKIP_ENTRY)
       choice++;
     choice_store[setup_mode] = choice;
 
@@ -2151,7 +2201,7 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
   }
   else if (button == MB_MENU_LEAVE)
   {
-    for (y=0; y<num_setup_info; y++)
+    for (y = 0; y < num_setup_info; y++)
     {
       if (setup_info[y].type & TYPE_LEAVE_MENU)
       {
@@ -2167,8 +2217,8 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
 
   if (mx || my)                /* mouse input */
   {
-    x = (mx - SX) / 32;
-    y = (my - SY) / 32 - MENU_SCREEN_START_YPOS;
+    x = (mx - mSX) / 32;
+    y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS;
   }
   else if (dx || dy)   /* keyboard input */
   {
@@ -2176,8 +2226,8 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
     {
       int menu_navigation_type = (dx < 0 ? TYPE_LEAVE_MENU : TYPE_ENTER_MENU);
 
-      if ((setup_info[choice].type & menu_navigation_type) ||
-         (setup_info[choice].type & TYPE_BOOLEAN_STYLE))
+      if (setup_info[choice].type & menu_navigation_type ||
+         setup_info[choice].type & TYPE_BOOLEAN_STYLE)
        button = MB_MENU_CHOICE;
     }
     else if (dy)
@@ -2185,12 +2235,12 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
 
     /* jump to next non-empty menu entry (up or down) */
     while (y > 0 && y < num_setup_info - 1 &&
-          (setup_info[y].type & TYPE_SKIP_ENTRY))
+          setup_info[y].type & TYPE_SKIP_ENTRY)
       y += dy;
   }
 
-  if (x == 0 && y >= 0 && y < num_setup_info &&
-      (setup_info[y].type & ~TYPE_SKIP_ENTRY))
+  if (IN_VIS_FIELD(x, y) &&
+      y >= 0 && y < num_setup_info && setup_info[y].type & ~TYPE_SKIP_ENTRY)
   {
     if (button)
     {
@@ -2211,8 +2261,8 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
       }
       else
       {
-       if ((setup_info[y].type & TYPE_KEYTEXT) &&
-           (setup_info[y + 1].type & TYPE_KEY))
+       if (setup_info[y].type & TYPE_KEYTEXT &&
+           setup_info[y + 1].type & TYPE_KEY)
          y++;
 
        if (setup_info[y].type & TYPE_VALUE)
@@ -2220,11 +2270,6 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
       }
     }
   }
-
-  BackToFront();
-
-  if (game_status == SETUP)
-    DoAnimation();
 }
 
 void DrawSetupScreen_Input()
@@ -2247,11 +2292,11 @@ void DrawSetupScreen_Input()
 
 #if 0
   DeactivateJoystickForCalibration();
-  DrawTextFCentered(SYSIZE - 20, FONT_TEXT_4,
+  DrawTextSCentered(SYSIZE - 20, FONT_TEXT_4,
                    "Joysticks deactivated on this screen");
 #endif
 
-  HandleSetupScreen_Input(0,0, 0,0, MB_MENU_INITIALIZE);
+  HandleSetupScreen_Input(0, 0, 0, 0, MB_MENU_INITIALIZE);
   FadeToFront();
   InitAnimation();
 }
@@ -2304,8 +2349,13 @@ static void drawPlayerSetupInputInfo(int player_nr)
 
   custom_key = setup.input[player_nr].key;
 
-  DrawText(mSX+11*32, mSY+2*32, int2str(player_nr + 1, 1), FONT_INPUT_ACTIVE);
+  DrawText(mSX+11*32, mSY+2*32, int2str(player_nr +1, 1), FONT_INPUT_1_ACTIVE);
+#if 1
+  DrawGraphicThruMaskExt(drawto, mSX + 8 * TILEX, mSY + 2 * TILEY,
+                        PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0);
+#else
   DrawGraphicThruMask(8, 2, PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0);
+#endif
 
   if (setup.input[player_nr].use_joystick)
   {
@@ -2334,7 +2384,7 @@ static void drawPlayerSetupInputInfo(int player_nr)
   DrawText(mSX+32, mSY+10*32, "Snap Field:", FONT_VALUE_OLD);
   DrawText(mSX+32, mSY+12*32, "Place Bomb:", FONT_VALUE_OLD);
 
-  for (i=0; i<6; i++)
+  for (i = 0; i < 6; i++)
   {
     int ypos = 6 + i + (i > 3 ? i-3 : 0);
 
@@ -2362,6 +2412,7 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
   {
     drawPlayerSetupInputInfo(player_nr);
     drawCursor(choice, FC_RED);
+
     return;
   }
   else if (button == MB_MENU_LEAVE)
@@ -2369,12 +2420,14 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
     setup_mode = SETUP_MODE_MAIN;
     DrawSetupScreen();
     InitJoysticks();
+
+    return;
   }
 
   if (mx || my)                /* mouse input */
   {
-    x = (mx - SX) / 32;
-    y = (my - SY) / 32 - MENU_SCREEN_START_YPOS;
+    x = (mx - mSX) / 32;
+    y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS;
   }
   else if (dx || dy)   /* keyboard input */
   {
@@ -2391,18 +2444,20 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
       y = (dy > 0 ? pos_empty2 + 1 : pos_empty1 - 1);
   }
 
-  if (y == 0 && ((x == 0 && !button) || ((x == 10 || x == 12) && button)))
+  if (IN_VIS_FIELD(x, y) &&
+      y == 0 && ((x < 10 && !button) || ((x == 10 || x == 12) && button)))
   {
     static unsigned long delay = 0;
 
     if (!DelayReached(&delay, GADGET_FRAME_DELAY))
-      goto out;
+      return;
 
     player_nr = (player_nr + (x == 10 ? -1 : +1) + MAX_PLAYERS) % MAX_PLAYERS;
 
     drawPlayerSetupInputInfo(player_nr);
   }
-  else if (x == 0 && y >= pos_start && y <= pos_end &&
+  else if (IN_VIS_FIELD(x, y) &&
+          y >= pos_start && y <= pos_end &&
           !(y >= pos_empty1 && y <= pos_empty2))
   {
     if (button)
@@ -2459,13 +2514,6 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
       }
     }
   }
-
-  BackToFront();
-
-  out:
-
-  if (game_status == SETUP)
-    DoAnimation();
 }
 
 void CustomizeKeyboard(int player_nr)
@@ -2499,13 +2547,13 @@ void CustomizeKeyboard(int player_nr)
 
   step_nr = 0;
   DrawText(mSX, mSY + (2+2*step_nr)*32,
-          customize_step[step_nr].text, FONT_INPUT_ACTIVE);
+          customize_step[step_nr].text, FONT_INPUT_1_ACTIVE);
   DrawText(mSX, mSY + (2+2*step_nr+1)*32,
-          "Key:", FONT_INPUT_ACTIVE);
+          "Key:", FONT_INPUT_1_ACTIVE);
   DrawText(mSX + 4*32, mSY + (2+2*step_nr+1)*32,
           getKeyNameFromKey(*customize_step[step_nr].key), FONT_VALUE_OLD);
 
-  while(!finished)
+  while (!finished)
   {
     if (PendingEvent())                /* got event */
     {
@@ -2534,7 +2582,7 @@ void CustomizeKeyboard(int player_nr)
              key = *customize_step[step_nr].key;
 
            /* check if key already used */
-           for (i=0; i<step_nr; i++)
+           for (i = 0; i < step_nr; i++)
              if (*customize_step[i].key == key)
                break;
            if (i < step_nr)
@@ -2564,9 +2612,9 @@ void CustomizeKeyboard(int player_nr)
 
            /* query next key binding */
            DrawText(mSX, mSY+(2+2*step_nr)*32,
-                    customize_step[step_nr].text, FONT_INPUT_ACTIVE);
+                    customize_step[step_nr].text, FONT_INPUT_1_ACTIVE);
            DrawText(mSX, mSY+(2+2*step_nr+1)*32,
-                    "Key:", FONT_INPUT_ACTIVE);
+                    "Key:", FONT_INPUT_1_ACTIVE);
            DrawText(mSX + 4*32, mSY+(2+2*step_nr+1)*32,
                     getKeyNameFromKey(*customize_step[step_nr].key),
                     FONT_VALUE_OLD);
@@ -2583,8 +2631,8 @@ void CustomizeKeyboard(int player_nr)
       }
     }
 
-    BackToFront();
     DoAnimation();
+    BackToFront();
 
     /* don't eat all CPU time */
     Delay(10);
@@ -2621,9 +2669,9 @@ static boolean CalibrateJoystickMain(int player_nr)
 
   ClearWindow();
 
-  for(y=0; y < 3; y++)
+  for (y = 0; y < 3; y++)
   {
-    for(x=0; x < 3; x++)
+    for (x = 0; x < 3; x++)
     {
       DrawGraphic(xpos + x - 1, ypos + y - 1, IMG_MENU_CALIBRATE_BLUE, 0);
       check[x][y] = FALSE;
@@ -2652,10 +2700,10 @@ static boolean CalibrateJoystickMain(int player_nr)
   DrawGraphic(xpos + last_x, ypos + last_y, IMG_MENU_CALIBRATE_RED, 0);
   BackToFront();
 
-  while(Joystick(player_nr) & JOY_BUTTON);     /* wait for released button */
+  while (Joystick(player_nr) & JOY_BUTTON);    /* wait for released button */
   InitAnimation();
 
-  while(result < 0)
+  while (result < 0)
   {
     if (PendingEvent())                /* got event */
     {
@@ -2746,8 +2794,8 @@ static boolean CalibrateJoystickMain(int player_nr)
 
     }
 
-    BackToFront();
     DoAnimation();
+    BackToFront();
 
     /* don't eat all CPU time */
     Delay(10);
@@ -2787,8 +2835,8 @@ void CalibrateJoystick(int player_nr)
   {
     ClearWindow();
 
-    DrawText(mSX + 16, mSY + 6*32, "  JOYSTICK NOT  ",  FONT_TITLE_1);
-    DrawText(mSX,      mSY + 7*32, "    AVAILABLE    ", FONT_TITLE_1);
+    DrawText(mSX + 16, mSY + 6 * 32, "  JOYSTICK NOT  ",  FONT_TITLE_1);
+    DrawText(mSX,      mSY + 7 * 32, "    AVAILABLE    ", FONT_TITLE_1);
     BackToFront();
     Delay(2000);       /* show error message for two seconds */
   }
@@ -2810,6 +2858,9 @@ void DrawSetupScreen()
     DrawChooseTree(&artwork.mus_current);
   else
     DrawSetupScreen_Generic();
+
+  PlayMenuSound();
+  PlayMenuMusic();
 }
 
 void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
@@ -2824,11 +2875,13 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
     HandleChooseTree(mx, my, dx, dy, button, &artwork.mus_current);
   else
     HandleSetupScreen_Generic(mx, my, dx, dy, button);
+
+  DoAnimation();
 }
 
 void HandleGameActions()
 {
-  if (game_status != PLAYING)
+  if (game_status != GAME_MODE_PLAYING)
     return;
 
   if (local_player->LevelSolved)
@@ -2838,24 +2891,29 @@ void HandleGameActions()
     TapeStop();
 
   GameActions();
-
   BackToFront();
+
+  if (tape.auto_play && !tape.playing)
+    AutoPlayTape();    /* continue automatically playing next tape */
 }
 
 /* ---------- new screen button stuff -------------------------------------- */
 
 /* graphic position and size values for buttons and scrollbars */
-#define SC_SCROLLBUTTON_XSIZE          32
-#define SC_SCROLLBUTTON_YSIZE          32
+#define SC_SCROLLBUTTON_XSIZE          TILEX
+#define SC_SCROLLBUTTON_YSIZE          TILEY
 
+#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              SC_SCROLLBUTTON_YSIZE
-#define SC_SCROLL_DOWN_XPOS            SC_SCROLL_UP_XPOS
-#define SC_SCROLL_DOWN_YPOS            (SYSIZE - SC_SCROLLBUTTON_YSIZE)
+#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_VERTICAL_XSIZE       SC_SCROLLBUTTON_XSIZE
-#define SC_SCROLL_VERTICAL_YSIZE       (SYSIZE - 3 * SC_SCROLLBUTTON_YSIZE)
+#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)
 
 #define SC_BORDER_SIZE                 14
 
@@ -2901,7 +2959,7 @@ static struct
 #else
     IMG_MENU_SCROLLBAR, IMG_MENU_SCROLLBAR_ACTIVE,
 #endif
-    SX + SC_SCROLL_VERTICAL_XPOS, SY + SC_SCROLL_VERTICAL_YPOS,
+    SC_SCROLL_VERTICAL_XPOS, SC_SCROLL_VERTICAL_YPOS,
     SC_SCROLL_VERTICAL_XSIZE, SC_SCROLL_VERTICAL_YSIZE,
     GD_TYPE_SCROLLBAR_VERTICAL,
     SCREEN_CTRL_ID_SCROLL_VERTICAL,
@@ -2915,7 +2973,7 @@ static void CreateScreenScrollbuttons()
   unsigned long event_mask;
   int i;
 
-  for (i=0; i<NUM_SCREEN_SCROLLBUTTONS; i++)
+  for (i = 0; i < NUM_SCREEN_SCROLLBUTTONS; i++)
   {
     Bitmap *gd_bitmap_unpressed, *gd_bitmap_pressed;
     int gfx_unpressed, gfx_pressed;
@@ -2923,16 +2981,17 @@ static void CreateScreenScrollbuttons()
     int gd_x1, gd_x2, gd_y1, gd_y2;
     int id = scrollbutton_info[i].gadget_id;
 
-    x = scrollbutton_info[i].x;
-    y = scrollbutton_info[i].y;
-
     event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
 
-    x += SX;
-    y += SY;
+    x = mSX + scrollbutton_info[i].x + menu.scrollbar_xoffset;
+    y = mSY + scrollbutton_info[i].y;
     width = SC_SCROLLBUTTON_XSIZE;
     height = SC_SCROLLBUTTON_YSIZE;
 
+    if (id == SCREEN_CTRL_ID_SCROLL_DOWN)
+      y = mSY + (SC_SCROLL_VERTICAL_YPOS +
+                (NUM_MENU_ENTRIES_ON_SCREEN - 2) * SC_SCROLLBUTTON_YSIZE);
+
     gfx_unpressed = scrollbutton_info[i].gfx_unpressed;
     gfx_pressed   = scrollbutton_info[i].gfx_pressed;
     gd_bitmap_unpressed = graphic_info[gfx_unpressed].bitmap;
@@ -2953,6 +3012,7 @@ static void CreateScreenScrollbuttons()
                      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);
@@ -2968,25 +3028,34 @@ static void CreateScreenScrollbars()
 {
   int i;
 
-  for (i=0; i<NUM_SCREEN_SCROLLBARS; i++)
+  for (i = 0; i < NUM_SCREEN_SCROLLBARS; i++)
   {
     Bitmap *gd_bitmap_unpressed, *gd_bitmap_pressed;
 #if !defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
     int gfx_unpressed, gfx_pressed;
 #endif
+    int x, y, width, height;
     int gd_x1, gd_x2, gd_y1, gd_y2;
     struct GadgetInfo *gi;
     int items_max, items_visible, item_position;
     unsigned long event_mask;
-    int num_page_entries = MAX_MENU_ENTRIES_ON_SCREEN - 1;
+    int num_page_entries = NUM_MENU_ENTRIES_ON_SCREEN;
     int id = scrollbar_info[i].gadget_id;
 
+    event_mask = GD_EVENT_MOVING | GD_EVENT_OFF_BORDERS;
+
+    x = mSX + scrollbar_info[i].x + menu.scrollbar_xoffset;
+    y = mSY + scrollbar_info[i].y;
+    width  = scrollbar_info[i].width;
+    height = scrollbar_info[i].height;
+
+    if (id == SCREEN_CTRL_ID_SCROLL_VERTICAL)
+      height = (NUM_MENU_ENTRIES_ON_SCREEN - 2) * SC_SCROLLBUTTON_YSIZE;
+
     items_max = num_page_entries;
     items_visible = num_page_entries;
     item_position = 0;
 
-    event_mask = GD_EVENT_MOVING | GD_EVENT_OFF_BORDERS;
-
 #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
     gd_bitmap_unpressed = *scrollbar_info[i].gfx_unpressed;
     gd_bitmap_pressed   = *scrollbar_info[i].gfx_pressed;
@@ -3008,10 +3077,10 @@ static void CreateScreenScrollbars()
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
                      GDI_INFO_TEXT, scrollbar_info[i].infotext,
-                     GDI_X, scrollbar_info[i].x,
-                     GDI_Y, scrollbar_info[i].y,
-                     GDI_WIDTH, scrollbar_info[i].width,
-                     GDI_HEIGHT, scrollbar_info[i].height,
+                     GDI_X, x,
+                     GDI_Y, y,
+                     GDI_WIDTH, width,
+                     GDI_HEIGHT, height,
                      GDI_TYPE, scrollbar_info[i].type,
                      GDI_SCROLLBAR_ITEMS_MAX, items_max,
                      GDI_SCROLLBAR_ITEMS_VISIBLE, items_visible,
@@ -3019,7 +3088,8 @@ static void CreateScreenScrollbars()
                      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_BORDER_SIZE, SC_BORDER_SIZE,
+                     GDI_BORDER_SIZE, SC_BORDER_SIZE, SC_BORDER_SIZE,
+                     GDI_DIRECT_DRAW, FALSE,
                      GDI_EVENT_MASK, event_mask,
                      GDI_CALLBACK_ACTION, HandleScreenGadgets,
                      GDI_END);
@@ -3033,10 +3103,12 @@ static void CreateScreenScrollbars()
 
 void CreateScreenGadgets()
 {
+  int last_game_status = game_status;  /* save current game status */
+
 #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
   int i;
 
-  for (i=0; i < NUM_SCROLLBAR_BITMAPS; i++)
+  for (i = 0; i < NUM_SCROLLBAR_BITMAPS; i++)
   {
     scrollbar_bitmap[i] = CreateBitmap(TILEX, TILEY, DEFAULT_DEPTH);
 
@@ -3054,8 +3126,13 @@ void CreateScreenGadgets()
   }
 #endif
 
+  /* force LEVELS draw offset for scrollbar / scrollbutton gadgets */
+  game_status = GAME_MODE_LEVELS;
+
   CreateScreenScrollbuttons();
   CreateScreenScrollbars();
+
+  game_status = last_game_status;      /* restore current game status */
 }
 
 void FreeScreenGadgets()
@@ -3063,7 +3140,7 @@ void FreeScreenGadgets()
   int i;
 
 #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
-  for (i=0; i < NUM_SCROLLBAR_BITMAPS; i++)
+  for (i = 0; i < NUM_SCROLLBAR_BITMAPS; i++)
   {
     /* prevent freeing clip mask and GC twice */
     scrollbar_bitmap[i]->clip_mask = None;
@@ -3073,7 +3150,7 @@ void FreeScreenGadgets()
   }
 #endif
 
-  for (i=0; i<NUM_SCREEN_GADGETS; i++)
+  for (i = 0; i < NUM_SCREEN_GADGETS; i++)
     FreeGadget(screen_gadget[i]);
 }
 
@@ -3082,48 +3159,50 @@ void MapChooseTreeGadgets(TreeInfo *ti)
   int num_entries = numTreeInfoInGroup(ti);
   int i;
 
-  if (num_entries <= MAX_MENU_ENTRIES_ON_SCREEN)
+  if (num_entries <= NUM_MENU_ENTRIES_ON_SCREEN)
     return;
 
-  for (i=0; i<NUM_SCREEN_GADGETS; i++)
+  for (i = 0; i < NUM_SCREEN_GADGETS; i++)
     MapGadget(screen_gadget[i]);
 }
 
+#if 0
 void UnmapChooseTreeGadgets()
 {
   int i;
 
-  for (i=0; i<NUM_SCREEN_GADGETS; i++)
+  for (i = 0; i < NUM_SCREEN_GADGETS; i++)
     UnmapGadget(screen_gadget[i]);
 }
+#endif
 
 static void HandleScreenGadgets(struct GadgetInfo *gi)
 {
   int id = gi->custom_id;
 
-  if (game_status != CHOOSELEVEL && game_status != SETUP)
+  if (game_status != GAME_MODE_LEVELS && game_status != GAME_MODE_SETUP)
     return;
 
   switch (id)
   {
     case SCREEN_CTRL_ID_SCROLL_UP:
-      if (game_status == CHOOSELEVEL)
-       HandleChooseLevel(SX,SY + 32, 0,0, MB_MENU_MARK);
-      else if (game_status == SETUP)
-       HandleSetupScreen(SX,SY + 32, 0,0, MB_MENU_MARK);
+      if (game_status == GAME_MODE_LEVELS)
+       HandleChooseLevel(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
+      else if (game_status == GAME_MODE_SETUP)
+       HandleSetupScreen(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
       break;
 
     case SCREEN_CTRL_ID_SCROLL_DOWN:
-      if (game_status == CHOOSELEVEL)
-       HandleChooseLevel(SX,SY + SYSIZE - 32, 0,0, MB_MENU_MARK);
-      else if (game_status == SETUP)
-       HandleSetupScreen(SX,SY + SYSIZE - 32, 0,0, MB_MENU_MARK);
+      if (game_status == GAME_MODE_LEVELS)
+       HandleChooseLevel(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
+      else if (game_status == GAME_MODE_SETUP)
+       HandleSetupScreen(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
       break;
 
     case SCREEN_CTRL_ID_SCROLL_VERTICAL:
-      if (game_status == CHOOSELEVEL)
+      if (game_status == GAME_MODE_LEVELS)
        HandleChooseLevel(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE);
-      else if (game_status == SETUP)
+      else if (game_status == GAME_MODE_SETUP)
        HandleSetupScreen(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE);
       break;