games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-07 00:58:39 +02:00
Code Issues Releases Activity

Merge pull request #1 from vcmi/develop

Browse Source 
Update branch
This commit is contained in:
George King
2025-03-19 09:45:29 +01:00
committed by GitHub
parent 02bae5ef21 8e1bd64799
commit 4a0d8a2015
81 changed files with 690 additions and 980 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/mainmenu/CMainMenu.cpp
View File

@ -64,14 +64,6 @@
ISelectionScreenInfo * SEL = nullptr;
static void do_quit()
{
ENGINE->dispatchMainThread([]()
{
handleQuit(false);
});
}
CMenuScreen::CMenuScreen(const JsonNode & configNode)
: CWindowObject(BORDERED), config(configNode)
{
@ -210,7 +202,7 @@ static std::function<void()> genCommand(CMenuScreen * menu, std::vector<std::str
break;
case 4: //exit
{
return []() { CInfoWindow::showYesNoDialog(LIBRARY->generaltexth->allTexts[69], std::vector<std::shared_ptr<CComponent>>(), do_quit, 0, PlayerColor(1)); };
return []() { CInfoWindow::showYesNoDialog(LIBRARY->generaltexth->allTexts[69], std::vector<std::shared_ptr<CComponent>>(), [](){GAME->onShutdownRequested(false);}, 0, PlayerColor(1)); };
}
break;
case 5: //highscores