Mercurial > mm7

diff Game/Game.cpp @ 2563:65c97624c047

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Saving & loading works from both main menu and game
author a.parshin
date Tue, 19 May 2015 22:00:56 +0200
parents f2a8ed07e921
children 30eb6dcac768
line wrap: on
line diff
--- a/Game/Game.cpp	Sun May 17 22:42:13 2015 +0600
+++ b/Game/Game.cpp	Tue May 19 22:00:56 2015 +0200
@@ -2755,7 +2755,11 @@
                 uGameState = GAME_STATE_PLAYING;
                 continue;
             }
-            if ((signed int)uGameState <= GAME_STATE_5 || uGameState == GAME_STATE_GAME_QUITTING_TO_MAIN_MENU)//GAME_STATE_NEWGAME_OUT_GAMEMENU, GAME_STATE_LOADING_GAME
+            //if ((signed int)uGameState <= GAME_STATE_5 || uGameState == GAME_STATE_GAME_QUITTING_TO_MAIN_MENU)//GAME_STATE_NEWGAME_OUT_GAMEMENU, GAME_STATE_LOADING_GAME
+            if (uGameState == GAME_STATE_LOADING_GAME
+                || uGameState == GAME_STATE_NEWGAME_OUT_GAMEMENU
+                || uGameState == GAME_STATE_5
+                || uGameState == GAME_STATE_GAME_QUITTING_TO_MAIN_MENU)
             {
                 game_finished = true;
                 continue;