projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup of game mode handling
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index 84e79b3a3c5088834a09a6e741b3b5553053c737..7e8806e54f67fd3e2e9055f631bee2229863b15b 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-330,8
+330,8
@@
void DrawMaskedBorder_ALL()
void DrawMaskedBorder(int redraw_mask)
{
/* never draw masked screen borders on borderless screens */
void DrawMaskedBorder(int redraw_mask)
{
/* never draw masked screen borders on borderless screens */
- if (
effectiveGameStatus()
== GAME_MODE_LOADING ||
-
effectiveGameStatus()
== GAME_MODE_TITLE)
+ if (
game_status
== GAME_MODE_LOADING ||
+
game_status
== GAME_MODE_TITLE)
return;
if (redraw_mask & REDRAW_ALL)
return;
if (redraw_mask & REDRAW_ALL)
@@
-826,6
+826,10
@@
boolean CheckIfGlobalBorderRedrawIsNeeded()
if (game_status == game_status_last)
return FALSE;
if (game_status == game_status_last)
return FALSE;
+ // redraw if last screen was title screen
+ if (game_status_last == GAME_MODE_TITLE)
+ return TRUE;
+
// redraw if global screen border has changed
if (CheckIfGlobalBorderHasChanged())
return TRUE;
// redraw if global screen border has changed
if (CheckIfGlobalBorderHasChanged())
return TRUE;