rnd-20030105-1-src
[rocksndiamonds.git] / src / screens.c
index 1465041cdb126c0006064c2406bade73626c193c..e99697810143aa152f42d5f42e9cb3e771450e14 100644 (file)
@@ -1,7 +1,7 @@
 /***********************************************************
 * Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-* (c) 1995-2001 Artsoft Entertainment                      *
+* (c) 1995-2002 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
 
 /* screens in the setup menu */
 #define SETUP_MODE_MAIN                        0
-#define SETUP_MODE_INPUT               1
-#define SETUP_MODE_SHORTCUT            2
-#define SETUP_MODE_GRAPHICS            3
-#define SETUP_MODE_SOUND               4
-#define SETUP_MODE_CHOOSE_GRAPHICS     5
-#define SETUP_MODE_CHOOSE_SOUNDS       6
-#define SETUP_MODE_CHOOSE_MUSIC                7
-
-#define MAX_SETUP_MODES                        8
+#define SETUP_MODE_GAME                        1
+#define SETUP_MODE_EDITOR              2
+#define SETUP_MODE_INPUT               3
+#define SETUP_MODE_SHORTCUT            4
+#define SETUP_MODE_GRAPHICS            5
+#define SETUP_MODE_SOUND               6
+#define SETUP_MODE_ARTWORK             7
+#define SETUP_MODE_CHOOSE_GRAPHICS     8
+#define SETUP_MODE_CHOOSE_SOUNDS       9
+#define SETUP_MODE_CHOOSE_MUSIC                10
+
+#define MAX_SETUP_MODES                        11
 
 /* for input setup functions */
 #define SETUPINPUT_SCREEN_POS_START    0
 
 /* forward declarations of internal functions */
 static void HandleScreenGadgets(struct GadgetInfo *);
-static void execExitSetupChooseArtwork(void);
 static void HandleSetupScreen_Generic(int, int, int, int, int);
 static void HandleSetupScreen_Input(int, int, int, int, int);
 static void CustomizeKeyboard(int);
 static void CalibrateJoystick(int);
+static void execSetupArtwork(void);
 static void HandleChooseTree(int, int, int, int, int, TreeInfo **);
 
 static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
 static int setup_mode = SETUP_MODE_MAIN;
 
-static void drawCursorExt(int pos, int color, int graphic)
+static void drawCursorExt(int xpos, int ypos, int color, int graphic)
 {
   static int cursor_array[SCR_FIELDY];
 
-  if (graphic)
-    cursor_array[pos] = graphic;
-
-  graphic = cursor_array[pos];
+  if (xpos == 0)
+  {
+    if (graphic != 0)
+      cursor_array[ypos] = graphic;
+    else
+      graphic = cursor_array[ypos];
+  }
 
   if (color == FC_RED)
-    graphic = (graphic == GFX_ARROW_BLUE_LEFT  ? GFX_ARROW_RED_LEFT  :
-              graphic == GFX_ARROW_BLUE_RIGHT ? GFX_ARROW_RED_RIGHT :
-              GFX_KUGEL_ROT);
+    graphic = (graphic == IMG_ARROW_BLUE_LEFT  ? IMG_ARROW_RED_LEFT  :
+              graphic == IMG_ARROW_BLUE_RIGHT ? IMG_ARROW_RED_RIGHT :
+              IMG_BALL_RED);
+
+  ypos += MENU_SCREEN_START_YPOS;
+
+  DrawBackground(SX + xpos * 32, SY + ypos * 32, TILEX, TILEY);
+  DrawGraphicThruMask(xpos, ypos, graphic, 0);
+}
 
-  DrawGraphic(0, MENU_SCREEN_START_YPOS + pos, graphic);
+static void initCursor(int ypos, int graphic)
+{
+  drawCursorExt(0, ypos, FC_BLUE, graphic);
 }
 
-static void initCursor(int pos, int graphic)
+static void drawCursor(int ypos, int color)
 {
-  drawCursorExt(pos, FC_BLUE, graphic);
+  drawCursorExt(0, ypos, color, 0);
 }
 
-static void drawCursor(int pos, int color)
+static void drawCursorXY(int xpos, int ypos, int graphic)
 {
-  drawCursorExt(pos, color, 0);
+  drawCursorExt(xpos, ypos, -1, graphic);
 }
 
 void DrawHeadline()
@@ -108,7 +122,7 @@ static void ToggleFullscreenIfNeeded()
   if (setup.fullscreen != video.fullscreen_enabled)
   {
     /* save old door content */
-    BlitBitmap(backbuffer, pix[PIX_DB_DOOR],
+    BlitBitmap(backbuffer, bitmap_db_door,
               DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
 
     /* toggle fullscreen */
@@ -116,10 +130,11 @@ static void ToggleFullscreenIfNeeded()
     setup.fullscreen = video.fullscreen_enabled;
 
     /* redraw background to newly created backbuffer */
-    BlitBitmap(pix[PIX_BACK], backbuffer, 0,0, WIN_XSIZE,WIN_YSIZE, 0,0);
+    BlitBitmap(new_graphic_info[IMG_MENU_FRAME].bitmap, backbuffer,
+              0,0, WIN_XSIZE,WIN_YSIZE, 0,0);
 
     /* restore old door content */
-    BlitBitmap(pix[PIX_DB_DOOR], backbuffer,
+    BlitBitmap(bitmap_db_door, backbuffer,
               DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
 
     redraw_mask = REDRAW_ALL;
@@ -137,6 +152,7 @@ void DrawMainMenu()
   KeyboardAutoRepeatOn();
   ActivateJoystick();
   SetDrawDeactivationMask(REDRAW_NONE);
+  SetBackgroundBitmap(new_graphic_info[IMG_MENU_BACKGROUND].bitmap);
   audio.sound_deactivated = FALSE;
 
   /* needed if last screen was the playing screen, invoked from level editor */
@@ -153,7 +169,7 @@ void DrawMainMenu()
   /* needed if last screen was the setup screen and fullscreen state changed */
   ToggleFullscreenIfNeeded();
 
-  /* needed if last screen (setup/level) changed graphics, sounds or music */
+  /* needed if last screen (level choice) changed graphics, sounds or music */
   ReloadCustomArtwork();
 
 #ifdef TARGET_SDL
@@ -177,7 +193,9 @@ void DrawMainMenu()
   GetPlayerConfig();
   LoadLevel(level_nr);
 
+  SetBackgroundBitmap(new_graphic_info[IMG_MENU_BACKGROUND].bitmap);
   ClearWindow();
+
   DrawHeadline();
   DrawText(SX + 32,    SY + 2*32, name_text, FS_BIG, FC_GREEN);
   DrawText(SX + 6*32,  SY + 2*32, setup.player_name, FS_BIG, FC_RED);
@@ -204,10 +222,15 @@ void DrawMainMenu()
   }
 
   for(i=0; i<8; i++)
-    initCursor(i, (i == 1 || i == 6 ? GFX_ARROW_BLUE_RIGHT : GFX_KUGEL_BLAU));
+    initCursor(i, (i == 1 || i == 6 ? IMG_ARROW_BLUE_RIGHT : IMG_BALL_BLUE));
 
-  DrawGraphic(10, 3, GFX_ARROW_BLUE_LEFT);
-  DrawGraphic(14, 3, GFX_ARROW_BLUE_RIGHT);
+#if 0
+  DrawGraphic(10, 3, IMG_ARROW_BLUE_LEFT, 0);
+  DrawGraphic(14, 3, IMG_ARROW_BLUE_RIGHT, 0);
+#else
+  drawCursorXY(10, 1, IMG_ARROW_BLUE_LEFT);
+  drawCursorXY(14, 1, IMG_ARROW_BLUE_RIGHT);
+#endif
 
   DrawText(SX + 56, SY + 326, "A Game by Artsoft Entertainment",
           FS_SMALL, FC_RED);
@@ -315,10 +338,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 
     level_nr = new_level_nr;
 
-    DrawTextExt(drawto, SX + 11 * 32, SY + 3 * 32,
-               int2str(level_nr, 3), FS_BIG, font_color);
-    DrawTextExt(window, SX + 11 * 32, SY + 3 * 32,
-               int2str(level_nr, 3), FS_BIG, font_color);
+    DrawText(SX + 11 * 32, SY + 3 * 32, int2str(level_nr, 3),
+            FS_BIG, font_color);
 
     LoadLevel(level_nr);
     DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE);
@@ -432,8 +453,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 static long helpscreen_state;
 static int helpscreen_step[MAX_HELPSCREEN_ELS];
 static int helpscreen_frame[MAX_HELPSCREEN_ELS];
-static int helpscreen_delay[MAX_HELPSCREEN_ELS];
-static int helpscreen_action[] =
+#if 0
+static int OLD_helpscreen_action[] =
 {
   GFX_SPIELER1_DOWN,4,2,
   GFX_SPIELER1_UP,4,2,
@@ -541,12 +562,225 @@ static int helpscreen_action[] =
   GFX_SPEED_PILL,1,100,                                                HA_NEXT,
   HA_END
 };
+#endif
+
+static int helpscreen_action[] =
+{
+  IMG_PLAYER1_DOWN_MOVING,             16,
+  IMG_PLAYER1_UP_MOVING,               16,
+  IMG_PLAYER1_LEFT_MOVING,             16,
+  IMG_PLAYER1_RIGHT_MOVING,            16,
+  IMG_PLAYER1_LEFT_PUSHING,            16,
+  IMG_PLAYER1_RIGHT_PUSHING,           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_WALL_GROWING_ACTIVE_LEFT,                20,
+  IMG_WALL,                            50,
+  IMG_EMPTY_SPACE,                     20,
+  IMG_WALL_GROWING_ACTIVE_RIGHT,       20,
+  IMG_WALL,                            50,
+  IMG_EMPTY_SPACE,                     20,
+  IMG_WALL_GROWING_ACTIVE_UP,          20,
+  IMG_WALL,                            50,
+  IMG_EMPTY_SPACE,                     20,
+  IMG_WALL_GROWING_ACTIVE_DOWN,                20,
+  IMG_WALL,                            50,
+  IMG_EMPTY_SPACE,                     20,                     HA_NEXT,
+
+  IMG_INVISIBLE_WALL,                  -1,                     HA_NEXT,
+
+  IMG_WALL_CRUMBLED,                   -1,                     HA_NEXT,
+
+  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,
+
+  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_CRACKING,                    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_KEY1,                            50,
+  IMG_KEY2,                            50,
+  IMG_KEY3,                            50,
+  IMG_KEY4,                            50,                     HA_NEXT,
+
+  IMG_GATE1,                           50,
+  IMG_GATE2,                           50,
+  IMG_GATE3,                           50,
+  IMG_GATE4,                           50,                     HA_NEXT,
+
+  IMG_GATE1_GRAY,                      50,
+  IMG_GATE2_GRAY,                      50,
+  IMG_GATE3_GRAY,                      50,
+  IMG_GATE4_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_NR,                     -1,                     HA_NEXT,
+
+  IMG_DYNABOMB_SZ,                     -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_RIGHT_MOVING,               16,
+  IMG_MOLE_UP_MOVING,                  16,
+  IMG_MOLE_LEFT_MOVING,                        16,
+  IMG_MOLE_DOWN_MOVING,                        16,                     HA_NEXT,
+
+  IMG_PENGUIN_RIGHT_MOVING,            16,
+  IMG_PENGUIN_UP_MOVING,               16,
+  IMG_PENGUIN_LEFT_MOVING,             16,
+  IMG_PENGUIN_DOWN_MOVING,             16,                     HA_NEXT,
+
+  IMG_PIG_RIGHT_MOVING,                        16,
+  IMG_PIG_UP_MOVING,                   16,
+  IMG_PIG_LEFT_MOVING,                 16,
+  IMG_PIG_DOWN_MOVING,                 16,                     HA_NEXT,
+
+  IMG_DRAGON_RIGHT_MOVING,             16,
+  IMG_DRAGON_UP_MOVING,                        16,
+  IMG_DRAGON_LEFT_MOVING,              16,
+  IMG_DRAGON_DOWN_MOVING,              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_CREATING,                 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_CREATING,                 6,                      HA_NEXT,
+
+  IMG_AMOEBA_FULL,                     50,
+  IMG_AMOEBA_DEAD,                     50,
+  IMG_EXPLOSION,                       16,
+  IMG_DIAMOND,                         20,                     HA_NEXT,
+
+  IMG_GAMEOFLIFE,                      -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 though 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"},
@@ -605,7 +839,7 @@ static char *helpscreen_eltext[][2] =
  {"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 int num_helpscreen_els = sizeof(helpscreen_eltext) / (2*sizeof(char *));
 
 static char *helpscreen_music[][3] =
 {
@@ -620,7 +854,8 @@ static char *helpscreen_music[][3] =
 static int num_helpscreen_music = 7;
 static int helpscreen_musicpos;
 
-void DrawHelpScreenElAction(int start)
+#if 0
+void OLD_DrawHelpScreenElAction(int start)
 {
   int i = 0, j = 0;
   int frame, graphic;
@@ -672,7 +907,7 @@ void DrawHelpScreenElAction(int start)
     }
     j++;
 
-    DrawGraphicExt(drawto, xstart, ystart+(i-start)*ystep, graphic+frame);
+    DrawOldGraphicExt(drawto, xstart, ystart+(i-start)*ystep, graphic+frame);
     i++;
   }
 
@@ -682,6 +917,81 @@ void DrawHelpScreenElAction(int start)
     MarkTileDirty(1,i);
   }
 }
+#endif
+
+void DrawHelpScreenElAction(int start)
+{
+  int i = 0, j = 0;
+  int xstart = SX + 16;
+  int ystart = SY + 64 + 2 * 32;
+  int ystep = TILEY + 4;
+  int graphic;
+  int frame_count;
+  int sync_frame;
+  int frame;
+
+  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++;
+
+      j++;
+      i++;
+
+      continue;
+    }
+
+    j += 2 * helpscreen_step[i-start];
+    graphic = helpscreen_action[j++];
+    frame_count = helpscreen_action[j++];
+    if (frame_count == -1)
+      frame_count = 1000000;
+
+    if (helpscreen_frame[i-start] == 0)
+    {
+      sync_frame = 0;
+      helpscreen_frame[i-start] = frame_count - 1;
+    }
+    else
+    {
+      sync_frame = frame_count - helpscreen_frame[i-start];
+      helpscreen_frame[i-start]--;
+    }
+
+    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++;
+
+    frame = getGraphicAnimationFrame(graphic, sync_frame);
+
+    DrawGraphicExt(drawto, xstart, ystart + (i-start) * ystep,
+                  graphic, frame);
+
+    i++;
+  }
+
+  for(i=2; i<16; i++)
+  {
+    MarkTileDirty(0, i);
+    MarkTileDirty(1, i);
+  }
+
+  FrameCounter++;
+}
 
 void DrawHelpScreenElText(int start)
 {
@@ -809,7 +1119,7 @@ void DrawHelpScreen()
   CloseDoor(DOOR_CLOSE_2);
 
   for(i=0;i<MAX_HELPSCREEN_ELS;i++)
-    helpscreen_step[i] = helpscreen_frame[i] = helpscreen_delay[i] = 0;
+    helpscreen_step[i] = helpscreen_frame[i] = 0;
   helpscreen_musicpos = 0;
   helpscreen_state = 0;
   DrawHelpScreenElText(0);
@@ -817,7 +1127,7 @@ void DrawHelpScreen()
 
   FadeToFront();
   InitAnimation();
-  PlaySoundLoop(SND_RHYTHMLOOP);
+  PlaySoundLoop(SND_MENU_INFO_SCREEN);
 }
 
 void HandleHelpScreen(int button)
@@ -833,10 +1143,12 @@ void HandleHelpScreen(int button)
     if (helpscreen_state < num_helpscreen_els_pages - 1)
     {
       for(i=0;i<MAX_HELPSCREEN_ELS;i++)
-       helpscreen_step[i] = helpscreen_frame[i] = helpscreen_delay[i] = 0;
+       helpscreen_step[i] = helpscreen_frame[i] = 0;
       helpscreen_state++;
-      DrawHelpScreenElText(helpscreen_state*MAX_HELPSCREEN_ELS);
-      DrawHelpScreenElAction(helpscreen_state*MAX_HELPSCREEN_ELS);
+
+      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)
@@ -865,11 +1177,17 @@ void HandleHelpScreen(int button)
   }
   else
   {
-    if (DelayReached(&hs_delay,GAME_FRAME_DELAY * 2))
+    if (DelayReached(&hs_delay, GAME_FRAME_DELAY))
     {
-      if (helpscreen_state<num_helpscreen_els_pages)
-       DrawHelpScreenElAction(helpscreen_state*MAX_HELPSCREEN_ELS);
+      if (helpscreen_state < num_helpscreen_els_pages)
+       DrawHelpScreenElAction(helpscreen_state * MAX_HELPSCREEN_ELS);
     }
+
+    /* !!! workaround for playing "music" that is really a sound loop (and
+       must therefore periodically be reactivated with the current sound
+       engine !!! */
+    PlaySoundLoop(SND_MENU_INFO_SCREEN);
+
     DoAnimation();
   }
 
@@ -883,8 +1201,10 @@ void HandleTypeName(int newxpos, Key key)
   if (newxpos)
   {
     xpos = newxpos;
-    DrawText(SX + 6*32, SY + ypos*32, setup.player_name, FS_BIG, FC_YELLOW);
-    DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT);
+    DrawText(SX + 6 * 32, SY + ypos * 32, setup.player_name,
+            FS_BIG, FC_YELLOW);
+    drawCursorXY(xpos + 6, ypos - 2, IMG_BALL_RED);
+
     return;
   }
 
@@ -902,23 +1222,23 @@ void HandleTypeName(int newxpos, Key key)
     setup.player_name[xpos] = ascii;
     setup.player_name[xpos + 1] = 0;
     xpos++;
-    DrawTextExt(drawto, SX + 6*32, SY + ypos*32,
-               setup.player_name, FS_BIG, FC_YELLOW);
-    DrawTextExt(window, SX + 6*32, SY + ypos*32,
-               setup.player_name, FS_BIG, FC_YELLOW);
-    DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT);
+
+    DrawText(SX + 6 * 32, SY + ypos * 32, setup.player_name,
+            FS_BIG, FC_YELLOW);
+    drawCursorXY(xpos + 6, ypos - 2, IMG_BALL_RED);
   }
   else if ((key == KSYM_Delete || key == KSYM_BackSpace) && xpos > 0)
   {
     xpos--;
     setup.player_name[xpos] = 0;
-    DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT);
-    DrawGraphic(xpos + 7, ypos, GFX_LEERRAUM);
+
+    DrawBackground(SX + (xpos + 6) * 32, SY + ypos * 32, 2 * TILEX, TILEY);
+    drawCursorXY(xpos + 6, ypos - 2, IMG_BALL_RED);
   }
   else if (key == KSYM_Return && xpos > 0)
   {
-    DrawText(SX + 6*32, SY + ypos*32, setup.player_name, FS_BIG, FC_RED);
-    DrawGraphic(xpos + 6, ypos, GFX_LEERRAUM);
+    DrawText(SX + 6 * 32, SY + ypos * 32, setup.player_name, FS_BIG, FC_RED);
+    DrawBackground(SX + (xpos + 6) * 32, SY + ypos * 32, TILEX, TILEY);
 
     SaveSetup();
     game_status = MAINMENU;
@@ -966,7 +1286,7 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
   char *title_string = NULL;
   int offset = (ti->type == TREE_TYPE_LEVEL_DIR ? 0 : 16);
 
-  ClearRectangle(backbuffer, SX, SY, SXSIZE - 32, SYSIZE);
+  DrawBackground(SX, SY, SXSIZE - 32, SYSIZE);
   redraw_mask |= REDRAW_FIELD;
 
   title_string =
@@ -993,18 +1313,28 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
     DrawText(SX + 32, SY + ypos * 32, buffer, FS_MEDIUM, node->color);
 
     if (node->parent_link)
-      initCursor(i, GFX_ARROW_BLUE_LEFT);
+      initCursor(i, IMG_ARROW_BLUE_LEFT);
     else if (node->level_group)
-      initCursor(i, GFX_ARROW_BLUE_RIGHT);
+      initCursor(i, IMG_ARROW_BLUE_RIGHT);
     else
-      initCursor(i, GFX_KUGEL_BLAU);
+      initCursor(i, IMG_BALL_BLUE);
   }
 
   if (first_entry > 0)
-    DrawGraphic(0, 1, GFX_ARROW_BLUE_UP);
+  {
+    int ypos = 1;
+
+    DrawBackground(SX, SY + ypos * 32, TILEX, TILEY);
+    DrawGraphicThruMask(0, ypos, IMG_ARROW_BLUE_UP, 0);
+  }
 
   if (first_entry + num_page_entries < num_entries)
-    DrawGraphic(0, MAX_MENU_ENTRIES_ON_SCREEN + 1, GFX_ARROW_BLUE_DOWN);
+  {
+    int ypos = MAX_MENU_ENTRIES_ON_SCREEN + 1;
+
+    DrawBackground(SX, SY + ypos * 32, TILEX, TILEY);
+    DrawGraphicThruMask(0, ypos, IMG_ARROW_BLUE_DOWN, 0);
+  }
 }
 
 static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti)
@@ -1018,7 +1348,7 @@ static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti)
   node_first = getTreeInfoFirstGroupEntry(ti);
   node = getTreeInfoFromPos(node_first, entry_pos);
 
-  ClearRectangle(drawto, SX + 32, SY + 32, SXSIZE - 64, 32);
+  DrawBackground(SX + 32, SY + 32, SXSIZE - 64, 32);
 
   if (node->parent_link)
     DrawTextFCentered(40, FC_RED, "leave group \"%s\"", node->class_desc);
@@ -1081,7 +1411,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
     }
     else if (game_status == SETUP)
     {
-      execExitSetupChooseArtwork();
+      execSetupArtwork();
     }
     else
     {
@@ -1218,7 +1548,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
        if (game_status == SETUP)
        {
-         execExitSetupChooseArtwork();
+         execSetupArtwork();
        }
        else
        {
@@ -1257,7 +1587,7 @@ void DrawHallOfFame(int highlight_position)
   FadeToFront();
   InitAnimation();
   HandleHallOfFame(highlight_position,0, 0,0, MB_MENU_INITIALIZE);
-  PlaySound(SND_HALLOFFAME);
+  PlaySound(SND_MENU_HALL_OF_FAME);
 }
 
 static void drawHallOfFameList(int first_entry, int highlight_position)
@@ -1335,7 +1665,7 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
 
   if (button_released)
   {
-    FadeSound(SND_HALLOFFAME);
+    FadeSound(SND_MENU_HALL_OF_FAME);
     game_status = MAINMENU;
     DrawMainMenu();
   }
@@ -1354,29 +1684,58 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
 static struct TokenInfo *setup_info;
 static int num_setup_info;
 
+static char *graphics_set_name;
+static char *sounds_set_name;
+static char *music_set_name;
+
 static void execSetupMain()
 {
   setup_mode = SETUP_MODE_MAIN;
   DrawSetupScreen();
 }
 
-static void execSetupGraphics()
+static void execSetupGame()
 {
-  setup.graphics_set = artwork.gfx_current->name;
+  setup_mode = SETUP_MODE_GAME;
+  DrawSetupScreen();
+}
 
+static void execSetupEditor()
+{
+  setup_mode = SETUP_MODE_EDITOR;
+  DrawSetupScreen();
+}
+
+static void execSetupGraphics()
+{
   setup_mode = SETUP_MODE_GRAPHICS;
   DrawSetupScreen();
 }
 
 static void execSetupSound()
 {
-  setup.sounds_set = artwork.snd_current->name;
-  setup.music_set = artwork.mus_current->name;
-
   setup_mode = SETUP_MODE_SOUND;
   DrawSetupScreen();
 }
 
+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 for displaying artwork name instead of artwork identifier */
+  graphics_set_name = artwork.gfx_current->name;
+  sounds_set_name = artwork.snd_current->name;
+  music_set_name = artwork.mus_current->name;
+
+  setup_mode = SETUP_MODE_ARTWORK;
+  DrawSetupScreen();
+}
+
 static void execSetupChooseGraphics()
 {
   setup_mode = SETUP_MODE_CHOOSE_GRAPHICS;
@@ -1407,14 +1766,6 @@ static void execSetupShortcut()
   DrawSetupScreen();
 }
 
-static void execExitSetupChooseArtwork()
-{
-  if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)
-    execSetupGraphics();
-  else
-    execSetupSound();
-}
-
 static void execExitSetup()
 {
   game_status = MAINMENU;
@@ -1429,38 +1780,60 @@ static void execSaveAndExitSetup()
 
 static struct TokenInfo setup_info_main[] =
 {
-  { TYPE_ENTER_MENU,   execSetupGraphics,      "Graphics Setup"        },
-  { TYPE_ENTER_MENU,   execSetupSound,         "Sound Setup"           },
+  { TYPE_ENTER_MENU,   execSetupGame,          "Game Settings"         },
+  { TYPE_ENTER_MENU,   execSetupEditor,        "Editor Settings"       },
+  { TYPE_ENTER_MENU,   execSetupGraphics,      "Graphics"              },
+  { TYPE_ENTER_MENU,   execSetupSound,         "Sound & Music"         },
+  { TYPE_ENTER_MENU,   execSetupArtwork,       "Custom Artwork"        },
   { TYPE_ENTER_MENU,   execSetupInput,         "Input Devices"         },
   { TYPE_ENTER_MENU,   execSetupShortcut,      "Key Shortcuts"         },
   { TYPE_EMPTY,                NULL,                   ""                      },
-#if 0
-  { TYPE_SWITCH,       &setup.double_buffering,"Buffered gfx:"         },
-  { TYPE_SWITCH,       &setup.fading,          "Fading:"               },
-#endif
-  { TYPE_SWITCH,       &setup.quick_doors,     "Quick Doors:"          },
-  { TYPE_SWITCH,       &setup.ask_on_escape,   "Ask on Esc:"           },
-  { TYPE_SWITCH,       &setup.toons,           "Toons:"                },
-  { TYPE_SWITCH,       &setup.autorecord,      "Auto-Record:"          },
+  { TYPE_LEAVE_MENU,   execExitSetup,          "Exit"                  },
+  { TYPE_LEAVE_MENU,   execSaveAndExitSetup,   "Save and Exit"         },
+  { 0,                 NULL,                   NULL                    }
+};
+
+static struct TokenInfo setup_info_game[] =
+{
   { TYPE_SWITCH,       &setup.team_mode,       "Team-Mode:"            },
   { TYPE_SWITCH,       &setup.handicap,        "Handicap:"             },
   { TYPE_SWITCH,       &setup.time_limit,      "Timelimit:"            },
+  { TYPE_SWITCH,       &setup.autorecord,      "Auto-Record:"          },
   { TYPE_EMPTY,                NULL,                   ""                      },
-  { TYPE_LEAVE_MENU,   execExitSetup,          "Exit"                  },
-  { TYPE_LEAVE_MENU,   execSaveAndExitSetup,   "Save and exit"         },
+  { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
+  { 0,                 NULL,                   NULL                    }
+};
+
+static struct TokenInfo setup_info_editor[] =
+{
+  { TYPE_STRING,       NULL,                   "Offer Special Elements:"},
+  { TYPE_SWITCH,       &setup.editor.el_boulderdash,   "BoulderDash:"  },
+  { TYPE_SWITCH,       &setup.editor.el_emerald_mine,  "Emerald Mine:" },
+  { TYPE_SWITCH,       &setup.editor.el_more,          "More:"         },
+  { TYPE_SWITCH,       &setup.editor.el_sokoban,       "Sokoban:"      },
+  { TYPE_SWITCH,       &setup.editor.el_supaplex,      "Supaplex:"     },
+  { TYPE_SWITCH,       &setup.editor.el_diamond_caves, "Diamd. Caves:" },
+  { TYPE_SWITCH,       &setup.editor.el_dx_boulderdash,"DX Boulderd.:" },
+  { TYPE_SWITCH,       &setup.editor.el_chars,         "Characters:"   },
+  { TYPE_SWITCH,       &setup.editor.el_custom,        "Custom:"       },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
   { 0,                 NULL,                   NULL                    }
 };
 
 static struct TokenInfo setup_info_graphics[] =
 {
-  { TYPE_ENTER_MENU,   execSetupChooseGraphics,"Custom Graphics"       },
-  { TYPE_STRING,       &setup.graphics_set,    ""                      },
-  { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_SWITCH,       &setup.fullscreen,      "Fullscreen:"           },
   { TYPE_SWITCH,       &setup.scroll_delay,    "Scroll Delay:"         },
   { TYPE_SWITCH,       &setup.soft_scrolling,  "Soft Scroll.:"         },
+#if 0
+  { TYPE_SWITCH,       &setup.double_buffering,"Buffered gfx:"         },
+  { TYPE_SWITCH,       &setup.fading,          "Fading:"               },
+#endif
+  { TYPE_SWITCH,       &setup.quick_doors,     "Quick Doors:"          },
+  { TYPE_SWITCH,       &setup.toons,           "Toons:"                },
   { TYPE_EMPTY,                NULL,                   ""                      },
-  { TYPE_LEAVE_MENU,   execSetupMain,          "Exit"                  },
+  { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
   { 0,                 NULL,                   NULL                    }
 };
 
@@ -1472,12 +1845,25 @@ static struct TokenInfo setup_info_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                    }
+};
+
+static struct TokenInfo setup_info_artwork[] =
+{
+  { TYPE_ENTER_MENU,   execSetupChooseGraphics,"Custom Graphics"       },
+  { TYPE_STRING,       &graphics_set_name,     ""                      },
   { TYPE_ENTER_MENU,   execSetupChooseSounds,  "Custom Sounds"         },
-  { TYPE_STRING,       &setup.sounds_set,      ""                      },
+  { TYPE_STRING,       &sounds_set_name,       ""                      },
   { TYPE_ENTER_MENU,   execSetupChooseMusic,   "Custom Music"          },
-  { TYPE_STRING,       &setup.music_set,       ""                      },
+  { TYPE_STRING,       &music_set_name,        ""                      },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_STRING,       NULL,                   "Override Level Artwork:"},
+  { TYPE_YES_NO,       &setup.override_level_graphics, "Graphics:"     },
+  { TYPE_YES_NO,       &setup.override_level_sounds,   "Sounds:"       },
+  { TYPE_YES_NO,       &setup.override_level_music,    "Music:"        },
   { TYPE_EMPTY,                NULL,                   ""                      },
-  { TYPE_LEAVE_MENU,   execSetupMain,          "Exit"                  },
+  { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
   { 0,                 NULL,                   NULL                    }
 };
 
@@ -1490,7 +1876,9 @@ static struct TokenInfo setup_info_shortcut[] =
   { TYPE_KEYTEXT,      NULL,                   "Toggle Pause:",        },
   { TYPE_KEY,          &setup.shortcut.toggle_pause,   ""              },
   { TYPE_EMPTY,                NULL,                   ""                      },
-  { TYPE_LEAVE_MENU,   execSetupMain,          "Exit"                  },
+  { TYPE_YES_NO,       &setup.ask_on_escape,   "Ask on Esc:"           },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
   { 0,                 NULL,                   NULL                    }
 };
 
@@ -1550,6 +1938,9 @@ static void drawSetupValue(int pos)
   char *value_string = getSetupValue(setup_info[pos].type & ~TYPE_GHOSTED,
                                     setup_info[pos].value);
 
+  if (value_string == NULL)
+    return;
+
   if (setup_info[pos].type & TYPE_KEY)
   {
     xpos = 3;
@@ -1615,6 +2006,16 @@ static void DrawSetupScreen_Generic()
     setup_info = setup_info_main;
     title_string = "Setup";
   }
+  else if (setup_mode == SETUP_MODE_GAME)
+  {
+    setup_info = setup_info_game;
+    title_string = "Setup Game";
+  }
+  else if (setup_mode == SETUP_MODE_EDITOR)
+  {
+    setup_info = setup_info_editor;
+    title_string = "Setup Editor";
+  }
   else if (setup_mode == SETUP_MODE_GRAPHICS)
   {
     setup_info = setup_info_graphics;
@@ -1625,6 +2026,11 @@ static void DrawSetupScreen_Generic()
     setup_info = setup_info_sound;
     title_string = "Setup Sound";
   }
+  else if (setup_mode == SETUP_MODE_ARTWORK)
+  {
+    setup_info = setup_info_artwork;
+    title_string = "Custom Artwork";
+  }
   else if (setup_mode == SETUP_MODE_SHORTCUT)
   {
     setup_info = setup_info_shortcut;
@@ -1644,21 +2050,20 @@ static void DrawSetupScreen_Generic()
     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.sound_music && !audio.music_available) ||
        (value_ptr == &setup.fullscreen  && !video.fullscreen_available))
       setup_info[i].type |= TYPE_GHOSTED;
 
-    if (setup_info[i].type & TYPE_ENTER_OR_LEAVE_MENU)
-      font_size = FS_BIG;
+    if (setup_info[i].type & TYPE_STRING)
+      font_size = FS_MEDIUM;
 
     DrawText(SX + 32, SY + ypos * 32, setup_info[i].text, font_size, FC_GREEN);
 
     if (setup_info[i].type & TYPE_ENTER_MENU)
-      initCursor(i, GFX_ARROW_BLUE_RIGHT);
+      initCursor(i, IMG_ARROW_BLUE_RIGHT);
     else if (setup_info[i].type & TYPE_LEAVE_MENU)
-      initCursor(i, GFX_ARROW_BLUE_LEFT);
+      initCursor(i, IMG_ARROW_BLUE_LEFT);
     else if (setup_info[i].type & ~TYPE_SKIP_ENTRY)
-      initCursor(i, GFX_KUGEL_BLAU);
+      initCursor(i, IMG_BALL_BLUE);
 
     if (setup_info[i].type & TYPE_VALUE)
       drawSetupValue(i);
@@ -1674,12 +2079,18 @@ static void DrawSetupScreen_Generic()
 void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
 {
   static int choice_store[MAX_SETUP_MODES];
-  int choice = choice_store[setup_mode];
+  int choice = choice_store[setup_mode];       /* always starts with 0 */
   int x = 0;
   int y = choice;
 
   if (button == MB_MENU_INITIALIZE)
   {
+    /* advance to first valid menu entry */
+    while (choice < num_setup_info &&
+          (setup_info[choice].type & TYPE_SKIP_ENTRY))
+      choice++;
+    choice_store[setup_mode] = choice;
+
     drawCursor(choice, FC_RED);
     return;
   }
@@ -1737,26 +2148,6 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
     }
     else if (!(setup_info[y].type & TYPE_GHOSTED))
     {
-#if 0
-      if (setup_info[y].type & TYPE_BOOLEAN_STYLE)
-      {
-       boolean new_value = !*(boolean *)(setup_info[y].value);
-
-       *(boolean *)setup_info[y].value = new_value;
-       drawSetupValue(y);
-      }
-      else if (setup_info[y].type == TYPE_KEYTEXT &&
-              setup_info[y + 1].type == TYPE_KEY)
-      {
-       changeSetupValue(y + 1);
-      }
-      else if (setup_info[y].type & TYPE_ENTER_OR_LEAVE_MENU)
-      {
-       void (*menu_callback_function)(void) = setup_info[choice].value;
-
-       menu_callback_function();
-      }
-#else
       if (setup_info[y].type & TYPE_ENTER_OR_LEAVE_MENU)
       {
        void (*menu_callback_function)(void) = setup_info[choice].value;
@@ -1772,7 +2163,6 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
        if (setup_info[y].type & TYPE_VALUE)
          changeSetupValue(y);
       }
-#endif
     }
   }
 
@@ -1787,17 +2177,17 @@ void DrawSetupScreen_Input()
   ClearWindow();
   DrawText(SX+16, SY+16, "Setup Input", FS_BIG, FC_YELLOW);
 
-  initCursor(0, GFX_KUGEL_BLAU);
-  initCursor(1, GFX_KUGEL_BLAU);
-  initCursor(2, GFX_ARROW_BLUE_RIGHT);
-  initCursor(13, GFX_ARROW_BLUE_LEFT);
+  initCursor(0, IMG_BALL_BLUE);
+  initCursor(1, IMG_BALL_BLUE);
+  initCursor(2, IMG_ARROW_BLUE_RIGHT);
+  initCursor(13, IMG_ARROW_BLUE_LEFT);
 
-  DrawGraphic(10, MENU_SCREEN_START_YPOS, GFX_ARROW_BLUE_LEFT);
-  DrawGraphic(12, MENU_SCREEN_START_YPOS, GFX_ARROW_BLUE_RIGHT);
+  drawCursorXY(10, 0, IMG_ARROW_BLUE_LEFT);
+  drawCursorXY(12, 0, IMG_ARROW_BLUE_RIGHT);
 
   DrawText(SX+32, SY+2*32, "Player:", FS_BIG, FC_GREEN);
   DrawText(SX+32, SY+3*32, "Device:", FS_BIG, FC_GREEN);
-  DrawText(SX+32, SY+15*32, "Exit", FS_BIG, FC_GREEN);
+  DrawText(SX+32, SY+15*32, "Back", FS_BIG, FC_GREEN);
 
 #if 0
   DeactivateJoystickForCalibration();
@@ -1859,7 +2249,7 @@ static void drawPlayerSetupInputInfo(int player_nr)
   custom_key = setup.input[player_nr].key;
 
   DrawText(SX+11*32, SY+2*32, int2str(player_nr + 1, 1), FS_BIG, FC_RED);
-  DrawGraphic(8, 2, GFX_SPIELER1 + player_nr);
+  DrawGraphicThruMask(8, 2, PLAYER_NR_GFX(IMG_PLAYER1, player_nr), 0);
 
   if (setup.input[player_nr].use_joystick)
   {
@@ -1877,10 +2267,10 @@ static void drawPlayerSetupInputInfo(int player_nr)
   }
 
   DrawText(SX+32, SY+5*32, "Actual Settings:", FS_BIG, FC_GREEN);
-  DrawGraphic(1, 6, GFX_ARROW_BLUE_LEFT);
-  DrawGraphic(1, 7, GFX_ARROW_BLUE_RIGHT);
-  DrawGraphic(1, 8, GFX_ARROW_BLUE_UP);
-  DrawGraphic(1, 9, GFX_ARROW_BLUE_DOWN);
+  drawCursorXY(1, 4, IMG_ARROW_BLUE_LEFT);
+  drawCursorXY(1, 5, IMG_ARROW_BLUE_RIGHT);
+  drawCursorXY(1, 6, IMG_ARROW_BLUE_UP);
+  drawCursorXY(1, 7, IMG_ARROW_BLUE_DOWN);
   DrawText(SX+2*32, SY+6*32, ":", FS_BIG, FC_BLUE);
   DrawText(SX+2*32, SY+7*32, ":", FS_BIG, FC_BLUE);
   DrawText(SX+2*32, SY+8*32, ":", FS_BIG, FC_BLUE);
@@ -2073,7 +2463,7 @@ void CustomizeKeyboard(int player_nr)
       {
         case EVENT_KEYPRESS:
          {
-           Key key = GetEventKey((KeyEvent *)&event, TRUE);
+           Key key = GetEventKey((KeyEvent *)&event, FALSE);
 
            if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6))
            {
@@ -2182,7 +2572,7 @@ static boolean CalibrateJoystickMain(int player_nr)
     for(x=0; x<3; x++)
     {
       check[x][y] = FALSE;
-      DrawGraphic(xpos + x - 1, ypos + y - 1, GFX_KUGEL_BLAU);
+      DrawGraphic(xpos + x - 1, ypos + y - 1, IMG_BALL_BLUE, 0);
     }
   }
 
@@ -2205,7 +2595,7 @@ static boolean CalibrateJoystickMain(int player_nr)
   new_joystick_xmiddle = joy_x;
   new_joystick_ymiddle = joy_y;
 
-  DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_ROT);
+  DrawGraphic(xpos + last_x, ypos + last_y, IMG_BALL_RED, 0);
   BackToFront();
 
   while(Joystick(player_nr) & JOY_BUTTON);     /* wait for released button */
@@ -2275,8 +2665,8 @@ static boolean CalibrateJoystickMain(int player_nr)
 
     if (x != last_x || y != last_y)
     {
-      DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_GELB);
-      DrawGraphic(xpos + x,      ypos + y,      GFX_KUGEL_ROT);
+      DrawGraphic(xpos + last_x, ypos + last_y, IMG_BALL_YELLOW, 0);
+      DrawGraphic(xpos + x,      ypos + y,      IMG_BALL_RED, 0);
 
       last_x = x;
       last_y = y;
@@ -2399,11 +2789,6 @@ void HandleGameActions()
 /* ---------- new screen button stuff -------------------------------------- */
 
 /* graphic position and size values for buttons and scrollbars */
-#define SC_SCROLLBUTTON_XPOS           64
-#define SC_SCROLLBUTTON_YPOS           0
-#define SC_SCROLLBAR_XPOS              0
-#define SC_SCROLLBAR_YPOS              64
-
 #define SC_SCROLLBUTTON_XSIZE          32
 #define SC_SCROLLBUTTON_YSIZE          32
 
@@ -2420,29 +2805,29 @@ void HandleGameActions()
 
 static struct
 {
-  int xpos, ypos;
+  int gfx_unpressed, gfx_pressed;
   int x, y;
   int gadget_id;
   char *infotext;
 } scrollbutton_info[NUM_SCREEN_SCROLLBUTTONS] =
 {
   {
-    SC_SCROLLBUTTON_XPOS + 0 * SC_SCROLLBUTTON_XSIZE,   SC_SCROLLBUTTON_YPOS,
-    SC_SCROLL_UP_XPOS,                                 SC_SCROLL_UP_YPOS,
+    IMG_ARROW_BLUE_UP, IMG_ARROW_RED_UP,
+    SC_SCROLL_UP_XPOS, SC_SCROLL_UP_YPOS,
     SCREEN_CTRL_ID_SCROLL_UP,
-    "scroll level series up"
+    "scroll up"
   },
   {
-    SC_SCROLLBUTTON_XPOS + 1 * SC_SCROLLBUTTON_XSIZE,   SC_SCROLLBUTTON_YPOS,
-    SC_SCROLL_DOWN_XPOS,                               SC_SCROLL_DOWN_YPOS,
+    IMG_ARROW_BLUE_DOWN, IMG_ARROW_RED_DOWN,
+    SC_SCROLL_DOWN_XPOS, SC_SCROLL_DOWN_YPOS,
     SCREEN_CTRL_ID_SCROLL_DOWN,
-    "scroll level series down"
+    "scroll down"
   }
 };
 
 static struct
 {
-  int xpos, ypos;
+  int gfx_unpressed, gfx_pressed;
   int x, y;
   int width, height;
   int type;
@@ -2451,9 +2836,9 @@ static struct
 } scrollbar_info[NUM_SCREEN_SCROLLBARS] =
 {
   {
-    SC_SCROLLBAR_XPOS,                 SC_SCROLLBAR_YPOS,
-    SX + SC_SCROLL_VERTICAL_XPOS,      SY + SC_SCROLL_VERTICAL_YPOS,
-    SC_SCROLL_VERTICAL_XSIZE,          SC_SCROLL_VERTICAL_YSIZE,
+    IMG_SCROLLBAR_BLUE, IMG_SCROLLBAR_RED,
+    SX + SC_SCROLL_VERTICAL_XPOS, SY + SC_SCROLL_VERTICAL_YPOS,
+    SC_SCROLL_VERTICAL_XSIZE, SC_SCROLL_VERTICAL_YSIZE,
     GD_TYPE_SCROLLBAR_VERTICAL,
     SCREEN_CTRL_ID_SCROLL_VERTICAL,
     "scroll level series vertically"
@@ -2462,16 +2847,17 @@ static struct
 
 static void CreateScreenScrollbuttons()
 {
-  Bitmap *gd_bitmap = pix[PIX_MORE];
   struct GadgetInfo *gi;
   unsigned long event_mask;
   int i;
 
   for (i=0; i<NUM_SCREEN_SCROLLBUTTONS; i++)
   {
-    int id = scrollbutton_info[i].gadget_id;
+    Bitmap *gd_bitmap_unpressed, *gd_bitmap_pressed;
+    int gfx_unpressed, gfx_pressed;
     int x, y, width, height;
     int gd_x1, gd_x2, gd_y1, gd_y2;
+    int id = scrollbutton_info[i].gadget_id;
 
     x = scrollbutton_info[i].x;
     y = scrollbutton_info[i].y;
@@ -2482,10 +2868,15 @@ static void CreateScreenScrollbuttons()
     y += SY;
     width = SC_SCROLLBUTTON_XSIZE;
     height = SC_SCROLLBUTTON_YSIZE;
-    gd_x1 = scrollbutton_info[i].xpos;
-    gd_y1 = scrollbutton_info[i].ypos;
-    gd_x2 = gd_x1;
-    gd_y2 = gd_y1 + SC_SCROLLBUTTON_YSIZE;
+
+    gfx_unpressed = scrollbutton_info[i].gfx_unpressed;
+    gfx_pressed   = scrollbutton_info[i].gfx_pressed;
+    gd_bitmap_unpressed = new_graphic_info[gfx_unpressed].bitmap;
+    gd_bitmap_pressed   = new_graphic_info[gfx_pressed].bitmap;
+    gd_x1 = new_graphic_info[gfx_unpressed].src_x;
+    gd_y1 = new_graphic_info[gfx_unpressed].src_y;
+    gd_x2 = new_graphic_info[gfx_pressed].src_x;
+    gd_y2 = new_graphic_info[gfx_pressed].src_y;
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
@@ -2496,8 +2887,8 @@ static void CreateScreenScrollbuttons()
                      GDI_HEIGHT, height,
                      GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
                      GDI_STATE, GD_BUTTON_UNPRESSED,
-                     GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y1,
-                     GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y2,
+                     GDI_DESIGN_UNPRESSED, gd_bitmap_unpressed, gd_x1, gd_y1,
+                     GDI_DESIGN_PRESSED, gd_bitmap_pressed, gd_x2, gd_y2,
                      GDI_EVENT_MASK, event_mask,
                      GDI_CALLBACK_ACTION, HandleScreenGadgets,
                      GDI_END);
@@ -2515,35 +2906,29 @@ static void CreateScreenScrollbars()
 
   for (i=0; i<NUM_SCREEN_SCROLLBARS; i++)
   {
-    int id = scrollbar_info[i].gadget_id;
-    Bitmap *gd_bitmap = pix[PIX_MORE];
+    Bitmap *gd_bitmap_unpressed, *gd_bitmap_pressed;
+    int gfx_unpressed, gfx_pressed;
     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 id = scrollbar_info[i].gadget_id;
 
-#if 0
-    if (num_leveldirs <= MAX_MENU_ENTRIES_ON_SCREEN)
-      num_page_entries = num_leveldirs;
-    else
-      num_page_entries = MAX_MENU_ENTRIES_ON_SCREEN - 1;
-
-    items_max = MAX(num_leveldirs, num_page_entries);
-    items_visible = num_page_entries;
-    item_position = 0;
-#else
     items_max = num_page_entries;
     items_visible = num_page_entries;
     item_position = 0;
-#endif
 
     event_mask = GD_EVENT_MOVING | GD_EVENT_OFF_BORDERS;
 
-    gd_x1 = scrollbar_info[i].xpos;
-    gd_x2 = gd_x1 + scrollbar_info[i].width;
-    gd_y1 = scrollbar_info[i].ypos;
-    gd_y2 = scrollbar_info[i].ypos;
+    gfx_unpressed = scrollbar_info[i].gfx_unpressed;
+    gfx_pressed   = scrollbar_info[i].gfx_pressed;
+    gd_bitmap_unpressed = new_graphic_info[gfx_unpressed].bitmap;
+    gd_bitmap_pressed   = new_graphic_info[gfx_pressed].bitmap;
+    gd_x1 = new_graphic_info[gfx_unpressed].src_x;
+    gd_y1 = new_graphic_info[gfx_unpressed].src_y;
+    gd_x2 = new_graphic_info[gfx_pressed].src_x;
+    gd_y2 = new_graphic_info[gfx_pressed].src_y;
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
@@ -2557,8 +2942,8 @@ static void CreateScreenScrollbars()
                      GDI_SCROLLBAR_ITEMS_VISIBLE, items_visible,
                      GDI_SCROLLBAR_ITEM_POSITION, item_position,
                      GDI_STATE, GD_BUTTON_UNPRESSED,
-                     GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y1,
-                     GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y2,
+                     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_EVENT_MASK, event_mask,
                      GDI_CALLBACK_ACTION, HandleScreenGadgets,
@@ -2577,6 +2962,14 @@ void CreateScreenGadgets()
   CreateScreenScrollbars();
 }
 
+void FreeScreenGadgets()
+{
+  int i;
+
+  for (i=0; i<NUM_SCREEN_GADGETS; i++)
+    FreeGadget(screen_gadget[i]);
+}
+
 void MapChooseTreeGadgets(TreeInfo *ti)
 {
   int num_entries = numTreeInfoInGroup(ti);
@@ -2601,21 +2994,30 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
 {
   int id = gi->custom_id;
 
-  if (game_status != CHOOSELEVEL)
+  if (game_status != CHOOSELEVEL && game_status != SETUP)
     return;
 
   switch (id)
   {
     case SCREEN_CTRL_ID_SCROLL_UP:
-      HandleChooseLevel(SX,SY + 32, 0,0, MB_MENU_MARK);
+      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);
       break;
 
     case SCREEN_CTRL_ID_SCROLL_DOWN:
-      HandleChooseLevel(SX,SY + SYSIZE - 32, 0,0, MB_MENU_MARK);
+      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);
       break;
 
     case SCREEN_CTRL_ID_SCROLL_VERTICAL:
-      HandleChooseLevel(0,0, 999,gi->event.item_position, MB_MENU_INITIALIZE);
+      if (game_status == CHOOSELEVEL)
+       HandleChooseLevel(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE);
+      else if (game_status == SETUP)
+       HandleSetupScreen(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE);
       break;
 
     default: