projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug in counter wait function
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index 61b4c4cb420347554d384de6c1687b92ea40162d..95bc7a45ac7bbdc8a83c1e6267b8314f43c446b4 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-334,11
+334,6
@@
void DrawMaskedBorder(int redraw_mask)
effectiveGameStatus() == GAME_MODE_TITLE)
return;
effectiveGameStatus() == GAME_MODE_TITLE)
return;
- /* never draw masked screen borders when displaying request outside door */
- if (effectiveGameStatus() == GAME_MODE_PSEUDO_DOOR &&
- global.use_envelope_request)
- return;
-
if (redraw_mask & REDRAW_ALL)
DrawMaskedBorder_ALL();
else
if (redraw_mask & REDRAW_ALL)
DrawMaskedBorder_ALL();
else
@@
-356,7
+351,6
@@
void DrawMaskedBorder(int redraw_mask)
void BlitScreenToBitmap_RND(Bitmap *target_bitmap)
{
void BlitScreenToBitmap_RND(Bitmap *target_bitmap)
{
- DrawBuffer *buffer = (drawto_field == window ? backbuffer : drawto_field);
int fx = FX, fy = FY;
int full_lev_fieldx = lev_fieldx + (BorderElement != EL_EMPTY ? 2 : 0);
int full_lev_fieldy = lev_fieldy + (BorderElement != EL_EMPTY ? 2 : 0);
int fx = FX, fy = FY;
int full_lev_fieldx = lev_fieldx + (BorderElement != EL_EMPTY ? 2 : 0);
int full_lev_fieldy = lev_fieldy + (BorderElement != EL_EMPTY ? 2 : 0);
@@
-410,7
+404,7
@@
void BlitScreenToBitmap_RND(Bitmap *target_bitmap)
fy = 2 * TILEY_VAR - (EVEN(lev_fieldy) ? TILEY_VAR / 2 : 0);
}
fy = 2 * TILEY_VAR - (EVEN(lev_fieldy) ? TILEY_VAR / 2 : 0);
}
- BlitBitmap(
buffer
, target_bitmap, fx, fy, SXSIZE, SYSIZE, SX, SY);
+ BlitBitmap(
drawto_field
, target_bitmap, fx, fy, SXSIZE, SYSIZE, SX, SY);
}
void BlitScreenToBitmap(Bitmap *target_bitmap)
}
void BlitScreenToBitmap(Bitmap *target_bitmap)
@@
-860,7
+854,9
@@
void ClearField()
SetDrawtoField(DRAW_FIELDBUFFER);
}
else
SetDrawtoField(DRAW_FIELDBUFFER);
}
else
+ {
SetDrawtoField(DRAW_BACKBUFFER);
SetDrawtoField(DRAW_BACKBUFFER);
+ }
}
void MarkTileDirty(int x, int y)
}
void MarkTileDirty(int x, int y)
@@
-2321,7
+2317,6
@@
void AnimateEnvelopeRequest(int anim_mode, int action)
}
}
}
}
-
void ShowEnvelopeRequest(char *text, unsigned int req_state, int action)
{
int last_game_status = game_status; /* save current game status */
void ShowEnvelopeRequest(char *text, unsigned int req_state, int action)
{
int last_game_status = game_status; /* save current game status */