X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=ce3bbe47a3895349848f66661b9bced0833964a6;hb=1786288765edb99711ec0eb06520969879d62cc2;hp=cd38087393720868036bdad18708138f65a04ae1;hpb=342de2ef2eff4f6936541b70d1eabf01f315fa47;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index cd380873..ce3bbe47 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -1,7 +1,7 @@
 /***********************************************************
 * Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-* (c) 1995-2002 Artsoft Entertainment                      *
+* (c) 1995-2006 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -72,9 +72,9 @@
 #define MAX_MENU_TEXT_LENGTH_MEDIUM	(MAX_MENU_TEXT_LENGTH_BIG * 2)
 
 /* buttons and scrollbars identifiers */
-#define SCREEN_CTRL_ID_LAST_LEVEL	0
+#define SCREEN_CTRL_ID_PREV_LEVEL	0
 #define SCREEN_CTRL_ID_NEXT_LEVEL	1
-#define SCREEN_CTRL_ID_LAST_PLAYER	2
+#define SCREEN_CTRL_ID_PREV_PLAYER	2
 #define SCREEN_CTRL_ID_NEXT_PLAYER	3
 #define SCREEN_CTRL_ID_SCROLL_UP	4
 #define SCREEN_CTRL_ID_SCROLL_DOWN	5
@@ -115,6 +115,18 @@
 
 #define SC_BORDER_SIZE			14
 
+/* other useful macro definitions */
+#define BUTTON_GRAPHIC_ACTIVE(g)					       \
+	(g == IMG_MENU_BUTTON_LEFT       ? IMG_MENU_BUTTON_LEFT_ACTIVE       : \
+	 g == IMG_MENU_BUTTON_RIGHT      ? IMG_MENU_BUTTON_RIGHT_ACTIVE      : \
+	 g == IMG_MENU_BUTTON_UP         ? IMG_MENU_BUTTON_UP_ACTIVE         : \
+	 g == IMG_MENU_BUTTON_DOWN       ? IMG_MENU_BUTTON_DOWN_ACTIVE       : \
+         g == IMG_MENU_BUTTON_LEAVE_MENU ? IMG_MENU_BUTTON_LEAVE_MENU_ACTIVE : \
+         g == IMG_MENU_BUTTON_ENTER_MENU ? IMG_MENU_BUTTON_ENTER_MENU_ACTIVE : \
+         g == IMG_MENU_BUTTON_PREV_LEVEL ? IMG_MENU_BUTTON_PREV_LEVEL_ACTIVE : \
+         g == IMG_MENU_BUTTON_NEXT_LEVEL ? IMG_MENU_BUTTON_NEXT_LEVEL_ACTIVE : \
+         IMG_MENU_BUTTON_ACTIVE)
+
 
 /* forward declarations of internal functions */
 static void HandleScreenGadgets(struct GadgetInfo *);
@@ -128,9 +140,10 @@ static void HandleChooseTree(int, int, int, int, int, TreeInfo **);
 
 static void DrawChooseLevel(void);
 static void DrawInfoScreen(void);
+static void DrawAndFadeInInfoScreen(int);
 static void DrawSetupScreen(void);
 
-static void DrawInfoScreenExt(int);
+static void DrawInfoScreenExt(int, int);
 static void DrawInfoScreen_NotAvailable(char *, char *);
 static void DrawInfoScreen_HelpAnim(int, int, boolean);
 static void DrawInfoScreen_HelpText(int, int, int, int);
@@ -151,13 +164,31 @@ static int info_mode = INFO_MODE_MAIN;
 static TreeInfo *screen_modes = NULL;
 static TreeInfo *screen_mode_current = NULL;
 
-#define DRAW_OFFSET_MODE(x)	(x >= GAME_MODE_MAIN &&			\
-				 x <= GAME_MODE_SETUP ? x :		\
-				 x == GAME_MODE_PSEUDO_TYPENAME ?	\
+#define DRAW_MODE(s)		((s) >= GAME_MODE_MAIN &&		\
+				 (s) <= GAME_MODE_SETUP ? (s) :		\
+				 (s) == GAME_MODE_PSEUDO_TYPENAME ?	\
 				 GAME_MODE_MAIN : GAME_MODE_DEFAULT)
 
-#define mSX (SX + menu.draw_xoffset[DRAW_OFFSET_MODE(game_status)])
-#define mSY (SY + menu.draw_yoffset[DRAW_OFFSET_MODE(game_status)])
+#define DRAW_MODE_INFO(i)	((i) >= INFO_MODE_ELEMENTS &&		\
+				 (i) <= INFO_MODE_LEVELSET ? (i) :	\
+				 INFO_MODE_MAIN)
+
+#define DRAW_XOFFSET_INFO(i)	(DRAW_MODE_INFO(i) == INFO_MODE_MAIN ?	\
+				 menu.draw_xoffset[GAME_MODE_INFO] :	\
+				 menu.draw_xoffset_info[DRAW_MODE_INFO(i)])
+#define DRAW_YOFFSET_INFO(i)	(DRAW_MODE_INFO(i) == INFO_MODE_MAIN ?	\
+				 menu.draw_yoffset[GAME_MODE_INFO] :	\
+				 menu.draw_yoffset_info[DRAW_MODE_INFO(i)])
+
+#define DRAW_XOFFSET(s)		((s) == GAME_MODE_INFO ?		\
+				 DRAW_XOFFSET_INFO(info_mode) :		\
+				 menu.draw_xoffset[DRAW_MODE(s)])
+#define DRAW_YOFFSET(s)		((s) == GAME_MODE_INFO ?		\
+				 DRAW_YOFFSET_INFO(info_mode) :		\
+				 menu.draw_yoffset[DRAW_MODE(s)])
+
+#define mSX			(SX + DRAW_XOFFSET(game_status))
+#define mSY			(SY + DRAW_YOFFSET(game_status))
 
 #define NUM_MENU_ENTRIES_ON_SCREEN (menu.list_size[game_status] > 2 ?	\
 				    menu.list_size[game_status] :	\
@@ -169,56 +200,370 @@ static Bitmap *scrollbar_bitmap[NUM_SCROLLBAR_BITMAPS];
 #endif
 
 
-static void drawCursorExt(int xpos, int ypos, int color, int g)
+#define MAIN_CONTROL_NAME		0
+#define MAIN_CONTROL_LEVELS		1
+#define MAIN_CONTROL_SCORES		2
+#define MAIN_CONTROL_EDITOR		3
+#define MAIN_CONTROL_INFO		4
+#define MAIN_CONTROL_GAME		5
+#define MAIN_CONTROL_SETUP		6
+#define MAIN_CONTROL_QUIT		7
+#define MAIN_CONTROL_PREV_LEVEL		8
+#define MAIN_CONTROL_NEXT_LEVEL		9
+#define MAIN_CONTROL_CURRENT_LEVEL	10
+#define MAIN_CONTROL_FIRST_LEVEL	11
+#define MAIN_CONTROL_LAST_LEVEL		12
+#define MAIN_CONTROL_LEVEL_INFO_1	13
+#define MAIN_CONTROL_LEVEL_INFO_2	14
+#define MAIN_CONTROL_TITLE_1		15
+#define MAIN_CONTROL_TITLE_2		16
+#define MAIN_CONTROL_TITLE_3		17
+
+static char main_text_name[10];
+static char main_text_current_level[10];
+static char main_text_first_level[10];
+static char main_text_last_level[10];
+static char main_input_name[MAX_PLAYER_NAME_LEN + 1];
+
+static struct
+{
+  int nr;
+
+  struct MenuPosInfo *pos_button;
+  int button_graphic;
+
+  struct MenuPosInfo *pos_text;
+  char *text;
+  int font_text;
+
+  struct MenuPosInfo *pos_input;
+  char *input;
+  int font_input;
+}
+main_controls[] =
+{
+  {
+    MAIN_CONTROL_NAME,
+    &menu.main.button.name,		IMG_MENU_BUTTON,
+    &menu.main.text.name,		main_text_name,		FONT_MENU_1,
+    &menu.main.input.name,		main_input_name,	FONT_INPUT_1,
+  },
+  {
+    MAIN_CONTROL_LEVELS,
+    &menu.main.button.levels,		IMG_MENU_BUTTON_ENTER_MENU,
+    &menu.main.text.levels,		"Levelset",		FONT_MENU_1,
+    NULL,				NULL,			-1,
+  },
+  {
+    MAIN_CONTROL_SCORES,
+    &menu.main.button.scores,		IMG_MENU_BUTTON,
+    &menu.main.text.scores,		"Hall Of Fame",		FONT_MENU_1,
+    NULL,				NULL,			-1,
+  },
+  {
+    MAIN_CONTROL_EDITOR,
+    &menu.main.button.editor,		IMG_MENU_BUTTON,
+    &menu.main.text.editor,		"Level Creator",	FONT_MENU_1,	
+    NULL,				NULL,			-1,
+  },
+  {
+    MAIN_CONTROL_INFO,
+    &menu.main.button.info,		IMG_MENU_BUTTON_ENTER_MENU,
+    &menu.main.text.info,		"Info Screen",		FONT_MENU_1,
+    NULL,				NULL,			-1,
+  },
+  {
+    MAIN_CONTROL_GAME,
+    &menu.main.button.game,		IMG_MENU_BUTTON,
+    &menu.main.text.game,		"Start Game",		FONT_MENU_1,
+    NULL,				NULL,			-1,
+  },
+  {
+    MAIN_CONTROL_SETUP,
+    &menu.main.button.setup,		IMG_MENU_BUTTON_ENTER_MENU,
+    &menu.main.text.setup,		"Setup",		FONT_MENU_1,
+    NULL,				NULL,			-1,
+  },
+  {
+    MAIN_CONTROL_QUIT,
+    &menu.main.button.quit,		IMG_MENU_BUTTON,
+    &menu.main.text.quit,		"Quit",			FONT_MENU_1,
+    NULL,				NULL,			-1,
+  },
+#if 0
+  {
+    MAIN_CONTROL_PREV_LEVEL,
+    &menu.main.button.prev_level,	IMG_MENU_BUTTON_PREV_LEVEL,
+    NULL,				NULL,			-1,
+    NULL,				NULL,			-1,
+  },
+  {
+    MAIN_CONTROL_NEXT_LEVEL,
+    &menu.main.button.next_level,	IMG_MENU_BUTTON_NEXT_LEVEL,
+    NULL,				NULL,			-1,
+    NULL,				NULL,			-1,
+  },
+#endif
+  {
+    MAIN_CONTROL_CURRENT_LEVEL,
+    NULL,				-1,
+    &menu.main.text.current_level,	main_text_current_level,FONT_VALUE_1,
+    NULL,				NULL,			-1,
+  },
+  {
+    MAIN_CONTROL_FIRST_LEVEL,
+    NULL,				-1,
+    &menu.main.text.first_level,	main_text_first_level,	FONT_TEXT_3,
+    NULL,				NULL,			-1,
+  },
+  {
+    MAIN_CONTROL_LAST_LEVEL,
+    NULL,				-1,
+    &menu.main.text.last_level,		main_text_last_level,	FONT_TEXT_3,
+    NULL,				NULL,			-1,
+  },
+  {
+    MAIN_CONTROL_LEVEL_INFO_1,
+    NULL,				-1,
+    &menu.main.text.level_info_1,	NULL,			-1,
+    NULL,				NULL,			-1,
+  },
+  {
+    MAIN_CONTROL_LEVEL_INFO_2,
+    NULL,				-1,
+    &menu.main.text.level_info_2,	NULL,			-1,
+    NULL,				NULL,			-1,
+  },
+  {
+    MAIN_CONTROL_TITLE_1,
+    NULL,				-1,
+    &menu.main.text.title_1,		PROGRAM_TITLE_STRING,	FONT_TITLE_1,
+    NULL,				NULL,			-1,
+  },
+  {
+    MAIN_CONTROL_TITLE_2,
+    NULL,				-1,
+    &menu.main.text.title_2,		PROGRAM_COPYRIGHT_STRING, FONT_TITLE_2,
+    NULL,				NULL,			-1,
+  },
+  {
+    MAIN_CONTROL_TITLE_3,
+    NULL,				-1,
+    &menu.main.text.title_3,		PROGRAM_GAME_BY_STRING,	FONT_TITLE_2,
+    NULL,				NULL,			-1,
+  },
+
+  {
+    -1,
+    NULL,				-1,
+    NULL,				NULL,			-1,
+    NULL,				NULL,			-1,
+  }
+};
+
+
+static void InitializeMainControls()
+{
+  boolean local_team_mode = (!options.network && setup.team_mode);
+  int i;
+
+  /* set main control text values to dynamically determined values */
+  sprintf(main_text_name,          "%s",   local_team_mode ? "Team:" : "Name:");
+  sprintf(main_text_current_level, "%s",   int2str(level_nr, 3));
+  sprintf(main_text_first_level,   "%03d", leveldir_current->first_level);
+  sprintf(main_text_last_level,    "%03d", leveldir_current->last_level);
+  sprintf(main_input_name,         "%s",   setup.player_name);
+
+  /* set main control screen positions to dynamically determined values */
+  for (i = 0; main_controls[i].nr != -1; i++)
+  {
+    int nr                         = main_controls[i].nr;
+    struct MenuPosInfo *pos_button = main_controls[i].pos_button;
+    struct MenuPosInfo *pos_text   = main_controls[i].pos_text;
+    struct MenuPosInfo *pos_input  = main_controls[i].pos_input;
+    char *text                     = main_controls[i].text;
+    char *input                    = main_controls[i].input;
+    int button_graphic             = main_controls[i].button_graphic;
+    int font_text                  = main_controls[i].font_text;
+    int font_input                 = main_controls[i].font_input;
+
+    int font_text_width   = (font_text  != -1 ? getFontWidth(font_text)   : 0);
+    int font_text_height  = (font_text  != -1 ? getFontHeight(font_text)  : 0);
+    int font_input_width  = (font_input != -1 ? getFontWidth(font_input)  : 0);
+    int font_input_height = (font_input != -1 ? getFontHeight(font_input) : 0);
+    int text_chars  = (text  != NULL ? strlen(text)  : 0);
+    int input_chars = (input != NULL ? strlen(input) : 0);
+
+    int button_width =
+      (button_graphic != -1 ? graphic_info[button_graphic].width  : 0);
+    int button_height =
+      (button_graphic != -1 ? graphic_info[button_graphic].height : 0);
+    int text_width   = font_text_width * text_chars;
+    int text_height  = font_text_height;
+    int input_width  = font_input_width * input_chars;
+    int input_height = font_input_height;
+
+    if (nr == MAIN_CONTROL_NAME)
+    {
+#if 0
+      if (menu.main.input.name.x == -1)
+	menu.main.input.name.x = menu.main.text.name.x + text_width;
+      if (menu.main.input.name.y == -1)
+	menu.main.input.name.y = menu.main.text.name.y;
+#endif
+
+      menu.main.input.name.width  = font_input_width * MAX_PLAYER_NAME_LEN;
+      menu.main.input.name.height = font_input_height;
+    }
+
+    if (pos_button != NULL)
+    {
+      if (pos_button->width == 0)
+	pos_button->width = button_width;
+      if (pos_button->height == 0)
+	pos_button->height = button_height;
+    }
+
+    if (pos_text != NULL)
+    {
+      /* calculate width for non-clickable text -- needed for text alignment */
+      boolean calculate_text_width = (pos_button == NULL && text != NULL);
+
+      if (pos_text->x == -1 && pos_button != NULL)
+	pos_text->x = pos_button->x + pos_button->width;
+      if (pos_text->y == -1 && pos_button != NULL)
+	pos_text->y = pos_button->y;
+
+      if (pos_text->width == -1 || calculate_text_width)
+	pos_text->width = text_width;
+      if (pos_text->height == -1)
+	pos_text->height = text_height;
+    }
+
+    if (pos_input != NULL)
+    {
+      if (pos_input->x == -1 && pos_text != NULL)
+	pos_input->x = pos_text->x + pos_text->width;
+      if (pos_input->y == -1 && pos_text != NULL)
+	pos_input->y = pos_text->y;
+
+      if (pos_input->width == -1)
+	pos_input->width = input_width;
+      if (pos_input->height == -1)
+	pos_input->height = input_height;
+    }
+  }
+}
+
+static void DrawCursorAndText_Main(int pos, boolean active)
+{
+  int i;
+
+  for (i = 0; main_controls[i].nr != -1; i++)
+  {
+    if (main_controls[i].nr == pos || pos == -1)
+    {
+      struct MenuPosInfo *pos_button = main_controls[i].pos_button;
+      struct MenuPosInfo *pos_text   = main_controls[i].pos_text;
+      struct MenuPosInfo *pos_input  = main_controls[i].pos_input;
+      char *text                     = main_controls[i].text;
+      char *input                    = main_controls[i].input;
+      int button_graphic             = main_controls[i].button_graphic;
+      int font_text                  = main_controls[i].font_text;
+      int font_input                 = main_controls[i].font_input;
+
+      if (active)
+      {
+	button_graphic = BUTTON_GRAPHIC_ACTIVE(button_graphic);
+	font_text = FONT_ACTIVE(font_text);
+      }
+
+      if (pos_button != NULL)
+      {
+	int button_x = mSX + pos_button->x;
+	int button_y = mSY + pos_button->y;
+
+	DrawBackground(button_x,button_y, pos_button->width,pos_button->height);
+	DrawGraphicThruMaskExt(drawto, button_x, button_y, button_graphic, 0);
+      }
+
+      if (pos_text != NULL && text != NULL)
+      {
+	int text_x = mSX + ALIGNED_XPOS(pos_text->x, pos_text->width,
+					pos_text->align);
+	int text_y = mSY + pos_text->y;
+
+	DrawBackground(text_x, text_y, pos_text->width, pos_text->height);
+	DrawText(text_x, text_y, text, font_text);
+      }
+
+      if (pos_input != NULL && input != NULL)
+      {
+	int input_x = mSX + ALIGNED_XPOS(pos_input->x, pos_input->width,
+					 pos_input->align);
+	int input_y = mSY + pos_input->y;
+
+	DrawBackground(input_x, input_y, pos_input->width, pos_input->height);
+	DrawText(input_x, input_y, input, font_input);
+      }
+    }
+  }
+}
+
+static boolean insideMenuPosRect(struct MenuPosInfo *rect, int x, int y)
+{
+  int rect_x = ALIGNED_XPOS(rect->x, rect->width, rect->align);
+  int rect_y = rect->y;
+
+  return (rect != NULL &&
+	  x >= rect_x && x < rect_x + rect->width &&
+	  y >= rect_y && y < rect_y + rect->height);
+}
+
+static void drawCursorExt(int xpos, int ypos, boolean active, int graphic)
 {
   static int cursor_array[SCR_FIELDY];
+  int x = mSX + TILEX * xpos;
+  int y = mSY + TILEY * (MENU_SCREEN_START_YPOS + ypos);
 
   if (xpos == 0)
   {
-    if (g != 0)
-      cursor_array[ypos] = g;
+    if (graphic != -1)
+      cursor_array[ypos] = graphic;
     else
-      g = cursor_array[ypos];
+      graphic = cursor_array[ypos];
   }
 
-  if (color == FC_RED)
-    g = (g == IMG_MENU_BUTTON_LEFT  ? IMG_MENU_BUTTON_LEFT_ACTIVE  :
-	 g == IMG_MENU_BUTTON_RIGHT ? IMG_MENU_BUTTON_RIGHT_ACTIVE :
-	 g == IMG_MENU_BUTTON_LEAVE_MENU ? IMG_MENU_BUTTON_LEAVE_MENU_ACTIVE :
-	 g == IMG_MENU_BUTTON_ENTER_MENU ? IMG_MENU_BUTTON_ENTER_MENU_ACTIVE :
-	 g == IMG_MENU_BUTTON_LAST_LEVEL ? IMG_MENU_BUTTON_LAST_LEVEL_ACTIVE :
-	 g == IMG_MENU_BUTTON_NEXT_LEVEL ? IMG_MENU_BUTTON_NEXT_LEVEL_ACTIVE :
-	 IMG_MENU_BUTTON_ACTIVE);
+  if (active)
+    graphic = BUTTON_GRAPHIC_ACTIVE(graphic);
 
-  ypos += MENU_SCREEN_START_YPOS;
-
-  DrawBackground(mSX + xpos * TILEX, mSY + ypos * TILEY, TILEX, TILEY);
-  DrawGraphicThruMaskExt(drawto, mSX + xpos * TILEX, mSY + ypos * TILEY, g, 0);
+  DrawBackground(x, y, TILEX, TILEY);
+  DrawGraphicThruMaskExt(drawto, x, y, graphic, 0);
 }
 
 static void initCursor(int ypos, int graphic)
 {
-  drawCursorExt(0, ypos, FC_BLUE, graphic);
+  drawCursorExt(0, ypos, FALSE, graphic);
 }
 
-static void drawCursor(int ypos, int color)
+static void drawCursor(int ypos, boolean active)
 {
-  drawCursorExt(0, ypos, color, 0);
+  drawCursorExt(0, ypos, active, -1);
 }
 
 static void drawCursorXY(int xpos, int ypos, int graphic)
 {
-  drawCursorExt(xpos, ypos, -1, graphic);
+  drawCursorExt(xpos, ypos, FALSE, graphic);
 }
 
-static void drawChooseTreeCursor(int ypos, int color)
+static void drawChooseTreeCursor(int ypos, boolean active)
 {
   int last_game_status = game_status;	/* save current game status */
 
   /* force LEVELS draw offset on artwork setup screen */
   game_status = GAME_MODE_LEVELS;
 
-  drawCursorExt(0, ypos, color, 0);
+  drawCursorExt(0, ypos, active, -1);
 
   game_status = last_game_status;	/* restore current game status */
 }
@@ -229,25 +574,27 @@ void DrawHeadline()
   DrawTextSCentered(MENU_TITLE2_YPOS, FONT_TITLE_2, PROGRAM_COPYRIGHT_STRING);
 }
 
-static int getLastLevelButtonPos()
+#if 0
+static int getPrevlevelButtonPos()
 {
   return 10;
 }
 
 static int getCurrentLevelTextPos()
 {
-  return (getLastLevelButtonPos() + 1);
+  return (getPrevlevelButtonPos() + 1);
 }
 
 static int getNextLevelButtonPos()
 {
-  return getLastLevelButtonPos() + 3 + 1;
+  return getPrevlevelButtonPos() + 3 + 1;
 }
 
 static int getLevelRangeTextPos()
 {
   return getNextLevelButtonPos() + 1;
 }
+#endif
 
 void DrawTitleScreenImage(int nr)
 {
@@ -303,14 +650,14 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
 {
   static LevelDirTree *leveldir_last_valid = NULL;
   boolean levelset_has_changed = FALSE;
-  char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:");
-#if 1
-  char *level_text = "Levelset";
-#else
-  char *level_text = "Level:";
-#endif
+#if 0
+  boolean local_team_mode = (!options.network && setup.team_mode);
+  char *name_text = (local_team_mode ? "Team:" : "Name:");
   int name_width, level_width;
+#endif
+#if 0
   int i;
+#endif
 
   UnmapAllGadgets();
   FadeSoundsAndMusic();
@@ -323,9 +670,7 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
 
   audio.sound_deactivated = FALSE;
 
-#if 1
   GetPlayerConfig();
-#endif
 
   /* needed if last screen was the playing screen, invoked from level editor */
   if (level_editor_test_game)
@@ -364,32 +709,56 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
       graphic_info[IMG_TITLESCREEN_1].bitmap != NULL)
   {
     game_status = GAME_MODE_TITLE;
+
     DrawTitleScreen();
 
     return;
   }
 
-#if 0
-  /* map gadgets for main menu screen */
-  MapTapeButtons();
-#endif
-
   /* level_nr may have been set to value over handicap with level editor */
   if (setup.handicap && level_nr > leveldir_current->handicap_level)
     level_nr = leveldir_current->handicap_level;
 
-#if 0
-  GetPlayerConfig();
-#endif
   LoadLevel(level_nr);
 
   SetMainBackgroundImage(IMG_BACKGROUND_MAIN);
   ClearWindow();
 
+#if 1
+  InitializeMainControls();
+
+#if 1
+  DrawCursorAndText_Main(-1, FALSE);
+#else
+  for (i = 0; main_controls[i].nr != -1; i++)
+  {
+    struct MenuPosInfo *pos_button = main_controls[i].pos_button;
+    struct MenuPosInfo *pos_text   = main_controls[i].pos_text;
+    struct MenuPosInfo *pos_input  = main_controls[i].pos_input;
+    char *text                     = main_controls[i].text;
+    char *input                    = main_controls[i].input;
+    int button_graphic             = main_controls[i].button_graphic;
+    int font_text                  = main_controls[i].font_text;
+    int font_input                 = main_controls[i].font_input;
+
+    if (pos_button != NULL)
+      DrawGraphicThruMaskExt(drawto, mSX + pos_button->x, mSY + pos_button->y,
+			     button_graphic, 0);
+
+    if (pos_text != NULL && text != NULL)
+      DrawText(mSX + pos_text->x, mSY + pos_text->y, text, font_text);
+
+    if (pos_input != NULL && input != NULL)
+      DrawText(mSX + pos_input->x, mSY + pos_input->y, input, font_input);
+  }
+#endif
+
+#else
+
   DrawHeadline();
 
   DrawText(mSX + 32, mSY + 2 * 32, name_text,       FONT_MENU_1);
-  DrawText(mSX + 32, mSY + 3 * 32, level_text,      FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 3 * 32, "Levelset",      FONT_MENU_1);
   DrawText(mSX + 32, mSY + 4 * 32, "Hall Of Fame",  FONT_MENU_1);
   DrawText(mSX + 32, mSY + 5 * 32, "Level Creator", FONT_MENU_1);
   DrawText(mSX + 32, mSY + 6 * 32, "Info Screen",   FONT_MENU_1);
@@ -399,101 +768,34 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
 
   /* calculated after (possible) reload of custom artwork */
   name_width  = getTextWidth(name_text,  FONT_MENU_1);
-#if 1
   level_width = 9 * 32;
-#else
-#if 1
-  level_width = 9 * getFontWidth(FONT_MENU_1);
-#else
-  level_width = getTextWidth(level_text, FONT_MENU_1);
-#endif
-#endif
 
   DrawText(mSX + 32 + name_width, mSY + 2 * 32, setup.player_name,
 	   FONT_INPUT_1);
 
-#if 1
   DrawText(mSX + getCurrentLevelTextPos() * 32, mSY + 3 * 32,
 	   int2str(level_nr, 3), FONT_VALUE_1);
-#else
-#if 1
-  DrawText(mSX + level_width + 2 * 32, mSY + 3 * 32, int2str(level_nr, 3),
-	   FONT_VALUE_1);
-#else
-  DrawText(mSX + level_width + 5 * 32, mSY + 3 * 32, int2str(level_nr, 3),
-	   FONT_VALUE_1);
-#endif
-#endif
-
-  DrawPreviewLevel(TRUE);
-
-#if 1
 
-#if 1
   {
     int text_height = getFontHeight(FONT_TEXT_3);
-#if 1
-    int xpos = getLevelRangeTextPos() * 32;
-#else
-    int xpos = level_width + 6 * 32;
-#endif
-    int ypos2 = -SY + 3 * 32 + 16;
+    int xpos = getLevelRangeTextPos() * 32 + 8;
+    int ypos2 = 3 * 32 + 16;
     int ypos1 = ypos2 - text_height;
 
-    DrawTextF(mSX + xpos, mSY + ypos1, FONT_TEXT_3,
+    DrawTextF(mSX - SX + xpos, mSY - SY + ypos1, FONT_TEXT_3,
 	      "%03d", leveldir_current->first_level);
-    DrawTextF(mSX + xpos, mSY + ypos2, FONT_TEXT_3,
+    DrawTextF(mSX - SX + xpos, mSY - SY + ypos2, FONT_TEXT_3,
 	      "%03d", leveldir_current->last_level);
   }
-#else
-  DrawTextF(mSX + level_width + 6 * 32, mSY + 3 * 32 + 1, FONT_TEXT_3,
-	    "%d", leveldir_current->levels);
-#endif
-
-#else
-  DrawTextF(mSX + 32 + level_width - 2, mSY + 3 * 32 + 1, FONT_TEXT_3, "%d-%d",
-	    leveldir_current->first_level, leveldir_current->last_level);
-#endif
-
-#if 0
-  if (leveldir_current->readonly)
-  {
-    DrawTextS(mSX + level_width + 9 * 32 - 2,
-	      mSY + 3 * 32 + 1 - 7, FONT_TEXT_3, "READ");
-    DrawTextS(mSX + level_width + 9 * 32 - 2,
-	      mSY + 3 * 32 + 1 + 7, FONT_TEXT_3, "ONLY");
-  }
-#endif
 
   for (i = 0; i < 8; i++)
     initCursor(i, (i == 1 || i == 4 || i == 6 ? IMG_MENU_BUTTON_ENTER_MENU :
 		   IMG_MENU_BUTTON));
 
-#if 0
-
-#if 1
-  drawCursorXY(getLastLevelButtonPos(), 1, IMG_MENU_BUTTON_LAST_LEVEL);
-  drawCursorXY(getNextLevelButtonPos(), 1, IMG_MENU_BUTTON_NEXT_LEVEL);
-#else
-#if 1
-  drawCursorXY(level_width / 32 + 1, 1, IMG_MENU_BUTTON_LEFT);
-  drawCursorXY(level_width / 32 + 5, 1, IMG_MENU_BUTTON_RIGHT);
-#else
-  drawCursorXY(level_width / 32 + 4, 1, IMG_MENU_BUTTON_LEFT);
-  drawCursorXY(level_width / 32 + 8, 1, IMG_MENU_BUTTON_RIGHT);
-#endif
-#endif
-
+  DrawTextSCentered(326, FONT_TITLE_2, PROGRAM_GAME_BY_STRING);
 #endif
 
-  DrawTextSCentered(326, FONT_TITLE_2, "A Game by Artsoft Entertainment");
-
-#if 0
-  FadeToFront();
-#endif
-#if 0
-  InitAnimation();
-#endif
+  DrawPreviewLevel(TRUE);
 
   HandleMainMenu(0, 0, 0, 0, MB_MENU_INITIALIZE);
 
@@ -505,22 +807,6 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
   PlayMenuSound();
   PlayMenuMusic();
 
-#if 0
-#if 1
-  OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
-#else
-  if (fade_delay > 0)
-    OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
-  else
-    OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
-#endif
-#endif
-
-#if 0
-  InitAnimation();
-#endif
-
-#if 1
   /* create gadgets for main menu screen */
   FreeScreenGadgets();
   CreateScreenGadgets();
@@ -528,26 +814,17 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
   /* map gadgets for main menu screen */
   MapTapeButtons();
   MapScreenMenuGadgets(SCREEN_MASK_MAIN);
-#endif
 
-#if 1
-#if 1
+  DrawMaskedBorder(REDRAW_ALL);
+
   if (do_fading)
     FadeIn(redraw_mask);
   else
     BackToFront();
-#else
-  BackToFront();
-#endif
-#endif
 
-#if 1
   InitAnimation();
-#endif
 
-#if 1
   OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
-#endif
 }
 
 void DrawAndFadeInMainMenu(int redraw_mask)
@@ -656,18 +933,10 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
     if (title_nr < MAX_NUM_TITLE_SCREENS &&
 	graphic_info[IMG_TITLESCREEN_1 + title_nr].bitmap != NULL)
     {
-      Bitmap *drawto_last = drawto;
-
-#if 1
       if (use_cross_fading)
 	FadeCrossSaveBackbuffer();
-#else
-      if (use_cross_fading)
-	drawto = bitmap_db_cross;
-#endif
-      DrawTitleScreenImage(title_nr);
 
-      drawto = drawto_last;
+      DrawTitleScreenImage(title_nr);
 
       if (use_cross_fading)
 	FadeCross(REDRAW_ALL);
@@ -693,7 +962,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
       OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
 
       info_mode = INFO_MODE_MAIN;
-      DrawInfoScreenExt(use_fading_main_menu);
+      DrawInfoScreenExt(REDRAW_ALL, use_fading_main_menu);
     }
     else	/* default: return to main menu */
     {
@@ -748,109 +1017,175 @@ void HandleMainMenu_SelectLevel(int step, int direction)
   }
 }
 
+#if 1
+
 void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 {
-#if 0
-  static unsigned long level_delay = 0;
-  static unsigned long level_delay_value = GADGET_FRAME_DELAY;
-#endif
-  static int choice = 5;
-  int x = 0;
-  int y = choice;
+  static int choice = MAIN_CONTROL_GAME;
+  int pos = choice;
+  int i;
 
   if (button == MB_MENU_INITIALIZE)
   {
-    drawCursor(choice, FC_RED);
+    DrawCursorAndText_Main(choice, TRUE);
+
     return;
   }
 
   if (mx || my)		/* mouse input */
   {
-    x = (mx - mSX) / 32;
-    y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS;
+    pos = -1;
+
+    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) ||
+	  insideMenuPosRect(main_controls[i].pos_input,  mx - mSX, my - mSY))
+      {
+	pos = main_controls[i].nr;
+
+	break;
+      }
+    }
   }
   else if (dx || dy)	/* keyboard input */
   {
-    if (dx && choice == 1)
-      x = (dx < 0 ? 10 : 14);
-    else if (dx > 0)
-    {
-      if (choice == 4 || choice == 6)
-	button = MB_MENU_CHOICE;
-    }
+    if (dx > 0 && (choice == MAIN_CONTROL_INFO ||
+		   choice == MAIN_CONTROL_SETUP))
+      button = MB_MENU_CHOICE;
     else if (dy)
-      y = choice + dy;
+      pos = choice + dy;
+  }
+
+  if (pos == MAIN_CONTROL_LEVELS && dx != 0 && button)
+  {
+    HandleMainMenu_SelectLevel(1, dx < 0 ? -1 : +1);
   }
+  else if (pos >= MAIN_CONTROL_NAME && pos <= MAIN_CONTROL_QUIT)
+  {
+    if (button)
+    {
+      if (pos != choice)
+      {
+	DrawCursorAndText_Main(choice, FALSE);
+	DrawCursorAndText_Main(pos, TRUE);
+
+	choice = pos;
+      }
+    }
+    else
+    {
+      if (pos == MAIN_CONTROL_NAME)
+      {
+	game_status = GAME_MODE_PSEUDO_TYPENAME;
+
+	HandleTypeName(strlen(setup.player_name), 0);
+      }
+      else if (pos == MAIN_CONTROL_LEVELS)
+      {
+	if (leveldir_first)
+	{
+	  game_status = GAME_MODE_LEVELS;
+
+	  SaveLevelSetup_LastSeries();
+	  SaveLevelSetup_SeriesInfo();
 
 #if 0
-  /* start gadget delay with longer delay after first click on gadget */
-  if (button == 0)
-    pressed_delay_value = GADGET_FRAME_DELAY_FIRST;
+	  gotoTopLevelDir();
 #endif
 
-#if 1
+	  DrawChooseLevel();
+	}
+      }
+      else if (pos == MAIN_CONTROL_SCORES)
+      {
+	game_status = GAME_MODE_SCORES;
 
-  if (y == 1 && dx != 0 && button)
-  {
-    HandleMainMenu_SelectLevel(1, dx < 0 ? -1 : +1);
-  }
+	DrawHallOfFame(-1);
+      }
+      else if (pos == MAIN_CONTROL_EDITOR)
+      {
+	if (leveldir_current->readonly &&
+	    !strEqual(setup.player_name, "Artsoft"))
+	  Request("This level is read only !", REQ_CONFIRM);
 
-#else
+	game_status = GAME_MODE_EDITOR;
 
-  if (y == 1 && ((x == 10 && level_nr > leveldir_current->first_level) ||
-		 (x == 14 && level_nr < leveldir_current->last_level)) &&
-      button && DelayReached(&level_delay, level_delay_value))
-  {
-    int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
-    int old_level_nr = level_nr;
-    int new_level_nr;
+	DrawLevelEd();
+      }
+      else if (pos == MAIN_CONTROL_INFO)
+      {
+	game_status = GAME_MODE_INFO;
+	info_mode = INFO_MODE_MAIN;
 
-    new_level_nr = level_nr + (x == 10 ? -step : +step);
-    if (new_level_nr < leveldir_current->first_level)
-      new_level_nr = leveldir_current->first_level;
-    if (new_level_nr > leveldir_current->last_level)
-      new_level_nr = leveldir_current->last_level;
+	DrawInfoScreen();
+      }
+      else if (pos == MAIN_CONTROL_GAME)
+      {
+	StartGameActions(options.network, setup.autorecord, NEW_RANDOMIZE);
+      }
+      else if (pos == MAIN_CONTROL_SETUP)
+      {
+	game_status = GAME_MODE_SETUP;
+	setup_mode = SETUP_MODE_MAIN;
 
-    if (setup.handicap && new_level_nr > leveldir_current->handicap_level)
-    {
-      /* skipping levels is only allowed when trying to skip single level */
-      if (setup.skip_levels && step == 1 &&
-	  Request("Level still unsolved ! Skip despite handicap ?", REQ_ASK))
+	DrawSetupScreen();
+      }
+      else if (pos == MAIN_CONTROL_QUIT)
       {
-	leveldir_current->handicap_level++;
+	SaveLevelSetup_LastSeries();
 	SaveLevelSetup_SeriesInfo();
-      }
 
-      new_level_nr = leveldir_current->handicap_level;
+        if (Request("Do you really want to quit ?", REQ_ASK | REQ_STAY_CLOSED))
+	  game_status = GAME_MODE_QUIT;
+      }
     }
+  }
 
-    if (new_level_nr != old_level_nr)
-    {
-      level_nr = new_level_nr;
+  if (game_status == GAME_MODE_MAIN)
+  {
+    DrawPreviewLevel(FALSE);
+    DoAnimation();
+  }
+}
 
-      DrawText(mSX + 11 * 32, mSY + 3 * 32, int2str(level_nr, 3),
-	       FONT_VALUE_1);
+#else
 
-      LoadLevel(level_nr);
-      DrawPreviewLevel(TRUE);
+void HandleMainMenu(int mx, int my, int dx, int dy, int button)
+{
+  static int choice = 5;
+  int x = 0;
+  int y = choice;
 
-      TapeErase();
-      LoadTape(level_nr);
-      DrawCompleteVideoDisplay();
+  if (button == MB_MENU_INITIALIZE)
+  {
+    drawCursor(choice, TRUE);
 
-      /* needed because DrawPreviewLevel() takes some time */
-      BackToFront();
-      SyncDisplay();
+    return;
+  }
 
-      DelayReached(&level_delay, 0);	/* reset delay counter */
-#if 0
-      pressed_delay_value = GADGET_FRAME_DELAY_FIRST;
-#endif
+  if (mx || my)		/* mouse input */
+  {
+    x = (mx - mSX) / 32;
+    y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS;
+  }
+  else if (dx || dy)	/* keyboard input */
+  {
+    if (dx && choice == 1)
+      x = (dx < 0 ? 10 : 14);
+    else if (dx > 0)
+    {
+      if (choice == 4 || choice == 6)
+	button = MB_MENU_CHOICE;
     }
+    else if (dy)
+      y = choice + dy;
   }
 
-#endif
-
+  if (y == 1 && dx != 0 && button)
+  {
+    HandleMainMenu_SelectLevel(1, dx < 0 ? -1 : +1);
+  }
   else if (IN_VIS_FIELD(x, y) &&
 	   y >= 0 && y <= 7 && (y != 1 || x < 10))
   {
@@ -858,8 +1193,9 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
     {
       if (y != choice)
       {
-	drawCursor(y, FC_RED);
-	drawCursor(choice, FC_BLUE);
+	drawCursor(choice, FALSE);
+	drawCursor(y, TRUE);
+
 	choice = y;
       }
     }
@@ -933,6 +1269,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
   }
 }
 
+#endif
+
 
 /* ========================================================================= */
 /* info screen functions                                                     */
@@ -997,7 +1335,22 @@ static struct TokenInfo info_info_main[] =
   { 0,			NULL,			NULL			}
 };
 
-static void DrawInfoScreen_Main(boolean do_fading)
+static void DrawCursorAndText_Info(int pos, boolean active)
+{
+  int xpos = MENU_SCREEN_START_XPOS;
+  int ypos = MENU_SCREEN_START_YPOS + pos;
+  int font_nr = FONT_MENU_1;
+
+  if (active)
+    font_nr = FONT_ACTIVE(font_nr);
+
+  DrawText(mSX + xpos * 32, mSY + ypos * 32, info_info[pos].text, font_nr);
+
+  if (info_info[pos].type & ~TYPE_SKIP_ENTRY)
+    drawCursor(pos, active);
+}
+
+static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading)
 {
   int i;
 
@@ -1006,22 +1359,18 @@ static void DrawInfoScreen_Main(boolean do_fading)
 
   ClearWindow();
 
-#if 1
   DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Info Screen");
-#else
-  DrawText(mSX + 16, mSY + 16, "Info Screen", FONT_TITLE_1);
-#endif
 
   info_info = info_info_main;
   num_info_info = 0;
 
   for (i = 0; info_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++)
   {
+#if 0
     int xpos = MENU_SCREEN_START_XPOS;
     int ypos = MENU_SCREEN_START_YPOS + i;
     int font_nr = FONT_MENU_1;
-
-    DrawText(mSX + xpos * 32, mSY + ypos * 32, info_info[i].text, font_nr);
+#endif
 
     if (info_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST))
       initCursor(i, IMG_MENU_BUTTON_ENTER_MENU);
@@ -1030,33 +1379,28 @@ static void DrawInfoScreen_Main(boolean do_fading)
     else if (info_info[i].type & ~TYPE_SKIP_ENTRY)
       initCursor(i, IMG_MENU_BUTTON);
 
+#if 1
+    DrawCursorAndText_Info(i, FALSE);
+#else
+    DrawText(mSX + xpos * 32, mSY + ypos * 32, info_info[i].text, font_nr);
+#endif
+
     num_info_info++;
   }
 
-#if 1
-
   HandleInfoScreen_Main(0, 0, 0, 0, MB_MENU_INITIALIZE);
 
   PlayMenuSound();
   PlayMenuMusic();
 
+  DrawMaskedBorder(REDRAW_ALL);
+
   if (do_fading)
-    FadeIn(REDRAW_ALL);
+    FadeIn(redraw_mask);
   else
     BackToFront();
 
   InitAnimation();
-
-#else
-
-  FadeToFront();
-  InitAnimation();
-
-  PlayMenuSound();
-  PlayMenuMusic();
-
-  HandleInfoScreen_Main(0, 0, 0, 0, MB_MENU_INITIALIZE);
-#endif
 }
 
 void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
@@ -1074,7 +1418,12 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
       choice++;
     choice_store[info_mode] = choice;
 
-    drawCursor(choice, FC_RED);
+#if 1
+    DrawCursorAndText_Info(choice, TRUE);
+#else
+    drawCursor(choice, TRUE);
+#endif
+
     return;
   }
   else if (button == MB_MENU_LEAVE)
@@ -1086,6 +1435,7 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
 	void (*menu_callback_function)(void) = info_info[y].value;
 
 	menu_callback_function();
+
 	break;	/* absolutely needed because function changes 'info_info'! */
       }
     }
@@ -1125,8 +1475,14 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
     {
       if (y != choice)
       {
-	drawCursor(y, FC_RED);
-	drawCursor(choice, FC_BLUE);
+#if 1
+	DrawCursorAndText_Info(choice, FALSE);
+	DrawCursorAndText_Info(y, TRUE);
+#else
+	drawCursor(choice, FALSE);
+	drawCursor(y, TRUE);
+#endif
+
 	choice = choice_store[info_mode] = y;
       }
     }
@@ -1334,12 +1690,15 @@ void DrawInfoScreen_Elements()
 {
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS);
 
+  FadeOut(REDRAW_FIELD);
+
   LoadHelpAnimInfo();
   LoadHelpTextInfo();
 
   HandleInfoScreen_Elements(MB_MENU_INITIALIZE);
 
-  FadeToFront();
+  FadeIn(REDRAW_FIELD);
+
   InitAnimation();
 }
 
@@ -1388,14 +1747,21 @@ void HandleInfoScreen_Elements(int button)
     if (page >= num_pages)
     {
       FadeSoundsAndMusic();
+      FadeOut(REDRAW_FIELD);
 
       info_mode = INFO_MODE_MAIN;
-      DrawInfoScreen();
+      DrawAndFadeInInfoScreen(REDRAW_FIELD);
 
       return;
     }
 
+    if (button != MB_MENU_INITIALIZE)
+      FadeCrossSaveBackbuffer();
+
     DrawInfoScreen_HelpAnim(page * anims_per_page, num_anims, TRUE);
+
+    if (button != MB_MENU_INITIALIZE)
+      FadeCross(REDRAW_FIELD);
   }
   else
   {
@@ -1411,12 +1777,16 @@ void DrawInfoScreen_Music()
 {
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_MUSIC);
 
+  FadeOut(REDRAW_FIELD);
+
   ClearWindow();
   DrawHeadline();
 
   LoadMusicInfo();
 
   HandleInfoScreen_Music(MB_MENU_INITIALIZE);
+
+  FadeIn(REDRAW_FIELD);
 }
 
 void HandleInfoScreen_Music(int button)
@@ -1455,7 +1825,6 @@ void HandleInfoScreen_Music(int button)
 
   if (button_released || button == MB_MENU_INITIALIZE)
   {
-    Bitmap *drawto_last = drawto;
     int y = 0;
 
     if (button != MB_MENU_INITIALIZE)
@@ -1464,21 +1833,19 @@ void HandleInfoScreen_Music(int button)
 
     if (list == NULL)
     {
+      FadeSoundsAndMusic();
+      FadeOut(REDRAW_FIELD);
+
       info_mode = INFO_MODE_MAIN;
-      DrawInfoScreen();
+      DrawAndFadeInInfoScreen(REDRAW_FIELD);
 
       return;
     }
 
     FadeSoundsAndMusic();
 
-#if 1
     if (button != MB_MENU_INITIALIZE)
       FadeCrossSaveBackbuffer();
-#else
-    if (button != MB_MENU_INITIALIZE)
-      drawto = bitmap_db_cross;
-#endif
 
     ClearWindow();
     DrawHeadline();
@@ -1542,8 +1909,6 @@ void HandleInfoScreen_Music(int button)
     DrawTextSCentered(ybottom, FONT_TEXT_4,
 		      "Press any key or button for next page");
 
-    drawto = drawto_last;
-
     if (button != MB_MENU_INITIALIZE)
       FadeCross(REDRAW_FIELD);
   }
@@ -1557,6 +1922,9 @@ static boolean DrawInfoScreen_CreditsScreen(int screen_nr)
   int ystart = 150, ystep = 30;
   int ybottom = SYSIZE - 20;
 
+  if (screen_nr > 8)
+    return FALSE;
+
   ClearWindow();
   DrawHeadline();
 
@@ -1711,10 +2079,12 @@ static boolean DrawInfoScreen_CreditsScreen(int screen_nr)
     DrawTextSCentered(ystart + 4 * ystep, FONT_TEXT_3,
 		      "since 1995");
   }
+#if 0
   else
   {
     return FALSE;
   }
+#endif
 
   DrawTextSCentered(ybottom, FONT_TEXT_4,
 		    "Press any key or button for next page");
@@ -1728,7 +2098,11 @@ void DrawInfoScreen_Credits()
 
   FadeSoundsAndMusic();
 
+  FadeOut(REDRAW_FIELD);
+
   HandleInfoScreen_Credits(MB_MENU_INITIALIZE);
+
+  FadeIn(REDRAW_FIELD);
 }
 
 void HandleInfoScreen_Credits(int button)
@@ -1750,20 +2124,13 @@ void HandleInfoScreen_Credits(int button)
   }
   else if (button == MB_MENU_CHOICE)
   {
-    Bitmap *drawto_last = drawto;
     boolean show_screen;
 
     screen_nr++;
 
-#if 1
     FadeCrossSaveBackbuffer();
-#else
-    drawto = bitmap_db_cross;
-#endif
 
     show_screen = DrawInfoScreen_CreditsScreen(screen_nr);
-
-    drawto = drawto_last;
   
     if (show_screen)
     {
@@ -1772,9 +2139,10 @@ void HandleInfoScreen_Credits(int button)
     else
     {
       FadeSoundsAndMusic();
+      FadeOut(REDRAW_FIELD);
 
       info_mode = INFO_MODE_MAIN;
-      DrawInfoScreen();
+      DrawAndFadeInInfoScreen(REDRAW_FIELD);
     }
   }
   else
@@ -1790,6 +2158,8 @@ void DrawInfoScreen_Program()
 
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_PROGRAM);
 
+  FadeOut(REDRAW_FIELD);
+
   ClearWindow();
   DrawHeadline();
 
@@ -1824,6 +2194,8 @@ void DrawInfoScreen_Program()
 
   DrawTextSCentered(ybottom, FONT_TEXT_4,
 		    "Press any key or button for info menu");
+
+  FadeIn(REDRAW_FIELD);
 }
 
 void HandleInfoScreen_Program(int button)
@@ -1841,9 +2213,10 @@ void HandleInfoScreen_Program(int button)
   if (button_released)
   {
     FadeSoundsAndMusic();
+    FadeOut(REDRAW_FIELD);
 
     info_mode = INFO_MODE_MAIN;
-    DrawInfoScreen();
+    DrawAndFadeInInfoScreen(REDRAW_FIELD);
   }
   else
   {
@@ -1868,6 +2241,8 @@ void DrawInfoScreen_LevelSet()
 
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET);
 
+  FadeOut(REDRAW_FIELD);
+
   ClearWindow();
   DrawHeadline();
 
@@ -1882,6 +2257,8 @@ void DrawInfoScreen_LevelSet()
   else
     DrawTextSCentered(ystart, FONT_TEXT_2,
 		      "No information for this level set.");
+
+  FadeIn(REDRAW_FIELD);
 }
 
 void HandleInfoScreen_LevelSet(int button)
@@ -1899,9 +2276,10 @@ void HandleInfoScreen_LevelSet(int button)
   if (button_released)
   {
     FadeSoundsAndMusic();
+    FadeOut(REDRAW_FIELD);
 
     info_mode = INFO_MODE_MAIN;
-    DrawInfoScreen();
+    DrawAndFadeInInfoScreen(REDRAW_FIELD);
   }
   else
   {
@@ -1909,7 +2287,7 @@ void HandleInfoScreen_LevelSet(int button)
   }
 }
 
-static void DrawInfoScreenExt(boolean do_fading)
+static void DrawInfoScreenExt(int redraw_mask, boolean do_fading)
 {
   SetMainBackgroundImage(IMG_BACKGROUND_INFO);
 
@@ -1926,7 +2304,7 @@ static void DrawInfoScreenExt(boolean do_fading)
   else if (info_mode == INFO_MODE_LEVELSET)
     DrawInfoScreen_LevelSet();
   else
-    DrawInfoScreen_Main(do_fading);
+    DrawInfoScreen_Main(redraw_mask, do_fading);
 
   if (info_mode != INFO_MODE_MAIN &&
       info_mode != INFO_MODE_TITLE &&
@@ -1937,9 +2315,14 @@ static void DrawInfoScreenExt(boolean do_fading)
   }
 }
 
+void DrawAndFadeInInfoScreen(int redraw_mask)
+{
+  DrawInfoScreenExt(redraw_mask, TRUE);
+}
+
 void DrawInfoScreen()
 {
-  DrawInfoScreenExt(0);
+  DrawInfoScreenExt(REDRAW_ALL, FALSE);
 }
 
 void HandleInfoScreen(int mx, int my, int dx, int dy, int button)
@@ -2065,34 +2448,15 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
 {
   int i;
   char *title_string = NULL;
-#if 0
-  int xoffset_sets = 16;
-#endif
   int yoffset_sets = MENU_TITLE1_YPOS;
-#if 0
-  int xoffset_setup = 16;
-#endif
   int yoffset_setup = 16;
-#if 1
-#if 0
-  int xoffset = (ti->type == TREE_TYPE_LEVEL_DIR ? xoffset_sets :
-		 xoffset_setup);
-#endif
   int yoffset = (ti->type == TREE_TYPE_LEVEL_DIR ? yoffset_sets :
 		 yoffset_setup);
-#else
-  int xoffset = (ti->type == TREE_TYPE_LEVEL_DIR ? 0 : xoffset_setup);
-  int yoffset = (ti->type == TREE_TYPE_LEVEL_DIR ? 0 : yoffset_setup);
-#endif
   int last_game_status = game_status;	/* save current game status */
 
   title_string = ti->infotext;
 
-#if 1
   DrawTextSCentered(mSY - SY + yoffset, FONT_TITLE_1, title_string);
-#else
-  DrawText(SX + xoffset, SY + yoffset, title_string, FONT_TITLE_1);
-#endif
 
   /* force LEVELS font on artwork setup screen */
   game_status = GAME_MODE_LEVELS;
@@ -2143,11 +2507,7 @@ static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti)
 {
   TreeInfo *node, *node_first;
   int x, last_redraw_mask = redraw_mask;
-#if 1
   int ypos = MENU_TITLE2_YPOS;
-#else
-  int ypos = 40;
-#endif
 
   if (ti->type != TREE_TYPE_LEVEL_DIR)
     return;
@@ -2223,7 +2583,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
     drawChooseTreeList(ti->cl_first, num_page_entries, ti);
     drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti);
-    drawChooseTreeCursor(ti->cl_cursor, FC_RED);
+    drawChooseTreeCursor(ti->cl_cursor, TRUE);
 
     return;
   }
@@ -2291,7 +2651,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
 	drawChooseTreeList(ti->cl_first, num_page_entries, ti);
 	drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti);
-	drawChooseTreeCursor(ti->cl_cursor, FC_RED);
+	drawChooseTreeCursor(ti->cl_cursor, TRUE);
+
 	AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
 				  ti->cl_first, ti);
       }
@@ -2305,7 +2666,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
 	drawChooseTreeList(ti->cl_first, num_page_entries, ti);
 	drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti);
-	drawChooseTreeCursor(ti->cl_cursor, FC_RED);
+	drawChooseTreeCursor(ti->cl_cursor, TRUE);
+
 	AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
 				  ti->cl_first, ti);
       }
@@ -2352,9 +2714,10 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
     {
       if (y != ti->cl_cursor)
       {
-	drawChooseTreeCursor(y, FC_RED);
-	drawChooseTreeCursor(ti->cl_cursor, FC_BLUE);
+	drawChooseTreeCursor(ti->cl_cursor, FALSE);
+	drawChooseTreeCursor(y, TRUE);
 	drawChooseTreeInfo(ti->cl_first + y, ti);
+
 	ti->cl_cursor = y;
       }
     }
@@ -2438,9 +2801,6 @@ void DrawHallOfFame(int highlight_position)
 
   FadeOut(REDRAW_FIELD);
 
-#if 0
-  FadeToFront();
-#endif
   InitAnimation();
 
   PlayMenuSound();
@@ -2458,15 +2818,9 @@ static void drawHallOfFameList(int first_entry, int highlight_position)
   SetMainBackgroundImage(IMG_BACKGROUND_SCORES);
   ClearWindow();
 
-#if 1
   DrawTextSCentered(MENU_TITLE1_YPOS, FONT_TITLE_1, "Hall Of Fame");
   DrawTextFCentered(MENU_TITLE2_YPOS, FONT_TITLE_2,
 		    "HighScores of Level %d", level_nr);
-#else
-  DrawText(mSX + 80, mSY + MENU_TITLE1_YPOS, "Hall Of Fame", FONT_TITLE_1);
-  DrawTextFCentered(MENU_TITLE2_YPOS, FONT_TITLE_2,
-		    "HighScores of Level %d", level_nr);
-#endif
 
   for (i = 0; i < NUM_MENU_ENTRIES_ON_SCREEN; i++)
   {
@@ -2804,8 +3158,8 @@ static struct TokenInfo setup_info_graphics[] =
 #if 0
   { TYPE_SWITCH,	&setup.soft_scrolling,	"Soft Scrolling:"	},
   { TYPE_SWITCH,	&setup.double_buffering,"Double-Buffering:"	},
-  { TYPE_SWITCH,	&setup.fading,		"Fading:"		},
 #endif
+  { TYPE_SWITCH,	&setup.fade_screens,	"Fade Screens:"		},
   { TYPE_SWITCH,	&setup.quick_switch,	"Quick Player Focus Switch:" },
   { TYPE_SWITCH,	&setup.quick_doors,	"Quick Menu Doors:"	},
   { TYPE_SWITCH,	&setup.show_titlescreen,"Show Title Screens:"	},
@@ -2853,6 +3207,26 @@ static struct TokenInfo setup_info_artwork[] =
   { 0,			NULL,			NULL			}
 };
 
+static struct TokenInfo setup_info_input[] =
+{
+  { TYPE_SWITCH,	NULL,			"Player:"		},
+  { TYPE_SWITCH,	NULL,			"Device:"		},
+  { TYPE_ENTER_MENU,	NULL,			""			},
+  { TYPE_EMPTY,		NULL,			""			},
+  { TYPE_EMPTY,		NULL,			""			},
+  { TYPE_EMPTY,		NULL,			""			},
+  { TYPE_EMPTY,		NULL,			""			},
+  { TYPE_EMPTY,		NULL,			""			},
+  { TYPE_EMPTY,		NULL,			""			},
+  { TYPE_EMPTY,		NULL,			""			},
+  { TYPE_EMPTY,		NULL,			""			},
+  { TYPE_EMPTY,		NULL,			""			},
+  { TYPE_EMPTY,		NULL,			""			},
+  { TYPE_LEAVE_MENU,	execSetupMain, 		"Back"			},
+
+  { 0,			NULL,			NULL			}
+};
+
 static struct TokenInfo setup_info_shortcut_1[] =
 {
   { TYPE_KEYTEXT,	NULL,		"Quick Save Game to Tape:",	},
@@ -2981,18 +3355,11 @@ static void drawSetupValue(int pos)
 
   if (type & TYPE_KEY)
   {
-#if 1
     xpos = MENU_SCREEN_START_XPOS;
-#else
-    xpos = 3;
-#endif
 
     if (type & TYPE_QUERY)
     {
       value_string = "<press key>";
-#if 0
-      font_nr = FONT_INPUT_1_ACTIVE;
-#endif
     }
   }
   else if (type & TYPE_STRING)
@@ -3000,25 +3367,10 @@ static void drawSetupValue(int pos)
     int max_value_len = (SCR_FIELDX - 2) * 2;
 
     xpos = MENU_SCREEN_START_XPOS;
-#if 0
-    font_nr = FONT_VALUE_2;
-#endif
 
     if (strlen(value_string) > max_value_len)
       value_string[max_value_len] = '\0';
   }
-  else if (type & TYPE_ECS_AGA)
-  {
-#if 0
-    font_nr = FONT_VALUE_1;
-#endif
-  }
-  else if (type & TYPE_BOOLEAN_STYLE)
-  {
-#if 0
-    font_nr = (*(boolean *)value ? FONT_OPTION_ON : FONT_OPTION_OFF);
-#endif
-  }
 
   startx = mSX + xpos * 32;
   starty = mSY + ypos * 32;
@@ -3045,12 +3397,6 @@ static void drawSetupValue(int pos)
 	startx + font2_xoffset < text_startx + text_width + text_font_xoffset)
       correct_font_draw_xoffset = TRUE;
 
-#if 0
-    printf("::: %d + %d < %d + %d + %d\n",
-	   startx, font_xoffset, text_startx, text_width, text_font_xoffset);
-    printf("::: => need correction == %d\n", correct_font_draw_xoffset);
-#endif
-
     /* check if setup value would overlap with setup text when printed */
     /* (this can happen for extreme/wrong values for font draw offset) */
     if (correct_font_draw_xoffset)
@@ -3066,18 +3412,8 @@ static void drawSetupValue(int pos)
     }
   }
 
-#if 1
   for (i = 0; i <= MENU_SCREEN_MAX_XPOS - xpos; i++)
     DrawText(startx + i * font_width, starty, " ", font_nr);
-#else
-#if 1
-  for (i = xpos; i <= MENU_SCREEN_MAX_XPOS; i++)
-    DrawText(mSX + i * 32, starty, " ", font_nr);
-#else
-  DrawText(startx, starty,
-	   (xpos == 3 ? "              " : "   "), font_nr);
-#endif
-#endif
 
   DrawText(startx, starty, value_string, font_nr);
 
@@ -3107,6 +3443,24 @@ static void changeSetupValue(int pos)
   drawSetupValue(pos);
 }
 
+static void DrawCursorAndText_Setup(int pos, boolean active)
+{
+  int xpos = MENU_SCREEN_START_XPOS;
+  int ypos = MENU_SCREEN_START_YPOS + pos;
+  int font_nr = getSetupTextFont(setup_info[pos].type);
+
+  if (setup_info == setup_info_input)
+    font_nr = FONT_MENU_1;
+
+  if (active)
+    font_nr = FONT_ACTIVE(font_nr);
+
+  DrawText(mSX + xpos * 32, mSY + ypos * 32, setup_info[pos].text, font_nr);
+
+  if (setup_info[pos].type & ~TYPE_SKIP_ENTRY)
+    drawCursor(pos, active);
+}
+
 static void DrawSetupScreen_Generic()
 {
   char *title_string = NULL;
@@ -3158,22 +3512,17 @@ static void DrawSetupScreen_Generic()
     title_string = "Setup Shortcuts";
   }
 
-#if 1
   DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, title_string);
-#else
-  DrawText(mSX + 16, mSY + 16, title_string, FONT_TITLE_1);
-#endif
 
   num_setup_info = 0;
   for (i = 0; setup_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++)
   {
     void *value_ptr = setup_info[i].value;
+#if 1
+#else
     int xpos = MENU_SCREEN_START_XPOS;
     int ypos = MENU_SCREEN_START_YPOS + i;
-#if 1
     int font_nr;
-#else
-    int font_nr = FONT_MENU_1;
 #endif
 
     /* set some entries to "unchangeable" according to other variables */
@@ -3184,24 +3533,6 @@ static void DrawSetupScreen_Generic()
 	(value_ptr == &screen_mode_text   && !video.fullscreen_available))
       setup_info[i].type |= TYPE_GHOSTED;
 
-#if 1
-    font_nr = getSetupTextFont(setup_info[i].type);
-#else
-#if 1
-    if (setup_info[i].type & (TYPE_SWITCH |
-			      TYPE_YES_NO |
-			      TYPE_STRING |
-			      TYPE_ECS_AGA |
-			      TYPE_KEYTEXT))
-      font_nr = FONT_MENU_2;
-#else
-    if (setup_info[i].type & TYPE_STRING)
-      font_nr = FONT_MENU_2;
-#endif
-#endif
-
-    DrawText(mSX + xpos * 32, mSY + ypos * 32, setup_info[i].text, font_nr);
-
     if (setup_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST))
       initCursor(i, IMG_MENU_BUTTON_ENTER_MENU);
     else if (setup_info[i].type & (TYPE_LEAVE_MENU|TYPE_LEAVE_LIST))
@@ -3209,6 +3540,14 @@ static void DrawSetupScreen_Generic()
     else if (setup_info[i].type & ~TYPE_SKIP_ENTRY)
       initCursor(i, IMG_MENU_BUTTON);
 
+#if 1
+    DrawCursorAndText_Setup(i, FALSE);
+#else
+    font_nr = getSetupTextFont(setup_info[i].type);
+
+    DrawText(mSX + xpos * 32, mSY + ypos * 32, setup_info[i].text, font_nr);
+#endif
+
     if (setup_info[i].type & TYPE_VALUE)
       drawSetupValue(i);
 
@@ -3240,7 +3579,11 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
       choice++;
     choice_store[setup_mode] = choice;
 
-    drawCursor(choice, FC_RED);
+#if 1
+    DrawCursorAndText_Setup(choice, TRUE);
+#else
+    drawCursor(choice, TRUE);
+#endif
 
     return;
   }
@@ -3285,15 +3628,20 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
       y += dy;
   }
 
-#if 1
   if (IN_VIS_FIELD(x, y) && y >= 0 && y < num_setup_info)
   {
     if (button)
     {
       if (y != choice && setup_info[y].type & ~TYPE_SKIP_ENTRY)
       {
-	drawCursor(y, FC_RED);
-	drawCursor(choice, FC_BLUE);
+#if 1
+	DrawCursorAndText_Setup(choice, FALSE);
+	DrawCursorAndText_Setup(y, TRUE);
+#else
+	drawCursor(choice, FALSE);
+	drawCursor(y, TRUE);
+#endif
+
 	choice = choice_store[setup_mode] = y;
       }
     }
@@ -3322,64 +3670,44 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
       }
     }
   }
-#else
-  if (IN_VIS_FIELD(x, y) &&
-      y >= 0 && y < num_setup_info && setup_info[y].type & ~TYPE_SKIP_ENTRY)
-  {
-    if (button)
-    {
-      if (y != choice)
-      {
-	drawCursor(y, FC_RED);
-	drawCursor(choice, FC_BLUE);
-	choice = choice_store[setup_mode] = y;
-      }
-    }
-    else if (!(setup_info[y].type & TYPE_GHOSTED))
-    {
-      if (setup_info[y].type & TYPE_ENTER_OR_LEAVE)
-      {
-	void (*menu_callback_function)(void) = setup_info[choice].value;
-
-	menu_callback_function();
-      }
-      else
-      {
-	if (setup_info[y].type & TYPE_KEYTEXT &&
-	    setup_info[y + 1].type & TYPE_KEY)
-	  y++;
-
-	if (setup_info[y].type & TYPE_VALUE)
-	  changeSetupValue(y);
-      }
-    }
-  }
-#endif
 }
 
 void DrawSetupScreen_Input()
 {
+#if 1
+  int i;
+#endif
+
   ClearWindow();
 
 #if 1
-  DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Setup Input");
-#else
-  DrawText(mSX + 16, mSY + 16, "Setup Input", FONT_TITLE_1);
+  setup_info = setup_info_input;
 #endif
 
+  DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Setup Input");
+
+#if 1
+  for (i = 0; setup_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++)
+  {
+    if (setup_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST))
+      initCursor(i, IMG_MENU_BUTTON_ENTER_MENU);
+    else if (setup_info[i].type & (TYPE_LEAVE_MENU|TYPE_LEAVE_LIST))
+      initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU);
+    else if (setup_info[i].type & ~TYPE_SKIP_ENTRY)
+      initCursor(i, IMG_MENU_BUTTON);
+
+    DrawCursorAndText_Setup(i, FALSE);
+  }
+#else
   initCursor(0,  IMG_MENU_BUTTON);
   initCursor(1,  IMG_MENU_BUTTON);
   initCursor(2,  IMG_MENU_BUTTON_ENTER_MENU);
   initCursor(13, IMG_MENU_BUTTON_LEAVE_MENU);
 
-#if 0
-  drawCursorXY(10, 0, IMG_MENU_BUTTON_LEFT);
-  drawCursorXY(12, 0, IMG_MENU_BUTTON_RIGHT);
-#endif
-
   DrawText(mSX + 32, mSY +  2 * 32, "Player:", FONT_MENU_1);
   DrawText(mSX + 32, mSY +  3 * 32, "Device:", FONT_MENU_1);
   DrawText(mSX + 32, mSY + 15 * 32, "Back",   FONT_MENU_1);
+#endif
 
 #if 0
   DeactivateJoystickForCalibration();
@@ -3389,14 +3717,12 @@ void DrawSetupScreen_Input()
 		    "Joysticks deactivated on this screen");
 #endif
 
-#if 1
   /* create gadgets for setup input menu screen */
   FreeScreenGadgets();
   CreateScreenGadgets();
 
   /* map gadgets for setup input menu screen */
   MapScreenMenuGadgets(SCREEN_MASK_INPUT);
-#endif
 
   HandleSetupScreen_Input(0, 0, 0, 0, MB_MENU_INITIALIZE);
   FadeToFront();
@@ -3424,7 +3750,7 @@ static void setJoystickDeviceToNr(char *device_name, int device_nr)
 	    strlen(device_name));
 }
 
-static void drawPlayerSetupInputInfo(int player_nr)
+static void drawPlayerSetupInputInfo(int player_nr, boolean active)
 {
   int i;
   static struct SetupKeyboardInfo custom_key;
@@ -3448,6 +3774,7 @@ static void drawPlayerSetupInputInfo(int player_nr)
     "Joystick3",
     "Joystick4"
   };
+  int text_font_nr = (active ? FONT_MENU_1_ACTIVE : FONT_MENU_1);
 
   InitJoysticks();
 
@@ -3468,19 +3795,21 @@ static void drawPlayerSetupInputInfo(int player_nr)
     int font_nr = (joystick.fd[player_nr] < 0 ? FONT_VALUE_OLD : FONT_VALUE_1);
 
     DrawText(mSX + 8 * 32, mSY + 3 * 32, text, font_nr);
-    DrawText(mSX + 32, mSY + 4 * 32, "Calibrate", FONT_MENU_1);
+    DrawText(mSX + 32, mSY + 4 * 32, "Calibrate", text_font_nr);
   }
   else
   {
     DrawText(mSX + 8 * 32, mSY + 3 * 32, "Keyboard ", FONT_VALUE_1);
-    DrawText(mSX + 1 * 32, mSY + 4 * 32, "Customize", FONT_MENU_1);
+    DrawText(mSX + 1 * 32, mSY + 4 * 32, "Customize", text_font_nr);
   }
 
   DrawText(mSX + 32, mSY + 5 * 32, "Actual Settings:", FONT_MENU_1);
+
   drawCursorXY(1, 4, IMG_MENU_BUTTON_LEFT);
   drawCursorXY(1, 5, IMG_MENU_BUTTON_RIGHT);
   drawCursorXY(1, 6, IMG_MENU_BUTTON_UP);
   drawCursorXY(1, 7, IMG_MENU_BUTTON_DOWN);
+
   DrawText(mSX + 2 * 32, mSY +  6 * 32, ":", FONT_VALUE_OLD);
   DrawText(mSX + 2 * 32, mSY +  7 * 32, ":", FONT_VALUE_OLD);
   DrawText(mSX + 2 * 32, mSY +  8 * 32, ":", FONT_VALUE_OLD);
@@ -3518,7 +3847,7 @@ void HandleSetupScreen_Input_Player(int step, int direction)
   {
     input_player_nr = new_player_nr;
 
-    drawPlayerSetupInputInfo(input_player_nr);
+    drawPlayerSetupInputInfo(input_player_nr, FALSE);
   }
 }
 
@@ -3534,8 +3863,13 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
 
   if (button == MB_MENU_INITIALIZE)
   {
-    drawPlayerSetupInputInfo(input_player_nr);
-    drawCursor(choice, FC_RED);
+    drawPlayerSetupInputInfo(input_player_nr, (choice == 2));
+
+#if 1
+    DrawCursorAndText_Setup(choice, TRUE);
+#else
+    drawCursor(choice, TRUE);
+#endif
 
     return;
   }
@@ -3568,31 +3902,10 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
       y = (dy > 0 ? pos_empty2 + 1 : pos_empty1 - 1);
   }
 
-#if 1
-
   if (y == 0 && dx != 0 && button)
   {
     HandleSetupScreen_Input_Player(1, dx < 0 ? -1 : +1);
   }
-
-#else
-
-  if (IN_VIS_FIELD(x, y) &&
-      y == 0 && ((x < 10 && !button) || ((x == 10 || x == 12) && button)))
-  {
-    static unsigned long delay = 0;
-
-    if (!DelayReached(&delay, GADGET_FRAME_DELAY))
-      return;
-
-    input_player_nr =
-      (input_player_nr + (x == 10 ? -1 : +1) + MAX_PLAYERS) % MAX_PLAYERS;
-
-    drawPlayerSetupInputInfo(input_player_nr);
-  }
-
-#endif
-
   else if (IN_VIS_FIELD(x, y) &&
 	   y >= pos_start && y <= pos_end &&
 	   !(y >= pos_empty1 && y <= pos_empty2))
@@ -3601,8 +3914,16 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
     {
       if (y != choice)
       {
-	drawCursor(y, FC_RED);
-	drawCursor(choice, FC_BLUE);
+#if 1
+	DrawCursorAndText_Setup(choice, FALSE);
+	DrawCursorAndText_Setup(y, TRUE);
+
+	drawPlayerSetupInputInfo(input_player_nr, (y == 2));
+#else
+	drawCursor(choice, FALSE);
+	drawCursor(y, TRUE);
+#endif
+
 	choice = y;
       }
     }
@@ -3630,7 +3951,7 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
 	    setJoystickDeviceToNr(device_name, new_device_nr);
 	}
 
-	drawPlayerSetupInputInfo(input_player_nr);
+	drawPlayerSetupInputInfo(input_player_nr, FALSE);
       }
       else if (y == 2)
       {
@@ -3678,11 +3999,7 @@ void CustomizeKeyboard(int player_nr)
 
   ClearWindow();
 
-#if 1
   DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Keyboard Input");
-#else
-  DrawText(mSX + 16, mSY + 16, "Keyboard Input", FONT_TITLE_1);
-#endif
 
   BackToFront();
   InitAnimation();
@@ -4021,6 +4338,12 @@ void DrawSetupScreen()
   PlayMenuMusic();
 }
 
+void RedrawSetupScreenAfterFullscreenToggle()
+{
+  if (setup_mode == SETUP_MODE_GRAPHICS)
+    DrawSetupScreen();
+}
+
 void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 {
   if (setup_mode == SETUP_MODE_INPUT)
@@ -4057,8 +4380,19 @@ static void getScreenMenuButtonPos(int *x, int *y, int gadget_id)
 {
   switch (gadget_id)
   {
-    case SCREEN_CTRL_ID_LAST_LEVEL:
-      *x = mSX + TILEX * getLastLevelButtonPos();
+#if 1
+    case SCREEN_CTRL_ID_PREV_LEVEL:
+      *x = mSX + menu.main.button.prev_level.x;
+      *y = mSY + menu.main.button.prev_level.y;
+      break;
+
+    case SCREEN_CTRL_ID_NEXT_LEVEL:
+      *x = mSX + menu.main.button.next_level.x;
+      *y = mSY + menu.main.button.next_level.y;
+      break;
+#else
+    case SCREEN_CTRL_ID_PREV_LEVEL:
+      *x = mSX + TILEX * getPrevlevelButtonPos();
       *y = mSY + TILEY * (MENU_SCREEN_START_YPOS + 1);
       break;
 
@@ -4066,8 +4400,9 @@ static void getScreenMenuButtonPos(int *x, int *y, int gadget_id)
       *x = mSX + TILEX * getNextLevelButtonPos();
       *y = mSY + TILEY * (MENU_SCREEN_START_YPOS + 1);
       break;
+#endif
 
-    case SCREEN_CTRL_ID_LAST_PLAYER:
+    case SCREEN_CTRL_ID_PREV_PLAYER:
       *x = mSX + TILEX * 10;
       *y = mSY + TILEY * MENU_SCREEN_START_YPOS;
       break;
@@ -4092,9 +4427,9 @@ static struct
 } menubutton_info[NUM_SCREEN_MENUBUTTONS] =
 {
   {
-    IMG_MENU_BUTTON_LAST_LEVEL, IMG_MENU_BUTTON_LAST_LEVEL_ACTIVE,
+    IMG_MENU_BUTTON_PREV_LEVEL, IMG_MENU_BUTTON_PREV_LEVEL_ACTIVE,
     getScreenMenuButtonPos,
-    SCREEN_CTRL_ID_LAST_LEVEL,
+    SCREEN_CTRL_ID_PREV_LEVEL,
     SCREEN_MASK_MAIN,
     "last level"
   },
@@ -4108,7 +4443,7 @@ static struct
   {
     IMG_MENU_BUTTON_LEFT, IMG_MENU_BUTTON_LEFT_ACTIVE,
     getScreenMenuButtonPos,
-    SCREEN_CTRL_ID_LAST_PLAYER,
+    SCREEN_CTRL_ID_PREV_PLAYER,
     SCREEN_MASK_INPUT,
     "last player"
   },
@@ -4342,10 +4677,17 @@ static void CreateScreenScrollbars()
 		      GDI_SCROLLBAR_ITEMS_MAX, items_max,
 		      GDI_SCROLLBAR_ITEMS_VISIBLE, items_visible,
 		      GDI_SCROLLBAR_ITEM_POSITION, item_position,
+#if 1
+		      GDI_WHEEL_AREA_X, SX,
+		      GDI_WHEEL_AREA_Y, SY,
+		      GDI_WHEEL_AREA_WIDTH, SXSIZE,
+		      GDI_WHEEL_AREA_HEIGHT, SYSIZE,
+#else
 		      GDI_WHEEL_AREA_X, 0,
 		      GDI_WHEEL_AREA_Y, 0,
 		      GDI_WHEEL_AREA_WIDTH, WIN_XSIZE,
 		      GDI_WHEEL_AREA_HEIGHT, WIN_YSIZE,
+#endif
 		      GDI_STATE, GD_BUTTON_UNPRESSED,
 		      GDI_DESIGN_UNPRESSED, gd_bitmap_unpressed, gd_x1, gd_y1,
 		      GDI_DESIGN_PRESSED, gd_bitmap_pressed, gd_x2, gd_y2,
@@ -4447,14 +4789,9 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
   int button = gi->event.button;
   int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
 
-#if 0
-  if (game_status != GAME_MODE_LEVELS && game_status != GAME_MODE_SETUP)
-    return;
-#endif
-
   switch (id)
   {
-    case SCREEN_CTRL_ID_LAST_LEVEL:
+    case SCREEN_CTRL_ID_PREV_LEVEL:
       HandleMainMenu_SelectLevel(step, -1);
       break;
 
@@ -4462,7 +4799,7 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
       HandleMainMenu_SelectLevel(step, +1);
       break;
 
-    case SCREEN_CTRL_ID_LAST_PLAYER:
+    case SCREEN_CTRL_ID_PREV_PLAYER:
       HandleSetupScreen_Input_Player(step, -1);
       break;