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 feature/nullkiller2

Browse Source
This commit is contained in:
Mircea TheHonestCTO
2025-11-15 17:15:46 +01:00
parent 00c93c7b6a 81db5c7cf4
commit 0ee10c9213
151 changed files with 17411 additions and 9818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/NetPacksClient.cpp
View File

@@ -15,6 +15,7 @@
#include "windows/GUIClasses.h"
#include "windows/CCastleInterface.h"
#include "mapView/mapHandler.h"
#include "mainmenu/CMainMenu.h"
#include "adventureMap/AdventureMapInterface.h"
#include "adventureMap/CInGameConsole.h"
#include "battle/BattleInterface.h"
@@ -400,7 +401,7 @@ void ApplyClientNetPackVisitor::visitPlayerEndsGame(PlayerEndsGame & pack)
bool localHumanWinsGame = vstd::contains(cl.playerint, pack.player) && cl.gameInfo().getPlayerState(pack.player)->human && pack.victoryLossCheckResult.victory();
bool lastHumanEndsGame = GAME->server().howManyPlayerInterfaces() == 1 && vstd::contains(cl.playerint, pack.player) && cl.gameInfo().getPlayerState(pack.player)->human && !settings["session"]["spectate"].Bool();
if(lastHumanEndsGame || localHumanWinsGame)
if(lastHumanEndsGame || localHumanWinsGame || pack.silentEnd)
{
assert(adventureInt);
if(adventureInt)
@@ -409,7 +410,13 @@ void ApplyClientNetPackVisitor::visitPlayerEndsGame(PlayerEndsGame & pack)
adventureInt.reset();
}
GAME->server().showHighScoresAndEndGameplay(pack.player, pack.victoryLossCheckResult.victory(), pack.statistic);
if(!pack.silentEnd)
GAME->server().showHighScoresAndEndGameplay(pack.player, pack.victoryLossCheckResult.victory(), pack.statistic);
else
{
GAME->server().endGameplay();
GAME->mainmenu()->menu->switchToTab("main");
}
}
// In auto testing pack.mode we always close client if red pack.player won or lose