X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftoons.h;h=313458372e363252b52ed40af19317fc3125c83b;hb=002c075b9935dc5dc055d3a8f35b2774796fa1c4;hp=8ea41d1868fb375e51de653b2e699c5b488e50ac;hpb=7119b5d2e756b1ab23818ea39d19aece0563bab0;p=rocksndiamonds.git

diff --git a/src/libgame/toons.h b/src/libgame/toons.h
index 8ea41d18..31345837 100644
--- a/src/libgame/toons.h
+++ b/src/libgame/toons.h
@@ -17,29 +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)
-
-/* 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;
@@ -58,6 +35,7 @@ struct ToonScreenInfo
 
 struct ToonInfo
 {
+#if 0
   int graphic;
   int width, height;
   int src_x, src_y;
@@ -72,7 +50,11 @@ struct ToonInfo
   int anim_start_frame;
   Bitmap *bitmap;	/* dynamically initialized */
 
-#if 0
+  char *direction_str;
+  char *position_str;
+
+#else
+
   Bitmap *bitmap;
   int src_x, src_y;
   int width, height;
@@ -82,6 +64,8 @@ struct ToonInfo
   int anim_mode;
   int step_offset;
   int step_delay;
+  char *direction;
+  char *position;
 #endif
 };