rnd-20060819-3-src

[rocksndiamonds.git] / src / libgame / toons.c

diff --git a/src/libgame/toons.c b/src/libgame/toons.c
index 6f4fd2f7c49e3e79b7d0b340ded7ade00cf45829..0b7ca5522c8db2391bb2751b50a3d2d35ae6e812 100644 (file)
--- a/src/libgame/toons.c
+++ b/src/libgame/toons.c
@@ -1,7 +1,7 @@
 /***********************************************************
 * Artsoft Retro-Game Library                               *
 *----------------------------------------------------------*
-* (c) 1995-2002 Artsoft Entertainment                      *
+* (c) 1995-2006 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -69,7 +69,7 @@ int getAnimationFrame(int num_frames, int delay, int mode, int start_frame,
     else
       frame = gfx.anim_random_frame % num_frames;
   }
-  else if (mode & (ANIM_CE_VALUE | ANIM_CE_SCORE))
+  else if (mode & (ANIM_CE_VALUE | ANIM_CE_SCORE | ANIM_CE_DELAY))
   {
     frame = sync_frame % num_frames;
   }
@@ -88,10 +88,10 @@ int getAnimationFrame(int num_frames, int delay, int mode, int start_frame,
 static int get_toon_direction(char *direction_string_raw)
 {
   char *direction_string = getStringToLower(direction_string_raw);
-  int direction = (strcmp(direction_string, "left")  == 0 ? MV_LEFT :
-                  strcmp(direction_string, "right") == 0 ? MV_RIGHT :
-                  strcmp(direction_string, "up")    == 0 ? MV_UP :
-                  strcmp(direction_string, "down")  == 0 ? MV_DOWN :
+  int direction = (strEqual(direction_string, "left")  ? MV_LEFT :
+                  strEqual(direction_string, "right") ? MV_RIGHT :
+                  strEqual(direction_string, "up")    ? MV_UP :
+                  strEqual(direction_string, "down")  ? MV_DOWN :
                   MV_NONE);
 
   free(direction_string);
@@ -177,13 +177,13 @@ boolean AnimateToon(int toon_nr, boolean restart)
     {
       int pos_bottom = screen_info.height - anim->height;
 
-      if (strcmp(anim->position, "top") == 0)
+      if (strEqual(anim->position, "top"))
        pos_y = 0;
-      else if (strcmp(anim->position, "bottom") == 0)
+      else if (strEqual(anim->position, "bottom"))
        pos_y = pos_bottom;
-      else if (strcmp(anim->position, "upper")  == 0)
+      else if (strEqual(anim->position, "upper"))
        pos_y = SimpleRND(pos_bottom / 2);
-      else if (strcmp(anim->position, "lower")  == 0)
+      else if (strEqual(anim->position, "lower"))
        pos_y = pos_bottom / 2 + SimpleRND(pos_bottom / 2);
       else
        pos_y = SimpleRND(pos_bottom);
@@ -205,9 +205,9 @@ boolean AnimateToon(int toon_nr, boolean restart)
     {
       int pos_right = screen_info.width - anim->width;
 
-      if (strcmp(anim->position, "left") == 0)
+      if (strEqual(anim->position, "left"))
        pos_x = 0;
-      else if (strcmp(anim->position, "right")  == 0)
+      else if (strEqual(anim->position, "right"))
        pos_x = pos_right;
       else
        pos_x = SimpleRND(pos_right);