X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=347ae23c65af4f0d71ff06518854fb645f6a2a46;hb=f5356588a234e34e349c0b1eba02008655fdee87;hp=c1ad55de96dd55fb92d90688b256210209f314bd;hpb=48542a06103232c408ce6250f5bc2d9add00f233;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index c1ad55de..347ae23c 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -107,8 +107,8 @@ 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_PFEIL_LEFT);
+  DrawGraphic(14, 3, GFX_PFEIL_RIGHT);
 
   DrawText(SX + 56, SY + 326, "A Game by Artsoft Entertainment",
 	   FS_SMALL, FC_RED);
@@ -380,10 +380,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 +461,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"},
@@ -828,10 +828,10 @@ static void drawChooseLevelList(int first_entry, int num_page_entries)
   }
 
   if (first_entry > 0)
-    DrawGraphic(0, 1, GFX_PFEIL_O);
+    DrawGraphic(0, 1, GFX_PFEIL_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_PFEIL_DOWN);
 }
 
 static void drawChooseLevelInfo(int leveldir_nr)
@@ -839,9 +839,16 @@ static void drawChooseLevelInfo(int leveldir_nr)
   int x, last_redraw_mask = redraw_mask;
 
   XFillRectangle(display, drawto, gc, SX + 32, SY + 32, SXSIZE - 32, 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
 
   /* let BackToFront() redraw only what is needed */
   redraw_mask = last_redraw_mask | REDRAW_TILES;
@@ -868,7 +875,7 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
   {
     if (first_entry == -1)
     {
-      first_entry = leveldir_nr - num_page_entries + 1;
+      first_entry = MAX(0, leveldir_nr - num_page_entries + 1);
       choice = leveldir_nr - first_entry + 3;
     }
 
@@ -915,7 +922,7 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 	first_entry = 0;
 
       drawChooseLevelList(first_entry, num_page_entries);
-      drawChooseLevelInfo(first_entry);
+      drawChooseLevelInfo(first_entry + choice - 3);
       DrawGraphic(0, choice - 1, GFX_KUGEL_ROT);
       return;
     }
@@ -927,10 +934,10 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
     {
       first_entry += step;
       if (first_entry + num_page_entries > num_leveldirs)
-	first_entry = num_leveldirs - num_page_entries;
+	first_entry = MAX(0, num_leveldirs - num_page_entries);
 
       drawChooseLevelList(first_entry, num_page_entries);
-      drawChooseLevelInfo(first_entry + num_page_entries - 1);
+      drawChooseLevelInfo(first_entry + choice - 3);
       DrawGraphic(0, choice - 1, GFX_KUGEL_ROT);
       return;
     }
@@ -1293,8 +1300,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_PFEIL_LEFT);
+  DrawGraphic(12, 2, GFX_PFEIL_RIGHT);
 
   DrawText(SX+32, SY+2*32, "Player:", FS_BIG, FC_GREEN);
   DrawText(SX+32, SY+3*32, "Device:", FS_BIG, FC_GREEN);
@@ -1374,10 +1381,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_PFEIL_LEFT);
+  DrawGraphic(1, 7, GFX_PFEIL_RIGHT);
+  DrawGraphic(1, 8, GFX_PFEIL_UP);
+  DrawGraphic(1, 9, GFX_PFEIL_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);