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

Merge branch 'develop' into extended_statistic

Browse Source
This commit is contained in:
Laserlicht
2024-08-13 00:49:51 +02:00
committed by GitHub
parent 1980f56668 812f8d993b
commit 9e9a6f1c5f
151 changed files with 1062 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/CServerHandler.cpp
View File

@@ -688,7 +688,6 @@ void CServerHandler::showHighScoresAndEndGameplay(PlayerColor player, bool victo
scenarioHighScores.isCampaign = false;
endGameplay();
GH.defActionsDef = 63;
CMM->menu->switchToTab("main");
GH.windows().createAndPushWindow<CHighScoreInputScreen>(victory, scenarioHighScores, statistic);
}
@@ -919,7 +918,6 @@ void CServerHandler::onDisconnected(const std::shared_ptr<INetworkConnection> &
if(client)
{
endGameplay();
GH.defActionsDef = 63;
CMM->menu->switchToTab("main");
showServerError(CGI->generaltexth->translate("vcmi.server.errors.disconnected"));
}