rnd-20021023-1-src

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index 8499f619bda35cd748456f3241a29c4c82f5e5e5..386094d46615c2a095d83a2b52e85b16c0eb3c78 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -80,11 +80,11 @@ static void drawCursorExt(int pos, int color, int graphic)
   graphic = cursor_array[pos];
 
   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);
+    graphic = (graphic == IMG_ARROW_BLUE_LEFT  ? IMG_ARROW_RED_LEFT  :
+              graphic == IMG_ARROW_BLUE_RIGHT ? IMG_ARROW_RED_RIGHT :
+              IMG_BALL_RED);
 
-  DrawGraphic(0, MENU_SCREEN_START_YPOS + pos, graphic);
+  DrawNewGraphic(0, MENU_SCREEN_START_YPOS + pos, graphic, 0);
 }
 
 static void initCursor(int pos, int graphic)
@@ -206,10 +206,10 @@ void DrawMainMenu()
   }
 
   for(i=0; i<8; i++)
-    initCursor(i, (i == 1 || i == 6 ? GFX_ARROW_BLUE_RIGHT : GFX_KUGEL_BLAU));
+    initCursor(i, (i == 1 || i == 6 ? IMG_ARROW_BLUE_RIGHT : IMG_BALL_BLUE));
 
-  DrawGraphic(10, 3, GFX_ARROW_BLUE_LEFT);
-  DrawGraphic(14, 3, GFX_ARROW_BLUE_RIGHT);
+  DrawNewGraphic(10, 3, IMG_ARROW_BLUE_LEFT, 0);
+  DrawNewGraphic(14, 3, IMG_ARROW_BLUE_RIGHT, 0);
 
   DrawText(SX + 56, SY + 326, "A Game by Artsoft Entertainment",
           FS_SMALL, FC_RED);
@@ -674,7 +674,7 @@ void DrawHelpScreenElAction(int start)
     }
     j++;
 
-    DrawGraphicExt(drawto, xstart, ystart+(i-start)*ystep, graphic+frame);
+    DrawOldGraphicExt(drawto, xstart, ystart+(i-start)*ystep, graphic+frame);
     i++;
   }
 
@@ -892,7 +892,7 @@ void HandleTypeName(int newxpos, Key key)
   {
     xpos = newxpos;
     DrawText(SX + 6*32, SY + ypos*32, setup.player_name, FS_BIG, FC_YELLOW);
-    DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT);
+    DrawNewGraphic(xpos + 6, ypos, IMG_BALL_RED, 0);
     return;
   }
 
@@ -914,19 +914,19 @@ void HandleTypeName(int newxpos, Key key)
                setup.player_name, FS_BIG, FC_YELLOW);
     DrawTextExt(window, SX + 6*32, SY + ypos*32,
                setup.player_name, FS_BIG, FC_YELLOW);
-    DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT);
+    DrawNewGraphic(xpos + 6, ypos, IMG_BALL_RED, 0);
   }
   else if ((key == KSYM_Delete || key == KSYM_BackSpace) && xpos > 0)
   {
     xpos--;
     setup.player_name[xpos] = 0;
-    DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT);
-    DrawGraphic(xpos + 7, ypos, GFX_LEERRAUM);
+    DrawNewGraphic(xpos + 6, ypos, IMG_BALL_RED, 0);
+    DrawNewGraphic(xpos + 7, ypos, IMG_EMPTY, 0);
   }
   else if (key == KSYM_Return && xpos > 0)
   {
     DrawText(SX + 6*32, SY + ypos*32, setup.player_name, FS_BIG, FC_RED);
-    DrawGraphic(xpos + 6, ypos, GFX_LEERRAUM);
+    DrawNewGraphic(xpos + 6, ypos, IMG_EMPTY, 0);
 
     SaveSetup();
     game_status = MAINMENU;
@@ -1001,18 +1001,18 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
     DrawText(SX + 32, SY + ypos * 32, buffer, FS_MEDIUM, node->color);
 
     if (node->parent_link)
-      initCursor(i, GFX_ARROW_BLUE_LEFT);
+      initCursor(i, IMG_ARROW_BLUE_LEFT);
     else if (node->level_group)
-      initCursor(i, GFX_ARROW_BLUE_RIGHT);
+      initCursor(i, IMG_ARROW_BLUE_RIGHT);
     else
-      initCursor(i, GFX_KUGEL_BLAU);
+      initCursor(i, IMG_BALL_BLUE);
   }
 
   if (first_entry > 0)
-    DrawGraphic(0, 1, GFX_ARROW_BLUE_UP);
+    DrawNewGraphic(0, 1, IMG_ARROW_BLUE_UP, 0);
 
   if (first_entry + num_page_entries < num_entries)
-    DrawGraphic(0, MAX_MENU_ENTRIES_ON_SCREEN + 1, GFX_ARROW_BLUE_DOWN);
+    DrawNewGraphic(0, MAX_MENU_ENTRIES_ON_SCREEN + 1, IMG_ARROW_BLUE_DOWN, 0);
 }
 
 static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti)
@@ -1708,11 +1708,11 @@ static void DrawSetupScreen_Generic()
     DrawText(SX + 32, SY + ypos * 32, setup_info[i].text, font_size, FC_GREEN);
 
     if (setup_info[i].type & TYPE_ENTER_MENU)
-      initCursor(i, GFX_ARROW_BLUE_RIGHT);
+      initCursor(i, IMG_ARROW_BLUE_RIGHT);
     else if (setup_info[i].type & TYPE_LEAVE_MENU)
-      initCursor(i, GFX_ARROW_BLUE_LEFT);
+      initCursor(i, IMG_ARROW_BLUE_LEFT);
     else if (setup_info[i].type & ~TYPE_SKIP_ENTRY)
-      initCursor(i, GFX_KUGEL_BLAU);
+      initCursor(i, IMG_BALL_BLUE);
 
     if (setup_info[i].type & TYPE_VALUE)
       drawSetupValue(i);
@@ -1820,13 +1820,13 @@ void DrawSetupScreen_Input()
   ClearWindow();
   DrawText(SX+16, SY+16, "Setup Input", FS_BIG, FC_YELLOW);
 
-  initCursor(0, GFX_KUGEL_BLAU);
-  initCursor(1, GFX_KUGEL_BLAU);
-  initCursor(2, GFX_ARROW_BLUE_RIGHT);
-  initCursor(13, GFX_ARROW_BLUE_LEFT);
+  initCursor(0, IMG_BALL_BLUE);
+  initCursor(1, IMG_BALL_BLUE);
+  initCursor(2, IMG_ARROW_BLUE_RIGHT);
+  initCursor(13, IMG_ARROW_BLUE_LEFT);
 
-  DrawGraphic(10, MENU_SCREEN_START_YPOS, GFX_ARROW_BLUE_LEFT);
-  DrawGraphic(12, MENU_SCREEN_START_YPOS, GFX_ARROW_BLUE_RIGHT);
+  DrawNewGraphic(10, MENU_SCREEN_START_YPOS, IMG_ARROW_BLUE_LEFT, 0);
+  DrawNewGraphic(12, MENU_SCREEN_START_YPOS, IMG_ARROW_BLUE_RIGHT, 0);
 
   DrawText(SX+32, SY+2*32, "Player:", FS_BIG, FC_GREEN);
   DrawText(SX+32, SY+3*32, "Device:", FS_BIG, FC_GREEN);
@@ -1892,7 +1892,7 @@ static void drawPlayerSetupInputInfo(int player_nr)
   custom_key = setup.input[player_nr].key;
 
   DrawText(SX+11*32, SY+2*32, int2str(player_nr + 1, 1), FS_BIG, FC_RED);
-  DrawGraphic(8, 2, GFX_SPIELER1 + player_nr);
+  DrawNewGraphic(8, 2, PLAYER_NR_GFX(IMG_PLAYER1, player_nr), 0);
 
   if (setup.input[player_nr].use_joystick)
   {
@@ -1910,10 +1910,10 @@ static void drawPlayerSetupInputInfo(int player_nr)
   }
 
   DrawText(SX+32, SY+5*32, "Actual Settings:", FS_BIG, FC_GREEN);
-  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);
+  DrawNewGraphic(1, 6, IMG_ARROW_BLUE_LEFT, 0);
+  DrawNewGraphic(1, 7, IMG_ARROW_BLUE_RIGHT, 0);
+  DrawNewGraphic(1, 8, IMG_ARROW_BLUE_UP, 0);
+  DrawNewGraphic(1, 9, IMG_ARROW_BLUE_DOWN, 0);
   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);
@@ -2215,7 +2215,7 @@ static boolean CalibrateJoystickMain(int player_nr)
     for(x=0; x<3; x++)
     {
       check[x][y] = FALSE;
-      DrawGraphic(xpos + x - 1, ypos + y - 1, GFX_KUGEL_BLAU);
+      DrawNewGraphic(xpos + x - 1, ypos + y - 1, IMG_BALL_BLUE, 0);
     }
   }
 
@@ -2238,7 +2238,7 @@ static boolean CalibrateJoystickMain(int player_nr)
   new_joystick_xmiddle = joy_x;
   new_joystick_ymiddle = joy_y;
 
-  DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_ROT);
+  DrawNewGraphic(xpos + last_x, ypos + last_y, IMG_BALL_RED, 0);
   BackToFront();
 
   while(Joystick(player_nr) & JOY_BUTTON);     /* wait for released button */
@@ -2308,8 +2308,8 @@ static boolean CalibrateJoystickMain(int player_nr)
 
     if (x != last_x || y != last_y)
     {
-      DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_GELB);
-      DrawGraphic(xpos + x,      ypos + y,      GFX_KUGEL_ROT);
+      DrawNewGraphic(xpos + last_x, ypos + last_y, IMG_BALL_YELLOW, 0);
+      DrawNewGraphic(xpos + x,      ypos + y,      IMG_BALL_RED, 0);
 
       last_x = x;
       last_y = y;