projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20040111-3-src
[rocksndiamonds.git]
/
src
/
libgame
/
toons.h
diff --git
a/src/libgame/toons.h
b/src/libgame/toons.h
index 75f76864e8203ccef076017791a773ea5c98780f..313458372e363252b52ed40af19317fc3125c83b 100644
(file)
--- a/
src/libgame/toons.h
+++ b/
src/libgame/toons.h
@@
-17,28
+17,6
@@
#include "system.h"
#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;
struct ToonScreenInfo
{
Bitmap *save_buffer;
@@
-51,29
+29,53
@@
struct ToonScreenInfo
int startx, starty;
int width, height;
int startx, starty;
int width, height;
+
+ int frame_delay_value;
};
struct ToonInfo
{
};
struct ToonInfo
{
+#if 0
int graphic;
int width, height;
int src_x, src_y;
int anim_frames;
int graphic;
int width, height;
int src_x, src_y;
int anim_frames;
- int
move
_delay;
- int step
size
;
+ int
step
_delay;
+ int step
_offset
;
int anim_mode;
int direction;
int position;
int anim_delay;
int anim_mode;
int direction;
int position;
int anim_delay;
- int start_frame;
+ int
anim_
start_frame;
Bitmap *bitmap; /* dynamically initialized */
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
};
int getAnimationFrame(int, int, int, int, int);
};
int getAnimationFrame(int, int, int, int, int);
-void InitToonScreen();
+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);
void InitAnimation(void);
void StopAnimation(void);
void DoAnimation(void);