X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftoons.h;h=4d3e0be8a08d2579177c915d82fe38bb17756871;hb=ee749a764df3dfa944c1f9de740ccbeb1cfdef40;hp=4ed43abe148c1e16e46db1dafaa911d809a83c26;hpb=4be46f1030df4cb7db0ce7c46d2518334861731a;p=rocksndiamonds.git

diff --git a/src/libgame/toons.h b/src/libgame/toons.h
index 4ed43abe..4d3e0be8 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,19 +35,19 @@ struct ToonScreenInfo
 
 struct ToonInfo
 {
-  int graphic;
-  int width, height;
+  Bitmap *bitmap;
+
   int src_x, src_y;
+  int width, height;
   int anim_frames;
-  int move_delay;
-  int stepsize;
+  int anim_start_frame;
+  int anim_delay;
   int anim_mode;
-  int direction;
-  int position;
+  int step_offset;
+  int step_delay;
 
-  int anim_delay;
-  int start_frame;
-  Bitmap *bitmap;	/* dynamically initialized */
+  char *direction;
+  char *position;
 };