From adc5f329f05cb1ba5bb3bab0aff55cebc68a3013 Mon Sep 17 00:00:00 2001 From: devZoGok Date: Sun, 8 Mar 2026 11:40:18 +0200 Subject: [PATCH] bugfix unpausing crashes --- activeGameState.cpp | 5 +++-- game.cpp | 5 ++--- game.h | 2 +- inGameAppState.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/activeGameState.cpp b/activeGameState.cpp index e652b40..4d26463 100755 --- a/activeGameState.cpp +++ b/activeGameState.cpp @@ -478,14 +478,15 @@ namespace battleship{ void ActiveGameState::renderUnits() { vector friendlyUnits = mainPlayer->getFriendlyUnits(); + Game *game = Game::getSingleton(); - for (Player *p : Game::getSingleton()->getPlayers(true)){ + for (Player *p : game->getPlayers(true)){ vector units = p->getUnits(); for (Unit *u : units) { if(u->isVehicle() && ((Vehicle*)u)->getGarrisonable()) continue; - bool unitVisible = mainPlayer->isObjectVisible((GameObject*)u, friendlyUnits); + bool unitVisible = (game->isDebug() || mainPlayer->isObjectVisible((GameObject*)u, friendlyUnits)); u->getModel()->setVisible(unitVisible); } } diff --git a/game.cpp b/game.cpp index a99ab19..10715c1 100644 --- a/game.cpp +++ b/game.cpp @@ -75,15 +75,14 @@ namespace battleship{ FxManager::getSingleton()->update(); } - void Game::initLuaPlayers(bool resetBehaviour){ + void Game::initLuaPlayers(){ sol::state_view SOL_LUA_VIEW = generateView(); vector cpuPlayers = getCpuPlayers(); for(int i = 0; i < cpuPlayers.size(); i++) SOL_LUA_VIEW["game"]["cpuPlayers"][i + 1] = cpuPlayers[i]; - if(resetBehaviour) - SOL_LUA_VIEW.script_file(GameManager::getSingleton()->getPath() + "Scripts/Core/playerInit.lua"); + SOL_LUA_VIEW.script_file(GameManager::getSingleton()->getPath() + "Scripts/Core/playerInit.lua"); } void Game::removeAllElements(){ diff --git a/game.h b/game.h index 19ffbff..1661f3f 100644 --- a/game.h +++ b/game.h @@ -20,7 +20,7 @@ namespace battleship{ public: static Game* getSingleton(); void update(); - void initLuaPlayers(bool = false); + void initLuaPlayers(); void togglePause(); void removeAllElements(); void initTechnologies(); diff --git a/inGameAppState.cpp b/inGameAppState.cpp index 281b147..23b23de 100755 --- a/inGameAppState.cpp +++ b/inGameAppState.cpp @@ -74,8 +74,8 @@ namespace battleship{ activeState = new ActiveGameState(guiState, playerId); stateManager->attachAppState(activeState); - Game::getSingleton()->initLuaPlayers(true); - Map::Minimap::getSingleton()->updateImage(); + Game::getSingleton()->initLuaPlayers(); + //Map::Minimap::getSingleton()->updateImage(); } void InGameAppState::onDettached() {