X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=4839ab3927153319d3009f12a7f81807d95f7536;hb=370a25a79d2e8df1e6e3e4cb4be39496d0190c28;hp=bd1a65f1002f60a94aeb7578c3d542e8f5e9767f;hpb=538315c24bc8be21751b452eef2f02b13e159f55;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index bd1a65f1..4839ab39 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -41,6 +41,20 @@
 /* for HandleChooseLevel() */
 #define MAX_LEVEL_SERIES_ON_SCREEN	(SCR_FIELDY - 2)
 
+/* buttons and scrollbars identifiers */
+#define SCREEN_CTRL_ID_SCROLL_UP	0
+#define SCREEN_CTRL_ID_SCROLL_DOWN	1
+#define SCREEN_CTRL_ID_SCROLL_VERTICAL	2
+
+#define NUM_SCREEN_SCROLLBUTTONS	2
+#define NUM_SCREEN_SCROLLBARS		1
+#define NUM_SCREEN_GADGETS		3
+
+/* forward declaration for internal use */
+static void HandleScreenGadgets(struct GadgetInfo *);
+
+static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
+
 #ifdef MSDOS
 extern unsigned char get_ascii(KeySym);
 #endif
@@ -76,6 +90,10 @@ 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_current->handicap_level)
+    level_nr = leveldir_current->handicap_level;
+
   GetPlayerConfig();
   LoadLevel(level_nr);
 
@@ -85,7 +103,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);
@@ -96,10 +114,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");
@@ -107,19 +125,19 @@ void DrawMainMenu()
 
   for(i=2; i<10; i++)
     DrawGraphic(0, i, GFX_KUGEL_BLAU);
-  DrawGraphic(10, 3, GFX_PFEIL_L);
-  DrawGraphic(14, 3, GFX_PFEIL_R);
+  DrawGraphic(10, 3, GFX_ARROW_BLUE_LEFT);
+  DrawGraphic(14, 3, GFX_ARROW_BLUE_RIGHT);
 
   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();
@@ -181,20 +199,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_current->handicap_level)
+      new_level_nr = leveldir_current->handicap_level;
 
     if (old_level_nr == new_level_nr ||
 	!DelayReached(&level_delay, GADGET_FRAME_DELAY))
@@ -225,7 +246,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;
       }
@@ -242,7 +263,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 	if (num_leveldirs)
 	{
 	  game_status = CHOOSELEVEL;
-	  SaveLevelSetup();
+	  SaveLevelSetup_LastSeries();
+	  SaveLevelSetup_SeriesInfo();
 	  DrawChooseLevel();
 	}
       }
@@ -253,7 +275,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;
@@ -276,6 +298,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 #endif
 	{
 	  game_status = PLAYING;
+	  StopAnimation();
 	  InitGame();
 	}
       }
@@ -286,7 +309,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       }
       else if (y == 10)
       {
-	SaveLevelSetup();
+	SaveLevelSetup_LastSeries();
+	SaveLevelSetup_SeriesInfo();
         if (Request("Do you really want to quit ?", REQ_ASK | REQ_STAY_CLOSED))
 	  game_status = EXITGAME;
       }
@@ -380,10 +404,10 @@ static int helpscreen_action[] =
   GFX_MAMPFER2+1,1,1, GFX_MAMPFER2+0,1,1,			HA_NEXT,
   GFX_ROBOT+0,4,1, GFX_ROBOT+3,1,1, GFX_ROBOT+2,1,1,
   GFX_ROBOT+1,1,1, GFX_ROBOT+0,1,1,				HA_NEXT,
-  GFX_MAULWURF_DOWN,4,2,
-  GFX_MAULWURF_UP,4,2,
-  GFX_MAULWURF_LEFT,4,2,
-  GFX_MAULWURF_RIGHT,4,2,					HA_NEXT,
+  GFX_MOLE_DOWN,4,2,
+  GFX_MOLE_UP,4,2,
+  GFX_MOLE_LEFT,4,2,
+  GFX_MOLE_RIGHT,4,2,						HA_NEXT,
   GFX_PINGUIN_DOWN,4,2,
   GFX_PINGUIN_UP,4,2,
   GFX_PINGUIN_LEFT,4,2,
@@ -461,7 +485,7 @@ static char *helpscreen_eltext[][2] =
  {"Cruncher: Eats diamonds and you,",	"if you're not careful"},
  {"Cruncher (BD style):",		"Eats almost everything"},
  {"Robot: Tries to kill the player",	""},
- {"The mole: You must guide him savely","to the exit; he will follow you"},
+ {"The mole: Eats the amoeba and turns","empty space into normal sand"},
  {"The penguin: Guide him to the exit,","but keep him away from monsters!"},
  {"The Pig: Harmless, but eats all",	"gems it can get"},
  {"The Dragon: Breathes fire,",		"especially to some monsters"},
@@ -805,50 +829,74 @@ void DrawChooseLevel()
   UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
 
+  ClearWindow();
+  HandleChooseLevel(0,0, 0,0, MB_MENU_INITIALIZE);
+  MapChooseLevelGadgets();
+
   FadeToFront();
   InitAnimation();
-  HandleChooseLevel(0,0, 0,0, MB_MENU_INITIALIZE);
+}
+
+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_visible = MAX_LEVEL_SERIES_ON_SCREEN - 1;
+  item_position = first_entry;
+
+  if (item_position > items_max - items_visible)
+    item_position = items_max - items_visible;
+
+  ModifyGadget(gi, GDI_SCROLLBAR_ITEMS_MAX, items_max,
+	       GDI_SCROLLBAR_ITEM_POSITION, item_position, GDI_END);
 }
 
 static void drawChooseLevelList(int first_entry, int num_page_entries)
 {
   int i;
-  char buffer[SCR_FIELDX];
+  char buffer[SCR_FIELDX * 2];
+  int max_buffer_len = (SCR_FIELDX - 2) * 2;
+
+  XFillRectangle(display, backbuffer, gc, SX, SY, SXSIZE - 32, SYSIZE);
+  redraw_mask |= REDRAW_FIELD;
 
-  ClearWindow();
   DrawText(SX, SY, "Level Directories", FS_BIG, FC_GREEN);
 
   for(i=0; i<num_page_entries; i++)
   {
-    strncpy(buffer, leveldir[first_entry + i].name_short , SCR_FIELDX - 1);
-    buffer[SCR_FIELDX - 1] = '\0';
-    DrawText(SX + 32, SY + (i + 2) * 32, buffer,
-	     FS_BIG, leveldir[first_entry + i].color);
+    struct LevelDirInfo *leveldir_node;
+    int leveldir_pos = first_entry + i;
+
+    leveldir_node = getLevelDirInfoFromPos(leveldir_first, leveldir_pos);
+    strncpy(buffer, leveldir_node->name , max_buffer_len);
+    buffer[max_buffer_len] = '\0';
+
+    DrawText(SX + 32, SY + (i + 2) * 32, buffer, FS_MEDIUM,
+	     leveldir_node->color);
     DrawGraphic(0, i + 2, GFX_KUGEL_BLAU);
   }
 
   if (first_entry > 0)
-    DrawGraphic(0, 1, GFX_PFEIL_O);
+    DrawGraphic(0, 1, GFX_ARROW_BLUE_UP);
 
   if (first_entry + num_page_entries < num_leveldirs)
-    DrawGraphic(0, MAX_LEVEL_SERIES_ON_SCREEN + 1, GFX_PFEIL_U);
+    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 *leveldir_node;
   int x, last_redraw_mask = redraw_mask;
 
-  XFillRectangle(display, drawto, gc, SX + 32, SY + 32, SXSIZE - 32, 32);
+  leveldir_node = getLevelDirInfoFromPos(leveldir_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
+		    leveldir_node->levels,
+		    leveldir_node->class_desc);
 
   /* let BackToFront() redraw only what is needed */
   redraw_mask = last_redraw_mask | REDRAW_TILES;
@@ -873,14 +921,20 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 
   if (button == MB_MENU_INITIALIZE)
   {
+    int leveldir_pos = posLevelDirInfo(leveldir_current);
+
     if (first_entry == -1)
     {
-      first_entry = MAX(0, leveldir_nr - num_page_entries + 1);
-      choice = leveldir_nr - first_entry + 3;
+      first_entry = MAX(0, leveldir_pos - num_page_entries + 1);
+      choice = leveldir_pos - first_entry + 3;
+      AdjustChooseLevelScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, first_entry);
     }
 
+    if (dx == 1)	/* 'first_entry' is set by scrollbar position */
+      first_entry = dy;
+
     drawChooseLevelList(first_entry, num_page_entries);
-    drawChooseLevelInfo(leveldir_nr);
+    drawChooseLevelInfo(leveldir_pos);
     redraw = TRUE;
   }
 
@@ -923,6 +977,7 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 
       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);
       return;
     }
@@ -938,6 +993,7 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 
       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);
       return;
     }
@@ -963,13 +1019,23 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
     }
     else
     {
-      leveldir_nr = first_entry + y - 3;
-      level_nr =
-	getLastPlayedLevelOfLevelSeries(leveldir[leveldir_nr].filename);
+      int leveldir_pos = first_entry + y - 3;
 
-      SaveLevelSetup();
+      leveldir_current = getLevelDirInfoFromPos(leveldir_first, leveldir_pos);
+
+      LoadLevelSetup_SeriesInfo();
+
+      SaveLevelSetup_LastSeries();
+      SaveLevelSetup_SeriesInfo();
       TapeErase();
 
+
+      printf("first_level == %d, last_level == %d, levels == %d\n",
+	     leveldir_current->first_level,
+	     leveldir_current->last_level,
+	     leveldir_current->levels);
+
+
       game_status = MAINMENU;
       DrawMainMenu();
       redraw = TRUE;
@@ -984,47 +1050,101 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 
 void DrawHallOfFame(int highlight_position)
 {
-  int i;
-
   UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
 
   if (highlight_position < 0) 
     LoadScore(level_nr);
 
-  ClearWindow();
+  FadeToFront();
+  InitAnimation();
+  HandleHallOfFame(highlight_position,0, 0,0, MB_MENU_INITIALIZE);
+  PlaySound(SND_HALLOFFAME);
+}
 
+static void drawHallOfFameList(int first_entry, int highlight_position)
+{
+  int i;
+
+  ClearWindow();
   DrawText(SX + 80, SY + 8, "Hall Of Fame", FS_BIG, FC_YELLOW);
   DrawTextFCentered(46, FC_RED, "HighScores of Level %d", level_nr);
 
   for(i=0; i<MAX_LEVEL_SERIES_ON_SCREEN; i++)
   {
-    DrawText(SX, SY + 64 + i * 32, ".................", FS_BIG,
-	     (i == highlight_position ? FC_RED : FC_GREEN));
-    DrawText(SX, SY + 64 + i * 32, highscore[i].Name, FS_BIG,
-	     (i == highlight_position ? FC_RED : FC_GREEN));
+    int entry = first_entry + i;
+    int color = (entry == highlight_position ? FC_RED : FC_GREEN);
+
+#if 0
+    DrawText(SX, SY + 64 + i * 32, ".................", FS_BIG, color);
+    DrawText(SX, SY + 64 + i * 32, highscore[i].Name, FS_BIG, color);
     DrawText(SX + 12 * 32, SY + 64 + i * 32,
-	     int2str(highscore[i].Score, 5), FS_BIG,
-	     (i == highlight_position ? FC_RED : FC_GREEN));
+	     int2str(highscore[i].Score, 5), FS_BIG, color);
+#else
+    DrawText(SX, SY + 64 + i * 32, "..................................",
+	     FS_MEDIUM, FC_YELLOW);
+    DrawText(SX, SY + 64 + i * 32, int2str(entry + 1, 3),
+	     FS_MEDIUM, FC_YELLOW);
+    DrawText(SX + 64, SY + 64 + i * 32, highscore[entry].Name, FS_BIG, color);
+    DrawText(SX + 14 * 32 + 16, SY + 64 + i * 32,
+	     int2str(highscore[entry].Score, 5), FS_MEDIUM, color);
+#endif
   }
-
-  FadeToFront();
-  InitAnimation();
-  PlaySound(SND_HALLOFFAME);
 }
 
-void HandleHallOfFame(int button)
+void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
 {
+  static int first_entry = 0;
+  static int highlight_position = 0;
+  int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
   int button_released = !button;
 
+  if (button == MB_MENU_INITIALIZE)
+  {
+    first_entry = 0;
+    highlight_position = mx;
+    drawHallOfFameList(first_entry, highlight_position);
+    return;
+  }
+
+  if (ABS(dy) == SCR_FIELDY)	/* handle XK_Page_Up, XK_Page_Down */
+    step = MAX_LEVEL_SERIES_ON_SCREEN - 1;
+
+  if (dy < 0)
+  {
+    if (first_entry > 0)
+    {
+      first_entry -= step;
+      if (first_entry < 0)
+	first_entry = 0;
+
+      drawHallOfFameList(first_entry, highlight_position);
+      return;
+    }
+  }
+  else if (dy > 0)
+  {
+    if (first_entry + MAX_LEVEL_SERIES_ON_SCREEN < MAX_SCORE_ENTRIES)
+    {
+      first_entry += step;
+      if (first_entry + MAX_LEVEL_SERIES_ON_SCREEN > MAX_SCORE_ENTRIES)
+	first_entry = MAX(0, MAX_SCORE_ENTRIES - MAX_LEVEL_SERIES_ON_SCREEN);
+
+      drawHallOfFameList(first_entry, highlight_position);
+      return;
+    }
+  }
+
   if (button_released)
   {
     FadeSound(SND_HALLOFFAME);
     game_status = MAINMENU;
     DrawMainMenu();
-    BackToFront();
   }
-  else
+
+  BackToFront();
+
+  if (game_status == HALLOFFAME)
     DoAnimation();
 }
 
@@ -1040,14 +1160,18 @@ void DrawSetupScreen()
     { &setup.sound,		"Sound:",	},
     { &setup.sound_loops,	" Sound Loops:"	},
     { &setup.sound_music,	" Game Music:"	},
+#if 0
     { &setup.toons,		"Toons:"	},
     { &setup.double_buffering,	"Buffered gfx:"	},
+#endif
     { &setup.scroll_delay,	"Scroll Delay:"	},
     { &setup.soft_scrolling,	"Soft Scroll.:"	},
     { &setup.fading,		"Fading:"	},
     { &setup.quick_doors,	"Quick Doors:"	},
     { &setup.autorecord,	"Auto-Record:"	},
     { &setup.team_mode,		"Team-Mode:"	},
+    { &setup.handicap,		"Handicap:"	},
+    { &setup.time_limit,	"Timelimit:"	},
     { NULL,			"Input Devices"	},
     { NULL,			""		},
     { NULL,			"Exit"		},
@@ -1185,6 +1309,8 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 	}
 	setup.sound_music = !setup.sound_music;
       }
+
+#if 0
       else if (y==6)
       {
 	if (setup.toons)
@@ -1208,7 +1334,9 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 	setup.direct_draw = !setup.double_buffering;
 #endif
       }
-      else if (y==8)
+#endif
+
+      else if (y==6)
       {
 	if (setup.scroll_delay)
 	  DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@ -1216,7 +1344,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 	  DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
 	setup.scroll_delay = !setup.scroll_delay;
       }
-      else if (y==9)
+      else if (y==7)
       {
 	if (setup.soft_scrolling)
 	  DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@ -1224,7 +1352,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 	  DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
 	setup.soft_scrolling = !setup.soft_scrolling;
       }
-      else if (y==10)
+      else if (y==8)
       {
 	if (setup.fading)
 	  DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@ -1232,7 +1360,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 	  DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
 	setup.fading = !setup.fading;
       }
-      else if (y==11)
+      else if (y==9)
       {
 	if (setup.quick_doors)
 	  DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@ -1240,7 +1368,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 	  DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
 	setup.quick_doors = !setup.quick_doors;
       }
-      else if (y==12)
+      else if (y==10)
       {
 	if (setup.autorecord)
 	  DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@ -1248,7 +1376,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 	  DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
 	setup.autorecord = !setup.autorecord;
       }
-      else if (y==13)
+      else if (y==11)
       {
 	if (setup.team_mode)
 	  DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@ -1256,6 +1384,22 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 	  DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
 	setup.team_mode = !setup.team_mode;
       }
+      else if (y==12)
+      {
+	if (setup.handicap)
+	  DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
+	else
+	  DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
+	setup.handicap = !setup.handicap;
+      }
+      else if (y==13)
+      {
+	if (setup.time_limit)
+	  DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
+	else
+	  DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
+	setup.time_limit = !setup.time_limit;
+      }
       else if (y==14)
       {
 	game_status = SETUPINPUT;
@@ -1300,8 +1444,8 @@ void DrawSetupInputScreen()
   DrawGraphic(0, 3, GFX_KUGEL_BLAU);
   DrawGraphic(0, 4, GFX_KUGEL_BLAU);
   DrawGraphic(0, 15, GFX_KUGEL_BLAU);
-  DrawGraphic(10, 2, GFX_PFEIL_L);
-  DrawGraphic(12, 2, GFX_PFEIL_R);
+  DrawGraphic(10, 2, GFX_ARROW_BLUE_LEFT);
+  DrawGraphic(12, 2, GFX_ARROW_BLUE_RIGHT);
 
   DrawText(SX+32, SY+2*32, "Player:", FS_BIG, FC_GREEN);
   DrawText(SX+32, SY+3*32, "Device:", FS_BIG, FC_GREEN);
@@ -1381,10 +1525,10 @@ static void drawPlayerSetupInputInfo(int player_nr)
   }
 
   DrawText(SX+32, SY+5*32, "Actual Settings:", FS_BIG, FC_GREEN);
-  DrawGraphic(1, 6, GFX_PFEIL_L);
-  DrawGraphic(1, 7, GFX_PFEIL_R);
-  DrawGraphic(1, 8, GFX_PFEIL_O);
-  DrawGraphic(1, 9, GFX_PFEIL_U);
+  DrawGraphic(1, 6, GFX_ARROW_BLUE_LEFT);
+  DrawGraphic(1, 7, GFX_ARROW_BLUE_RIGHT);
+  DrawGraphic(1, 8, GFX_ARROW_BLUE_UP);
+  DrawGraphic(1, 9, GFX_ARROW_BLUE_DOWN);
   DrawText(SX+2*32, SY+6*32, ":", FS_BIG, FC_BLUE);
   DrawText(SX+2*32, SY+7*32, ":", FS_BIG, FC_BLUE);
   DrawText(SX+2*32, SY+8*32, ":", FS_BIG, FC_BLUE);
@@ -1956,3 +2100,223 @@ void HandleGameActions()
 
   BackToFront();
 }
+
+/* ---------- new screen button stuff -------------------------------------- */
+
+/* graphic position and size values for buttons and scrollbars */
+#define SC_SCROLLBUTTON_XPOS		64
+#define SC_SCROLLBUTTON_YPOS		0
+#define SC_SCROLLBAR_XPOS		0
+#define SC_SCROLLBAR_YPOS		64
+
+#define SC_SCROLLBUTTON_XSIZE		32
+#define SC_SCROLLBUTTON_YSIZE		32
+
+#define SC_SCROLL_UP_XPOS		(SXSIZE - SC_SCROLLBUTTON_XSIZE)
+#define SC_SCROLL_UP_YPOS		SC_SCROLLBUTTON_YSIZE
+#define SC_SCROLL_DOWN_XPOS		SC_SCROLL_UP_XPOS
+#define SC_SCROLL_DOWN_YPOS		(SYSIZE - SC_SCROLLBUTTON_YSIZE)
+#define SC_SCROLL_VERTICAL_XPOS		SC_SCROLL_UP_XPOS
+#define SC_SCROLL_VERTICAL_YPOS	  (SC_SCROLL_UP_YPOS + SC_SCROLLBUTTON_YSIZE)
+#define SC_SCROLL_VERTICAL_XSIZE	SC_SCROLLBUTTON_XSIZE
+#define SC_SCROLL_VERTICAL_YSIZE	(SYSIZE - 3 * SC_SCROLLBUTTON_YSIZE)
+
+#define SC_BORDER_SIZE			14
+
+static struct
+{
+  int xpos, ypos;
+  int x, y;
+  int gadget_id;
+  char *infotext;
+} scrollbutton_info[NUM_SCREEN_SCROLLBUTTONS] =
+{
+  {
+    SC_SCROLLBUTTON_XPOS + 0 * SC_SCROLLBUTTON_XSIZE,   SC_SCROLLBUTTON_YPOS,
+    SC_SCROLL_UP_XPOS,					SC_SCROLL_UP_YPOS,
+    SCREEN_CTRL_ID_SCROLL_UP,
+    "scroll level series up"
+  },
+  {
+    SC_SCROLLBUTTON_XPOS + 1 * SC_SCROLLBUTTON_XSIZE,   SC_SCROLLBUTTON_YPOS,
+    SC_SCROLL_DOWN_XPOS,				SC_SCROLL_DOWN_YPOS,
+    SCREEN_CTRL_ID_SCROLL_DOWN,
+    "scroll level series down"
+  }
+};
+
+static struct
+{
+  int xpos, ypos;
+  int x, y;
+  int width, height;
+  int type;
+  int gadget_id;
+  char *infotext;
+} scrollbar_info[NUM_SCREEN_SCROLLBARS] =
+{
+  {
+    SC_SCROLLBAR_XPOS,			SC_SCROLLBAR_YPOS,
+    SX + SC_SCROLL_VERTICAL_XPOS,	SY + SC_SCROLL_VERTICAL_YPOS,
+    SC_SCROLL_VERTICAL_XSIZE,		SC_SCROLL_VERTICAL_YSIZE,
+    GD_TYPE_SCROLLBAR_VERTICAL,
+    SCREEN_CTRL_ID_SCROLL_VERTICAL,
+    "scroll level series vertically"
+  }
+};
+
+static void CreateScreenScrollbuttons()
+{
+  Pixmap gd_pixmap = pix[PIX_MORE];
+  struct GadgetInfo *gi;
+  unsigned long event_mask;
+  int i;
+
+  for (i=0; i<NUM_SCREEN_SCROLLBUTTONS; i++)
+  {
+    int id = scrollbutton_info[i].gadget_id;
+    int x, y, width, height;
+    int gd_x1, gd_x2, gd_y1, gd_y2;
+
+    x = scrollbutton_info[i].x;
+    y = scrollbutton_info[i].y;
+
+    event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
+
+    x += SX;
+    y += SY;
+    width = SC_SCROLLBUTTON_XSIZE;
+    height = SC_SCROLLBUTTON_YSIZE;
+    gd_x1 = scrollbutton_info[i].xpos;
+    gd_y1 = scrollbutton_info[i].ypos;
+    gd_x2 = gd_x1;
+    gd_y2 = gd_y1 + SC_SCROLLBUTTON_YSIZE;
+
+    gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_CUSTOM_TYPE_ID, i,
+		      GDI_INFO_TEXT, scrollbutton_info[i].infotext,
+		      GDI_X, x,
+		      GDI_Y, y,
+		      GDI_WIDTH, width,
+		      GDI_HEIGHT, height,
+		      GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
+		      GDI_STATE, GD_BUTTON_UNPRESSED,
+		      GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y1,
+		      GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y2,
+		      GDI_EVENT_MASK, event_mask,
+		      GDI_CALLBACK_ACTION, HandleScreenGadgets,
+		      GDI_END);
+
+    if (gi == NULL)
+      Error(ERR_EXIT, "cannot create gadget");
+
+    screen_gadget[id] = gi;
+  }
+}
+
+static void CreateScreenScrollbars()
+{
+  int i;
+
+  for (i=0; i<NUM_SCREEN_SCROLLBARS; i++)
+  {
+    int id = scrollbar_info[i].gadget_id;
+    Pixmap gd_pixmap = pix[PIX_MORE];
+    int gd_x1, gd_x2, gd_y1, gd_y2;
+    struct GadgetInfo *gi;
+    int items_max, items_visible, item_position;
+    unsigned long event_mask;
+    int num_page_entries;
+
+    if (num_leveldirs <= MAX_LEVEL_SERIES_ON_SCREEN)
+      num_page_entries = num_leveldirs;
+    else
+      num_page_entries = MAX_LEVEL_SERIES_ON_SCREEN - 1;
+
+    items_max = MAX(num_leveldirs, num_page_entries);
+    items_visible = num_page_entries;
+    item_position = 0;
+
+    event_mask = GD_EVENT_MOVING | GD_EVENT_OFF_BORDERS;
+
+    gd_x1 = scrollbar_info[i].xpos;
+    gd_x2 = gd_x1 + scrollbar_info[i].width;
+    gd_y1 = scrollbar_info[i].ypos;
+    gd_y2 = scrollbar_info[i].ypos;
+
+    gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_CUSTOM_TYPE_ID, i,
+		      GDI_INFO_TEXT, scrollbar_info[i].infotext,
+		      GDI_X, scrollbar_info[i].x,
+		      GDI_Y, scrollbar_info[i].y,
+		      GDI_WIDTH, scrollbar_info[i].width,
+		      GDI_HEIGHT, scrollbar_info[i].height,
+		      GDI_TYPE, scrollbar_info[i].type,
+		      GDI_SCROLLBAR_ITEMS_MAX, items_max,
+		      GDI_SCROLLBAR_ITEMS_VISIBLE, items_visible,
+		      GDI_SCROLLBAR_ITEM_POSITION, item_position,
+		      GDI_STATE, GD_BUTTON_UNPRESSED,
+		      GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y1,
+		      GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y2,
+		      GDI_BORDER_SIZE, SC_BORDER_SIZE,
+		      GDI_EVENT_MASK, event_mask,
+		      GDI_CALLBACK_ACTION, HandleScreenGadgets,
+		      GDI_END);
+
+    if (gi == NULL)
+      Error(ERR_EXIT, "cannot create gadget");
+
+    screen_gadget[id] = gi;
+  }
+}
+
+void CreateScreenGadgets()
+{
+  CreateScreenScrollbuttons();
+  CreateScreenScrollbars();
+}
+
+void MapChooseLevelGadgets()
+{
+  int i;
+
+  if (num_leveldirs <= MAX_LEVEL_SERIES_ON_SCREEN)
+    return;
+
+  for (i=0; i<NUM_SCREEN_GADGETS; i++)
+    MapGadget(screen_gadget[i]);
+}
+
+void UnmapChooseLevelGadgets()
+{
+  int i;
+
+  for (i=0; i<NUM_SCREEN_GADGETS; i++)
+    UnmapGadget(screen_gadget[i]);
+}
+
+static void HandleScreenGadgets(struct GadgetInfo *gi)
+{
+  int id = gi->custom_id;
+
+  if (game_status != CHOOSELEVEL)
+    return;
+
+  switch (id)
+  {
+    case SCREEN_CTRL_ID_SCROLL_UP:
+      HandleChooseLevel(SX,SY + 32, 0,0, MB_MENU_MARK);
+      break;
+
+    case SCREEN_CTRL_ID_SCROLL_DOWN:
+      HandleChooseLevel(SX,SY + SYSIZE - 32, 0,0, MB_MENU_MARK);
+      break;
+
+    case SCREEN_CTRL_ID_SCROLL_VERTICAL:
+      HandleChooseLevel(0,0, 1,gi->event.item_position, MB_MENU_INITIALIZE);
+      break;
+
+    default:
+      break;
+  }
+}