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

CGameHandler no longer inherits CGameInfoCallback, reduce direct access

Browse Source 
to gamestate
This commit is contained in:
Ivan Savenko
2025-05-20 19:01:25 +03:00
parent 25e57542be
commit 8255a4b9ae
30 changed files with 271 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/NetPacksLobbyServer.cpp
View File

@@ -19,6 +19,7 @@
#include "../lib/campaign/CampaignState.h"
#include "../lib/entities/faction/CTownHandler.h"
#include "../lib/entities/faction/CFaction.h"
#include "../lib/gameState/CGameState.h"
#include "../lib/serializer/Connection.h"
#include "../lib/mapping/CMapInfo.h"
#include "../lib/mapping/CMapHeader.h"
@@ -225,7 +226,7 @@ void ApplyOnServerNetPackVisitor::visitLobbyStartGame(LobbyStartGame & pack)
return;
}
pack.initializedStartInfo = std::make_shared<StartInfo>(*srv.gh->getInitialStartInfo());
pack.initializedStartInfo = std::make_shared<StartInfo>(*srv.gh->gameState().getInitialStartInfo());
pack.initializedGameState = srv.gh->gs;
result = true;
}
@@ -240,7 +241,7 @@ void ApplyOnServerAfterAnnounceNetPackVisitor::visitLobbyStartGame(LobbyStartGam
{
if(connection->connectionID == pack.clientId)
{
connection->enterGameplayConnectionMode(srv.gh->gameState());
connection->setCallback(&srv.gh->gameInfo());
srv.reconnectPlayer(pack.clientId);
}
}