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

diff --git a/src/libgame/toons.h b/src/libgame/toons.h
index 3588d7da..5dc52d02 100644
--- a/src/libgame/toons.h
+++ b/src/libgame/toons.h
@@ -1,15 +1,13 @@
-/***********************************************************
-* Artsoft Retro-Game Library                               *
-*----------------------------------------------------------*
-* (c) 1995-2002 Artsoft Entertainment                      *
-*               Holger Schemel                             *
-*               Detmolder Strasse 189                      *
-*               33604 Bielefeld                            *
-*               Germany                                    *
-*               e-mail: info@artsoft.org                   *
-*----------------------------------------------------------*
-* toons.h                                                  *
-***********************************************************/
+// ============================================================================
+// Artsoft Retro-Game Library
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//     		    Holger Schemel
+//		    info@artsoft.org
+//		    http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// toons.h
+// ============================================================================
 
 #ifndef TOONS_H
 #define TOONS_H
@@ -17,28 +15,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 +33,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;
 };