Mercurial > mm7

comparison 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
comparison
equal deleted inserted replaced
2562:b8a56afc6ba1 2563:65c97624c047
1823 return true; 1823 return true;
1824 } 1824 }
1825 else if (GetCurrentMenuID() == MENU_SAVELOAD) 1825 else if (GetCurrentMenuID() == MENU_SAVELOAD)
1826 { 1826 {
1827 MainMenuLoad_Loop(); 1827 MainMenuLoad_Loop();
1828 if (GetCurrentMenuID() == MENU_LoadingProcInMainMenu)
1829 {
1830 uGameState = GAME_STATE_PLAYING;
1831 Game_Loop();
1832 }
1828 break; 1833 break;
1829 } 1834 }
1830 else if (GetCurrentMenuID() == MENU_NEWGAME) 1835 else if (GetCurrentMenuID() == MENU_NEWGAME)
1831 { 1836 {
1832 if (!CreateParty_Loop()) 1837 if (!CreateParty_Loop())