major cleanup of preprocessor hell

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

diff --git a/src/libgame/toons.c b/src/libgame/toons.c
index 300ae70bf3da93d4f8505d87896424cc7bc3ae13..8d0a8ba53a57d515fcecac5b469f5a621c40ec4d 100644 (file)
--- a/src/libgame/toons.c
+++ b/src/libgame/toons.c
@@ -1,15 +1,13 @@
-/***********************************************************
-* Artsoft Retro-Game Library                               *
-*----------------------------------------------------------*
-* (c) 1995-2006 Artsoft Entertainment                      *
-*               Holger Schemel                             *
-*               Detmolder Strasse 189                      *
-*               33604 Bielefeld                            *
-*               Germany                                    *
-*               e-mail: info@artsoft.org                   *
-*----------------------------------------------------------*
-* toons.c                                                  *
-***********************************************************/
+// ============================================================================
+// Artsoft Retro-Game Library
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//                         Holger Schemel
+//                 info@artsoft.org
+//                 http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// toons.c
+// ============================================================================
 
 #include "toons.h"
 #include "misc.h"
@@ -129,25 +127,8 @@ void DrawAnim(Bitmap *toon_bitmap, GC toon_clip_gc,
   int pad_dest_y = dest_y - pad_y;
   int pad_width  = width  + 2 * pad_x;
   int pad_height = height + 2 * pad_y;
-#if 1
   int buffer_x = 0;
   int buffer_y = 0;
-#else
-  int buffer_x = DOOR_GFX_PAGEX3;
-  int buffer_y = DOOR_GFX_PAGEY1;
-#endif
-
-#if 0
-  printf("::: (%d, %d), (%d, %d), (%d, %d), (%d, %d) -> (%d, %d), (%d, %d), (%d, %d)\n",
-        src_x, src_y,
-        width, height,
-        dest_x, dest_y,
-        pad_x, pad_y,
-
-        pad_dest_x, pad_dest_y,
-        pad_width, pad_height,
-        buffer_x, buffer_y);
-#endif
 
   /* correct values to avoid off-screen blitting (start position) */
   if (pad_dest_x < screen_info.startx)
@@ -186,13 +167,13 @@ void DrawAnim(Bitmap *toon_bitmap, GC toon_clip_gc,
 
 boolean AnimateToon(int toon_nr, boolean restart)
 {
-  static unsigned long animation_frame_counter = 0;
+  static unsigned int animation_frame_counter = 0;
   static int pos_x = 0, pos_y = 0;
   static int delta_x = 0, delta_y = 0;
   static int frame = 0;
   static boolean horiz_move, vert_move;
-  static unsigned long anim_delay = 0;
-  static unsigned long anim_delay_value = 0;
+  static unsigned int anim_delay = 0;
+  static unsigned int anim_delay_value = 0;
   static int width,height;
   static int pad_x,pad_y;
   static int cut_x,cut_y;
@@ -342,8 +323,8 @@ boolean AnimateToon(int toon_nr, boolean restart)
 
 void HandleAnimation(int mode)
 {
-  static unsigned long animstart_delay = -1;
-  static unsigned long animstart_delay_value = 0;
+  static unsigned int animstart_delay = -1;
+  static unsigned int animstart_delay_value = 0;
   static boolean anim_running = FALSE;
   static boolean anim_restart = TRUE;
   static boolean reset_delay = TRUE;
@@ -376,11 +357,9 @@ void HandleAnimation(int mode)
     case ANIM_STOP:
       if (anim_running)
       {
-#if 1
        redraw_mask |= (REDRAW_FIELD | REDRAW_FROM_BACKBUFFER);
 
        screen_info.update_function();
-#endif
 
        anim_running = FALSE;
       }