projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20040430-1-src
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index 26ec6c22bf8f801bbba920c036e588cc5475c467..7e8b6921a4769e86e197e2f6fc37e1265ff2147f 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-302,10
+302,10
@@
void BackToFront()
if (redraw_mask & REDRAW_TILES)
{
for (x = 0; x < SCR_FIELDX; x++)
if (redraw_mask & REDRAW_TILES)
{
for (x = 0; x < SCR_FIELDX; x++)
- for (y =0 ; y < SCR_FIELDY; y++)
+ for (y =
0 ; y < SCR_FIELDY; y++)
if (redraw[redraw_x1 + x][redraw_y1 + y])
BlitBitmap(buffer, window,
if (redraw[redraw_x1 + x][redraw_y1 + y])
BlitBitmap(buffer, window,
- FX + x * TILEX, F
X
+ y * TILEY, TILEX, TILEY,
+ FX + x * TILEX, F
Y
+ y * TILEY, TILEX, TILEY,
SX + x * TILEX, SY + y * TILEY);
}
SX + x * TILEX, SY + y * TILEY);
}
@@
-878,7
+878,9
@@
void DrawPlayer(struct PlayerInfo *player)
else if (player_is_moving && IS_ACCESSIBLE_UNDER(last_element))
DrawLevelFieldThruMask(last_jx, last_jy);
else if (player_is_moving && IS_ACCESSIBLE_UNDER(last_element))
DrawLevelFieldThruMask(last_jx, last_jy);
-#if 1
+#if 0
+ /* !!! I have forgotton what this should be good for !!! */
+ /* !!! causes player being visible when pushing from within tubes !!! */
if (!player->is_pushing)
#endif
{
if (!player->is_pushing)
#endif
{
@@
-2070,7
+2072,7
@@
boolean Request(char *text, unsigned int req_state)
SetMouseCursor(CURSOR_DEFAULT);
#endif
SetMouseCursor(CURSOR_DEFAULT);
#endif
-#if defined(
PLATFORM_UNIX
)
+#if defined(
NETWORK_AVALIABLE
)
/* pause network game while waiting for request to answer */
if (options.network &&
game_status == GAME_MODE_PLAYING &&
/* pause network game while waiting for request to answer */
if (options.network &&
game_status == GAME_MODE_PLAYING &&
@@
-2311,8
+2313,8
@@
boolean Request(char *text, unsigned int req_state)
if (!(req_state & REQ_STAY_CLOSED) && (old_door_state & DOOR_OPEN_1))
{
BlitBitmap(bitmap_db_door, bitmap_db_door,
if (!(req_state & REQ_STAY_CLOSED) && (old_door_state & DOOR_OPEN_1))
{
BlitBitmap(bitmap_db_door, bitmap_db_door,
- DOOR_GFX_PAGEX2,
DOOR_GFX_PAGEY1, DXSIZE,
DYSIZE,
- DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY1);
+ DOOR_GFX_PAGEX2,
DOOR_GFX_PAGEY1, DXSIZE,
DYSIZE,
+ DOOR_GFX_PAGEX1,
DOOR_GFX_PAGEY1);
OpenDoor(DOOR_OPEN_1);
}
}
OpenDoor(DOOR_OPEN_1);
}
}
@@
-2321,7
+2323,7
@@
boolean Request(char *text, unsigned int req_state)
SetDrawBackgroundMask(REDRAW_FIELD);
SetDrawBackgroundMask(REDRAW_FIELD);
-#if defined(
PLATFORM_UNIX
)
+#if defined(
NETWORK_AVALIABLE
)
/* continue network game after request */
if (options.network &&
game_status == GAME_MODE_PLAYING &&
/* continue network game after request */
if (options.network &&
game_status == GAME_MODE_PLAYING &&