rnd-20030128-1-src

[rocksndiamonds.git] / src / cartoons.c

diff --git a/src/cartoons.c b/src/cartoons.c
index 45de45be169d868d9fee68bbd293e61b2c69791b..5f7407dee1180bb98d4d3a9364955e2fb64e8284 100644 (file)
--- a/src/cartoons.c
+++ b/src/cartoons.c
@@ -120,7 +120,7 @@ struct ToonInfo toons[NUM_TOONS] =
     ANIMPOS_UPPER
   },
   {
-    IMG_PLAYER1_LEFT_MOVING,
+    IMG_PLAYER1_MOVING_LEFT,
     -1, -1,
     -1, -1,
     -1,
@@ -131,7 +131,7 @@ struct ToonInfo toons[NUM_TOONS] =
     ANIMPOS_DOWN
   },
   {
-    IMG_PLAYER1_RIGHT_MOVING,
+    IMG_PLAYER1_MOVING_RIGHT,
     -1, -1,
     -1, -1,
     -1,
@@ -142,7 +142,7 @@ struct ToonInfo toons[NUM_TOONS] =
     ANIMPOS_DOWN
   },
   {
-    IMG_PENGUIN_LEFT_MOVING,
+    IMG_PENGUIN_MOVING_LEFT,
     -1, -1,
     -1, -1,
     -1,
@@ -153,7 +153,7 @@ struct ToonInfo toons[NUM_TOONS] =
     ANIMPOS_DOWN
   },
   {
-    IMG_PENGUIN_RIGHT_MOVING,
+    IMG_PENGUIN_MOVING_RIGHT,
     -1, -1,
     -1, -1,
     -1,
@@ -164,7 +164,7 @@ struct ToonInfo toons[NUM_TOONS] =
     ANIMPOS_DOWN
   },
   {
-    IMG_MOLE_LEFT_MOVING,
+    IMG_MOLE_MOVING_LEFT,
     -1, -1,
     -1, -1,
     -1,
@@ -175,7 +175,7 @@ struct ToonInfo toons[NUM_TOONS] =
     ANIMPOS_DOWN
   },
   {
-    IMG_MOLE_RIGHT_MOVING,
+    IMG_MOLE_MOVING_RIGHT,
     -1, -1,
     -1, -1,
     -1,
@@ -186,7 +186,7 @@ struct ToonInfo toons[NUM_TOONS] =
     ANIMPOS_DOWN
   },
   {
-    IMG_PIG_LEFT_MOVING,
+    IMG_PIG_MOVING_LEFT,
     -1, -1,
     -1, -1,
     -1,
@@ -197,7 +197,7 @@ struct ToonInfo toons[NUM_TOONS] =
     ANIMPOS_DOWN
   },
   {
-    IMG_PIG_RIGHT_MOVING,
+    IMG_PIG_MOVING_RIGHT,
     -1, -1,
     -1, -1,
     -1,
@@ -208,7 +208,7 @@ struct ToonInfo toons[NUM_TOONS] =
     ANIMPOS_DOWN
   },
   {
-    IMG_DRAGON_LEFT_MOVING,
+    IMG_DRAGON_MOVING_LEFT,
     -1, -1,
     -1, -1,
     -1,
@@ -219,7 +219,7 @@ struct ToonInfo toons[NUM_TOONS] =
     ANIMPOS_DOWN
   },
   {
-    IMG_DRAGON_RIGHT_MOVING,
+    IMG_DRAGON_MOVING_RIGHT,
     -1, -1,
     -1, -1,
     -1,
@@ -297,17 +297,17 @@ void InitToons()
   {
     int graphic = toons[i].graphic;
 
-    toons[i].bitmap = new_graphic_info[graphic].bitmap;
+    toons[i].bitmap = graphic_info[graphic].bitmap;
 
     if (toons[i].src_x == -1 && toons[i].src_y == -1)
     {
-      int anim_frames = new_graphic_info[graphic].anim_frames;
-      int anim_delay = new_graphic_info[graphic].anim_delay;
-      int anim_mode = new_graphic_info[graphic].anim_mode;
-      int start_frame = new_graphic_info[graphic].anim_start_frame;
+      int anim_frames = graphic_info[graphic].anim_frames;
+      int anim_delay = graphic_info[graphic].anim_delay;
+      int anim_mode = graphic_info[graphic].anim_mode;
+      int start_frame = graphic_info[graphic].anim_start_frame;
 
-      toons[i].src_x = new_graphic_info[graphic].src_x;
-      toons[i].src_y = new_graphic_info[graphic].src_y;
+      toons[i].src_x = graphic_info[graphic].src_x;
+      toons[i].src_y = graphic_info[graphic].src_y;
 
       toons[i].width = TILEX;
       toons[i].height = TILEY;