projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030823-2-src
[rocksndiamonds.git]
/
src
/
libgame
/
toons.c
diff --git
a/src/libgame/toons.c
b/src/libgame/toons.c
index 613d2017a7993e5aa900f371c0779faa9a261d64..f2684b4034d626e097f77319f2172d2b8d83f9df 100644
(file)
--- a/
src/libgame/toons.c
+++ b/
src/libgame/toons.c
@@
-64,10
+64,10
@@
int getAnimationFrame(int num_frames, int delay, int mode, int start_frame,
{
/* note: expect different frames for the same delay cycle! */
{
/* note: expect different frames for the same delay cycle! */
- if (
anim.
random_frame < 0)
+ if (
gfx.anim_
random_frame < 0)
frame = SimpleRND(num_frames);
else
frame = SimpleRND(num_frames);
else
- frame =
anim.
random_frame % num_frames;
+ frame =
gfx.anim_
random_frame % num_frames;
}
if (mode & ANIM_REVERSE) /* use reverse animation direction */
}
if (mode & ANIM_REVERSE) /* use reverse animation direction */
@@
-310,6
+310,7
@@
void HandleAnimation(int mode)
{
static unsigned long animstart_delay = -1;
static unsigned long animstart_delay_value = 0;
{
static unsigned long animstart_delay = -1;
static unsigned long animstart_delay_value = 0;
+ static boolean anim_running = FALSE;
static boolean anim_restart = TRUE;
static boolean reset_delay = TRUE;
static int toon_nr = 0;
static boolean anim_restart = TRUE;
static boolean reset_delay = TRUE;
static int toon_nr = 0;
@@
-326,12
+327,17
@@
void HandleAnimation(int mode)
{
case ANIM_START:
screen_info.prepare_backbuffer_function();
{
case ANIM_START:
screen_info.prepare_backbuffer_function();
+
+ anim_running = TRUE;
anim_restart = TRUE;
reset_delay = TRUE;
return;
case ANIM_CONTINUE:
anim_restart = TRUE;
reset_delay = TRUE;
return;
case ANIM_CONTINUE:
+ if (!anim_running)
+ return;
+
break;
case ANIM_STOP:
break;
case ANIM_STOP:
@@
-343,6
+349,8
@@
void HandleAnimation(int mode)
screen_info.update_function();
setup.direct_draw = draw_mode;
screen_info.update_function();
setup.direct_draw = draw_mode;
+ anim_running = FALSE;
+
return;
default:
return;
default: