rnd-20060112-1-src

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

diff --git a/src/libgame/toons.h b/src/libgame/toons.h
index a30cbe63456786bcf9d1dc4642930d6a05487c17..4d3e0be8a08d2579177c915d82fe38bb17756871 100644 (file)
--- a/src/libgame/toons.h
+++ b/src/libgame/toons.h
@@ -17,31 +17,6 @@
 #include "system.h"
 
 
-/* values for animation mode (frame order and direction) */
-#define ANIM_NONE              0
-#define ANIM_LOOP              (1 << 0)
-#define ANIM_LINEAR            (1 << 1)
-#define ANIM_PINGPONG          (1 << 2)
-#define ANIM_PINGPONG2         (1 << 3)
-#define ANIM_REVERSE           (1 << 4)
-#define ANIM_RANDOM            (1 << 5)
-
-#if 0
-/* values for toon animation direction */
-#define ANIMDIR_LEFT   1
-#define ANIMDIR_RIGHT  2
-#define ANIMDIR_UP     4
-#define ANIMDIR_DOWN   8
-
-#define ANIMPOS_ANY    0
-#define ANIMPOS_LEFT   1
-#define ANIMPOS_RIGHT  2
-#define ANIMPOS_UP     4
-#define ANIMPOS_DOWN   8
-#define ANIMPOS_UPPER  16
-#endif
-
-
 struct ToonScreenInfo
 {
   Bitmap *save_buffer;
@@ -60,27 +35,8 @@ struct ToonScreenInfo
 
 struct ToonInfo
 {
-#if 0
-  int graphic;
-  int width, height;
-  int src_x, src_y;
-  int anim_frames;
-  int step_delay;
-  int step_offset;
-  int anim_mode;
-  int direction;
-  int position;
-
-  int anim_delay;
-  int anim_start_frame;
-  Bitmap *bitmap;      /* dynamically initialized */
-
-  char *direction_str;
-  char *position_str;
-
-#else
-
   Bitmap *bitmap;
+
   int src_x, src_y;
   int width, height;
   int anim_frames;
@@ -89,9 +45,9 @@ struct ToonInfo
   int anim_mode;
   int step_offset;
   int step_delay;
+
   char *direction;
   char *position;
-#endif
 };