projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup of some common and specific game engine function calls
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index 4cf1c874b3a8ca3a00c59ab75a24d21b3e0ec460..2bfae3c978c65ebf24d7dd2058ffdfb0656175de 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
@@
-420,6
+415,8
@@
void BlitScreenToBitmap(Bitmap *target_bitmap)
BlitScreenToBitmap_SP(target_bitmap);
else if (level.game_engine_type == GAME_ENGINE_TYPE_RND)
BlitScreenToBitmap_RND(target_bitmap);
BlitScreenToBitmap_SP(target_bitmap);
else if (level.game_engine_type == GAME_ENGINE_TYPE_RND)
BlitScreenToBitmap_RND(target_bitmap);
+
+ redraw_mask |= REDRAW_FIELD;
}
void BackToFront_OLD()
}
void BackToFront_OLD()
@@
-859,7
+856,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)
@@
-2320,7
+2319,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 */