games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-31 22:05:10 +02:00
Code Issues Releases Activity

Rename variable

Browse Source
This commit is contained in:
nordsoft 2022-09-30 18:28:17 +04:00
parent 8a8716ce8a
commit 3621b05682
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/Client.cpp
View File

@ -180,14 +180,14 @@ events::EventBus * CClient::eventBus() const
return clientEventBus.get(); return clientEventBus.get();
} }
void CClient::newGame(CGameState * gameState) void CClient::newGame(CGameState * initializedGameState)
{ {
CSH->th->update(); CSH->th->update();
CMapService mapService; CMapService mapService;
gs = gameState ? gameState : new CGameState(); gs = initializedGameState ? initializedGameState : new CGameState();
gs->preInit(VLC); gs->preInit(VLC);
logNetwork->trace("\tCreating gamestate: %i", CSH->th->getDiff()); logNetwork->trace("\tCreating gamestate: %i", CSH->th->getDiff());
if(!gameState) if(!initializedGameState)
gs->init(&mapService, CSH->si.get(), settings["general"]["saveRandomMaps"].Bool()); gs->init(&mapService, CSH->si.get(), settings["general"]["saveRandomMaps"].Bool());
logNetwork->trace("Initializing GameState (together): %d ms", CSH->th->getDiff()); logNetwork->trace("Initializing GameState (together): %d ms", CSH->th->getDiff());
@ -197,14 +197,14 @@ void CClient::newGame(CGameState * gameState)
initPlayerInterfaces(); initPlayerInterfaces();
} }
void CClient::loadGame(CGameState * gameState) void CClient::loadGame(CGameState * initializedGameState)
{ {
logNetwork->info("Loading procedure started!"); logNetwork->info("Loading procedure started!");
if(gameState) if(initializedGameState)
{ {
logNetwork->info("Game state was transferred over network, loading."); logNetwork->info("Game state was transferred over network, loading.");
gs = gameState; gs = initializedGameState;
} }
else else
{ {