rnd-20030128-1-src

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index e86a4f128675112125760c02c142ca8c6d8ca0ce..554e53a83085c574caf39be020e4425ca8aa56d5 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -135,7 +135,7 @@ static void ToggleFullscreenIfNeeded()
     setup.fullscreen = video.fullscreen_enabled;
 
     /* redraw background to newly created backbuffer */
-    BlitBitmap(new_graphic_info[IMG_GLOBAL_BORDER].bitmap, backbuffer,
+    BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, backbuffer,
               0,0, WIN_XSIZE,WIN_YSIZE, 0,0);
 
     /* restore old door content */
@@ -575,12 +575,12 @@ static int OLD_helpscreen_action[] =
 
 static int helpscreen_action[] =
 {
-  IMG_PLAYER1_DOWN_MOVING,             16,
-  IMG_PLAYER1_UP_MOVING,               16,
-  IMG_PLAYER1_LEFT_MOVING,             16,
-  IMG_PLAYER1_RIGHT_MOVING,            16,
-  IMG_PLAYER1_LEFT_PUSHING,            16,
-  IMG_PLAYER1_RIGHT_PUSHING,           16,                     HA_NEXT,
+  IMG_PLAYER1_MOVING_DOWN,             16,
+  IMG_PLAYER1_MOVING_UP,               16,
+  IMG_PLAYER1_MOVING_LEFT,             16,
+  IMG_PLAYER1_MOVING_RIGHT,            16,
+  IMG_PLAYER1_PUSHING_LEFT,            16,
+  IMG_PLAYER1_PUSHING_RIGHT,           16,                     HA_NEXT,
 
   IMG_SAND,                            -1,                     HA_NEXT,
 
@@ -713,25 +713,25 @@ static int helpscreen_action[] =
 
   IMG_ROBOT,                           -1,                     HA_NEXT,
 
-  IMG_MOLE_RIGHT_MOVING,               16,
-  IMG_MOLE_UP_MOVING,                  16,
-  IMG_MOLE_LEFT_MOVING,                        16,
-  IMG_MOLE_DOWN_MOVING,                        16,                     HA_NEXT,
+  IMG_MOLE_MOVING_RIGHT,               16,
+  IMG_MOLE_MOVING_UP,                  16,
+  IMG_MOLE_MOVING_LEFT,                        16,
+  IMG_MOLE_MOVING_DOWN,                        16,                     HA_NEXT,
 
-  IMG_PENGUIN_RIGHT_MOVING,            16,
-  IMG_PENGUIN_UP_MOVING,               16,
-  IMG_PENGUIN_LEFT_MOVING,             16,
-  IMG_PENGUIN_DOWN_MOVING,             16,                     HA_NEXT,
+  IMG_PENGUIN_MOVING_RIGHT,            16,
+  IMG_PENGUIN_MOVING_UP,               16,
+  IMG_PENGUIN_MOVING_LEFT,             16,
+  IMG_PENGUIN_MOVING_DOWN,             16,                     HA_NEXT,
 
-  IMG_PIG_RIGHT_MOVING,                        16,
-  IMG_PIG_UP_MOVING,                   16,
-  IMG_PIG_LEFT_MOVING,                 16,
-  IMG_PIG_DOWN_MOVING,                 16,                     HA_NEXT,
+  IMG_PIG_MOVING_RIGHT,                        16,
+  IMG_PIG_MOVING_UP,                   16,
+  IMG_PIG_MOVING_LEFT,                 16,
+  IMG_PIG_MOVING_DOWN,                 16,                     HA_NEXT,
 
-  IMG_DRAGON_RIGHT_MOVING,             16,
-  IMG_DRAGON_UP_MOVING,                        16,
-  IMG_DRAGON_LEFT_MOVING,              16,
-  IMG_DRAGON_DOWN_MOVING,              16,                     HA_NEXT,
+  IMG_DRAGON_MOVING_RIGHT,             16,
+  IMG_DRAGON_MOVING_UP,                        16,
+  IMG_DRAGON_MOVING_LEFT,              16,
+  IMG_DRAGON_MOVING_DOWN,              16,                     HA_NEXT,
 
   IMG_SATELLITE,                       -1,                     HA_NEXT,
 
@@ -2899,12 +2899,12 @@ static void CreateScreenScrollbuttons()
 
     gfx_unpressed = scrollbutton_info[i].gfx_unpressed;
     gfx_pressed   = scrollbutton_info[i].gfx_pressed;
-    gd_bitmap_unpressed = new_graphic_info[gfx_unpressed].bitmap;
-    gd_bitmap_pressed   = new_graphic_info[gfx_pressed].bitmap;
-    gd_x1 = new_graphic_info[gfx_unpressed].src_x;
-    gd_y1 = new_graphic_info[gfx_unpressed].src_y;
-    gd_x2 = new_graphic_info[gfx_pressed].src_x;
-    gd_y2 = new_graphic_info[gfx_pressed].src_y;
+    gd_bitmap_unpressed = graphic_info[gfx_unpressed].bitmap;
+    gd_bitmap_pressed   = graphic_info[gfx_pressed].bitmap;
+    gd_x1 = graphic_info[gfx_unpressed].src_x;
+    gd_y1 = graphic_info[gfx_unpressed].src_y;
+    gd_x2 = graphic_info[gfx_pressed].src_x;
+    gd_y2 = graphic_info[gfx_pressed].src_y;
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
@@ -2961,12 +2961,12 @@ static void CreateScreenScrollbars()
 #else
     gfx_unpressed = scrollbar_info[i].gfx_unpressed;
     gfx_pressed   = scrollbar_info[i].gfx_pressed;
-    gd_bitmap_unpressed = new_graphic_info[gfx_unpressed].bitmap;
-    gd_bitmap_pressed   = new_graphic_info[gfx_pressed].bitmap;
-    gd_x1 = new_graphic_info[gfx_unpressed].src_x;
-    gd_y1 = new_graphic_info[gfx_unpressed].src_y;
-    gd_x2 = new_graphic_info[gfx_pressed].src_x;
-    gd_y2 = new_graphic_info[gfx_pressed].src_y;
+    gd_bitmap_unpressed = graphic_info[gfx_unpressed].bitmap;
+    gd_bitmap_pressed   = graphic_info[gfx_pressed].bitmap;
+    gd_x1 = graphic_info[gfx_unpressed].src_x;
+    gd_y1 = graphic_info[gfx_unpressed].src_y;
+    gd_x2 = graphic_info[gfx_pressed].src_x;
+    gd_y2 = graphic_info[gfx_pressed].src_y;
 #endif
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
@@ -3006,14 +3006,14 @@ void CreateScreenGadgets()
 
     /* copy pointers to clip mask and GC */
     scrollbar_bitmap[i]->clip_mask =
-      new_graphic_info[IMG_SCROLLBAR_BLUE + i].clip_mask;
+      graphic_info[IMG_SCROLLBAR_BLUE + i].clip_mask;
     scrollbar_bitmap[i]->stored_clip_gc =
-      new_graphic_info[IMG_SCROLLBAR_BLUE + i].clip_gc;
+      graphic_info[IMG_SCROLLBAR_BLUE + i].clip_gc;
 
-    BlitBitmap(new_graphic_info[IMG_SCROLLBAR_BLUE + i].bitmap,
+    BlitBitmap(graphic_info[IMG_SCROLLBAR_BLUE + i].bitmap,
               scrollbar_bitmap[i],
-              new_graphic_info[IMG_SCROLLBAR_BLUE + i].src_x,
-              new_graphic_info[IMG_SCROLLBAR_BLUE + i].src_y,
+              graphic_info[IMG_SCROLLBAR_BLUE + i].src_x,
+              graphic_info[IMG_SCROLLBAR_BLUE + i].src_y,
               TILEX, TILEY, 0, 0);
   }
 #endif