X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftoons.h;h=313458372e363252b52ed40af19317fc3125c83b;hb=39af00f43cf5c4cea174d0e90633877df08a2f7c;hp=cf267345df4cecd8b167cf09ef12ff21c799c57c;hpb=a4eaa7fcd8ca604faeee50f049c441415aa4968c;p=rocksndiamonds.git

diff --git a/src/libgame/toons.h b/src/libgame/toons.h
index cf267345..31345837 100644
--- a/src/libgame/toons.h
+++ b/src/libgame/toons.h
@@ -17,31 +17,8 @@
 #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 **toon_bitmap_array;
   Bitmap *save_buffer;
   void (*update_function)(void);
   void (*prepare_backbuffer_function)(void);
@@ -52,23 +29,53 @@ struct ToonScreenInfo
 
   int startx, starty;
   int width, height;
+
+  int frame_delay_value;
 };
 
 struct ToonInfo
 {
-  int bitmap_nr;
+#if 0
+  int graphic;
   int width, height;
   int src_x, src_y;
-  int frames;
-  int frames_per_second;
-  int stepsize;
-  int mode;
+  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;
+  int anim_start_frame;
+  int anim_delay;
+  int anim_mode;
+  int step_offset;
+  int step_delay;
+  char *direction;
+  char *position;
+#endif
 };
 
 
-void InitToonScreen();
+int getAnimationFrame(int, int, int, int, int);
+
+void InitToonScreen(Bitmap *, void (*update_function)(void),
+		    void (*prepare_backbuffer_function)(void),
+		    boolean (*redraw_needed_function)(void),
+		    struct ToonInfo *, int, int, int, int, int, int);
 void InitAnimation(void);
 void StopAnimation(void);
 void DoAnimation(void);