Mercurial > mm7

diff Engine/Engine.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 b8a56afc6ba1
children f9bdfe26d03d
line wrap: on
line diff
--- a/Engine/Engine.cpp	Sun May 17 22:42:13 2015 +0600
+++ b/Engine/Engine.cpp	Tue May 19 22:00:56 2015 +0200
@@ -1825,6 +1825,11 @@
             else if (GetCurrentMenuID() == MENU_SAVELOAD)
             {
                 MainMenuLoad_Loop();
+                if (GetCurrentMenuID() == MENU_LoadingProcInMainMenu)
+                {
+                    uGameState = GAME_STATE_PLAYING;
+                    Game_Loop();
+                }
                 break;
             }
             else if (GetCurrentMenuID() == MENU_NEWGAME)