projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19981209-1
[rocksndiamonds.git]
/
src
/
cartoons.c
diff --git
a/src/cartoons.c
b/src/cartoons.c
index 6b145d6d253097237e234b38723eb9718234704a..834996b73c53ff4a49d594226fc40ee6de9f5dcb 100644
(file)
--- a/
src/cartoons.c
+++ b/
src/cartoons.c
@@
-107,14
+107,14
@@
void DoAnimation()
void HandleAnimation(int mode)
{
void HandleAnimation(int mode)
{
- static long animstart_delay = -1;
- static long animstart_delay_value = 0;
+ static
unsigned
long animstart_delay = -1;
+ static
unsigned
long animstart_delay_value = 0;
static boolean anim_restart = TRUE;
static boolean reset_delay = TRUE;
static int toon_nr = 0;
int draw_mode;
static boolean anim_restart = TRUE;
static boolean reset_delay = TRUE;
static int toon_nr = 0;
int draw_mode;
- if (!setup.toons
_on
)
+ if (!setup.toons)
return;
switch(mode)
return;
switch(mode)
@@
-124,7
+124,7
@@
void HandleAnimation(int mode)
reset_delay = TRUE;
/* Fill empty backbuffer for animation functions */
reset_delay = TRUE;
/* Fill empty backbuffer for animation functions */
- if (setup.direct_draw
_on
&& game_status == PLAYING)
+ if (setup.direct_draw && game_status == PLAYING)
{
int xx,yy;
{
int xx,yy;
@@
-138,7
+138,7
@@
void HandleAnimation(int mode)
SetDrawtoField(DRAW_DIRECT);
}
SetDrawtoField(DRAW_DIRECT);
}
- if (setup.soft_scrolling
_on
&& game_status == PLAYING)
+ if (setup.soft_scrolling && game_status == PLAYING)
{
int fx = FX, fy = FY;
{
int fx = FX, fy = FY;
@@
-158,12
+158,12
@@
void HandleAnimation(int mode)
redraw_mask |= (REDRAW_FIELD | REDRAW_FROM_BACKBUFFER);
/* Redraw background even when in direct drawing mode */
redraw_mask |= (REDRAW_FIELD | REDRAW_FROM_BACKBUFFER);
/* Redraw background even when in direct drawing mode */
- draw_mode = setup.direct_draw
_on
;
- setup.direct_draw
_on
= FALSE;
+ draw_mode = setup.direct_draw;
+ setup.direct_draw = FALSE;
BackToFront();
BackToFront();
- setup.direct_draw
_on
= draw_mode;
+ setup.direct_draw = draw_mode;
return;
break;
return;
break;
@@
-191,12
+191,12
@@
void HandleAnimation(int mode)
boolean AnimateToon(int toon_nr, boolean restart)
{
boolean AnimateToon(int toon_nr, boolean restart)
{
- static pos_x = 0, pos_y = 0;
- static delta_x = 0, delta_y = 0;
+ static
int
pos_x = 0, pos_y = 0;
+ static
int
delta_x = 0, delta_y = 0;
static int frame = 0, frame_step = 1;
static boolean horiz_move, vert_move;
static int frame = 0, frame_step = 1;
static boolean horiz_move, vert_move;
- static long anim_delay = 0;
- static
int
anim_delay_value = 0;
+ static
unsigned
long anim_delay = 0;
+ static
unsigned long
anim_delay_value = 0;
static int width,height;
static int pad_x,pad_y;
static int cut_x,cut_y;
static int width,height;
static int pad_x,pad_y;
static int cut_x,cut_y;