X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=1a900b21fe682920ba7444c835efc8e568a56aca;hb=5a9927b017cadc09250e6b3de89a88d23bf89143;hp=57f7a4bcd35035605ddaaecacff1156370eaba5b;hpb=8acfa954d5b7d689ee20ffd1ed5a238909e1a1cc;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 57f7a4bc..1a900b21 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -23,23 +23,25 @@
 #include "cartoons.h"
 #include "network.h"
 #include "init.h"
+#include "config.h"
 
 /* screens in the setup menu */
 #define SETUP_MODE_MAIN			0
 #define SETUP_MODE_GAME			1
-#define SETUP_MODE_EDITOR		2
-#define SETUP_MODE_INPUT		3
-#define SETUP_MODE_SHORTCUT_1		4
-#define SETUP_MODE_SHORTCUT_2		5
-#define SETUP_MODE_GRAPHICS		6
-#define SETUP_MODE_CHOOSE_SCREEN_MODE	7
-#define SETUP_MODE_SOUND		8
-#define SETUP_MODE_ARTWORK		9
-#define SETUP_MODE_CHOOSE_GRAPHICS	10
-#define SETUP_MODE_CHOOSE_SOUNDS	11
-#define SETUP_MODE_CHOOSE_MUSIC		12
-
-#define MAX_SETUP_MODES			13
+#define SETUP_MODE_CHOOSE_GAME_SPEED	2
+#define SETUP_MODE_EDITOR		3
+#define SETUP_MODE_INPUT		4
+#define SETUP_MODE_SHORTCUT_1		5
+#define SETUP_MODE_SHORTCUT_2		6
+#define SETUP_MODE_GRAPHICS		7
+#define SETUP_MODE_CHOOSE_SCREEN_MODE	8
+#define SETUP_MODE_SOUND		9
+#define SETUP_MODE_ARTWORK		10
+#define SETUP_MODE_CHOOSE_GRAPHICS	11
+#define SETUP_MODE_CHOOSE_SOUNDS	12
+#define SETUP_MODE_CHOOSE_MUSIC		13
+
+#define MAX_SETUP_MODES			14
 
 /* for input setup functions */
 #define SETUPINPUT_SCREEN_POS_START	0
@@ -54,9 +56,10 @@
 #define INFO_MODE_MUSIC			3
 #define INFO_MODE_CREDITS		4
 #define INFO_MODE_PROGRAM		5
-#define INFO_MODE_LEVELSET		6
+#define INFO_MODE_VERSION		6
+#define INFO_MODE_LEVELSET		7
 
-#define MAX_INFO_MODES			7
+#define MAX_INFO_MODES			8
 
 /* for various menu stuff  */
 #define MENU_SCREEN_START_XPOS		1
@@ -134,6 +137,7 @@ static void HandleSetupScreen_Generic(int, int, int, int, int);
 static void HandleSetupScreen_Input(int, int, int, int, int);
 static void CustomizeKeyboard(int);
 static void CalibrateJoystick(int);
+static void execSetupGame(void);
 static void execSetupGraphics(void);
 static void execSetupArtwork(void);
 static void HandleChooseTree(int, int, int, int, int, TreeInfo **);
@@ -153,20 +157,53 @@ static void HandleInfoScreen_Elements(int);
 static void HandleInfoScreen_Music(int);
 static void HandleInfoScreen_Credits(int);
 static void HandleInfoScreen_Program(int);
+static void HandleInfoScreen_Version(int);
 
 static void MapScreenMenuGadgets(int);
 static void MapScreenTreeGadgets(TreeInfo *);
 
 static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
 
-static boolean show_titlescreen_initial = TRUE;
-
 static int setup_mode = SETUP_MODE_MAIN;
 static int info_mode = INFO_MODE_MAIN;
 
 static TreeInfo *screen_modes = NULL;
 static TreeInfo *screen_mode_current = NULL;
 
+static TreeInfo *game_speeds = NULL;
+static TreeInfo *game_speed_current = NULL;
+
+static struct
+{
+  int value;
+  char *text;
+} game_speeds_list[] =
+{
+#if 1
+  {	30,	"Very Slow"			},
+  {	25,	"Slow"				},
+  {	20,	"Normal"			},
+  {	15,	"Fast"				},
+  {	10,	"Very Fast"			},
+#else
+  {	1000,	"1/1s (Extremely Slow)"		},
+  {	500,	"1/2s"				},
+  {	200,	"1/5s"				},
+  {	100,	"1/10s"				},
+  {	50,	"1/20s"				},
+  {	29,	"1/35s (Original Supaplex)"	},
+  {	25,	"1/40s"				},
+  {	20,	"1/50s (Normal Speed)"		},
+  {	14,	"1/70s (Maximum Supaplex)"	},
+  {	10,	"1/100s"			},
+  {	5,	"1/200s"			},
+  {	2,	"1/500s"			},
+  {	1,	"1/1000s (Extremely Fast)"	},
+#endif
+
+  {	-1,	NULL				},
+};
+
 #define DRAW_MODE(s)		((s) >= GAME_MODE_MAIN &&		\
 				 (s) <= GAME_MODE_SETUP ? (s) :		\
 				 (s) == GAME_MODE_PSEUDO_TYPENAME ?	\
@@ -203,6 +240,26 @@ static Bitmap *scrollbar_bitmap[NUM_SCROLLBAR_BITMAPS];
 #endif
 
 
+/* title display and control definitions */
+
+#define MAX_NUM_TITLE_SCREENS	(2 * MAX_NUM_TITLE_IMAGES +		\
+				 2 * MAX_NUM_TITLE_MESSAGES)
+
+static boolean show_title_initial = TRUE;
+static int num_title_screens = 0;
+
+struct TitleControlInfo
+{
+  boolean is_image;
+  boolean initial;
+  int local_nr;
+};
+
+struct TitleControlInfo title_controls[MAX_NUM_TITLE_SCREENS];
+
+
+/* main menu display and control definitions */
+
 #define MAIN_CONTROL_NAME		0
 #define MAIN_CONTROL_LEVELS		1
 #define MAIN_CONTROL_SCORES		2
@@ -235,7 +292,7 @@ struct MainControlInfo
   struct MenuPosInfo *pos_button;
   int button_graphic;
 
-  struct MenuPosInfo *pos_text;
+  struct TextPosInfo *pos_text;
   char *text;
   int font_text;
 
@@ -367,6 +424,44 @@ static struct MainControlInfo main_controls[] =
 };
 
 
+static int getTitleScreenGraphic(int nr, boolean initial)
+{
+  return (initial ? IMG_TITLESCREEN_INITIAL_1 : IMG_TITLESCREEN_1) + nr;
+}
+
+static void InitializeTitleControlsExt_AddTitleInfo(boolean is_image,
+						    boolean initial, int nr)
+{
+  title_controls[num_title_screens].is_image = is_image;
+  title_controls[num_title_screens].initial = initial;
+  title_controls[num_title_screens].local_nr = nr;
+
+  num_title_screens++;
+}
+
+static void InitializeTitleControls_CheckTitleInfo(boolean initial)
+{
+  int i;
+
+  for (i = 0; i < MAX_NUM_TITLE_IMAGES; i++)
+    if (graphic_info[getTitleScreenGraphic(i, initial)].bitmap != NULL)
+      InitializeTitleControlsExt_AddTitleInfo(TRUE, initial, i);
+
+  for (i = 0; i < MAX_NUM_TITLE_MESSAGES; i++)
+    if (getLevelSetTitleMessageFilename(i, initial) != NULL)
+      InitializeTitleControlsExt_AddTitleInfo(FALSE, initial, i);
+}
+
+static void InitializeTitleControls()
+{
+  num_title_screens = 0;
+
+  if (show_title_initial)
+    InitializeTitleControls_CheckTitleInfo(TRUE);
+
+  InitializeTitleControls_CheckTitleInfo(FALSE);
+}
+
 static void InitializeMainControls()
 {
   boolean local_team_mode = (!options.network && setup.team_mode);
@@ -385,7 +480,7 @@ static void InitializeMainControls()
     struct MainControlInfo *mci = &main_controls[i];
     int nr                         = mci->nr;
     struct MenuPosInfo *pos_button = mci->pos_button;
-    struct MenuPosInfo *pos_text   = mci->pos_text;
+    struct TextPosInfo *pos_text   = mci->pos_text;
     struct MenuPosInfo *pos_input  = mci->pos_input;
     char *text                     = mci->text;
     char *input                    = mci->input;
@@ -418,8 +513,13 @@ static void InitializeMainControls()
 	menu.main.input.name.y = menu.main.text.name.y;
 #endif
 
+#if 1
+      menu.main.input.name.width  = input_width;
+      menu.main.input.name.height = input_height;
+#else
       menu.main.input.name.width  = font_input_width * MAX_PLAYER_NAME_LEN;
       menu.main.input.name.height = font_input_height;
+#endif
     }
 
     if (pos_button != NULL)
@@ -461,7 +561,8 @@ static void InitializeMainControls()
   }
 }
 
-static void DrawCursorAndText_Main(int nr, boolean active)
+static void DrawCursorAndText_Main_Ext(int nr, boolean active_text,
+				       boolean active_input)
 {
   int i;
 
@@ -472,7 +573,7 @@ static void DrawCursorAndText_Main(int nr, boolean active)
     if (mci->nr == nr || nr == -1)
     {
       struct MenuPosInfo *pos_button = mci->pos_button;
-      struct MenuPosInfo *pos_text   = mci->pos_text;
+      struct TextPosInfo *pos_text   = mci->pos_text;
       struct MenuPosInfo *pos_input  = mci->pos_input;
       char *text                     = mci->text;
       char *input                    = mci->input;
@@ -480,12 +581,17 @@ static void DrawCursorAndText_Main(int nr, boolean active)
       int font_text                  = mci->font_text;
       int font_input                 = mci->font_input;
 
-      if (active)
+      if (active_text)
       {
 	button_graphic = BUTTON_GRAPHIC_ACTIVE(button_graphic);
 	font_text = FONT_ACTIVE(font_text);
       }
 
+      if (active_input)
+      {
+	font_input = FONT_ACTIVE(font_input);
+      }
+
       if (pos_button != NULL)
       {
 	struct MenuPosInfo *pos = pos_button;
@@ -498,9 +604,9 @@ static void DrawCursorAndText_Main(int nr, boolean active)
 
       if (pos_text != NULL && text != NULL)
       {
-	struct MenuPosInfo *pos = pos_text;
-	int x = mSX + ALIGNED_XPOS(pos->x, pos->width, pos->align);
-	int y = mSY + pos->y;
+	struct TextPosInfo *pos = pos_text;
+	int x = mSX + ALIGNED_MENU_XPOS(pos);
+	int y = mSY + ALIGNED_MENU_YPOS(pos);
 
 	DrawBackgroundForFont(x, y, pos->width, pos->height, font_text);
 	DrawText(x, y, text, font_text);
@@ -509,8 +615,8 @@ static void DrawCursorAndText_Main(int nr, boolean active)
       if (pos_input != NULL && input != NULL)
       {
 	struct MenuPosInfo *pos = pos_input;
-	int x = mSX + ALIGNED_XPOS(pos->x, pos->width, pos->align);
-	int y = mSY + pos->y;
+	int x = mSX + ALIGNED_MENU_XPOS(pos);
+	int y = mSY + ALIGNED_MENU_YPOS(pos);
 
 	DrawBackgroundForFont(x, y, pos->width, pos->height, font_input);
 	DrawText(x, y, input, font_input);
@@ -519,6 +625,18 @@ static void DrawCursorAndText_Main(int nr, boolean active)
   }
 }
 
+static void DrawCursorAndText_Main(int nr, boolean active_text)
+{
+  DrawCursorAndText_Main_Ext(nr, active_text, FALSE);
+}
+
+#if 0
+static void DrawCursorAndText_Main_Input(int nr, boolean active_text)
+{
+  DrawCursorAndText_Main_Ext(nr, active_text, TRUE);
+}
+#endif
+
 static struct MainControlInfo *getMainControlInfo(int nr)
 {
   int i;
@@ -535,8 +653,20 @@ static boolean insideMenuPosRect(struct MenuPosInfo *rect, int x, int y)
   if (rect == NULL)
     return FALSE;
 
-  int rect_x = ALIGNED_XPOS(rect->x, rect->width, rect->align);
-  int rect_y = rect->y;
+  int rect_x = ALIGNED_MENU_XPOS(rect);
+  int rect_y = ALIGNED_MENU_YPOS(rect);
+
+  return (x >= rect_x && x < rect_x + rect->width &&
+	  y >= rect_y && y < rect_y + rect->height);
+}
+
+static boolean insideTextPosRect(struct TextPosInfo *rect, int x, int y)
+{
+  if (rect == NULL)
+    return FALSE;
+
+  int rect_x = ALIGNED_MENU_XPOS(rect);
+  int rect_y = ALIGNED_MENU_YPOS(rect);
 
   return (x >= rect_x && x < rect_x + rect->width &&
 	  y >= rect_y && y < rect_y + rect->height);
@@ -618,15 +748,17 @@ static int getLevelRangeTextPos()
 }
 #endif
 
-static int getTitleScreenGraphic()
+int effectiveGameStatus()
 {
-  return (show_titlescreen_initial ? IMG_TITLESCREEN_INITIAL_1 :
-	  IMG_TITLESCREEN_1);
+  if (game_status == GAME_MODE_INFO && info_mode == INFO_MODE_TITLE)
+    return GAME_MODE_TITLE;
+
+  return game_status;
 }
 
-void DrawTitleScreenImage(int nr)
+void DrawTitleScreenImage(int nr, boolean initial)
 {
-  int graphic = getTitleScreenGraphic() + nr;
+  int graphic = getTitleScreenGraphic(nr, initial);
   Bitmap *bitmap = graphic_info[graphic].bitmap;
 #if 1
   int width  = graphic_info[graphic].width;
@@ -683,6 +815,42 @@ void DrawTitleScreenImage(int nr)
     title.auto_delay_final = graphic_info[graphic].auto_delay;
 }
 
+void DrawTitleScreenMessage(int nr, boolean initial)
+{
+  char *filename = getLevelSetTitleMessageFilename(nr, initial);
+  int font_nr = FONT_TEXT_1;
+  int font_width;
+  int font_height;
+  int pad_x = 16   + 4;
+  int pad_y = 32   + 14;
+  int sx = pad_x;
+  int sy = pad_y;
+  int max_chars_per_line;
+  int max_lines_per_screen;
+  int last_game_status = game_status;	/* save current game status */
+
+  if (filename == NULL)
+    return;
+
+  SetDrawBackgroundMask(REDRAW_ALL);
+  SetWindowBackgroundImageIfDefined(IMG_BACKGROUND_MESSAGE);
+
+  ClearRectangleOnBackground(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE);
+
+  /* force MESSAGE font on title message screen */
+  game_status = GAME_MODE_MESSAGE;
+
+  font_width = getFontWidth(font_nr);
+  font_height = getFontHeight(font_nr);
+  max_chars_per_line = (WIN_XSIZE - 2 * pad_x) / font_width;
+  max_lines_per_screen = (WIN_YSIZE - pad_y) / font_height - 1;
+
+  DrawTextFromFile(sx, sy, filename, font_nr, max_chars_per_line,
+		   max_lines_per_screen, FALSE);
+
+  game_status = last_game_status;	/* restore current game status */
+}
+
 void DrawTitleScreen()
 {
   KeyboardAutoRepeatOff();
@@ -748,15 +916,33 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
   /* needed if last screen (level choice) changed graphics, sounds or music */
   ReloadCustomArtwork(0);
 
-#ifdef TARGET_SDL
+#if defined(TARGET_SDL)
   SetDrawtoField(DRAW_BACKBUFFER);
 #endif
 
+#if 1
+  if (setup.show_titlescreen && (show_title_initial || levelset_has_changed))
+  {
+    /* needed to be able to skip title screen, if no image or message defined */
+    InitializeTitleControls();
+
+    if (num_title_screens > 0)
+    {
+      game_status = GAME_MODE_TITLE;
+
+      DrawTitleScreen();
+
+      return;
+    }
+  }
+#else
   if (setup.show_titlescreen &&
       ((levelset_has_changed &&
-	graphic_info[IMG_TITLESCREEN_1].bitmap != NULL) ||
-       (show_titlescreen_initial &&
-	graphic_info[IMG_TITLESCREEN_INITIAL_1].bitmap != NULL)))
+	(graphic_info[IMG_TITLESCREEN_1].bitmap != NULL ||
+	 getLevelSetMessageFilename(1, FALSE) != NULL)) ||
+       (show_title_initial &&
+	(graphic_info[IMG_TITLESCREEN_INITIAL_1].bitmap != NULL ||
+	 getLevelSetMessageFilename(1, TRUE) != NULL))))
   {
     game_status = GAME_MODE_TITLE;
 
@@ -764,6 +950,7 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
 
     return;
   }
+#endif
 
   /* level_nr may have been set to value over handicap with level editor */
   if (setup.handicap && level_nr > leveldir_current->handicap_level)
@@ -872,6 +1059,8 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
   else
     BackToFront();
 
+  SetMouseCursor(CURSOR_DEFAULT);
+
   InitAnimation();
 
   OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
@@ -918,13 +1107,180 @@ static void gotoTopLevelDir()
 }
 #endif
 
+#if 1
+void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
+{
+  static unsigned long title_delay = 0;
+  static int title_screen_nr = 0;
+  boolean return_to_main_menu = FALSE;
+  boolean use_fading_main_menu = TRUE;
+  boolean use_cross_fading = !show_title_initial;		/* default */
+  struct TitleControlInfo *tci;
+
+  if (button == MB_MENU_INITIALIZE)
+  {
+    int last_game_status = game_status;	/* save current game status */
+
+    title_delay = 0;
+    title_screen_nr = 0;
+    tci = &title_controls[title_screen_nr];
+
+    /* determine number of title screens to display (images and messages) */
+    InitializeTitleControls();
+
+    if (game_status == GAME_MODE_INFO)
+    {
+      if (num_title_screens == 0)
+      {
+	DrawInfoScreen_NotAvailable("Title screen information:",
+				    "No title screen for this level set.");
+
+	title.auto_delay_final = -1;
+
+	return;
+      }
+
+      FadeSoundsAndMusic();
+
+      FadeOut(REDRAW_ALL);
+    }
+
+    /* force TITLE music on title info screen */
+    game_status = GAME_MODE_TITLE;
+
+    PlayMenuSound();
+    PlayMenuMusic();
+
+    game_status = last_game_status;	/* restore current game status */
+
+    if (tci->is_image)
+    {
+      DrawTitleScreenImage(tci->local_nr, tci->initial);
+    }
+    else
+    {
+      DrawTitleScreenMessage(tci->local_nr, tci->initial);
+
+      title.fade_delay_final = title.fade_delay;
+      title.post_delay_final = title.post_delay;
+      title.auto_delay_final = -1;
+    }
+
+    SetMouseCursor(CURSOR_NONE);
+
+    FadeIn(REDRAW_ALL);
+
+    DelayReached(&title_delay, 0);	/* reset delay counter */
+
+    return;
+  }
+
+  if (title.auto_delay_final > -1 &&
+      DelayReached(&title_delay, title.auto_delay_final))
+    button = MB_MENU_CHOICE;
+
+  if (button == MB_MENU_LEAVE)
+  {
+    return_to_main_menu = TRUE;
+    use_fading_main_menu = FALSE;
+  }
+  else if (button == MB_MENU_CHOICE)
+  {
+    int anim_mode;
+
+    if (game_status == GAME_MODE_INFO && num_title_screens == 0)
+    {
+      FadeOut(REDRAW_FIELD);
+
+      info_mode = INFO_MODE_MAIN;
+      DrawAndFadeInInfoScreen(REDRAW_FIELD);
+
+      return;
+    }
+
+    title_screen_nr++;
+    tci = &title_controls[title_screen_nr];
+
+    if (tci->is_image)
+      anim_mode =
+	graphic_info[getTitleScreenGraphic(tci->local_nr,
+					   tci->initial)].anim_mode;
+    else
+      anim_mode = ANIM_FADE;	/* ??? */
+
+    use_cross_fading = (anim_mode == ANIM_FADE ? FALSE :
+			anim_mode == ANIM_CROSSFADE ? TRUE :
+			use_cross_fading);
+
+    if (title_screen_nr < num_title_screens)
+    {
+      if (!use_cross_fading)
+	FadeOut(REDRAW_ALL);
+
+      if (use_cross_fading)
+	FadeCrossSaveBackbuffer();
+
+      if (tci->is_image)
+	DrawTitleScreenImage(tci->local_nr, tci->initial);
+      else
+	DrawTitleScreenMessage(tci->local_nr, tci->initial);
+
+      if (use_cross_fading)
+	FadeCross(REDRAW_ALL);
+      else
+	FadeIn(REDRAW_ALL);
+
+      DelayReached(&title_delay, 0);	/* reset delay counter */
+    }
+    else
+    {
+      FadeSoundsAndMusic();
+
+      FadeOut(REDRAW_ALL);
+
+      return_to_main_menu = TRUE;
+    }
+  }
+
+  if (return_to_main_menu)
+  {
+    /* show initial title images and messages only once at program start */
+    show_title_initial = FALSE;
+
+    RedrawBackground();
+
+    SetMouseCursor(CURSOR_DEFAULT);
+
+    if (game_status == GAME_MODE_INFO)
+    {
+      OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
+      info_mode = INFO_MODE_MAIN;
+      DrawInfoScreenExt(REDRAW_ALL, use_fading_main_menu);
+    }
+    else	/* default: return to main menu */
+    {
+      OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
+      game_status = GAME_MODE_MAIN;
+      DrawMainMenuExt(REDRAW_ALL, use_fading_main_menu);
+    }
+  }
+}
+
+#else
+
 void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
 {
   static unsigned long title_delay = 0;
   static int title_nr = 0;
+  static boolean showing_message = FALSE;
+  char *filename = getLevelSetMessageFilename();
   boolean return_to_main_menu = FALSE;
   boolean use_fading_main_menu = TRUE;
-  boolean use_cross_fading = !show_titlescreen_initial;		/* default */
+  boolean use_cross_fading = !show_title_initial;		/* default */
+  boolean no_title_info = (graphic_info[IMG_TITLESCREEN_1].bitmap == NULL &&
+			   getLevelSetMessageFilename(1, FALSE) == NULL);
 
   if (button == MB_MENU_INITIALIZE)
   {
@@ -932,14 +1288,16 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
 
     title_delay = 0;
     title_nr = 0;
+    showing_message = FALSE;
 
-    if (show_titlescreen_initial &&
-	graphic_info[IMG_TITLESCREEN_INITIAL_1].bitmap == NULL)
-      show_titlescreen_initial = FALSE;
+    if (show_title_initial &&
+	graphic_info[IMG_TITLESCREEN_INITIAL_1].bitmap == NULL &&
+	getLevelSetMessageFilename(1, TRUE) == NULL)
+      show_title_initial = FALSE;
 
     if (game_status == GAME_MODE_INFO)
     {
-      if (graphic_info[IMG_TITLESCREEN_1].bitmap == NULL)
+      if (no_title_info)
       {
 	DrawInfoScreen_NotAvailable("Title screen information:",
 				    "No title screen for this level set.");
@@ -962,7 +1320,20 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
 
     game_status = last_game_status;	/* restore current game status */
 
-    DrawTitleScreenImage(title_nr);
+    if (graphic_info[getTitleScreenGraphic(0, show_title_initial)].bitmap != NULL)
+    {
+      DrawTitleScreenImage(title_nr, show_title_initial);
+    }
+    else
+    {
+      DrawTitleScreenMessage(filename);
+
+      showing_message = TRUE;
+
+      title.fade_delay_final = title.fade_delay;
+      title.post_delay_final = title.post_delay;
+      title.auto_delay_final = -1;
+    }
 
     FadeIn(REDRAW_ALL);
 
@@ -984,8 +1355,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
   {
     int anim_mode;
 
-    if (game_status == GAME_MODE_INFO &&
-	graphic_info[IMG_TITLESCREEN_1].bitmap == NULL)
+    if (game_status == GAME_MODE_INFO && no_title_info)
     {
       FadeOut(REDRAW_FIELD);
 
@@ -997,16 +1367,16 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
 
     title_nr++;
 
-    if (show_titlescreen_initial &&
-	(title_nr >= MAX_NUM_TITLE_SCREENS ||
+    if (show_title_initial &&
+	(title_nr >= MAX_NUM_TITLE_IMAGES ||
 	 graphic_info[IMG_TITLESCREEN_INITIAL_1 + title_nr].bitmap == NULL))
     {
-      show_titlescreen_initial = FALSE;
+      show_title_initial = FALSE;
 
       title_nr = 0;	/* restart with title screens for current level set */
     }
 
-    anim_mode = graphic_info[getTitleScreenGraphic() + title_nr].anim_mode;
+    anim_mode = graphic_info[getTitleScreenGraphic(title_nr, show_title_initial)].anim_mode;
 
     use_cross_fading = (anim_mode == ANIM_FADE ? FALSE :
 			anim_mode == ANIM_CROSSFADE ? TRUE :
@@ -1015,13 +1385,13 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
     if (!use_cross_fading)
       FadeOut(REDRAW_ALL);
 
-    if (title_nr < MAX_NUM_TITLE_SCREENS &&
-	graphic_info[getTitleScreenGraphic() + title_nr].bitmap != NULL)
+    if (title_nr < MAX_NUM_TITLE_IMAGES &&
+	graphic_info[getTitleScreenGraphic(title_nr, show_title_initial)].bitmap != NULL)
     {
       if (use_cross_fading)
 	FadeCrossSaveBackbuffer();
 
-      DrawTitleScreenImage(title_nr);
+      DrawTitleScreenImage(title_nr, show_title_initial);
 
       if (use_cross_fading)
 	FadeCross(REDRAW_ALL);
@@ -1030,6 +1400,22 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
 
       DelayReached(&title_delay, 0);	/* reset delay counter */
     }
+    else if (!showing_message && filename != NULL)
+    {
+      if (use_cross_fading)
+	FadeCrossSaveBackbuffer();
+
+      DrawTitleScreenMessage(filename);
+
+      if (use_cross_fading)
+	FadeCross(REDRAW_ALL);
+      else
+	FadeIn(REDRAW_ALL);
+
+      DelayReached(&title_delay, 0);	/* reset delay counter */
+
+      showing_message = TRUE;
+    }
     else
     {
       FadeSoundsAndMusic();
@@ -1042,7 +1428,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
 
   if (return_to_main_menu)
   {
-    show_titlescreen_initial = FALSE;
+    show_title_initial = FALSE;
 
     RedrawBackground();
 
@@ -1062,6 +1448,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
     }
   }
 }
+#endif
 
 void HandleMainMenu_SelectLevel(int step, int direction)
 {
@@ -1091,6 +1478,8 @@ void HandleMainMenu_SelectLevel(int step, int direction)
   {
     struct MainControlInfo *mci= getMainControlInfo(MAIN_CONTROL_CURRENT_LEVEL);
 
+    PlaySound(SND_MENU_ITEM_SELECTING);
+
     level_nr = new_level_nr;
 
 #if 1
@@ -1135,7 +1524,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
     for (i = 0; main_controls[i].nr != -1; i++)
     {
       if (insideMenuPosRect(main_controls[i].pos_button, mx - mSX, my - mSY) ||
-	  insideMenuPosRect(main_controls[i].pos_text,   mx - mSX, my - mSY) ||
+	  insideTextPosRect(main_controls[i].pos_text,   mx - mSX, my - mSY) ||
 	  insideMenuPosRect(main_controls[i].pos_input,  mx - mSX, my - mSY))
       {
 	pos = main_controls[i].nr;
@@ -1163,6 +1552,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
     {
       if (pos != choice)
       {
+	PlaySound(SND_MENU_ITEM_ACTIVATING);
+
 	DrawCursorAndText_Main(choice, FALSE);
 	DrawCursorAndText_Main(pos, TRUE);
 
@@ -1171,6 +1562,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
     }
     else
     {
+      PlaySound(SND_MENU_ITEM_SELECTING);
+
       if (pos == MAIN_CONTROL_NAME)
       {
 	game_status = GAME_MODE_PSEUDO_TYPENAME;
@@ -1405,6 +1798,12 @@ static void execInfoProgram()
   DrawInfoScreen();
 }
 
+static void execInfoVersion()
+{
+  info_mode = INFO_MODE_VERSION;
+  DrawInfoScreen();
+}
+
 static void execInfoLevelSet()
 {
   info_mode = INFO_MODE_LEVELSET;
@@ -1424,6 +1823,7 @@ static struct TokenInfo info_info_main[] =
   { TYPE_ENTER_SCREEN,	execInfoMusic,		"Music Info"		},
   { TYPE_ENTER_SCREEN,	execInfoCredits,	"Credits"		},
   { TYPE_ENTER_SCREEN,	execInfoProgram,	"Program Info"		},
+  { TYPE_ENTER_SCREEN,	execInfoVersion,	"Version Info"		},
   { TYPE_ENTER_SCREEN,	execInfoLevelSet,	"Level Set Info"	},
   { TYPE_EMPTY,		NULL,			""			},
   { TYPE_LEAVE_MENU,	execExitInfo, 		"Exit"			},
@@ -1571,6 +1971,8 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
     {
       if (y != choice)
       {
+	PlaySound(SND_MENU_ITEM_ACTIVATING);
+
 #if 1
 	DrawCursorAndText_Info(choice, FALSE);
 	DrawCursorAndText_Info(y, TRUE);
@@ -1584,6 +1986,8 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
     }
     else if (!(info_info[y].type & TYPE_GHOSTED))
     {
+      PlaySound(SND_MENU_ITEM_SELECTING);
+
       if (info_info[y].type & TYPE_ENTER_OR_LEAVE)
       {
 	void (*menu_callback_function)(void) = info_info[choice].value;
@@ -1744,7 +2148,11 @@ static char *getHelpText(int element, int action, int direction)
 
 void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos)
 {
+#if 1
+  int font_nr = FONT_INFO_ELEMENTS;
+#else
   int font_nr = FONT_LEVEL_NUMBER;
+#endif
   int font_width = getFontWidth(font_nr);
   int sx = mSX + MINI_TILEX + TILEX + MINI_TILEX;
   int sy = mSY + 65 + 2 * 32 + 1;
@@ -1834,6 +2242,8 @@ void HandleInfoScreen_Elements(int button)
 
   if (button == MB_MENU_LEAVE)
   {
+    PlaySound(SND_MENU_ITEM_SELECTING);
+
     info_mode = INFO_MODE_MAIN;
     DrawInfoScreen();
 
@@ -1842,7 +2252,11 @@ void HandleInfoScreen_Elements(int button)
   else if (button == MB_MENU_CHOICE || button == MB_MENU_INITIALIZE)
   {
     if (button != MB_MENU_INITIALIZE)
+    {
+      PlaySound(SND_MENU_ITEM_SELECTING);
+
       page++;
+    }
 
     if (page >= num_pages)
     {
@@ -1917,6 +2331,10 @@ void HandleInfoScreen_Music(int button)
 
   if (button == MB_MENU_LEAVE)
   {
+    PlaySound(SND_MENU_ITEM_SELECTING);
+
+    FadeSoundsAndMusic();
+
     info_mode = INFO_MODE_MAIN;
     DrawInfoScreen();
 
@@ -1927,8 +2345,12 @@ void HandleInfoScreen_Music(int button)
     int y = 0;
 
     if (button != MB_MENU_INITIALIZE)
+    {
+      PlaySound(SND_MENU_ITEM_SELECTING);
+
       if (list != NULL)
 	list = list->next;
+    }
 
     if (list == NULL)
     {
@@ -2216,6 +2638,8 @@ void HandleInfoScreen_Credits(int button)
   }
   else if (button == MB_MENU_LEAVE)
   {
+    PlaySound(SND_MENU_ITEM_SELECTING);
+
     info_mode = INFO_MODE_MAIN;
     DrawInfoScreen();
 
@@ -2225,6 +2649,8 @@ void HandleInfoScreen_Credits(int button)
   {
     boolean show_screen;
 
+    PlaySound(SND_MENU_ITEM_SELECTING);
+
     screen_nr++;
 
     FadeCrossSaveBackbuffer();
@@ -2301,6 +2727,148 @@ void HandleInfoScreen_Program(int button)
 {
   if (button == MB_MENU_LEAVE)
   {
+    PlaySound(SND_MENU_ITEM_SELECTING);
+
+    info_mode = INFO_MODE_MAIN;
+    DrawInfoScreen();
+
+    return;
+  }
+  else if (button == MB_MENU_CHOICE)
+  {
+    PlaySound(SND_MENU_ITEM_SELECTING);
+
+    FadeSoundsAndMusic();
+    FadeOut(REDRAW_FIELD);
+
+    info_mode = INFO_MODE_MAIN;
+    DrawAndFadeInInfoScreen(REDRAW_FIELD);
+  }
+  else
+  {
+    PlayMenuSoundIfLoop();
+  }
+}
+
+void DrawInfoScreen_Version()
+{
+  int font_header = FONT_TEXT_3;
+  int font_text = FONT_TEXT_2;
+  int xstep = getFontWidth(font_text);
+  int ystep = getFontHeight(font_text);
+  int ystart = 150;
+  int ybottom = SYSIZE - 20;
+  int xstart1 = SX + 2 * xstep;
+  int xstart2 = SX + 18 * xstep;
+#if defined(TARGET_SDL)
+  int xstart3 = SX + 28 * xstep;
+  SDL_version sdl_version_compiled;
+  const SDL_version *sdl_version_linked;
+#endif
+
+  SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_PROGRAM);
+
+  FadeOut(REDRAW_FIELD);
+
+  ClearWindow();
+  DrawHeadline();
+
+  DrawTextSCentered(100, FONT_TEXT_1, "Version Information:");
+
+  DrawTextF(xstart1, ystart, font_header, "Name");
+  DrawTextF(xstart2, ystart, font_text, PROGRAM_TITLE_STRING);
+
+  ystart += ystep;
+  DrawTextF(xstart1, ystart, font_header, "Version");
+  DrawTextF(xstart2, ystart, font_text, getProgramFullVersionString());
+
+  ystart += ystep;
+  DrawTextF(xstart1, ystart, font_header, "Platform");
+  DrawTextF(xstart2, ystart, font_text, PLATFORM_STRING);
+
+  ystart += ystep;
+  DrawTextF(xstart1, ystart, font_header, "Target");
+  DrawTextF(xstart2, ystart, font_text, TARGET_STRING);
+
+  ystart += ystep;
+  DrawTextF(xstart1, ystart, font_header, "Compile time");
+  DrawTextF(xstart2, ystart, font_text, getCompileDateString());
+
+#if defined(TARGET_SDL)
+  ystart += 3 * ystep;
+  DrawTextF(xstart1, ystart, font_header, "Library");
+  DrawTextF(xstart2, ystart, font_header, "compiled");
+  DrawTextF(xstart3, ystart, font_header, "linked");
+
+  SDL_VERSION(&sdl_version_compiled);
+  sdl_version_linked = SDL_Linked_Version();
+
+  ystart += 2 * ystep;
+  DrawTextF(xstart1, ystart, font_text, "SDL");
+  DrawTextF(xstart2, ystart, font_text, "%d.%d.%d",
+	    sdl_version_compiled.major,
+	    sdl_version_compiled.minor,
+	    sdl_version_compiled.patch);
+  DrawTextF(xstart3, ystart, font_text, "%d.%d.%d",
+	    sdl_version_linked->major,
+	    sdl_version_linked->minor,
+	    sdl_version_linked->patch);
+
+  SDL_IMAGE_VERSION(&sdl_version_compiled);
+  sdl_version_linked = IMG_Linked_Version();
+
+  ystart += ystep;
+  DrawTextF(xstart1, ystart, font_text, "SDL_image");
+  DrawTextF(xstart2, ystart, font_text, "%d.%d.%d",
+	    sdl_version_compiled.major,
+	    sdl_version_compiled.minor,
+	    sdl_version_compiled.patch);
+  DrawTextF(xstart3, ystart, font_text, "%d.%d.%d",
+	    sdl_version_linked->major,
+	    sdl_version_linked->minor,
+	    sdl_version_linked->patch);
+
+  SDL_MIXER_VERSION(&sdl_version_compiled);
+  sdl_version_linked = Mix_Linked_Version();
+
+  ystart += ystep;
+  DrawTextF(xstart1, ystart, font_text, "SDL_mixer");
+  DrawTextF(xstart2, ystart, font_text, "%d.%d.%d",
+	    sdl_version_compiled.major,
+	    sdl_version_compiled.minor,
+	    sdl_version_compiled.patch);
+  DrawTextF(xstart3, ystart, font_text, "%d.%d.%d",
+	    sdl_version_linked->major,
+	    sdl_version_linked->minor,
+	    sdl_version_linked->patch);
+
+  SDL_NET_VERSION(&sdl_version_compiled);
+  sdl_version_linked = SDLNet_Linked_Version();
+
+  ystart += ystep;
+  DrawTextF(xstart1, ystart, font_text, "SDL_net");
+  DrawTextF(xstart2, ystart, font_text, "%d.%d.%d",
+	    sdl_version_compiled.major,
+	    sdl_version_compiled.minor,
+	    sdl_version_compiled.patch);
+  DrawTextF(xstart3, ystart, font_text, "%d.%d.%d",
+	    sdl_version_linked->major,
+	    sdl_version_linked->minor,
+	    sdl_version_linked->patch);
+#endif
+
+  DrawTextSCentered(ybottom, FONT_TEXT_4,
+		    "Press any key or button for info menu");
+
+  FadeIn(REDRAW_FIELD);
+}
+
+void HandleInfoScreen_Version(int button)
+{
+  if (button == MB_MENU_LEAVE)
+  {
+    PlaySound(SND_MENU_ITEM_SELECTING);
+
     info_mode = INFO_MODE_MAIN;
     DrawInfoScreen();
 
@@ -2308,6 +2876,8 @@ void HandleInfoScreen_Program(int button)
   }
   else if (button == MB_MENU_CHOICE)
   {
+    PlaySound(SND_MENU_ITEM_SELECTING);
+
     FadeSoundsAndMusic();
     FadeOut(REDRAW_FIELD);
 
@@ -2325,7 +2895,11 @@ void DrawInfoScreen_LevelSet()
   int ystart = 150;
   int ybottom = SYSIZE - 20;
   char *filename = getLevelSetInfoFilename();
+#if 1
+  int font_nr = FONT_INFO_LEVELSET;
+#else
   int font_nr = FONT_LEVEL_NUMBER;
+#endif
   int font_width = getFontWidth(font_nr);
   int font_height = getFontHeight(font_nr);
   int pad_x = 32;
@@ -2349,7 +2923,7 @@ void DrawInfoScreen_LevelSet()
 
   if (filename != NULL)
     DrawTextFromFile(sx, sy, filename, font_nr, max_chars_per_line,
-		     max_lines_per_screen);
+		     max_lines_per_screen, TRUE);
   else
     DrawTextSCentered(ystart, FONT_TEXT_2,
 		      "No information for this level set.");
@@ -2361,6 +2935,8 @@ void HandleInfoScreen_LevelSet(int button)
 {
   if (button == MB_MENU_LEAVE)
   {
+    PlaySound(SND_MENU_ITEM_SELECTING);
+
     info_mode = INFO_MODE_MAIN;
     DrawInfoScreen();
 
@@ -2368,6 +2944,8 @@ void HandleInfoScreen_LevelSet(int button)
   }
   else if (button == MB_MENU_CHOICE)
   {
+    PlaySound(SND_MENU_ITEM_SELECTING);
+
     FadeSoundsAndMusic();
     FadeOut(REDRAW_FIELD);
 
@@ -2394,6 +2972,8 @@ static void DrawInfoScreenExt(int redraw_mask, boolean do_fading)
     DrawInfoScreen_Credits();
   else if (info_mode == INFO_MODE_PROGRAM)
     DrawInfoScreen_Program();
+  else if (info_mode == INFO_MODE_VERSION)
+    DrawInfoScreen_Version();
   else if (info_mode == INFO_MODE_LEVELSET)
     DrawInfoScreen_LevelSet();
   else
@@ -2430,6 +3010,8 @@ void HandleInfoScreen(int mx, int my, int dx, int dy, int button)
     HandleInfoScreen_Credits(button);
   else if (info_mode == INFO_MODE_PROGRAM)
     HandleInfoScreen_Program(button);
+  else if (info_mode == INFO_MODE_VERSION)
+    HandleInfoScreen_Version(button);
   else if (info_mode == INFO_MODE_LEVELSET)
     HandleInfoScreen_LevelSet(button);
   else
@@ -2445,7 +3027,13 @@ void HandleInfoScreen(int mx, int my, int dx, int dy, int button)
 
 void HandleTypeName(int newxpos, Key key)
 {
+  static char last_player_name[MAX_PLAYER_NAME_LEN + 1];
   struct MainControlInfo *mci = getMainControlInfo(MAIN_CONTROL_NAME);
+#if 1
+  struct MenuPosInfo *pos = mci->pos_input;
+  int startx = mSX + ALIGNED_MENU_XPOS(pos);
+  int starty = mSY + ALIGNED_MENU_YPOS(pos);
+#endif
 #if 1
   static int xpos = 0;
 #else
@@ -2455,42 +3043,51 @@ void HandleTypeName(int newxpos, Key key)
   int font_active_nr = FONT_ACTIVE(font_nr);
   int font_width = getFontWidth(font_active_nr);
 #if 1
+#if 0
   int startx = mSX + mci->pos_input->x;
   int starty = mSY + mci->pos_input->y;
+#endif
 #else
   int name_width = getFontWidth(FONT_MENU_1) * strlen("Name:");
   int startx = mSX + 32 + name_width;
   int starty = mSY + ypos * 32;
 #endif
+  char key_char = getValidConfigValueChar(getCharFromKey(key));
+  boolean is_valid_key_char = (key_char != 0 && (key_char != ' ' || xpos > 0));
+  boolean is_active = TRUE;
+
+  DrawBackgroundForFont(startx,starty, pos->width, pos->height, font_active_nr);
 
   if (newxpos)
   {
+    strcpy(last_player_name, setup.player_name);
+
     xpos = newxpos;
 
+#if 0
+    /* add one character width for added cursor character */
+    pos->width += font_width;
+    startx = mSX + ALIGNED_MENU_XPOS(pos);
+
     DrawText(startx, starty, setup.player_name, font_active_nr);
     DrawText(startx + xpos * font_width, starty, "_", font_active_nr);
-
-    return;
+#endif
   }
-
-  if (((key >= KSYM_A && key <= KSYM_Z) ||
-       (key >= KSYM_a && key <= KSYM_z)) && 
-      xpos < MAX_PLAYER_NAME_LEN)
+  else if (is_valid_key_char && xpos < MAX_PLAYER_NAME_LEN)
   {
-    char ascii;
-
-    if (key >= KSYM_A && key <= KSYM_Z)
-      ascii = 'A' + (char)(key - KSYM_A);
-    else
-      ascii = 'a' + (char)(key - KSYM_a);
-
-    setup.player_name[xpos] = ascii;
+    setup.player_name[xpos] = key_char;
     setup.player_name[xpos + 1] = 0;
 
     xpos++;
 
+#if 0
+    /* add one character width for added name text character */
+    pos->width += font_width;
+    startx = mSX + ALIGNED_MENU_XPOS(pos);
+
     DrawText(startx, starty, setup.player_name, font_active_nr);
     DrawText(startx + xpos * font_width, starty, "_", font_active_nr);
+#endif
   }
   else if ((key == KSYM_Delete || key == KSYM_BackSpace) && xpos > 0)
   {
@@ -2498,17 +3095,58 @@ void HandleTypeName(int newxpos, Key key)
 
     setup.player_name[xpos] = 0;
 
+#if 0
+    /* remove one character width for removed name text character */
+    pos->width -= font_width;
+    startx = mSX + ALIGNED_MENU_XPOS(pos);
+
+    DrawText(startx, starty, setup.player_name, font_active_nr);
     DrawText(startx + xpos * font_width, starty, "_ ", font_active_nr);
+#endif
   }
   else if (key == KSYM_Return && xpos > 0)
   {
+#if 0
+    /* remove one character width for removed cursor text character */
+    pos->width -= font_width;
+    startx = mSX + ALIGNED_MENU_XPOS(pos);
+
     DrawText(startx, starty, setup.player_name, font_nr);
     DrawText(startx + xpos * font_width, starty, " ", font_active_nr);
+#endif
 
     SaveSetup();
 
+    is_active = FALSE;
+
+    game_status = GAME_MODE_MAIN;
+  }
+  else if (key == KSYM_Escape)
+  {
+    strcpy(setup.player_name, last_player_name);
+
+    is_active = FALSE;
+
     game_status = GAME_MODE_MAIN;
   }
+
+  if (is_active)
+  {
+    pos->width = (strlen(setup.player_name) + 1) * font_width;
+    startx = mSX + ALIGNED_MENU_XPOS(pos);
+
+    DrawText(startx, starty, setup.player_name, font_active_nr);
+    DrawText(startx + xpos * font_width, starty, "_", font_active_nr);
+  }
+  else
+  {
+    pos->width = strlen(setup.player_name) * font_width;
+    startx = mSX + ALIGNED_MENU_XPOS(pos);
+
+    DrawText(startx, starty, setup.player_name, font_nr);
+  }
+
+  sprintf(main_input_name, "%s", setup.player_name);
 }
 
 
@@ -2705,6 +3343,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
   }
   else if (button == MB_MENU_LEAVE)
   {
+    PlaySound(SND_MENU_ITEM_SELECTING);
+
     if (ti->node_parent)
     {
       *ti_ptr = ti->node_parent;
@@ -2712,13 +3352,12 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
     }
     else if (game_status == GAME_MODE_SETUP)
     {
-      if (game_status == GAME_MODE_SETUP)
-      {
-	if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
-	  execSetupGraphics();
-	else
-	  execSetupArtwork();
-      }
+      if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED)
+	execSetupGame();
+      else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
+	execSetupGraphics();
+      else
+	execSetupArtwork();
     }
     else
     {
@@ -2805,6 +3444,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
     if (node_cursor->node_group)
     {
+      PlaySound(SND_MENU_ITEM_SELECTING);
+
       node_cursor->cl_first = ti->cl_first;
       node_cursor->cl_cursor = ti->cl_cursor;
       *ti_ptr = node_cursor->node_group;
@@ -2815,6 +3456,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
   }
   else if (dx == -1 && ti->node_parent)
   {
+    PlaySound(SND_MENU_ITEM_SELECTING);
+
     *ti_ptr = ti->node_parent;
     DrawChooseTree(ti_ptr);
 
@@ -2830,6 +3473,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
     {
       if (y != ti->cl_cursor)
       {
+	PlaySound(SND_MENU_ITEM_ACTIVATING);
+
 	drawChooseTreeCursor(ti->cl_cursor, FALSE);
 	drawChooseTreeCursor(y, TRUE);
 	drawChooseTreeInfo(ti->cl_first + y, ti);
@@ -2842,6 +3487,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
       TreeInfo *node_first, *node_cursor;
       int entry_pos = ti->cl_first + y;
 
+      PlaySound(SND_MENU_ITEM_SELECTING);
+
       node_first = getTreeInfoFirstGroupEntry(ti);
       node_cursor = getTreeInfoFromPos(node_first, entry_pos);
 
@@ -2874,7 +3521,9 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
 	if (game_status == GAME_MODE_SETUP)
 	{
-	  if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
+	  if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED)
+	    execSetupGame();
+	  else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
 	    execSetupGraphics();
 	  else
 	    execSetupArtwork();
@@ -3015,6 +3664,8 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
   }
   else if (button == MB_MENU_LEAVE)
   {
+    PlaySound(SND_MENU_ITEM_SELECTING);
+
     FadeSound(SND_BACKGROUND_SCORES);
 
     game_status = GAME_MODE_MAIN;
@@ -3023,6 +3674,8 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
   }
   else if (button == MB_MENU_CHOICE)
   {
+    PlaySound(SND_MENU_ITEM_SELECTING);
+
     FadeSound(SND_BACKGROUND_SCORES);
     FadeOut(REDRAW_FIELD);
 
@@ -3046,6 +3699,7 @@ static struct TokenInfo *setup_info;
 static int num_setup_info;
 
 static char *screen_mode_text;
+static char *game_speed_text;
 static char *graphics_set_name;
 static char *sounds_set_name;
 static char *music_set_name;
@@ -3058,10 +3712,63 @@ static void execSetupMain()
 
 static void execSetupGame()
 {
+  if (game_speeds == NULL)
+  {
+    int i;
+
+    for (i = 0; game_speeds_list[i].value != -1; i++)
+    {
+      TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+      char identifier[32], name[32];
+      int value = game_speeds_list[i].value;
+      char *text = game_speeds_list[i].text;
+
+      ti->node_top = &game_speeds;
+      ti->sort_priority = 10000 - value;
+
+      sprintf(identifier, "%d", value);
+      sprintf(name, "%s", text);
+
+      setString(&ti->identifier, identifier);
+      setString(&ti->name, name);
+      setString(&ti->name_sorting, name);
+      setString(&ti->infotext, "Game Speed");
+
+      pushTreeInfo(&game_speeds, ti);
+    }
+
+    /* sort game speed values to start with slowest game speed */
+    sortTreeInfo(&game_speeds);
+
+    /* set current game speed to configured game speed value */
+    game_speed_current =
+      getTreeInfoFromIdentifier(game_speeds, i_to_a(setup.game_frame_delay));
+
+    /* if that fails, set current game speed to reliable default value */
+    if (game_speed_current == NULL)
+      game_speed_current =
+	getTreeInfoFromIdentifier(game_speeds, i_to_a(GAME_FRAME_DELAY));
+
+    /* if that also fails, set current game speed to first available speed */
+    if (game_speed_current == NULL)
+      game_speed_current = game_speeds;
+  }
+
+  setup.game_frame_delay = atoi(game_speed_current->identifier);
+
+  /* needed for displaying game speed text instead of identifier */
+  game_speed_text = game_speed_current->name;
+
   setup_mode = SETUP_MODE_GAME;
   DrawSetupScreen();
 }
 
+static void execSetupChooseGameSpeed()
+{
+  setup_mode = SETUP_MODE_CHOOSE_GAME_SPEED;
+  DrawSetupScreen();
+}
+
 static void execSetupEditor()
 {
   setup_mode = SETUP_MODE_EDITOR;
@@ -3088,7 +3795,7 @@ static void execSetupGraphics()
       ti->sort_priority = x * 10000 + y;
 
       sprintf(identifier, "%dx%d", x, y);
-      sprintf(name,     "%d x %d [%d:%d]", x, y, xx, yy);
+      sprintf(name, "%d x %d [%d:%d]", x, y, xx, yy);
 
       setString(&ti->identifier, identifier);
       setString(&ti->name, name);
@@ -3236,6 +3943,8 @@ static struct TokenInfo setup_info_game[] =
   { TYPE_SWITCH,	&setup.skip_levels,	"Skip Unsolved Levels:"	},
   { TYPE_SWITCH,	&setup.time_limit,	"Time Limit:"		},
   { TYPE_SWITCH,	&setup.autorecord,	"Auto-Record Tapes:"	},
+  { TYPE_ENTER_LIST,	execSetupChooseGameSpeed, "Game Speed:"		},
+  { TYPE_STRING,	&game_speed_text,	""			},
   { TYPE_EMPTY,		NULL,			""			},
   { TYPE_LEAVE_MENU,	execSetupMain, 		"Back"			},
 
@@ -3255,6 +3964,7 @@ static struct TokenInfo setup_info_editor[] =
   { TYPE_SWITCH,	&setup.editor.el_dx_boulderdash,"DX-Boulderdash:" },
 #endif
   { TYPE_SWITCH,	&setup.editor.el_chars,		"Text Characters:" },
+  { TYPE_SWITCH, &setup.editor.el_steel_chars, "Text Characters (Steel):" },
   { TYPE_SWITCH,	&setup.editor.el_custom,  "Custom & Group Elements:" },
 #if 0
   { TYPE_SWITCH,	&setup.editor.el_headlines,	"Headlines:"	},
@@ -3714,6 +4424,8 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
   }
   else if (button == MB_MENU_LEAVE)
   {
+    PlaySound(SND_MENU_ITEM_SELECTING);
+
     for (y = 0; y < num_setup_info; y++)
     {
       if (setup_info[y].type & TYPE_LEAVE_MENU)
@@ -3759,6 +4471,8 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
     {
       if (y != choice && setup_info[y].type & ~TYPE_SKIP_ENTRY)
       {
+	PlaySound(SND_MENU_ITEM_ACTIVATING);
+
 #if 1
 	DrawCursorAndText_Setup(choice, FALSE);
 	DrawCursorAndText_Setup(y, TRUE);
@@ -3772,6 +4486,8 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
     }
     else if (!(setup_info[y].type & TYPE_GHOSTED))
     {
+      PlaySound(SND_MENU_ITEM_SELECTING);
+
       /* when selecting key headline, execute function for key value change */
       if (setup_info[y].type & TYPE_KEYTEXT &&
 	  setup_info[y + 1].type & TYPE_KEY)
@@ -4448,6 +5164,8 @@ void DrawSetupScreen()
 
   if (setup_mode == SETUP_MODE_INPUT)
     DrawSetupScreen_Input();
+  else if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED)
+    DrawChooseTree(&game_speed_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
     DrawChooseTree(&screen_mode_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)
@@ -4473,6 +5191,8 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 {
   if (setup_mode == SETUP_MODE_INPUT)
     HandleSetupScreen_Input(mx, my, dx, dy, button);
+  else if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED)
+    HandleChooseTree(mx, my, dx, dy, button, &game_speed_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
     HandleChooseTree(mx, my, dx, dy, button, &screen_mode_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)