X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftoons.h;h=313458372e363252b52ed40af19317fc3125c83b;hb=756a24e132e64d1514e85b8fa09f123e75417fd0;hp=3588d7da46a4a0df1080c7f796780f20f492b15d;hpb=3fd727f8ab7628eaab0be7de31658d7d468d6c8d;p=rocksndiamonds.git

diff --git a/src/libgame/toons.h b/src/libgame/toons.h
index 3588d7da..31345837 100644
--- a/src/libgame/toons.h
+++ b/src/libgame/toons.h
@@ -17,28 +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)
-
-/* 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
-
-
 struct ToonScreenInfo
 {
   Bitmap *save_buffer;
@@ -57,19 +35,38 @@ struct ToonScreenInfo
 
 struct ToonInfo
 {
+#if 0
   int graphic;
   int width, height;
   int src_x, src_y;
   int anim_frames;
-  int move_delay;
-  int stepsize;
+  int step_delay;
+  int step_offset;
   int anim_mode;
   int direction;
   int position;
 
   int anim_delay;
-  int start_frame;
+  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;
+  int anim_start_frame;
+  int anim_delay;
+  int anim_mode;
+  int step_offset;
+  int step_delay;
+  char *direction;
+  char *position;
+#endif
 };