Mercurial > mm7

comparison Engine/Engine.cpp @ 2552:ac16f4a3a91e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Load from MainMenu logic separated from MainMenu window
author a.parshin
date Wed, 13 May 2015 01:33:20 +0200
parents 4008b2f34be0
children 48708da03b7f
comparison
equal deleted inserted replaced
2551:4008b2f34be0 2552:ac16f4a3a91e
1809 MMT_MainMenu_Loop(); 1809 MMT_MainMenu_Loop();
1810 1810
1811 Log::Warning(L"MM: entering main loop"); 1811 Log::Warning(L"MM: entering main loop");
1812 while (1) 1812 while (1)
1813 { 1813 {
1814 MainMenuWindow *main_menu_window = MainMenuWindow::Create(); 1814 //MainMenuWindow *main_menu_window = MainMenuWindow::Create();
1815 window->AddControl(main_menu_window); 1815 //window->AddControl(main_menu_window);
1816 MainMenu_Loop(); 1816 MainMenu_Loop();
1817 uGameState = GAME_STATE_PLAYING; 1817 uGameState = GAME_STATE_PLAYING;
1818 while (1) 1818 while (1)
1819 { 1819 {
1820 if (uGameState == GAME_FINISHED || GetCurrentMenuID() == MENU_EXIT_GAME) 1820 if (uGameState == GAME_FINISHED || GetCurrentMenuID() == MENU_EXIT_GAME)