projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030701-2-src
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index b29cb819122cbc032a244d5f96c1f78151120222..974765111a020583fdfddb12566c784b84a37c0a 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-70,7
+70,7
@@
void SetDrawtoField(int mode)
void RedrawPlayfield(boolean force_redraw, int x, int y, int width, int height)
{
void RedrawPlayfield(boolean force_redraw, int x, int y, int width, int height)
{
- if (game_status == PLAYING)
+ if (game_status ==
GAME_MODE_
PLAYING)
{
if (force_redraw)
{
{
if (force_redraw)
{
@@
-118,7
+118,7
@@
void BackToFront()
int x,y;
DrawBuffer *buffer = (drawto_field == window ? backbuffer : drawto_field);
int x,y;
DrawBuffer *buffer = (drawto_field == window ? backbuffer : drawto_field);
- if (setup.direct_draw && game_status == PLAYING)
+ if (setup.direct_draw && game_status ==
GAME_MODE_
PLAYING)
redraw_mask &= ~REDRAW_MAIN;
if (redraw_mask & REDRAW_TILES && redraw_tiles > REDRAWTILES_THRESHOLD)
redraw_mask &= ~REDRAW_MAIN;
if (redraw_mask & REDRAW_TILES && redraw_tiles > REDRAWTILES_THRESHOLD)
@@
-130,7
+130,7
@@
void BackToFront()
if (redraw_mask == REDRAW_NONE)
return;
if (redraw_mask == REDRAW_NONE)
return;
- if (global.fps_slowdown && game_status == PLAYING)
+ if (global.fps_slowdown && game_status ==
GAME_MODE_
PLAYING)
{
static boolean last_frame_skipped = FALSE;
boolean skip_even_when_not_scrolling = TRUE;
{
static boolean last_frame_skipped = FALSE;
boolean skip_even_when_not_scrolling = TRUE;
@@
-175,7
+175,8
@@
void BackToFront()
if (redraw_mask & REDRAW_FIELD)
{
if (redraw_mask & REDRAW_FIELD)
{
- if (game_status != PLAYING || redraw_mask & REDRAW_FROM_BACKBUFFER)
+ if (game_status != GAME_MODE_PLAYING ||
+ redraw_mask & REDRAW_FROM_BACKBUFFER)
{
BlitBitmap(backbuffer, window,
REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE, REAL_SX, REAL_SY);
{
BlitBitmap(backbuffer, window,
REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE, REAL_SX, REAL_SY);
@@
-388,7
+389,7
@@
void ClearWindow()
{
DrawBackground(REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
{
DrawBackground(REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
- if (setup.soft_scrolling && game_status == PLAYING)
+ if (setup.soft_scrolling && game_status ==
GAME_MODE_
PLAYING)
{
ClearRectangle(fieldbuffer, 0, 0, FXSIZE, FYSIZE);
SetDrawtoField(DRAW_BUFFERED);
{
ClearRectangle(fieldbuffer, 0, 0, FXSIZE, FYSIZE);
SetDrawtoField(DRAW_BUFFERED);
@@
-396,7
+397,7
@@
void ClearWindow()
else
SetDrawtoField(DRAW_BACKBUFFER);
else
SetDrawtoField(DRAW_BACKBUFFER);
- if (setup.direct_draw && game_status == PLAYING)
+ if (setup.direct_draw && game_status ==
GAME_MODE_
PLAYING)
{
ClearRectangle(window, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
SetDrawtoField(DRAW_DIRECT);
{
ClearRectangle(window, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
SetDrawtoField(DRAW_DIRECT);
@@
-482,7
+483,13
@@
void DrawLevelGraphicAnimation(int x, int y, int graphic)
void DrawLevelElementAnimation(int x, int y, int element)
{
void DrawLevelElementAnimation(int x, int y, int element)
{
+#if 1
+ int graphic = el_act_dir2img(element, GfxAction[x][y], MovDir[x][y]);
+
+ DrawGraphicAnimation(SCREENX(x), SCREENY(y), graphic);
+#else
DrawGraphicAnimation(SCREENX(x), SCREENY(y), el2img(element));
DrawGraphicAnimation(SCREENX(x), SCREENY(y), el2img(element));
+#endif
}
inline void DrawLevelGraphicAnimationIfNeeded(int x, int y, int graphic)
}
inline void DrawLevelGraphicAnimationIfNeeded(int x, int y, int graphic)
@@
-575,9
+582,9
@@
void DrawPlayer(struct PlayerInfo *player)
if (player_is_moving)
{
if (player_is_moving)
{
- if (
Store
[last_jx][last_jy] && IS_DRAWABLE(last_element))
+ if (
Back
[last_jx][last_jy] && IS_DRAWABLE(last_element))
{
{
- DrawLevelElement(last_jx, last_jy,
Store
[last_jx][last_jy]);
+ DrawLevelElement(last_jx, last_jy,
Back
[last_jx][last_jy]);
if (last_element == EL_DYNAMITE_ACTIVE ||
last_element == EL_SP_DISK_RED_ACTIVE)
if (last_element == EL_DYNAMITE_ACTIVE ||
last_element == EL_SP_DISK_RED_ACTIVE)
@@
-593,6
+600,9
@@
void DrawPlayer(struct PlayerInfo *player)
if (player->Pushing && IN_SCR_FIELD(SCREENX(next_jx), SCREENY(next_jy)))
{
if (player->Pushing && IN_SCR_FIELD(SCREENX(next_jx), SCREENY(next_jy)))
{
+#if 1
+ DrawLevelElement(next_jx, next_jy, EL_EMPTY);
+#else
if (player->GfxPos)
{
if (Feld[next_jx][next_jy] == EL_SOKOBAN_FIELD_FULL)
if (player->GfxPos)
{
if (Feld[next_jx][next_jy] == EL_SOKOBAN_FIELD_FULL)
@@
-602,6
+612,7
@@
void DrawPlayer(struct PlayerInfo *player)
}
else
DrawLevelField(next_jx, next_jy);
}
else
DrawLevelField(next_jx, next_jy);
+#endif
}
}
}
}
@@
-615,8
+626,8
@@
void DrawPlayer(struct PlayerInfo *player)
/* draw things behind the player, if needed */
/* ----------------------------------------------------------------------- */
/* draw things behind the player, if needed */
/* ----------------------------------------------------------------------- */
- if (
Store
[jx][jy])
- DrawLevelElement(jx, jy,
Store
[jx][jy]);
+ if (
Back
[jx][jy])
+ DrawLevelElement(jx, jy,
Back
[jx][jy]);
else if (IS_ACTIVE_BOMB(element))
DrawLevelElement(jx, jy, EL_EMPTY);
else
else if (IS_ACTIVE_BOMB(element))
DrawLevelElement(jx, jy, EL_EMPTY);
else
@@
-693,14
+704,28
@@
void DrawPlayer(struct PlayerInfo *player)
{
int px = SCREENX(next_jx), py = SCREENY(next_jy);
{
int px = SCREENX(next_jx), py = SCREENY(next_jy);
+ if (Back[next_jx][next_jy])
+ DrawLevelElement(next_jx, next_jy, Back[next_jx][next_jy]);
+
+#if 1
+ if ((sxx || syy) && element == EL_SOKOBAN_OBJECT)
+ DrawGraphicShiftedThruMask(px, py, sxx, syy, IMG_SOKOBAN_OBJECT, 0,
+ NO_CUTTING);
+#else
if ((sxx || syy) &&
(element == EL_SOKOBAN_FIELD_EMPTY ||
Feld[next_jx][next_jy] == EL_SOKOBAN_FIELD_FULL))
DrawGraphicShiftedThruMask(px, py, sxx, syy, IMG_SOKOBAN_OBJECT, 0,
NO_CUTTING);
if ((sxx || syy) &&
(element == EL_SOKOBAN_FIELD_EMPTY ||
Feld[next_jx][next_jy] == EL_SOKOBAN_FIELD_FULL))
DrawGraphicShiftedThruMask(px, py, sxx, syy, IMG_SOKOBAN_OBJECT, 0,
NO_CUTTING);
+#endif
else
{
else
{
+#if 1
+ int element = Feld[jx][jy];
+#else
int element = Feld[next_jx][next_jy];
int element = Feld[next_jx][next_jy];
+#endif
+
int graphic = el2img(element);
int frame = 0;
int graphic = el2img(element);
int frame = 0;
@@
-732,10
+757,14
@@
void DrawPlayer(struct PlayerInfo *player)
if (player_is_moving && last_element == EL_EXPLOSION)
{
if (player_is_moving && last_element == EL_EXPLOSION)
{
+#if 1
+ int graphic = el_act2img(GfxElement[last_jx][last_jy], ACTION_EXPLODING);
+#else
int stored = Store[last_jx][last_jy];
int graphic = (game.emulation != EMU_SUPAPLEX ? IMG_EXPLOSION :
stored == EL_SP_INFOTRON ? IMG_SP_EXPLOSION_INFOTRON :
IMG_SP_EXPLOSION);
int stored = Store[last_jx][last_jy];
int graphic = (game.emulation != EMU_SUPAPLEX ? IMG_EXPLOSION :
stored == EL_SP_INFOTRON ? IMG_SP_EXPLOSION_INFOTRON :
IMG_SP_EXPLOSION);
+#endif
int delay = (game.emulation == EMU_SUPAPLEX ? 3 : 2);
int phase = ExplodePhase[last_jx][last_jy] - 1;
int frame = getGraphicAnimationFrame(graphic, phase - delay);
int delay = (game.emulation == EMU_SUPAPLEX ? 3 : 2);
int phase = ExplodePhase[last_jx][last_jy] - 1;
int frame = getGraphicAnimationFrame(graphic, phase - delay);
@@
-745,16
+774,20
@@
void DrawPlayer(struct PlayerInfo *player)
}
/* ----------------------------------------------------------------------- */
}
/* ----------------------------------------------------------------------- */
- /* draw elements th
at stay over the player
*/
+ /* draw elements th
e player is just walking/passing through/under
*/
/* ----------------------------------------------------------------------- */
/* handle the field the player is leaving ... */
/* ----------------------------------------------------------------------- */
/* handle the field the player is leaving ... */
- if (player_is_moving && IS_
OVER_PLAYER
(last_element))
+ if (player_is_moving && IS_
ACCESSIBLE_INSIDE
(last_element))
DrawLevelField(last_jx, last_jy);
DrawLevelField(last_jx, last_jy);
+ else if (player_is_moving && IS_ACCESSIBLE_UNDER(last_element))
+ DrawLevelFieldThruMask(last_jx, last_jy);
/* ... and the field the player is entering */
/* ... and the field the player is entering */
- if (IS_
OVER_PLAYER
(element))
+ if (IS_
ACCESSIBLE_INSIDE
(element))
DrawLevelField(jx, jy);
DrawLevelField(jx, jy);
+ else if (IS_ACCESSIBLE_UNDER(element))
+ DrawLevelFieldThruMask(jx, jy);
if (setup.direct_draw)
{
if (setup.direct_draw)
{
@@
-779,13
+812,17
@@
void getGraphicSource(int graphic, int frame, Bitmap **bitmap, int *x, int *y)
if (g->offset_y == 0) /* frames are ordered horizontally */
{
if (g->offset_y == 0) /* frames are ordered horizontally */
{
- *x = g->src_x + (frame % g->anim_frames_per_line) * g->offset_x;
- *y = g->src_y + (frame / g->anim_frames_per_line) * g->height;
+ int max_width = g->anim_frames_per_line * g->width;
+
+ *x = (g->src_x + frame * g->offset_x) % max_width;
+ *y = g->src_y + (g->src_x + frame * g->offset_x) / max_width * g->height;
}
else if (g->offset_x == 0) /* frames are ordered vertically */
{
}
else if (g->offset_x == 0) /* frames are ordered vertically */
{
- *x = g->src_x + (frame / g->anim_frames_per_line) * g->width;
- *y = g->src_y + (frame % g->anim_frames_per_line) * g->offset_y;
+ int max_height = g->anim_frames_per_line * g->height;
+
+ *x = g->src_x + (g->src_y + frame * g->offset_y) / max_height * g->width;
+ *y = (g->src_y + frame * g->offset_y) % max_height;
}
else /* frames are ordered diagonally */
{
}
else /* frames are ordered diagonally */
{
@@
-916,11
+953,7
@@
void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int frame,
{
Bitmap *src_bitmap;
GC drawing_gc;
{
Bitmap *src_bitmap;
GC drawing_gc;
- int src_x;
- int src_y;
- int offset_x;
- int offset_y;
-
+ int src_x, src_y;
int width = TILEX, height = TILEY;
int cx = 0, cy = 0;
int dest_x, dest_y;
int width = TILEX, height = TILEY;
int cx = 0, cy = 0;
int dest_x, dest_y;
@@
-995,16
+1028,20
@@
void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int frame,
MarkTileDirty(x, y + SIGN(dy));
}
MarkTileDirty(x, y + SIGN(dy));
}
+#if 1
+ getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y);
+#else
src_bitmap = graphic_info[graphic].bitmap;
src_x = graphic_info[graphic].src_x;
src_y = graphic_info[graphic].src_y;
offset_x = graphic_info[graphic].offset_x;
offset_y = graphic_info[graphic].offset_y;
src_bitmap = graphic_info[graphic].bitmap;
src_x = graphic_info[graphic].src_x;
src_y = graphic_info[graphic].src_y;
offset_x = graphic_info[graphic].offset_x;
offset_y = graphic_info[graphic].offset_y;
- drawing_gc = src_bitmap->stored_clip_gc;
-
src_x += frame * offset_x;
src_y += frame * offset_y;
src_x += frame * offset_x;
src_y += frame * offset_y;
+#endif
+
+ drawing_gc = src_bitmap->stored_clip_gc;
src_x += cx;
src_y += cy;
src_x += cx;
src_y += cy;
@@
-1064,9
+1101,9
@@
void DrawScreenElementExt(int x, int y, int dx, int dy, int element,
{
boolean left_stopped = FALSE, right_stopped = FALSE;
{
boolean left_stopped = FALSE, right_stopped = FALSE;
- if (!IN_LEV_FIELD(lx - 1, ly) || IS_
MAUER
(Feld[lx - 1][ly]))
+ if (!IN_LEV_FIELD(lx - 1, ly) || IS_
WALL
(Feld[lx - 1][ly]))
left_stopped = TRUE;
left_stopped = TRUE;
- if (!IN_LEV_FIELD(lx + 1, ly) || IS_
MAUER
(Feld[lx + 1][ly]))
+ if (!IN_LEV_FIELD(lx + 1, ly) || IS_
WALL
(Feld[lx + 1][ly]))
right_stopped = TRUE;
if (left_stopped && right_stopped)
right_stopped = TRUE;
if (left_stopped && right_stopped)
@@
-1176,7
+1213,7
@@
static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame)
element = (GfxElement[x][y] != EL_UNDEFINED ? GfxElement[x][y] : Feld[x][y]);
/* crumble field itself */
element = (GfxElement[x][y] != EL_UNDEFINED ? GfxElement[x][y] : Feld[x][y]);
/* crumble field itself */
- if (CAN_BE_CRUMBLED(element))
+ if (CAN_BE_CRUMBLED(element)
&& !IS_MOVING(x, y)
)
{
if (!IN_SCR_FIELD(sx, sy))
return;
{
if (!IN_SCR_FIELD(sx, sy))
return;
@@
-1190,7
+1227,8
@@
static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame)
element = (IN_LEV_FIELD(xx, yy) ? Feld[xx][yy] : EL_STEELWALL);
element = (IN_LEV_FIELD(xx, yy) ? Feld[xx][yy] : EL_STEELWALL);
- if (CAN_BE_CRUMBLED(element)) /* neighbour is of same type */
+ /* check if neighbour field is of same type */
+ if (CAN_BE_CRUMBLED(element) && !IS_MOVING(xx, yy))
continue;
if (i == 1 || i == 2)
continue;
if (i == 1 || i == 2)
@@
-1227,7
+1265,8
@@
static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame)
if (!IN_LEV_FIELD(xx, yy) ||
!IN_SCR_FIELD(sxx, syy) ||
if (!IN_LEV_FIELD(xx, yy) ||
!IN_SCR_FIELD(sxx, syy) ||
- !CAN_BE_CRUMBLED(Feld[xx][yy]))
+ !CAN_BE_CRUMBLED(Feld[xx][yy]) ||
+ IS_MOVING(xx, yy))
continue;
if (i == 1 || i == 2)
continue;
if (i == 1 || i == 2)
@@
-1446,6
+1485,7
@@
void getMicroGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
int src_x = mini_startx + graphic_info[graphic].src_x / 8;
int src_y = mini_starty + graphic_info[graphic].src_y / 8;
int src_x = mini_startx + graphic_info[graphic].src_x / 8;
int src_y = mini_starty + graphic_info[graphic].src_y / 8;
+#if 0
if (src_x + MICRO_TILEX > src_bitmap->width ||
src_y + MICRO_TILEY > src_bitmap->height)
{
if (src_x + MICRO_TILEX > src_bitmap->width ||
src_y + MICRO_TILEY > src_bitmap->height)
{
@@
-1456,6
+1496,7
@@
void getMicroGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
src_x += (TILEX / 2 - MICRO_TILEX / 2);
src_y += (TILEY / 2 - MICRO_TILEY / 2);
}
src_x += (TILEX / 2 - MICRO_TILEX / 2);
src_y += (TILEY / 2 - MICRO_TILEY / 2);
}
+#endif
*bitmap = src_bitmap;
*x = src_x;
*bitmap = src_bitmap;
*x = src_x;
@@
-1580,7
+1621,8
@@
void DrawMicroLevel(int xpos, int ypos, boolean restart)
static int label_state, label_counter;
int last_game_status = game_status; /* save current game status */
static int label_state, label_counter;
int last_game_status = game_status; /* save current game status */
- game_status = PSEUDO_PREVIEW; /* force PREVIEW font on preview level */
+ /* force PREVIEW font on preview level */
+ game_status = GAME_MODE_PSEUDO_PREVIEW;
if (restart)
{
if (restart)
{
@@
-1703,7
+1745,7
@@
boolean Request(char *text, unsigned int req_state)
#if defined(PLATFORM_UNIX)
/* pause network game while waiting for request to answer */
if (options.network &&
#if defined(PLATFORM_UNIX)
/* pause network game while waiting for request to answer */
if (options.network &&
- game_status == PLAYING &&
+ game_status ==
GAME_MODE_
PLAYING &&
req_state & REQUEST_WAIT_FOR)
SendToServer_PausePlaying();
#endif
req_state & REQUEST_WAIT_FOR)
SendToServer_PausePlaying();
#endif
@@
-1724,7
+1766,8
@@
boolean Request(char *text, unsigned int req_state)
/* clear door drawing field */
DrawBackground(DX, DY, DXSIZE, DYSIZE);
/* clear door drawing field */
DrawBackground(DX, DY, DXSIZE, DYSIZE);
- game_status = PSEUDO_DOOR; /* force DOOR font on preview level */
+ /* force DOOR font on preview level */
+ game_status = GAME_MODE_PSEUDO_DOOR;
/* write text for request */
for(ty=0; ty < MAX_REQUEST_LINES; ty++)
/* write text for request */
for(ty=0; ty < MAX_REQUEST_LINES; ty++)
@@
-1796,7
+1839,7
@@
boolean Request(char *text, unsigned int req_state)
return FALSE;
}
return FALSE;
}
- if (game_status !=
MAINMENU
)
+ if (game_status !=
GAME_MODE_MAIN
)
InitAnimation();
button_status = MB_RELEASED;
InitAnimation();
button_status = MB_RELEASED;
@@
-1920,7
+1963,7
@@
boolean Request(char *text, unsigned int req_state)
Delay(10);
}
Delay(10);
}
- if (game_status !=
MAINMENU
)
+ if (game_status !=
GAME_MODE_MAIN
)
StopAnimation();
UnmapToolButtons();
StopAnimation();
UnmapToolButtons();
@@
-1945,7
+1988,7
@@
boolean Request(char *text, unsigned int req_state)
#if defined(PLATFORM_UNIX)
/* continue network game after request */
if (options.network &&
#if defined(PLATFORM_UNIX)
/* continue network game after request */
if (options.network &&
- game_status == PLAYING &&
+ game_status ==
GAME_MODE_
PLAYING &&
req_state & REQUEST_WAIT_FOR)
SendToServer_ContinuePlaying();
#endif
req_state & REQUEST_WAIT_FOR)
SendToServer_ContinuePlaying();
#endif
@@
-1999,8
+2042,8
@@
unsigned int MoveDoor(unsigned int door_state)
static int door1 = DOOR_OPEN_1;
static int door2 = DOOR_CLOSE_2;
static unsigned long door_delay = 0;
static int door1 = DOOR_OPEN_1;
static int door2 = DOOR_CLOSE_2;
static unsigned long door_delay = 0;
- int x, start, stepsize =
global.door_
step_offset;
- unsigned long door_delay_value =
global.door_
step_delay;
+ int x, start, stepsize =
door.
step_offset;
+ unsigned long door_delay_value =
door.
step_delay;
if (door_state == DOOR_GET_STATE)
return(door1 | door2);
if (door_state == DOOR_GET_STATE)
return(door1 | door2);
@@
-2138,7
+2181,7
@@
unsigned int MoveDoor(unsigned int door_state)
BackToFront();
BackToFront();
- if (game_status ==
MAINMENU
)
+ if (game_status ==
GAME_MODE_MAIN
)
DoAnimation();
}
}
DoAnimation();
}
}
@@
-2379,6
+2422,7
@@
int get_next_element(int element)
int el_act_dir2img(int element, int action, int direction)
{
int el_act_dir2img(int element, int action, int direction)
{
+ element = GFX_ELEMENT(element);
direction = MV_DIR_BIT(direction);
return element_info[element].direction_graphic[action][direction];
direction = MV_DIR_BIT(direction);
return element_info[element].direction_graphic[action][direction];
@@
-2386,25
+2430,35
@@
int el_act_dir2img(int element, int action, int direction)
int el_act2img(int element, int action)
{
int el_act2img(int element, int action)
{
+ element = GFX_ELEMENT(element);
+
return element_info[element].graphic[action];
}
int el_dir2img(int element, int direction)
{
return element_info[element].graphic[action];
}
int el_dir2img(int element, int direction)
{
+ element = GFX_ELEMENT(element);
+
return el_act_dir2img(element, ACTION_DEFAULT, direction);
}
int el2img(int element)
{
return el_act_dir2img(element, ACTION_DEFAULT, direction);
}
int el2img(int element)
{
+ element = GFX_ELEMENT(element);
+
return element_info[element].graphic[ACTION_DEFAULT];
}
int el2edimg(int element)
{
return element_info[element].graphic[ACTION_DEFAULT];
}
int el2edimg(int element)
{
+ element = GFX_ELEMENT(element);
+
return element_info[element].special_graphic[GFX_SPECIAL_ARG_EDITOR];
}
int el2preimg(int element)
{
return element_info[element].special_graphic[GFX_SPECIAL_ARG_EDITOR];
}
int el2preimg(int element)
{
+ element = GFX_ELEMENT(element);
+
return element_info[element].special_graphic[GFX_SPECIAL_ARG_PREVIEW];
}
return element_info[element].special_graphic[GFX_SPECIAL_ARG_PREVIEW];
}