projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reduced minimum required screen frame rate at startup (for speed-up)
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index cc6bcdfc33e33cedb876ec0bd0cb63d3f821c5b1..2aa3b3458e28d98d216dded012f8ab491bb23e69 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-2446,7
+2446,7
@@
void DisplayGameControlValues()
/* redraw game control buttons */
RedrawGameButtons();
/* redraw game control buttons */
RedrawGameButtons();
-
game_status = GAME_MODE_PSEUDO_PANEL
;
+
SetGameStatus(GAME_MODE_PSEUDO_PANEL)
;
for (i = 0; i < NUM_GAME_PANEL_CONTROLS; i++)
{
for (i = 0; i < NUM_GAME_PANEL_CONTROLS; i++)
{
@@
-2574,7
+2574,7
@@
void DisplayGameControlValues()
redraw_mask |= REDRAW_DOOR_1;
}
redraw_mask |= REDRAW_DOOR_1;
}
-
game_status = GAME_MODE_PLAYING
;
+
SetGameStatus(GAME_MODE_PLAYING)
;
}
void UpdateAndDisplayGameControlValues()
}
void UpdateAndDisplayGameControlValues()
@@
-3097,7
+3097,7
@@
void InitGame()
// required here to update video display before fading (FIX THIS)
DrawMaskedBorder(REDRAW_DOOR_2);
// required here to update video display before fading (FIX THIS)
DrawMaskedBorder(REDRAW_DOOR_2);
-
game_status = GAME_MODE_PLAYING
;
+
SetGameStatus(GAME_MODE_PLAYING)
;
if (!game.restart_level)
CloseDoor(DOOR_CLOSE_1);
if (!game.restart_level)
CloseDoor(DOOR_CLOSE_1);
@@
-4422,7
+4422,7
@@
void GameEnd()
if (level_editor_test_game)
{
if (level_editor_test_game)
{
-
game_status = GAME_MODE_MAIN
;
+
SetGameStatus(GAME_MODE_MAIN)
;
DrawMainMenu();
DrawMainMenu();
@@
-4431,7
+4431,7
@@
void GameEnd()
if (!local_player->LevelSolved_SaveScore)
{
if (!local_player->LevelSolved_SaveScore)
{
-
game_status = GAME_MODE_MAIN
;
+
SetGameStatus(GAME_MODE_MAIN)
;
DrawMainMenu();
DrawMainMenu();
@@
-4450,7
+4450,7
@@
void GameEnd()
if ((hi_pos = NewHiScore()) >= 0)
{
if ((hi_pos = NewHiScore()) >= 0)
{
-
game_status = GAME_MODE_SCORES
;
+
SetGameStatus(GAME_MODE_SCORES)
;
DrawHallOfFame(hi_pos);
DrawHallOfFame(hi_pos);
@@
-4462,7
+4462,7
@@
void GameEnd()
}
else
{
}
else
{
-
game_status = GAME_MODE_MAIN
;
+
SetGameStatus(GAME_MODE_MAIN)
;
if (raise_level)
{
if (raise_level)
{
@@
-14470,7
+14470,7
@@
void RequestQuitGameExt(boolean skip_request, boolean quick_quit, char *message)
if (quick_quit)
FadeSkipNextFadeIn();
if (quick_quit)
FadeSkipNextFadeIn();
-
game_status = GAME_MODE_MAIN
;
+
SetGameStatus(GAME_MODE_MAIN)
;
DrawMainMenu();
}
DrawMainMenu();
}