X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=f2335cac639ab23a52c3e2e5e3854f5f2aba8649;hp=2d53a4a238c9e417c2702949a330038aa702ff31;hb=8d46c5298f0fcce7bdb52f3835b2fbbdc403dfe0;hpb=a35852e106072656e444202e672d050ebff03abb

diff --git a/src/screens.c b/src/screens.c
index 2d53a4a2..f2335cac 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -69,6 +69,7 @@ void DrawHeadline()
 
 void DrawMainMenu()
 {
+  static struct LevelDirInfo *leveldir_last_valid = NULL;
   int i;
   char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:");
 
@@ -90,9 +91,16 @@ void DrawMainMenu()
   /* map gadgets for main menu screen */
   MapTapeButtons();
 
-  /* level_nr may have set to value over handicap with level editor */
-  if (setup.handicap && level_nr > leveldir[leveldir_nr].handicap_level)
-    level_nr = leveldir[leveldir_nr].handicap_level;
+  /* leveldir_current may be invalid (level group, parent link) */
+  if (!validLevelSeries(leveldir_current))
+    leveldir_current = getFirstValidLevelSeries(leveldir_last_valid);
+
+  /* store valid level series information */
+  leveldir_last_valid = leveldir_current;
+
+  /* level_nr may have been set to value over handicap with level editor */
+  if (setup.handicap && level_nr > leveldir_current->handicap_level)
+    level_nr = leveldir_current->handicap_level;
 
   GetPlayerConfig();
   LoadLevel(level_nr);
@@ -103,7 +111,7 @@ void DrawMainMenu()
   DrawText(SX + 6*32,  SY + 2*32, setup.player_name, FS_BIG, FC_RED);
   DrawText(SX + 32,    SY + 3*32, "Level:", FS_BIG, FC_GREEN);
   DrawText(SX + 11*32, SY + 3*32, int2str(level_nr,3), FS_BIG,
-	   (leveldir[leveldir_nr].readonly ? FC_RED : FC_YELLOW));
+	   (leveldir_current->readonly ? FC_RED : FC_YELLOW));
   DrawText(SX + 32,    SY + 4*32, "Hall Of Fame", FS_BIG, FC_GREEN);
   DrawText(SX + 32,    SY + 5*32, "Level Creator", FS_BIG, FC_GREEN);
   DrawText(SY + 32,    SY + 6*32, "Info Screen", FS_BIG, FC_GREEN);
@@ -114,10 +122,10 @@ void DrawMainMenu()
   DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE);
 
   DrawTextF(7*32 + 6, 3*32 + 9, FC_RED, "%d-%d",
-	    leveldir[leveldir_nr].first_level,
-	    leveldir[leveldir_nr].last_level);
+	    leveldir_current->first_level,
+	    leveldir_current->last_level);
 
-  if (leveldir[leveldir_nr].readonly)
+  if (leveldir_current->readonly)
   {
     DrawTextF(15*32 + 6, 3*32 + 9 - 7, FC_RED, "READ");
     DrawTextF(15*32 + 6, 3*32 + 9 + 7, FC_RED, "ONLY");
@@ -131,13 +139,13 @@ void DrawMainMenu()
   DrawText(SX + 56, SY + 326, "A Game by Artsoft Entertainment",
 	   FS_SMALL, FC_RED);
 
-  if (leveldir[leveldir_nr].name)
+  if (leveldir_current->name)
   {
-    int len = strlen(leveldir[leveldir_nr].name);
+    int len = strlen(leveldir_current->name);
     int lxpos = SX + (SXSIZE - len * FONT4_XSIZE) / 2;
     int lypos = SY + 352;
 
-    DrawText(lxpos, lypos, leveldir[leveldir_nr].name, FS_SMALL, FC_SPECIAL2);
+    DrawText(lxpos, lypos, leveldir_current->name, FS_SMALL, FC_SPECIAL2);
   }
 
   FadeToFront();
@@ -157,6 +165,35 @@ void DrawMainMenu()
 
 }
 
+static void gotoTopLevelDir()
+{
+  /* move upwards to top level directory */
+  while (leveldir_current->node_parent)
+  {
+    /* write a "path" into level tree for easy navigation to last level */
+    if (leveldir_current->node_parent->node_group->cl_first == -1)
+    {
+      int num_leveldirs = numLevelDirInfoInGroup(leveldir_current);
+      int leveldir_pos = posLevelDirInfo(leveldir_current);
+      int num_page_entries;
+      int cl_first, cl_cursor;
+
+      if (num_leveldirs <= MAX_LEVEL_SERIES_ON_SCREEN)
+	num_page_entries = num_leveldirs;
+      else
+	num_page_entries = MAX_LEVEL_SERIES_ON_SCREEN - 1;
+
+      cl_first = MAX(0, leveldir_pos - num_page_entries + 1);
+      cl_cursor = leveldir_pos - cl_first + 3;
+
+      leveldir_current->node_parent->node_group->cl_first = cl_first;
+      leveldir_current->node_parent->node_group->cl_cursor = cl_cursor;
+    }
+
+    leveldir_current = leveldir_current->node_parent;
+  }
+}
+
 void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 {
   static int choice = 3;
@@ -199,23 +236,23 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
     y = choice;
   }
 
-  if (y == 4 && ((x == 11 && level_nr > leveldir[leveldir_nr].first_level) ||
-		 (x == 15 && level_nr < leveldir[leveldir_nr].last_level)) &&
+  if (y == 4 && ((x == 11 && level_nr > leveldir_current->first_level) ||
+		 (x == 15 && level_nr < leveldir_current->last_level)) &&
       button)
   {
     static unsigned long level_delay = 0;
     int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
     int new_level_nr, old_level_nr = level_nr;
-    int font_color = (leveldir[leveldir_nr].readonly ? FC_RED : FC_YELLOW);
+    int font_color = (leveldir_current->readonly ? FC_RED : FC_YELLOW);
 
     new_level_nr = level_nr + (x == 11 ? -step : +step);
-    if (new_level_nr < leveldir[leveldir_nr].first_level)
-      new_level_nr = leveldir[leveldir_nr].first_level;
-    if (new_level_nr > leveldir[leveldir_nr].last_level)
-      new_level_nr = leveldir[leveldir_nr].last_level;
+    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;
 
-    if (setup.handicap && new_level_nr > leveldir[leveldir_nr].handicap_level)
-      new_level_nr = leveldir[leveldir_nr].handicap_level;
+    if (setup.handicap && new_level_nr > leveldir_current->handicap_level)
+      new_level_nr = leveldir_current->handicap_level;
 
     if (old_level_nr == new_level_nr ||
 	!DelayReached(&level_delay, GADGET_FRAME_DELAY))
@@ -246,7 +283,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
     {
       if (y != choice)
       {
-	DrawGraphic(0, y-1, GFX_KUGEL_ROT);
+	DrawGraphic(0, y - 1, GFX_KUGEL_ROT);
 	DrawGraphic(0, choice - 1, GFX_KUGEL_BLAU);
 	choice = y;
       }
@@ -260,11 +297,14 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       }
       else if (y == 4)
       {
-	if (num_leveldirs)
+	if (leveldir_first)
 	{
 	  game_status = CHOOSELEVEL;
 	  SaveLevelSetup_LastSeries();
-	  SaveLevelSetup_SeriesInfo(leveldir_nr);
+	  SaveLevelSetup_SeriesInfo();
+
+	  gotoTopLevelDir();
+
 	  DrawChooseLevel();
 	}
       }
@@ -275,7 +315,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       }
       else if (y == 6)
       {
-	if (leveldir[leveldir_nr].readonly &&
+	if (leveldir_current->readonly &&
 	    strcmp(setup.player_name, "Artsoft") != 0)
 	  Request("This level is read only !", REQ_CONFIRM);
 	game_status = LEVELED;
@@ -310,7 +350,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       else if (y == 10)
       {
 	SaveLevelSetup_LastSeries();
-	SaveLevelSetup_SeriesInfo(leveldir_nr);
+	SaveLevelSetup_SeriesInfo();
         if (Request("Do you really want to quit ?", REQ_ASK | REQ_STAY_CLOSED))
 	  game_status = EXITGAME;
       }
@@ -432,8 +472,8 @@ static int helpscreen_action[] =
   GFX_DIAMANT,1,10,						HA_NEXT,
   GFX_LIFE,1,100,						HA_NEXT,
   GFX_LIFE_ASYNC,1,100,						HA_NEXT,
-  GFX_SIEB_INAKTIV,4,2,						HA_NEXT,
-  GFX_SIEB2_INAKTIV,4,2,					HA_NEXT,
+  GFX_MAGIC_WALL_OFF,4,2,					HA_NEXT,
+  GFX_MAGIC_WALL_BD_OFF,4,2,					HA_NEXT,
   GFX_AUSGANG_ZU,1,100, GFX_AUSGANG_ACT,4,2,
   GFX_AUSGANG_AUF+0,4,2, GFX_AUSGANG_AUF+3,1,2,
   GFX_AUSGANG_AUF+2,1,2, GFX_AUSGANG_AUF+1,1,2,			HA_NEXT,
@@ -824,6 +864,33 @@ void HandleTypeName(int newxpos, KeySym key)
   BackToFront();
 }
 
+static void drawCursorExt(int ypos, int color, int graphic)
+{
+  static int cursor_array[SCR_FIELDY];
+
+  if (graphic)
+    cursor_array[ypos] = graphic;
+
+  graphic = cursor_array[ypos];
+
+  if (color == FC_RED)
+    graphic = (graphic == GFX_ARROW_BLUE_LEFT  ? GFX_ARROW_RED_LEFT  :
+	       graphic == GFX_ARROW_BLUE_RIGHT ? GFX_ARROW_RED_RIGHT :
+	       GFX_KUGEL_ROT);
+
+  DrawGraphic(0, ypos, graphic);
+}
+
+static void initCursor(int ypos, int graphic)
+{
+  drawCursorExt(ypos, FC_BLUE, graphic);
+}
+
+static void drawCursor(int ypos, int color)
+{
+  drawCursorExt(ypos, color, 0);
+}
+
 void DrawChooseLevel()
 {
   UnmapAllGadgets();
@@ -842,7 +909,7 @@ static void AdjustChooseLevelScrollbar(int id, int first_entry)
   struct GadgetInfo *gi = screen_gadget[id];
   int items_max, items_visible, item_position;
 
-  items_max = num_leveldirs;
+  items_max = numLevelDirInfoInGroup(leveldir_current);
   items_visible = MAX_LEVEL_SERIES_ON_SCREEN - 1;
   item_position = first_entry;
 
@@ -858,6 +925,7 @@ static void drawChooseLevelList(int first_entry, int num_page_entries)
   int i;
   char buffer[SCR_FIELDX * 2];
   int max_buffer_len = (SCR_FIELDX - 2) * 2;
+  int num_leveldirs = numLevelDirInfoInGroup(leveldir_current);
 
   XFillRectangle(display, backbuffer, gc, SX, SY, SXSIZE - 32, SYSIZE);
   redraw_mask |= REDRAW_FIELD;
@@ -866,17 +934,24 @@ static void drawChooseLevelList(int first_entry, int num_page_entries)
 
   for(i=0; i<num_page_entries; i++)
   {
-#if 0
-    strncpy(buffer, leveldir[first_entry + i].name_short , SCR_FIELDX - 1);
-    buffer[SCR_FIELDX - 1] = '\0';
-#else
-    strncpy(buffer, leveldir[first_entry + i].name , max_buffer_len);
+    struct LevelDirInfo *node, *node_first;
+    int leveldir_pos = first_entry + i;
+    int ypos = i + 2;
+
+    node_first = getLevelDirInfoFirstGroupEntry(leveldir_current);
+    node = getLevelDirInfoFromPos(node_first, leveldir_pos);
+
+    strncpy(buffer, node->name , max_buffer_len);
     buffer[max_buffer_len] = '\0';
-#endif
 
-    DrawText(SX + 32, SY + (i + 2) * 32, buffer,
-	     FS_MEDIUM, leveldir[first_entry + i].color);
-    DrawGraphic(0, i + 2, GFX_KUGEL_BLAU);
+    DrawText(SX + 32, SY + ypos * 32, buffer, FS_MEDIUM, node->color);
+
+    if (node->parent_link)
+      initCursor(ypos, GFX_ARROW_BLUE_LEFT);
+    else if (node->level_group)
+      initCursor(ypos, GFX_ARROW_BLUE_RIGHT);
+    else
+      initCursor(ypos, GFX_KUGEL_BLAU);
   }
 
   if (first_entry > 0)
@@ -886,21 +961,23 @@ static void drawChooseLevelList(int first_entry, int num_page_entries)
     DrawGraphic(0, MAX_LEVEL_SERIES_ON_SCREEN + 1, GFX_ARROW_BLUE_DOWN);
 }
 
-static void drawChooseLevelInfo(int leveldir_nr)
+static void drawChooseLevelInfo(int leveldir_pos)
 {
+  struct LevelDirInfo *node, *node_first;
   int x, last_redraw_mask = redraw_mask;
 
+  node_first = getLevelDirInfoFirstGroupEntry(leveldir_current);
+  node = getLevelDirInfoFromPos(node_first, leveldir_pos);
+
   XFillRectangle(display, drawto, gc, SX + 32, SY + 32, SXSIZE - 64, 32);
 
-#if 0
-  DrawTextFCentered(40, FC_RED, "%3d levels (%s)",
-		    leveldir[leveldir_nr].levels,
-		    leveldir[leveldir_nr].readonly ? "readonly" : "writable");
-#else
-  DrawTextFCentered(40, FC_RED, "%3d levels (%s)",
-		    leveldir[leveldir_nr].levels,
-		    leveldir[leveldir_nr].class_desc);
-#endif
+  if (node->parent_link)
+    DrawTextFCentered(40, FC_RED, "leave group \"%s\"", node->class_desc);
+  else if (node->level_group)
+    DrawTextFCentered(40, FC_RED, "enter group \"%s\"", node->class_desc);
+  else
+    DrawTextFCentered(40, FC_RED, "%3d levels (%s)",
+		      node->levels, node->class_desc);
 
   /* let BackToFront() redraw only what is needed */
   redraw_mask = last_redraw_mask | REDRAW_TILES;
@@ -910,12 +987,11 @@ static void drawChooseLevelInfo(int leveldir_nr)
 
 void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 {
-  static int choice = 3;
-  static int first_entry = -1;
   static unsigned long choose_delay = 0;
   static int redraw = TRUE;
   int x = (mx + 32 - SX) / 32, y = (my + 32 - SY) / 32;
   int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+  int num_leveldirs = numLevelDirInfoInGroup(leveldir_current);
   int num_page_entries;
 
   if (num_leveldirs <= MAX_LEVEL_SERIES_ON_SCREEN)
@@ -925,24 +1001,29 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 
   if (button == MB_MENU_INITIALIZE)
   {
-    if (first_entry == -1)
+    int leveldir_pos = posLevelDirInfo(leveldir_current);
+
+    if (leveldir_current->cl_first == -1)
     {
-      first_entry = MAX(0, leveldir_nr - num_page_entries + 1);
-      choice = leveldir_nr - first_entry + 3;
-      AdjustChooseLevelScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, first_entry);
+      leveldir_current->cl_first = MAX(0, leveldir_pos - num_page_entries + 1);
+      leveldir_current->cl_cursor =
+	leveldir_pos - leveldir_current->cl_first + 3;
     }
 
-    if (dx == 1)	/* 'first_entry' is set by scrollbar position */
-      first_entry = dy;
+    if (dx == 999)	/* first entry is set by scrollbar position */
+      leveldir_current->cl_first = dy;
+    else
+      AdjustChooseLevelScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
+				 leveldir_current->cl_first);
 
-    drawChooseLevelList(first_entry, num_page_entries);
-    drawChooseLevelInfo(leveldir_nr);
+    drawChooseLevelList(leveldir_current->cl_first, num_page_entries);
+    drawChooseLevelInfo(leveldir_pos);
     redraw = TRUE;
   }
 
   if (redraw)
   {
-    DrawGraphic(0, choice - 1, GFX_KUGEL_ROT);
+    drawCursor(leveldir_current->cl_cursor - 1, FC_RED);
     redraw = FALSE;
   }
 
@@ -954,7 +1035,7 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
     if (dy)
     {
       x = 1;
-      y = choice + dy;
+      y = leveldir_current->cl_cursor + dy;
     }
     else
       x = y = 0;	/* no action */
@@ -970,33 +1051,37 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 
   if (x == 1 && y == 2)
   {
-    if (first_entry > 0 &&
+    if (leveldir_current->cl_first > 0 &&
 	(dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY)))
     {
-      first_entry -= step;
-      if (first_entry < 0)
-	first_entry = 0;
-
-      drawChooseLevelList(first_entry, num_page_entries);
-      drawChooseLevelInfo(first_entry + choice - 3);
-      AdjustChooseLevelScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, first_entry);
-      DrawGraphic(0, choice - 1, GFX_KUGEL_ROT);
+      leveldir_current->cl_first -= step;
+      if (leveldir_current->cl_first < 0)
+	leveldir_current->cl_first = 0;
+
+      drawChooseLevelList(leveldir_current->cl_first, num_page_entries);
+      drawChooseLevelInfo(leveldir_current->cl_first +
+			  leveldir_current->cl_cursor - 3);
+      drawCursor(leveldir_current->cl_cursor - 1, FC_RED);
+      AdjustChooseLevelScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
+				 leveldir_current->cl_first);
       return;
     }
   }
   else if (x == 1 && y > num_page_entries + 2)
   {
-    if (first_entry + num_page_entries < num_leveldirs &&
+    if (leveldir_current->cl_first + num_page_entries < num_leveldirs &&
 	(dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY)))
     {
-      first_entry += step;
-      if (first_entry + num_page_entries > num_leveldirs)
-	first_entry = MAX(0, num_leveldirs - num_page_entries);
-
-      drawChooseLevelList(first_entry, num_page_entries);
-      drawChooseLevelInfo(first_entry + choice - 3);
-      AdjustChooseLevelScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, first_entry);
-      DrawGraphic(0, choice - 1, GFX_KUGEL_ROT);
+      leveldir_current->cl_first += step;
+      if (leveldir_current->cl_first + num_page_entries > num_leveldirs)
+	leveldir_current->cl_first = MAX(0, num_leveldirs - num_page_entries);
+
+      drawChooseLevelList(leveldir_current->cl_first, num_page_entries);
+      drawChooseLevelInfo(leveldir_current->cl_first +
+			  leveldir_current->cl_cursor - 3);
+      drawCursor(leveldir_current->cl_cursor - 1, FC_RED);
+      AdjustChooseLevelScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
+				 leveldir_current->cl_first);
       return;
     }
   }
@@ -1004,33 +1089,77 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
   if (!mx && !my && !dx && !dy)
   {
     x = 1;
-    y = choice;
+    y = leveldir_current->cl_cursor;
+  }
+
+  if (dx == 1)
+  {
+    struct LevelDirInfo *node_first, *node_cursor;
+    int leveldir_pos =
+      leveldir_current->cl_first + leveldir_current->cl_cursor - 3;
+
+    node_first = getLevelDirInfoFirstGroupEntry(leveldir_current);
+    node_cursor = getLevelDirInfoFromPos(node_first, leveldir_pos);
+
+    if (node_cursor->node_group)
+    {
+      node_cursor->cl_first = leveldir_current->cl_first;
+      node_cursor->cl_cursor = leveldir_current->cl_cursor;
+      leveldir_current = node_cursor->node_group;
+      DrawChooseLevel();
+    }
+  }
+  else if (dx == -1 && leveldir_current->node_parent)
+  {
+    leveldir_current = leveldir_current->node_parent;
+    DrawChooseLevel();
   }
 
   if (x == 1 && y >= 3 && y <= num_page_entries + 2)
   {
     if (button)
     {
-      if (y != choice)
+      if (y != leveldir_current->cl_cursor)
       {
-        DrawGraphic(0, y - 1, GFX_KUGEL_ROT);
-        DrawGraphic(0, choice - 1, GFX_KUGEL_BLAU);
-	drawChooseLevelInfo(first_entry + y - 3);
-	choice = y;
+	drawCursor(y - 1, FC_RED);
+	drawCursor(leveldir_current->cl_cursor - 1, FC_BLUE);
+	drawChooseLevelInfo(leveldir_current->cl_first + y - 3);
+	leveldir_current->cl_cursor = y;
       }
     }
     else
     {
-      leveldir_nr = first_entry + y - 3;
-      LoadLevelSetup_SeriesInfo(leveldir_nr);
+      struct LevelDirInfo *node_first, *node_cursor;
+      int leveldir_pos = leveldir_current->cl_first + y - 3;
 
-      SaveLevelSetup_LastSeries();
-      SaveLevelSetup_SeriesInfo(leveldir_nr);
-      TapeErase();
+      node_first = getLevelDirInfoFirstGroupEntry(leveldir_current);
+      node_cursor = getLevelDirInfoFromPos(node_first, leveldir_pos);
 
-      game_status = MAINMENU;
-      DrawMainMenu();
-      redraw = TRUE;
+      if (node_cursor->node_group)
+      {
+	node_cursor->cl_first = leveldir_current->cl_first;
+	node_cursor->cl_cursor = leveldir_current->cl_cursor;
+	leveldir_current = node_cursor->node_group;
+	DrawChooseLevel();
+      }
+      else if (node_cursor->parent_link)
+      {
+	leveldir_current = node_cursor->node_parent;
+	DrawChooseLevel();
+      }
+      else
+      {
+	leveldir_current = node_cursor;
+
+	LoadLevelSetup_SeriesInfo();
+
+	SaveLevelSetup_LastSeries();
+	SaveLevelSetup_SeriesInfo();
+	TapeErase();
+
+	game_status = MAINMENU;
+	DrawMainMenu();
+      }
     }
   }
 
@@ -1182,8 +1311,12 @@ void DrawSetupScreen()
 
     if (!(i >= SETUP_SCREEN_POS_EMPTY1 && i <= SETUP_SCREEN_POS_EMPTY2))
     {
-      DrawGraphic(0,i,GFX_KUGEL_BLAU);
       DrawText(SX+32,SY+i*32, setup_info[base].text, FS_BIG,FC_GREEN);
+
+      if (strcmp(setup_info[base].text, "Input Devices") == 0)
+	initCursor(i, GFX_ARROW_BLUE_RIGHT);
+      else
+	initCursor(i, GFX_KUGEL_BLAU);
     }
 
     if (setup_info[base].value)
@@ -1215,7 +1348,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 
   if (redraw)
   {
-    DrawGraphic(0,choice-1,GFX_KUGEL_ROT);
+    drawCursor(choice - 1, FC_RED);
     redraw = FALSE;
   }
 
@@ -1247,6 +1380,13 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
     y = choice;
   }
 
+  if (dx == 1 && choice == 14)
+  {
+    game_status = SETUPINPUT;
+    DrawSetupInputScreen();
+    redraw = TRUE;
+  }
+
   if (x==1 && y >= pos_start && y <= pos_end &&
       !(y >= pos_empty1 && y <= pos_empty2))
   {
@@ -1254,8 +1394,8 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
     {
       if (y!=choice)
       {
-	DrawGraphic(0,y-1,GFX_KUGEL_ROT);
-	DrawGraphic(0,choice-1,GFX_KUGEL_BLAU);
+	drawCursor(y - 1, FC_RED);
+	drawCursor(choice - 1, FC_BLUE);
       }
       choice = y;
     }
@@ -1432,10 +1572,11 @@ void DrawSetupInputScreen()
   ClearWindow();
   DrawText(SX+16, SY+16, "SETUP INPUT", FS_BIG, FC_YELLOW);
 
-  DrawGraphic(0, 2, GFX_KUGEL_BLAU);
-  DrawGraphic(0, 3, GFX_KUGEL_BLAU);
-  DrawGraphic(0, 4, GFX_KUGEL_BLAU);
-  DrawGraphic(0, 15, GFX_KUGEL_BLAU);
+  initCursor(2, GFX_KUGEL_BLAU);
+  initCursor(3, GFX_KUGEL_BLAU);
+  initCursor(4, GFX_ARROW_BLUE_RIGHT);
+  initCursor(15, GFX_KUGEL_BLAU);
+
   DrawGraphic(10, 2, GFX_ARROW_BLUE_LEFT);
   DrawGraphic(12, 2, GFX_ARROW_BLUE_RIGHT);
 
@@ -1561,7 +1702,7 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button)
 
   if (redraw)
   {
-    DrawGraphic(0,choice-1,GFX_KUGEL_ROT);
+    drawCursor(choice - 1, FC_RED);
     redraw = FALSE;
   }
 
@@ -1622,8 +1763,8 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button)
     {
       if (y != choice)
       {
-	DrawGraphic(0, y-1, GFX_KUGEL_ROT);
-	DrawGraphic(0, choice-1, GFX_KUGEL_BLAU);
+	drawCursor(y - 1, FC_RED);
+	drawCursor(choice - 1, FC_BLUE);
       }
       choice = y;
     }
@@ -2218,8 +2359,9 @@ static void CreateScreenScrollbars()
     struct GadgetInfo *gi;
     int items_max, items_visible, item_position;
     unsigned long event_mask;
-    int num_page_entries;
+    int num_page_entries = MAX_LEVEL_SERIES_ON_SCREEN - 1;
 
+#if 0
     if (num_leveldirs <= MAX_LEVEL_SERIES_ON_SCREEN)
       num_page_entries = num_leveldirs;
     else
@@ -2228,6 +2370,11 @@ static void CreateScreenScrollbars()
     items_max = MAX(num_leveldirs, num_page_entries);
     items_visible = num_page_entries;
     item_position = 0;
+#else
+    items_max = num_page_entries;
+    items_visible = num_page_entries;
+    item_position = 0;
+#endif
 
     event_mask = GD_EVENT_MOVING | GD_EVENT_OFF_BORDERS;
 
@@ -2270,6 +2417,7 @@ void CreateScreenGadgets()
 
 void MapChooseLevelGadgets()
 {
+  int num_leveldirs = numLevelDirInfoInGroup(leveldir_current);
   int i;
 
   if (num_leveldirs <= MAX_LEVEL_SERIES_ON_SCREEN)
@@ -2305,7 +2453,7 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
       break;
 
     case SCREEN_CTRL_ID_SCROLL_VERTICAL:
-      HandleChooseLevel(0,0, 1,gi->event.item_position, MB_MENU_INITIALIZE);
+      HandleChooseLevel(0,0, 999,gi->event.item_position, MB_MENU_INITIALIZE);
       break;
 
     default: