projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20021006-1-src
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index ebc8cb6dd6a0a0f95b4cc4fe98d4da8953ac4f25..c8f9e5d2dd7f9ac1861ade040d05cd2a66a394de 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-690,7
+690,7
@@
static int getGraphicAnimationPhase(int frames, int delay, int mode)
{
int phase;
{
int phase;
- if (mode
==
ANIM_PINGPONG)
+ if (mode
&
ANIM_PINGPONG)
{
int max_anim_frames = 2 * frames - 2;
{
int max_anim_frames = 2 * frames - 2;
@@
-700,7
+700,7
@@
static int getGraphicAnimationPhase(int frames, int delay, int mode)
else
phase = (FrameCounter % (delay * frames)) / delay;
else
phase = (FrameCounter % (delay * frames)) / delay;
- if (mode
==
ANIM_REVERSE)
+ if (mode
&
ANIM_REVERSE)
phase = -phase;
return phase;
phase = -phase;
return phase;
@@
-765,9
+765,9
@@
void DrawGraphicAnimationExt(int x, int y, int graphic,
void DrawNewGraphicAnimationExt(int x, int y, int graphic, int mask_mode)
{
void DrawNewGraphicAnimationExt(int x, int y, int graphic, int mask_mode)
{
+#if 0
int delay = new_graphic_info[graphic].anim_delay;
int delay = new_graphic_info[graphic].anim_delay;
-#if 0
if (!(FrameCounter % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
#else
if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
if (!(FrameCounter % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
#else
if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
@@
-1500,7
+1500,7
@@
inline static int getGfxAction(int x, int y)
}
void DrawNewScreenElementExt(int x, int y, int dx, int dy, int element,
}
void DrawNewScreenElementExt(int x, int y, int dx, int dy, int element,
- int cut_mode, int mask_mode)
+
int cut_mode, int mask_mode)
{
int ux = LEVELX(x), uy = LEVELY(y);
int move_dir = MovDir[ux][uy];
{
int ux = LEVELX(x), uy = LEVELY(y);
int move_dir = MovDir[ux][uy];
@@
-1521,9
+1521,15
@@
void DrawNewScreenElementExt(int x, int y, int dx, int dy, int element,
if (left_stopped && right_stopped)
graphic = IMG_WALL;
else if (left_stopped)
if (left_stopped && right_stopped)
graphic = IMG_WALL;
else if (left_stopped)
+ {
graphic = IMG_WALL_GROWING_ACTIVE_RIGHT;
graphic = IMG_WALL_GROWING_ACTIVE_RIGHT;
+ frame = new_graphic_info[graphic].anim_frames - 1;
+ }
else if (right_stopped)
else if (right_stopped)
+ {
graphic = IMG_WALL_GROWING_ACTIVE_LEFT;
graphic = IMG_WALL_GROWING_ACTIVE_LEFT;
+ frame = new_graphic_info[graphic].anim_frames - 1;
+ }
}
#if 0
else if ((element == EL_ROCK ||
}
#if 0
else if ((element == EL_ROCK ||
@@
-2109,7
+2115,7
@@
void DrawLevel()
for(x=BX1; x<=BX2; x++)
for(y=BY1; y<=BY2; y++)
for(x=BX1; x<=BX2; x++)
for(y=BY1; y<=BY2; y++)
- DrawScreenField(x, y);
+ Draw
New
ScreenField(x, y);
redraw_mask |= REDRAW_FIELD;
}
redraw_mask |= REDRAW_FIELD;
}