rnd-20030118-2-src

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index a3cc0df6d4ddfa350ed32e104888ea712ec5031a..1118258c87831ef924349f077c885f1f74f769d5 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -115,7 +115,7 @@ static void HandleGameButtons(struct GadgetInfo *);
 
 static struct GadgetInfo *game_gadget[NUM_GAME_BUTTONS];
 
-#define IS_ANIMATED(g) (new_graphic_info[g].anim_frames > 1)
+#define IS_ANIMATED(g) (graphic_info[g].anim_frames > 1)
 
 
 /* ------------------------------------------------------------------------- */
@@ -1081,7 +1081,7 @@ void InitGame()
   FadeToFront();
 
   /* copy default game door content to main double buffer */
-  BlitBitmap(new_graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
+  BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
             DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
 
   if (level_nr < 100)
@@ -2018,9 +2018,9 @@ static void InitBeltMovement()
       int graphic = el2img(element);
 
       if (game.belt_dir[i] == MV_LEFT)
-       new_graphic_info[graphic].anim_mode &= ~ANIM_REVERSE;
+       graphic_info[graphic].anim_mode &= ~ANIM_REVERSE;
       else
-       new_graphic_info[graphic].anim_mode |=  ANIM_REVERSE;
+       graphic_info[graphic].anim_mode |=  ANIM_REVERSE;
     }
   }
 
@@ -2102,9 +2102,9 @@ static void ToggleBeltSwitch(int x, int y)
     int graphic = el2img(element);
 
     if (belt_dir == MV_LEFT)
-      new_graphic_info[graphic].anim_mode &= ~ANIM_REVERSE;
+      graphic_info[graphic].anim_mode &= ~ANIM_REVERSE;
     else
-      new_graphic_info[graphic].anim_mode |=  ANIM_REVERSE;
+      graphic_info[graphic].anim_mode |=  ANIM_REVERSE;
   }
 
   for (yy=0; yy<lev_fieldy; yy++)
@@ -4765,7 +4765,7 @@ static void WarnBuggyBase(int x, int y)
 }
 
 #if 1
-static void CheckBuggyBase(int x, int y)
+void CheckBuggyBase(int x, int y)
 {
   int element = Feld[x][y];
 
@@ -4858,7 +4858,7 @@ static void ChangeActiveTrap(int x, int y)
 }
 
 #if 1
-static void CheckTrap(int x, int y)
+void CheckTrap(int x, int y)
 {
   int element = Feld[x][y];
 
@@ -5342,21 +5342,9 @@ void GameActions()
             element == EL_SP_BUGGY_BASE_ACTIVATING ||
             element == EL_SP_BUGGY_BASE_ACTIVE)
       CheckBuggyBase(x, y);
-#endif
-#if 0
     else if (element == EL_TRAP ||
             element == EL_TRAP_ACTIVE)
       CheckTrap(x, y);
-#endif
-#if 0
-    else if (element == EL_TRAP)
-      CheckTrap(x, y);
-#endif
-#if 0
-    else if (element == EL_TRAP_ACTIVE)
-      CheckTrap(x, y);
-#endif
-#if 0
     else if (IS_BELT_ACTIVE(element))
       DrawBeltAnimation(x, y, element);
     else if (element == EL_SWITCHGATE_OPENING)
@@ -7261,7 +7249,7 @@ void CreateGameButtons()
 
   for (i=0; i<NUM_GAME_BUTTONS; i++)
   {
-    Bitmap *gd_bitmap = new_graphic_info[IMG_GLOBAL_DOOR].bitmap;
+    Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
     struct GadgetInfo *gi;
     int button_type;
     boolean checked;