small structural code change for global animations preparation

diff --git a/src/cartoons.c b/src/cartoons.c
index a0115cf98dce2b312824186ef95b8ac2afe3c2be..043bd562c40bd7ac6b24b56339f5714843371240 100644 (file)
--- a/src/cartoons.c
+++ b/src/cartoons.c
@@ -71,3 +71,22 @@ void InitToons()
                 REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE,
                 GAME_FRAME_DELAY);
 }
                 REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE,
                 GAME_FRAME_DELAY);
 }

+
+void DrawGlobalAnim()
+{
+}
+
+void InitAnimation()
+{
+  HandleAnimation(ANIM_START);
+}
+
+void StopAnimation()
+{
+  HandleAnimation(ANIM_STOP);
+}
+
+void DoAnimation()
+{
+  HandleAnimation(ANIM_CONTINUE);
+}

diff --git a/src/cartoons.h b/src/cartoons.h
index b3c20192d88acb42b7b86424aa3403187619422f..a0290d1b3ca5d7324a82f8cd371c375b4364857b 100644 (file)
--- a/src/cartoons.h
+++ b/src/cartoons.h
@@ -14,4 +14,10 @@
 
 void InitToons(void);
 
 
 void InitToons(void);
 

+void DrawGlobalAnim(void);
+
+void InitAnimation(void);
+void StopAnimation(void);
+void DoAnimation(void);
+

 #endif
 #endif

diff --git a/src/events.c b/src/events.c
index e82d3667b42958144a01fdce30e24a70a3b8cec9..7282236ff8609522682938faca0ad99c59dbf80b 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -19,6 +19,7 @@
 #include "editor.h"
 #include "files.h"
 #include "tape.h"
 #include "editor.h"
 #include "files.h"
 #include "tape.h"

+#include "cartoons.h"

 #include "network.h"
 
 
 #include "network.h"
 
 

diff --git a/src/init.c b/src/init.c
index 8dfd5f785c00308234e3514905019bd92643865b..9493ab514d6fe22e1493f99fb9659956a0884466 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -129,10 +129,6 @@ void DrawInitAnim()
   FrameCounter++;
 }
 
   FrameCounter++;
 }
 

-void DrawGlobalAnim()
-{
-}
-

 void FreeGadgets()
 {
   FreeLevelEditorGadgets();
 void FreeGadgets()
 {
   FreeLevelEditorGadgets();

diff --git a/src/libgame/toons.c b/src/libgame/toons.c
index 3868bdb68300f2d59a854561be83090325324744..34fa8fbb675f157256375535116f9938538f239e 100644 (file)
--- a/src/libgame/toons.c
+++ b/src/libgame/toons.c
@@ -13,12 +13,6 @@
 #include "misc.h"
 
 
 #include "misc.h"
 
 

-/* values for toon animation */
-#define ANIM_START     0
-#define ANIM_CONTINUE  1
-#define ANIM_STOP      2
-
-

 static struct ToonScreenInfo screen_info;
 
 
 static struct ToonScreenInfo screen_info;
 
 


@@ -385,18 +379,3 @@ void HandleAnimation(int mode)
 
   anim_restart = reset_delay = AnimateToon(toon_nr, anim_restart);
 }
 
   anim_restart = reset_delay = AnimateToon(toon_nr, anim_restart);
 }

-
-void InitAnimation()
-{
-  HandleAnimation(ANIM_START);
-}
-
-void StopAnimation()
-{
-  HandleAnimation(ANIM_STOP);
-}
-
-void DoAnimation()
-{
-  HandleAnimation(ANIM_CONTINUE);
-}

diff --git a/src/libgame/toons.h b/src/libgame/toons.h
index 5dc52d021860d38dc2fb20514ab6c506b98c21bf..449687cd26f98a274d7236e61824f588b09973e4 100644 (file)
--- a/src/libgame/toons.h
+++ b/src/libgame/toons.h
@@ -15,6 +15,12 @@
 #include "system.h"
 
 
 #include "system.h"
 
 

+/* values for toon animation */
+#define ANIM_START     0
+#define ANIM_CONTINUE  1
+#define ANIM_STOP      2
+
+

 struct ToonScreenInfo
 {
   Bitmap *save_buffer;
 struct ToonScreenInfo
 {
   Bitmap *save_buffer;


@@ -55,8 +61,7 @@ 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 (*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);
+
+void HandleAnimation(int);

 
 #endif /* TOONS_H */
 
 #endif /* TOONS_H */