rnd-20030120-3-src

[rocksndiamonds.git] / src / cartoons.c

diff --git a/src/cartoons.c b/src/cartoons.c
index 5db44a296a82cd0805a61ad4ff9542aeb3ffea53..fa8152d9852c46da5671bf086bf55b00f09fda02 100644 (file)
--- a/src/cartoons.c
+++ b/src/cartoons.c
@@ -54,7 +54,7 @@
 struct ToonInfo toons[NUM_TOONS] =
 {
   {
-    IMG_MENU_TOONS,
+    IMG_GLOBAL_TOONS,
     DWARF_XSIZE, DWARF_YSIZE,
     DWARF_X, DWARF_Y,
     DWARF_FRAMES,
@@ -65,7 +65,7 @@ struct ToonInfo toons[NUM_TOONS] =
     ANIMPOS_DOWN
   },
   {
-    IMG_MENU_TOONS,
+    IMG_GLOBAL_TOONS,
     DWARF_XSIZE, DWARF_YSIZE,
     DWARF_X, DWARF2_Y,
     DWARF_FRAMES,
@@ -76,7 +76,7 @@ struct ToonInfo toons[NUM_TOONS] =
     ANIMPOS_DOWN
   },
   {
-    IMG_MENU_TOONS,
+    IMG_GLOBAL_TOONS,
     JUMPER_XSIZE, JUMPER_YSIZE,
     JUMPER_X, JUMPER_Y,
     JUMPER_FRAMES,
@@ -87,7 +87,7 @@ struct ToonInfo toons[NUM_TOONS] =
     ANIMPOS_DOWN
   },
   {
-    IMG_MENU_TOONS,
+    IMG_GLOBAL_TOONS,
     CLOWN_XSIZE, CLOWN_YSIZE,
     CLOWN_X, CLOWN_Y,
     CLOWN_FRAMES,
@@ -98,7 +98,7 @@ struct ToonInfo toons[NUM_TOONS] =
     ANIMPOS_ANY
   },
   {
-    IMG_MENU_TOONS,
+    IMG_GLOBAL_TOONS,
     BIRD_XSIZE, BIRD_YSIZE,
     BIRD1_X, BIRD1_Y,
     BIRD_FRAMES,
@@ -109,7 +109,7 @@ struct ToonInfo toons[NUM_TOONS] =
     ANIMPOS_UPPER
   },
   {
-    IMG_MENU_TOONS,
+    IMG_GLOBAL_TOONS,
     BIRD_XSIZE, BIRD_YSIZE,
     BIRD2_X, BIRD2_Y,
     BIRD_FRAMES,
@@ -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;
@@ -325,12 +325,11 @@ void InitToons()
       toons[i].anim_delay = 1;         /* no delay between frames */
       toons[i].start_frame = 0;                /* always start with first */
     }
-
-    toons[i].move_delay *= GAME_FRAME_DELAY;
   }
 
   InitToonScreen(bitmap_db_door,
                 BackToFront, PrepareBackbuffer, ToonNeedsRedraw,
                 toons, NUM_TOONS,
-                REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
+                REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE,
+                GAME_FRAME_DELAY);
 }