X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fcartoons.c;h=5b38eb77bd401dc943f53dbaa8b57ed8be4405f4;hb=75ebfce89c39bc740367807c4c16f469135ba6d5;hp=cf5a073675715dc52265995bd40e8a3dab05040d;hpb=1446af0fb66276d75bd2ce82d368292283e555aa;p=rocksndiamonds.git

diff --git a/src/cartoons.c b/src/cartoons.c
index cf5a0736..5b38eb77 100644
--- a/src/cartoons.c
+++ b/src/cartoons.c
@@ -1,7 +1,7 @@
 /***********************************************************
 * Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-* (c) 1995-2001 Artsoft Entertainment                      *
+* (c) 1995-2002 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -67,7 +67,7 @@ struct ToonInfo toons[NUM_TOONS] =
     DWARF_FRAMES,
     DWARF_FPS,
     DWARF_STEPSIZE,
-    ANIM_NORMAL,
+    ANIM_LOOP,
     ANIMDIR_RIGHT,
     ANIMPOS_DOWN
   },
@@ -78,7 +78,7 @@ struct ToonInfo toons[NUM_TOONS] =
     DWARF_FRAMES,
     DWARF_FPS,
     DWARF_STEPSIZE,
-    ANIM_NORMAL,
+    ANIM_LOOP,
     ANIMDIR_LEFT,
     ANIMPOS_DOWN
   },
@@ -89,7 +89,7 @@ struct ToonInfo toons[NUM_TOONS] =
     JUMPER_FRAMES,
     JUMPER_FPS,
     JUMPER_STEPSIZE,
-    ANIM_NORMAL,
+    ANIM_LOOP,
     ANIMDIR_RIGHT,
     ANIMPOS_DOWN
   },
@@ -100,7 +100,7 @@ struct ToonInfo toons[NUM_TOONS] =
     CLOWN_FRAMES,
     CLOWN_FPS,
     CLOWN_STEPSIZE,
-    ANIM_NORMAL,
+    ANIM_LOOP,
     ANIMDIR_UP,
     ANIMPOS_ANY
   },
@@ -111,7 +111,7 @@ struct ToonInfo toons[NUM_TOONS] =
     BIRD_FRAMES,
     BIRD_FPS,
     BIRD_STEPSIZE,
-    ANIM_OSCILLATE,
+    ANIM_PINGPONG,
     ANIMDIR_RIGHT,
     ANIMPOS_UPPER
   },
@@ -122,7 +122,7 @@ struct ToonInfo toons[NUM_TOONS] =
     BIRD_FRAMES,
     BIRD_FPS,
     BIRD_STEPSIZE,
-    ANIM_OSCILLATE,
+    ANIM_PINGPONG,
     ANIMDIR_LEFT,
     ANIMPOS_UPPER
   },
@@ -134,7 +134,7 @@ struct ToonInfo toons[NUM_TOONS] =
     GAMETOON_FRAMES_4,
     GAMETOON_FPS,
     GAMETOON_STEPSIZE,
-    ANIM_NORMAL,
+    ANIM_LOOP,
     ANIMDIR_LEFT,
     ANIMPOS_DOWN
   },
@@ -146,7 +146,7 @@ struct ToonInfo toons[NUM_TOONS] =
     GAMETOON_FRAMES_4,
     GAMETOON_FPS,
     GAMETOON_STEPSIZE,
-    ANIM_NORMAL,
+    ANIM_LOOP,
     ANIMDIR_RIGHT,
     ANIMPOS_DOWN
   },
@@ -158,7 +158,7 @@ struct ToonInfo toons[NUM_TOONS] =
     GAMETOON_FRAMES_4,
     GAMETOON_FPS,
     GAMETOON_STEPSIZE,
-    ANIM_NORMAL,
+    ANIM_LOOP,
     ANIMDIR_LEFT,
     ANIMPOS_DOWN
   },
@@ -170,7 +170,7 @@ struct ToonInfo toons[NUM_TOONS] =
     GAMETOON_FRAMES_4,
     GAMETOON_FPS,
     GAMETOON_STEPSIZE,
-    ANIM_NORMAL,
+    ANIM_LOOP,
     ANIMDIR_RIGHT,
     ANIMPOS_DOWN
   },
@@ -182,7 +182,7 @@ struct ToonInfo toons[NUM_TOONS] =
     GAMETOON_FRAMES_4,
     GAMETOON_FPS,
     GAMETOON_STEPSIZE,
-    ANIM_NORMAL,
+    ANIM_LOOP,
     ANIMDIR_LEFT,
     ANIMPOS_DOWN
   },
@@ -194,7 +194,7 @@ struct ToonInfo toons[NUM_TOONS] =
     GAMETOON_FRAMES_4,
     GAMETOON_FPS,
     GAMETOON_STEPSIZE,
-    ANIM_NORMAL,
+    ANIM_LOOP,
     ANIMDIR_RIGHT,
     ANIMPOS_DOWN
   },
@@ -206,7 +206,7 @@ struct ToonInfo toons[NUM_TOONS] =
     GAMETOON_FRAMES_4,
     GAMETOON_FPS,
     GAMETOON_STEPSIZE,
-    ANIM_NORMAL,
+    ANIM_LOOP,
     ANIMDIR_LEFT,
     ANIMPOS_DOWN
   },
@@ -218,7 +218,7 @@ struct ToonInfo toons[NUM_TOONS] =
     GAMETOON_FRAMES_4,
     GAMETOON_FPS,
     GAMETOON_STEPSIZE,
-    ANIM_NORMAL,
+    ANIM_LOOP,
     ANIMDIR_RIGHT,
     ANIMPOS_DOWN
   },
@@ -230,7 +230,7 @@ struct ToonInfo toons[NUM_TOONS] =
     GAMETOON_FRAMES_4,
     GAMETOON_FPS,
     GAMETOON_STEPSIZE,
-    ANIM_NORMAL,
+    ANIM_LOOP,
     ANIMDIR_LEFT,
     ANIMPOS_DOWN
   },
@@ -242,7 +242,7 @@ struct ToonInfo toons[NUM_TOONS] =
     GAMETOON_FRAMES_4,
     GAMETOON_FPS,
     GAMETOON_STEPSIZE,
-    ANIM_NORMAL,
+    ANIM_LOOP,
     ANIMDIR_RIGHT,
     ANIMPOS_DOWN
   },
@@ -254,7 +254,7 @@ struct ToonInfo toons[NUM_TOONS] =
     GAMETOON_FRAMES_8,
     GAMETOON_FPS,
     GAMETOON_STEPSIZE,
-    ANIM_NORMAL,
+    ANIM_LOOP,
     ANIMDIR_LEFT,
     ANIMPOS_ANY
   },
@@ -266,7 +266,7 @@ struct ToonInfo toons[NUM_TOONS] =
     GAMETOON_FRAMES_8,
     GAMETOON_FPS,
     GAMETOON_STEPSIZE,
-    ANIM_NORMAL,
+    ANIM_LOOP,
     ANIMDIR_RIGHT,
     ANIMPOS_ANY
   },
@@ -310,7 +310,7 @@ boolean ToonNeedsRedraw()
 
 void InitToons()
 {
-  InitToonScreen(pix, pix[PIX_DB_DOOR],
+  InitToonScreen(pix, bitmap_db_door,
 		 BackToFront, PrepareBackbuffer, ToonNeedsRedraw,
 		 toons, NUM_TOONS,
 		 REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);