rnd-20031129-3-src
[rocksndiamonds.git] / src / screens.c
index c119ff7c1eef22da85ce44d37fe4fb76cc8dfeae..346bb9276d04f99b1466d85d8fc96284a2249234 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_ELEMENTS             0
+#define INFO_MODE_MUSIC                        1
+#define INFO_MODE_CREDITS              2
+#define INFO_MODE_PROGRAM              3
+
+#define MAX_INFO_MODES                 4
+
 /* 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,9 +77,22 @@ static void CalibrateJoystick(int);
 static void execSetupArtwork(void);
 static void HandleChooseTree(int, int, int, int, int, TreeInfo **);
 
+static void DrawInfoScreenDemoAnim(int, boolean);
+static void DrawInfoScreenDemoText(int, int, int, int);
+static void DrawInfoScreenMusicText(int);
+static void DrawInfoScreenCreditsText(void);
+static void DrawInfoScreen(void);
+
 static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
 static int setup_mode = SETUP_MODE_MAIN;
 
+static long infoscreen_state;
+static int infoscreen_step[MAX_INFO_ELEMENTS_ON_SCREEN];
+static int infoscreen_frame[MAX_INFO_ELEMENTS_ON_SCREEN];
+static int num_infoscreen_elements;
+static int num_infoscreen_music;
+static int infoscreen_musicpos;
+
 #define mSX (SX + (game_status >= GAME_MODE_MAIN &&    \
                   game_status <= GAME_MODE_SETUP ?     \
                   menu.draw_xoffset[game_status] : menu.draw_xoffset_default))
@@ -139,29 +161,49 @@ static void drawChooseTreeCursor(int ypos, int color)
   game_status = last_game_status;      /* restore current game status */
 }
 
-static void PlaySound_Menu_Start(int sound)
+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 text1_width = getTextWidth(PROGRAM_TITLE_STRING,   FONT_TITLE_1);
-  int text2_width = getTextWidth(WINDOW_SUBTITLE_STRING, FONT_TITLE_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()
@@ -197,7 +239,7 @@ void DrawMainMenu()
   int i;
 
   UnmapAllGadgets();
-  FadeSounds();
+  FadeSoundsAndMusic();
 
   KeyboardAutoRepeatOn();
   ActivateJoystick();
@@ -212,6 +254,7 @@ void DrawMainMenu()
   {
     game_status = GAME_MODE_EDITOR;
     DrawLevelEd();
+
     return;
   }
 
@@ -270,13 +313,13 @@ void DrawMainMenu()
 
   if (leveldir_current->readonly)
   {
-    DrawTextF(mSX + level_width + 9 * 32 - 2,
+    DrawTextS(mSX + level_width + 9 * 32 - 2,
              mSY + 3 * 32 + 1 - 7, FONT_TEXT_3, "READ");
-    DrawTextF(mSX + level_width + 9 * 32 - 2,
+    DrawTextS(mSX + level_width + 9 * 32 - 2,
              mSY + 3 * 32 + 1 + 7, FONT_TEXT_3, "ONLY");
   }
 
-  for(i=0; i<8; i++)
+  for (i = 0; i < 8; i++)
     initCursor(i, (i == 1 || i == 6 ? IMG_MENU_BUTTON_RIGHT :IMG_MENU_BUTTON));
 
   drawCursorXY(level_width/32 + 4, 1, IMG_MENU_BUTTON_LEFT);
@@ -293,6 +336,9 @@ void DrawMainMenu()
     LoadTape(level_nr);
   DrawCompleteVideoDisplay();
 
+  PlayMenuSound();
+  PlayMenuMusic();
+
   OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
 
 #if 0
@@ -360,7 +406,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)
@@ -371,25 +418,26 @@ 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)
   {
@@ -438,7 +486,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       else if (y == 4)
       {
        game_status = GAME_MODE_INFO;
-       DrawHelpScreen();
+       DrawInfoScreen();
       }
       else if (y == 5)
       {
@@ -472,8 +520,6 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
     }
   }
 
-  out:
-
   if (game_status == GAME_MODE_MAIN)
   {
     DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, FALSE);
@@ -483,386 +529,37 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
   BackToFront();
 }
 
-
-#define MAX_HELPSCREEN_ELS     10
-#define HA_NEXT                        -999
-#define HA_END                 -1000
-
-static long helpscreen_state;
-static int helpscreen_step[MAX_HELPSCREEN_ELS];
-static int helpscreen_frame[MAX_HELPSCREEN_ELS];
-
-static int helpscreen_action[] =
-{
-  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,
-
-  IMG_SAND,                            -1,                     HA_NEXT,
-
-  IMG_EMPTY_SPACE,                     -1,                     HA_NEXT,
-
-  IMG_QUICKSAND_EMPTY,                 -1,                     HA_NEXT,
-
-  IMG_STEELWALL,                       -1,                     HA_NEXT,
-
-  IMG_WALL,                            -1,                     HA_NEXT,
-
-  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,
-
-  IMG_INVISIBLE_WALL,                  -1,                     HA_NEXT,
-
-  IMG_WALL_SLIPPERY,                   -1,                     HA_NEXT,
-
-  IMG_FONT_GAME_INFO,                  -1,                     HA_NEXT,
-
-  IMG_EMERALD,                         -1,                     HA_NEXT,
-
-  IMG_DIAMOND,                         -1,                     HA_NEXT,
-
-  IMG_BD_DIAMOND,                      -1,                     HA_NEXT,
-
-  IMG_EMERALD_YELLOW,                  50,
-  IMG_EMERALD_RED,                     50,
-  IMG_EMERALD_PURPLE,                  50,                     HA_NEXT,
-
-  IMG_BD_ROCK,                         -1,                     HA_NEXT,
-
-  IMG_BOMB,                            100,
-  IMG_EXPLOSION,                       16,
-  IMG_EMPTY_SPACE,                     10,                     HA_NEXT,
-
-  IMG_NUT,                             100,
-  IMG_NUT_BREAKING,                    6,
-  IMG_EMERALD,                         20,                     HA_NEXT,
-
-  IMG_WALL_EMERALD,                    100,
-  IMG_EXPLOSION,                       16,
-  IMG_EMERALD,                         20,                     HA_NEXT,
-
-  IMG_WALL_DIAMOND,                    100,
-  IMG_EXPLOSION,                       16,
-  IMG_DIAMOND,                         20,                     HA_NEXT,
-
-  IMG_WALL_BD_DIAMOND,                         100,
-  IMG_EXPLOSION,                       16,
-  IMG_BD_DIAMOND,                      20,                     HA_NEXT,
-
-  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,
-
-  IMG_ACID,                            -1,                     HA_NEXT,
-
-  IMG_KEY_1,                           50,
-  IMG_KEY_2,                           50,
-  IMG_KEY_3,                           50,
-  IMG_KEY_4,                           50,                     HA_NEXT,
-
-  IMG_GATE_1,                          50,
-  IMG_GATE_2,                          50,
-  IMG_GATE_3,                          50,
-  IMG_GATE_4,                          50,                     HA_NEXT,
-
-  IMG_GATE_1_GRAY,                     50,
-  IMG_GATE_2_GRAY,                     50,
-  IMG_GATE_3_GRAY,                     50,
-  IMG_GATE_4_GRAY,                     50,                     HA_NEXT,
-
-  IMG_DYNAMITE,                                -1,                     HA_NEXT,
-
-  IMG_DYNAMITE_ACTIVE,                 96,
-  IMG_EXPLOSION,                       16,
-  IMG_EMPTY_SPACE,                     20,                     HA_NEXT,
-
-  IMG_DYNABOMB_ACTIVE,                 100,
-  IMG_EXPLOSION,                       16,
-  IMG_EMPTY_SPACE,                     20,                     HA_NEXT,
-
-  IMG_DYNABOMB_INCREASE_NUMBER,                -1,                     HA_NEXT,
-
-  IMG_DYNABOMB_INCREASE_SIZE,          -1,                     HA_NEXT,
-
-  IMG_DYNABOMB_INCREASE_POWER,         -1,                     HA_NEXT,
-
-  IMG_SPACESHIP_RIGHT,                 16,
-  IMG_SPACESHIP_UP,                    16,
-  IMG_SPACESHIP_LEFT,                  16,
-  IMG_SPACESHIP_DOWN,                  16,                     HA_NEXT,
-
-  IMG_BUG_RIGHT,                       16,
-  IMG_BUG_UP,                          16,
-  IMG_BUG_LEFT,                                16,
-  IMG_BUG_DOWN,                                16,                     HA_NEXT,
-
-  IMG_BD_BUTTERFLY,                    -1,                     HA_NEXT,
-
-  IMG_BD_FIREFLY,                      -1,                     HA_NEXT,
-
-  IMG_PACMAN_RIGHT,                    16,
-  IMG_PACMAN_UP,                       16,
-  IMG_PACMAN_LEFT,                     16,
-  IMG_PACMAN_DOWN,                     16,                     HA_NEXT,
-
-  IMG_YAMYAM,                          -1,                     HA_NEXT,
-
-  IMG_DARK_YAMYAM,                     -1,                     HA_NEXT,
-
-  IMG_ROBOT,                           -1,                     HA_NEXT,
-
-  IMG_MOLE_MOVING_RIGHT,               16,
-  IMG_MOLE_MOVING_UP,                  16,
-  IMG_MOLE_MOVING_LEFT,                        16,
-  IMG_MOLE_MOVING_DOWN,                        16,                     HA_NEXT,
-
-  IMG_PENGUIN_MOVING_RIGHT,            16,
-  IMG_PENGUIN_MOVING_UP,               16,
-  IMG_PENGUIN_MOVING_LEFT,             16,
-  IMG_PENGUIN_MOVING_DOWN,             16,                     HA_NEXT,
-
-  IMG_PIG_MOVING_RIGHT,                        16,
-  IMG_PIG_MOVING_UP,                   16,
-  IMG_PIG_MOVING_LEFT,                 16,
-  IMG_PIG_MOVING_DOWN,                 16,                     HA_NEXT,
-
-  IMG_DRAGON_MOVING_RIGHT,             16,
-  IMG_DRAGON_MOVING_UP,                        16,
-  IMG_DRAGON_MOVING_LEFT,              16,
-  IMG_DRAGON_MOVING_DOWN,              16,                     HA_NEXT,
-
-  IMG_SATELLITE,                       -1,                     HA_NEXT,
-
-  IMG_ROBOT_WHEEL,                     50,
-  IMG_ROBOT_WHEEL_ACTIVE,              100,                    HA_NEXT,
-
-  IMG_LAMP,                            50,
-  IMG_LAMP_ACTIVE,                     50,                     HA_NEXT,
-
-  IMG_TIME_ORB_FULL,                   50,
-  IMG_TIME_ORB_EMPTY,                  50,                     HA_NEXT,
-
-  IMG_AMOEBA_DROP,                     50,
-  IMG_AMOEBA_GROWING,                  6,
-  IMG_AMOEBA_WET,                      20,                     HA_NEXT,
-
-  IMG_AMOEBA_DEAD,                     -1,                     HA_NEXT,
-
-  IMG_AMOEBA_WET,                      -1,                     HA_NEXT,
-
-  IMG_AMOEBA_WET,                      100,
-  IMG_AMOEBA_GROWING,                  6,                      HA_NEXT,
-
-  IMG_AMOEBA_FULL,                     50,
-  IMG_AMOEBA_DEAD,                     50,
-  IMG_EXPLOSION,                       16,
-  IMG_DIAMOND,                         20,                     HA_NEXT,
-
-  IMG_GAME_OF_LIFE,                    -1,                     HA_NEXT,
-
-  IMG_BIOMAZE,                         -1,                     HA_NEXT,
-
-  IMG_MAGIC_WALL_ACTIVE,               -1,                     HA_NEXT,
-
-  IMG_BD_MAGIC_WALL_ACTIVE,            -1,                     HA_NEXT,
-
-  IMG_EXIT_CLOSED,                     200,
-  IMG_EXIT_OPENING,                    16,
-  IMG_EXIT_OPEN,                       100,                    HA_NEXT,
-
-  IMG_EXIT_OPEN,                       -1,                     HA_NEXT,
-
-  IMG_SOKOBAN_OBJECT,                  -1,                     HA_NEXT,
-
-  IMG_SOKOBAN_FIELD_EMPTY,             -1,                     HA_NEXT,
-
-  IMG_SOKOBAN_FIELD_FULL,              -1,                     HA_NEXT,
-
-  IMG_SPEED_PILL,                      -1,                     HA_NEXT,
-
-  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"},
- {"Dyna Bomb: Increases the power 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 *));
-
-static char *helpscreen_music[][3] =
-{
-  { "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;
-
-#if 0
-void OLD_DrawHelpScreenElAction(int start)
-{
-  int i = 0, j = 0;
-  int frame, graphic;
-  int xstart = SX+16, ystart = SY+64+2*32, ystep = TILEY+4;
-
-  while(helpscreen_action[j] != HA_END)
-  {
-    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]--;
-
-      while(helpscreen_action[j] != HA_NEXT)
-       j++;
-      j++;
-      i++;
-      continue;
-    }
-
-    j += 3*helpscreen_step[i-start];
-    graphic = helpscreen_action[j++];
-
-    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;
-    }
-
-    helpscreen_delay[i-start] = helpscreen_action[j++] - 1;
-
-    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++;
-
-    DrawOldGraphicExt(drawto, xstart, ystart+(i-start)*ystep, graphic+frame);
-    i++;
-  }
-
-  for(i=2;i<16;i++)
-  {
-    MarkTileDirty(0,i);
-    MarkTileDirty(1,i);
-  }
-}
-#endif
-
-void DrawHelpScreenElAction(int start)
+void DrawInfoScreenDemoAnim(int start, boolean init)
 {
   int i = 0, j = 0;
   int xstart = mSX + 16;
   int ystart = mSY + 64 + 2 * 32;
   int ystep = TILEY + 4;
+  int element, action, direction;
   int graphic;
-  int frame_count;
+  int delay;
   int sync_frame;
 
-  while (helpscreen_action[j] != HA_END)
+  if (init)
+  {
+    SetMainBackgroundImage(IMG_BACKGROUND_INFO);
+    ClearWindow();
+    DrawHeadline();
+
+    DrawTextSCentered(100, FONT_TEXT_1, "The game elements:");
+
+    DrawTextSCentered(SYSIZE - 20, FONT_TEXT_4,
+                     "Press any key or button for next page");
+  }
+
+  while (helpanim_info[j].element != HELPANIM_LIST_END)
   {
-    if (i >= start + MAX_HELPSCREEN_ELS || i >= num_helpscreen_els)
+    if (i >= start + MAX_INFO_ELEMENTS_ON_SCREEN ||
+       i >= num_infoscreen_elements)
       break;
     else if (i < start)
     {
-      while (helpscreen_action[j] != HA_NEXT)
+      while (helpanim_info[j].element != HELPANIM_LIST_NEXT)
        j++;
 
       j++;
@@ -871,142 +568,160 @@ void DrawHelpScreenElAction(int start)
       continue;
     }
 
-    j += 2 * helpscreen_step[i-start];
-    graphic = helpscreen_action[j++];
-    frame_count = helpscreen_action[j++];
-    if (frame_count == -1)
-      frame_count = 1000000;
+    j += infoscreen_step[i - start];
 
-    if (helpscreen_frame[i-start] == 0)
+    element = helpanim_info[j].element;
+    action = helpanim_info[j].action;
+    direction = helpanim_info[j].direction;
+
+    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);
+
+    delay = helpanim_info[j++].delay;
+
+    if (delay == -1)
+      delay = 1000000;
+
+    if (infoscreen_frame[i - start] == 0)
     {
       sync_frame = 0;
-      helpscreen_frame[i-start] = frame_count - 1;
+      infoscreen_frame[i - start] = delay - 1;
     }
     else
     {
-      sync_frame = frame_count - helpscreen_frame[i-start];
-      helpscreen_frame[i-start]--;
+      sync_frame = delay - infoscreen_frame[i - start];
+      infoscreen_frame[i - start]--;
     }
 
-    if (helpscreen_action[j] == HA_NEXT)
+    if (helpanim_info[j].element == -1)
     {
-      if (!helpscreen_frame[i-start])
-       helpscreen_step[i-start] = 0;
+      if (!infoscreen_frame[i - start])
+       infoscreen_step[i - start] = 0;
     }
     else
     {
-      if (!helpscreen_frame[i-start])
-       helpscreen_step[i-start]++;
-      while(helpscreen_action[j] != HA_NEXT)
+      if (!infoscreen_frame[i - start])
+       infoscreen_step[i - start]++;
+      while (helpanim_info[j].element != -1)
        j++;
     }
+
     j++;
 
-#if 1
     ClearRectangleOnBackground(drawto, xstart, ystart + (i - start) * ystep,
                               TILEX, TILEY);
     DrawGraphicAnimationExt(drawto, xstart, ystart + (i - start) * ystep,
                            graphic, sync_frame, USE_MASKING);
-#else
-    frame = getGraphicAnimationFrame(graphic, sync_frame);
 
-    DrawGraphicExt(drawto, xstart, ystart + (i-start) * ystep,
-                  graphic, frame);
-#endif
+    if (init)
+      DrawInfoScreenDemoText(element, action, direction, i - start);
 
     i++;
   }
 
-#if 1
   redraw_mask |= REDRAW_FIELD;
-#else
-  for(i=2; i<16; i++)
-  {
-    MarkTileDirty(0, i);
-    MarkTileDirty(1, i);
-  }
-#endif
 
   FrameCounter++;
 }
 
-void DrawHelpScreenElText(int start)
+void DrawInfoScreenDemoText(int element, int action, int direction, int ypos)
 {
-  int i;
-  int xstart = mSX + 56, ystart = mSY + 65 + 2 * 32, ystep = TILEY + 4;
-  int ybottom = SYSIZE - 20;
-
-  SetMainBackgroundImage(IMG_BACKGROUND_INFO);
-  ClearWindow();
-  DrawHeadline();
+  int font_nr = FONT_TEXT_2;
+  int max_chars_per_line = 34;
+  int max_lines_per_text = 2;    
+  int sx = mSX + 56;
+  int sy = mSY + 65 + 2 * 32 + 1;
+  int ystep = TILEY + 4;
+  char *text;
 
-  DrawTextFCentered(100, FONT_TEXT_1, "The game elements:");
+  text = getHashEntry(helptext_info, element_info[element].token_name);
 
-  for(i=start; i < start + MAX_HELPSCREEN_ELS && i < num_helpscreen_els; i++)
+  if (text == NULL)
   {
-    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);
+    char token[MAX_LINE_LEN];
+
+    strcpy(token, element_info[element].token_name);
+
+    if (action != -1)
+      strcat(token, element_action_info[action].suffix);
+
+    if (direction != -1)
+      strcat(token, element_direction_info[MV_DIR_BIT(direction)].suffix);
+
+    text = getHashEntry(helptext_info, token);
+
+    if (text == NULL)
+      text = "No description available";
   }
 
-  DrawTextFCentered(ybottom, FONT_TEXT_4,
-                   "Press any key or button for next page");
+  if (strlen(text) <= max_chars_per_line)
+    sy += getFontHeight(font_nr) / 2;
+
+  DrawTextWrapped(sx, sy + ypos * ystep, text, font_nr,
+                 max_chars_per_line, max_lines_per_text);
 }
 
-void DrawHelpScreenMusicText(int num)
+void DrawInfoScreenMusicText(int num)
 {
+  struct MusicFileInfo *list = music_file_info;
   int ystart = 150, ystep = 30;
   int ybottom = SYSIZE - 20;
+  int i;
 
-  FadeSounds();
+  for (i=0; i < num && list; i++)
+    list = list->next;
+
+  FadeSoundsAndMusic();
   ClearWindow();
   DrawHeadline();
 
-  DrawTextFCentered(100, FONT_TEXT_1, "The game background music loops:");
+  DrawTextSCentered(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]);
+  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);
 
-  DrawTextFCentered(ybottom, FONT_TEXT_4,
+  DrawTextSCentered(ybottom, FONT_TEXT_4,
                    "Press any key or button for next page");
 
+  /* !!! add playing music !!! */
 #if 0
   PlaySoundLoop(background_loop[num]);
 #endif
 }
 
-void DrawHelpScreenCreditsText()
+void DrawInfoScreenCreditsText()
 {
   int ystart = 150, ystep = 30;
   int ybottom = SYSIZE - 20;
 
-  FadeSounds();
+  FadeSoundsAndMusic();
   ClearWindow();
   DrawHeadline();
 
-  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,
+  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");
-  DrawTextFCentered(ystart + 6 * ystep, FONT_TEXT_2, "of new levels!");
+  DrawTextSCentered(ystart + 6 * ystep, FONT_TEXT_2, "of new levels!");
 
-  DrawTextFCentered(ybottom, FONT_TEXT_4,
+  DrawTextSCentered(ybottom, FONT_TEXT_4,
                    "Press any key or button for next page");
 }
 
-void DrawHelpScreenContactText()
+void DrawInfoScreenContactText()
 {
   int ystart = 150, ystep = 30;
   int ybottom = SYSIZE - 20;
@@ -1014,102 +729,161 @@ 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,
+  DrawTextSCentered(ybottom, FONT_TEXT_4,
                    "Press any key or button for main menu");
 }
 
-void DrawHelpScreen()
+#if 1
+void DrawInfoScreen()
 {
+  struct MusicFileInfo *list;
   int i;
 
   UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
 
-  for(i=0;i<MAX_HELPSCREEN_ELS;i++)
-    helpscreen_step[i] = helpscreen_frame[i] = 0;
-  helpscreen_musicpos = 0;
-  helpscreen_state = 0;
+  for (i = 0; i < MAX_INFO_ELEMENTS_ON_SCREEN; i++)
+    infoscreen_step[i] = infoscreen_frame[i] = 0;
+  infoscreen_musicpos = 0;
+  infoscreen_state = 0;
+
+  LoadHelpAnimInfo();
+  LoadHelpTextInfo();
+  LoadMusicInfo();
+
+  num_infoscreen_elements = 0;
+  for (i = 0; helpanim_info[i].element != HELPANIM_LIST_END; i++)
+    if (helpanim_info[i].element == HELPANIM_LIST_NEXT)
+      num_infoscreen_elements++;
 
-  DrawHelpScreenElText(0);
-  DrawHelpScreenElAction(0);
+  num_infoscreen_music = 0;
+  for (list = music_file_info; list != NULL; list = list->next)
+    num_infoscreen_music++;
+
+  DrawInfoScreenDemoAnim(0, TRUE);
+#if 0
+  DrawInfoScreenDemoText(0);
+#endif
 
   FadeToFront();
   InitAnimation();
 
-#if 0
-  PlaySoundLoop(SND_BACKGROUND_INFO);
+  PlayMenuSound();
+  PlayMenuMusic();
+}
+
 #else
-  PlaySound_Menu_Start(SND_BACKGROUND_INFO);
+
+void DrawInfoScreen()
+{
+  struct MusicFileInfo *list;
+  int i;
+
+  UnmapAllGadgets();
+  CloseDoor(DOOR_CLOSE_2);
+
+  for (i = 0; i < MAX_INFO_ELEMENTS_ON_SCREEN; i++)
+    infoscreen_step[i] = infoscreen_frame[i] = 0;
+  infoscreen_musicpos = 0;
+  infoscreen_state = 0;
+
+  LoadHelpAnimInfo();
+  LoadHelpTextInfo();
+  LoadMusicInfo();
+
+  num_infoscreen_elements = 0;
+  for (i = 0; helpanim_info[i].element != HELPANIM_LIST_END; i++)
+    if (helpanim_info[i].element == HELPANIM_LIST_NEXT)
+      num_infoscreen_elements++;
+
+  num_infoscreen_music = 0;
+  for (list = music_file_info; list != NULL; list = list->next)
+    num_infoscreen_music++;
+
+  DrawInfoScreenDemoAnim(0, TRUE);
+#if 0
+  DrawInfoScreenDemoText(0);
 #endif
+
+  FadeToFront();
+  InitAnimation();
+
+  PlayMenuSound();
+  PlayMenuMusic();
 }
+#endif
 
-void HandleHelpScreen(int button)
+void HandleInfoScreen(int button)
 {
   static unsigned long hs_delay = 0;
-  int num_helpscreen_els_pages =
-    (num_helpscreen_els + MAX_HELPSCREEN_ELS-1) / MAX_HELPSCREEN_ELS;
+  int num_infoscreen_element_pages =
+    (num_infoscreen_elements + MAX_INFO_ELEMENTS_ON_SCREEN - 1)
+    / MAX_INFO_ELEMENTS_ON_SCREEN;
   int button_released = !button;
   int i;
 
   if (button_released)
   {
-    if (helpscreen_state < num_helpscreen_els_pages - 1)
+    if (infoscreen_state < num_infoscreen_element_pages - 1)
     {
-      for(i=0;i<MAX_HELPSCREEN_ELS;i++)
-       helpscreen_step[i] = helpscreen_frame[i] = 0;
-      helpscreen_state++;
+      for (i = 0; i < MAX_INFO_ELEMENTS_ON_SCREEN; i++)
+       infoscreen_step[i] = infoscreen_frame[i] = 0;
+      infoscreen_state++;
 
       FrameCounter = 0;
-      DrawHelpScreenElText(helpscreen_state * MAX_HELPSCREEN_ELS);
-      DrawHelpScreenElAction(helpscreen_state * MAX_HELPSCREEN_ELS);
+      DrawInfoScreenDemoAnim(infoscreen_state * MAX_INFO_ELEMENTS_ON_SCREEN,
+                            TRUE);
+#if 0
+      DrawInfoScreenDemoText(infoscreen_state * MAX_INFO_ELEMENTS_ON_SCREEN);
+#endif
     }
-    else if (helpscreen_state <
-            num_helpscreen_els_pages + num_helpscreen_music - 1)
+    else if (infoscreen_state <
+            num_infoscreen_element_pages + num_infoscreen_music - 1)
     {
-      helpscreen_state++;
-      DrawHelpScreenMusicText(helpscreen_state - num_helpscreen_els_pages);
+      infoscreen_state++;
+      DrawInfoScreenMusicText(infoscreen_state - num_infoscreen_element_pages);
     }
-    else if (helpscreen_state ==
-            num_helpscreen_els_pages + num_helpscreen_music - 1)
+    else if (infoscreen_state ==
+            num_infoscreen_element_pages + num_infoscreen_music - 1)
     {
-      helpscreen_state++;
-      DrawHelpScreenCreditsText();
+      infoscreen_state++;
+      DrawInfoScreenCreditsText();
     }
-    else if (helpscreen_state ==
-            num_helpscreen_els_pages + num_helpscreen_music)
+    else if (infoscreen_state ==
+            num_infoscreen_element_pages + num_infoscreen_music)
     {
-      helpscreen_state++;
-      DrawHelpScreenContactText();
+      infoscreen_state++;
+      DrawInfoScreenContactText();
     }
     else
     {
-      FadeSounds();
+      FadeSoundsAndMusic();
 
       game_status = GAME_MODE_MAIN;
       DrawMainMenu();
@@ -1119,18 +893,12 @@ void HandleHelpScreen(int button)
   {
     if (DelayReached(&hs_delay, GAME_FRAME_DELAY))
     {
-      if (helpscreen_state < num_helpscreen_els_pages)
-       DrawHelpScreenElAction(helpscreen_state * MAX_HELPSCREEN_ELS);
+      if (infoscreen_state < num_infoscreen_element_pages)
+       DrawInfoScreenDemoAnim(infoscreen_state * MAX_INFO_ELEMENTS_ON_SCREEN,
+                              FALSE);
     }
 
-    /* !!! 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_BACKGROUND_INFO);
-#else
-    PlaySound_Menu_Continue(SND_BACKGROUND_INFO);
-#endif
+    PlayMenuSoundIfLoop();
   }
 
   DoAnimation();
@@ -1240,12 +1008,6 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
   int yoffset = (ti->type == TREE_TYPE_LEVEL_DIR ? 0 : yoffset_setup);
   int last_game_status = game_status;  /* save current game status */
 
-#if 1
-  DrawBackground(mSX, mSY, SXSIZE - 32 + menu.scrollbar_xoffset, SYSIZE);
-#else
-  DrawBackground(SX, SY, SXSIZE - 32, SYSIZE);
-#endif
-
   title_string =
     (ti->type == TREE_TYPE_LEVEL_DIR ? "Level Directories" :
      ti->type == TREE_TYPE_GRAPHICS_DIR ? "Custom Graphics" :
@@ -1257,7 +1019,12 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
   /* 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;
@@ -1309,7 +1076,7 @@ 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);
 }
 
@@ -1549,6 +1316,9 @@ void DrawChooseLevel()
   SetMainBackgroundImage(IMG_BACKGROUND_LEVELS);
 
   DrawChooseTree(&leveldir_current);
+
+  PlayMenuSound();
+  PlayMenuMusic();
 }
 
 void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
@@ -1562,7 +1332,7 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 void DrawHallOfFame(int highlight_position)
 {
   UnmapAllGadgets();
-  FadeSounds();
+  FadeSoundsAndMusic();
   CloseDoor(DOOR_CLOSE_2);
 
   if (highlight_position < 0) 
@@ -1573,11 +1343,8 @@ void DrawHallOfFame(int highlight_position)
 
   HandleHallOfFame(highlight_position,0, 0,0, MB_MENU_INITIALIZE);
 
-#if 0
-  PlaySound(SND_BACKGROUND_SCORES);
-#else
-  PlaySound_Menu_Start(SND_BACKGROUND_SCORES);
-#endif
+  PlayMenuSound();
+  PlayMenuMusic();
 }
 
 static void drawHallOfFameList(int first_entry, int highlight_position)
@@ -1590,7 +1357,7 @@ 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<NUM_MENU_ENTRIES_ON_SCREEN; i++)
+  for (i = 0; i < NUM_MENU_ENTRIES_ON_SCREEN; i++)
   {
     int entry = first_entry + i;
     boolean active = (entry == highlight_position);
@@ -1662,10 +1429,8 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
     DrawMainMenu();
   }
 
-#if 1
   if (game_status == GAME_MODE_SCORES)
-    PlaySound_Menu_Continue(SND_BACKGROUND_SCORES);
-#endif
+    PlayMenuSoundIfLoop();
 
   DoAnimation();
   BackToFront();
@@ -1813,6 +1578,7 @@ static struct TokenInfo setup_info_editor[] =
   { 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                    }
@@ -1929,23 +1695,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_1_ACTIVE;
     }
   }
-  else if (setup_info[pos].type & TYPE_STRING)
+  else if (type & TYPE_STRING)
   {
     int max_value_len = (SCR_FIELDX - 2) * 2;
 
@@ -1955,10 +1723,9 @@ 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)
+  else if (type & TYPE_BOOLEAN_STYLE)
   {
-    font_nr = (*(boolean *)(setup_info[pos].value) ? FONT_OPTION_ON :
-              FONT_OPTION_OFF);
+    font_nr = (*(boolean *)value ? FONT_OPTION_ON : FONT_OPTION_OFF);
   }
 
   DrawText(mSX + xpos * 32, mSY + ypos * 32,
@@ -2037,7 +1804,7 @@ 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 < NUM_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;
@@ -2093,7 +1860,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)
       {
@@ -2191,7 +1958,7 @@ void DrawSetupScreen_Input()
 
 #if 0
   DeactivateJoystickForCalibration();
-  DrawTextFCentered(SYSIZE - 20, FONT_TEXT_4,
+  DrawTextSCentered(SYSIZE - 20, FONT_TEXT_4,
                    "Joysticks deactivated on this screen");
 #endif
 
@@ -2283,7 +2050,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);
 
@@ -2345,11 +2112,7 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
     static unsigned long delay = 0;
 
     if (!DelayReached(&delay, GADGET_FRAME_DELAY))
-#if 1
       return;
-#else
-      goto out;
-#endif
 
     player_nr = (player_nr + (x == 10 ? -1 : +1) + MAX_PLAYERS) % MAX_PLAYERS;
 
@@ -2412,15 +2175,6 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
       }
     }
   }
-
-#if 0
-  BackToFront();
-
-  out:
-
-  if (game_status == GAME_MODE_SETUP)
-    DoAnimation();
-#endif
 }
 
 void CustomizeKeyboard(int player_nr)
@@ -2460,7 +2214,7 @@ void CustomizeKeyboard(int player_nr)
   DrawText(mSX + 4*32, mSY + (2+2*step_nr+1)*32,
           getKeyNameFromKey(*customize_step[step_nr].key), FONT_VALUE_OLD);
 
-  while(!finished)
+  while (!finished)
   {
     if (PendingEvent())                /* got event */
     {
@@ -2489,7 +2243,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)
@@ -2576,9 +2330,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;
@@ -2607,10 +2361,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 */
     {
@@ -2742,8 +2496,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 */
   }
@@ -2765,6 +2519,9 @@ void DrawSetupScreen()
     DrawChooseTree(&artwork.mus_current);
   else
     DrawSetupScreen_Generic();
+
+  PlayMenuSound();
+  PlayMenuMusic();
 }
 
 void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
@@ -2881,7 +2638,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;
@@ -2936,7 +2693,7 @@ 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)
@@ -3016,7 +2773,7 @@ void CreateScreenGadgets()
 #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);
 
@@ -3048,7 +2805,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;
@@ -3058,7 +2815,7 @@ void FreeScreenGadgets()
   }
 #endif
 
-  for (i=0; i<NUM_SCREEN_GADGETS; i++)
+  for (i = 0; i < NUM_SCREEN_GADGETS; i++)
     FreeGadget(screen_gadget[i]);
 }
 
@@ -3070,7 +2827,7 @@ void MapChooseTreeGadgets(TreeInfo *ti)
   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]);
 }
 
@@ -3078,7 +2835,7 @@ void UnmapChooseTreeGadgets()
 {
   int i;
 
-  for (i=0; i<NUM_SCREEN_GADGETS; i++)
+  for (i = 0; i < NUM_SCREEN_GADGETS; i++)
     UnmapGadget(screen_gadget[i]);
 }