games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Refactoring of main menu related code

Browse Source 
We need to make sure it's not stay active during gameplay.
Proper fix would require actually removing menu interface from GH, but then GH needs refactoring too.
This commit is contained in:
Arseniy Shestakov
2018-04-07 18:42:11 +07:00
parent 5c09f751b3
commit 4af288aee4
9 changed files with 27 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/CMT.cpp
View File

@@ -1225,7 +1225,6 @@ static void handleEvent(SDL_Event & ev)
case EUserEvent::RETURN_TO_MAIN_MENU:
{
CSH->endGameplay();
GH.curInt = CMainMenu::create();
GH.defActionsDef = 63;
}
break;
@@ -1237,7 +1236,6 @@ static void handleEvent(SDL_Event & ev)
case EUserEvent::CAMPAIGN_START_SCENARIO:
{
CSH->endGameplay();
GH.curInt = CMainMenu::create();
auto ourCampaign = std::shared_ptr<CCampaignState>(reinterpret_cast<CCampaignState *>(ev.user.data1));
auto & epilogue = ourCampaign->camp->scenarios[ourCampaign->mapsConquered.back()].epilog;
auto finisher = [=]()
@@ -1259,11 +1257,8 @@ static void handleEvent(SDL_Event & ev)
break;
case EUserEvent::RETURN_TO_MENU_LOAD:
CSH->endGameplay();
CMainMenu::create();
GH.defActionsDef = 63;
CMM->update();
CMM->menu->switchToTab(vstd::find_pos(CMM->menu->menuNameToEntry, "load"));
GH.curInt = CMM;
CMM->menu->switchToTab("load");
break;
case EUserEvent::FULLSCREEN_TOGGLED:
fullScreenChanged();