games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +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

24
client/mainmenu/CMainMenu.cpp
View File

@@ -101,7 +101,7 @@ CMenuScreen::CMenuScreen(const JsonNode & configNode)
std::shared_ptr<CIntObject> CMenuScreen::createTab(size_t index)
{
if(config["items"].Vector().size() == index)
return std::make_shared<CreditsScreen>();
return std::make_shared<CreditsScreen>(this->pos);
else
return std::make_shared<CMenuEntry>(this, config["items"].Vector()[index]);
}
@@ -134,6 +134,11 @@ void CMenuScreen::switchToTab(size_t index)
tabs->setActive(index);
}
void CMenuScreen::switchToTab(std::string name)
{
switchToTab(vstd::find_pos(menuNameToEntry, name));
}
//funciton for std::string -> std::function conversion for main menu
static std::function<void()> genCommand(CMenuScreen * menu, std::vector<std::string> menuType, const std::string & string)
{
@@ -156,7 +161,7 @@ static std::function<void()> genCommand(CMenuScreen * menu, std::vector<std::str
{
size_t index2 = std::find(menuType.begin(), menuType.end(), commands.front()) - menuType.begin();
if(index2 != menuType.size())
return std::bind(&CMenuScreen::switchToTab, menu, index2);
return std::bind((void(CMenuScreen::*)(size_t))&CMenuScreen::switchToTab, menu, index2);
break;
}
case 1: //open campaign selection window
@@ -354,21 +359,6 @@ CMainMenu * CMainMenu::create()
return CMM;
}
void CMainMenu::removeFromGui()
{
//remove everything but main menu and background
GH.popInts(GH.listInt.size() - 2);
GH.popInt(GH.topInt()); //remove main menu
GH.popInt(GH.topInt()); //remove background
}
void CMainMenu::showLoadingScreen(std::function<void()> loader)
{
if(GH.listInt.size() && GH.listInt.front() == CMM)
CMM->removeFromGui();
GH.pushInt(new CLoadingScreen(loader));
}
std::shared_ptr<CPicture> CMainMenu::createPicture(const JsonNode & config)
{
return std::make_shared<CPicture>(config["name"].String(), config["x"].Float(), config["y"].Float());