projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added storing last game mode when setting new game mode
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 6ece1110727fd797d8743884607b9a33c298c6d7..a4dca87a5fb8ae6e5ada6a16496f7d94db3346a1 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-1452,8
+1452,6
@@
void DrawMainMenu()
if (CheckTitleScreen(levelset_has_changed))
{
if (CheckTitleScreen(levelset_has_changed))
{
- game_status_last_screen = GAME_MODE_MAIN;
-
SetGameStatus(GAME_MODE_TITLE);
DrawTitleScreen();
SetGameStatus(GAME_MODE_TITLE);
DrawTitleScreen();
@@
-1602,6
+1600,9
@@
void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
/* switch game mode from title screen mode back to info screen mode */
SetGameStatus(GAME_MODE_INFO);
/* switch game mode from title screen mode back to info screen mode */
SetGameStatus(GAME_MODE_INFO);
+ /* store that last screen was info screen, not main menu screen */
+ game_status_last_screen = GAME_MODE_INFO;
+
DrawInfoScreen_NotAvailable("Title screen information:",
"No title screen for this level set.");
return;
DrawInfoScreen_NotAvailable("Title screen information:",
"No title screen for this level set.");
return;
@@
-2678,8
+2679,6
@@
void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos)
void DrawInfoScreen_TitleScreen()
{
void DrawInfoScreen_TitleScreen()
{
- game_status_last_screen = GAME_MODE_INFO;
-
SetGameStatus(GAME_MODE_TITLE);
DrawTitleScreen();
SetGameStatus(GAME_MODE_TITLE);
DrawTitleScreen();