From 3621b05682d160e147d618c5a9f1bc6ec06a78f7 Mon Sep 17 00:00:00 2001 From: nordsoft Date: Fri, 30 Sep 2022 18:28:17 +0400 Subject: [PATCH] Rename variable --- client/Client.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/client/Client.cpp b/client/Client.cpp index 65efe2dac..34b9b0a13 100644 --- a/client/Client.cpp +++ b/client/Client.cpp @@ -180,14 +180,14 @@ events::EventBus * CClient::eventBus() const return clientEventBus.get(); } -void CClient::newGame(CGameState * gameState) +void CClient::newGame(CGameState * initializedGameState) { CSH->th->update(); CMapService mapService; - gs = gameState ? gameState : new CGameState(); + gs = initializedGameState ? initializedGameState : new CGameState(); gs->preInit(VLC); logNetwork->trace("\tCreating gamestate: %i", CSH->th->getDiff()); - if(!gameState) + if(!initializedGameState) gs->init(&mapService, CSH->si.get(), settings["general"]["saveRandomMaps"].Bool()); logNetwork->trace("Initializing GameState (together): %d ms", CSH->th->getDiff()); @@ -197,14 +197,14 @@ void CClient::newGame(CGameState * gameState) initPlayerInterfaces(); } -void CClient::loadGame(CGameState * gameState) +void CClient::loadGame(CGameState * initializedGameState) { logNetwork->info("Loading procedure started!"); - if(gameState) + if(initializedGameState) { logNetwork->info("Game state was transferred over network, loading."); - gs = gameState; + gs = initializedGameState; } else {