bugfix for crashing when toggling pause

This commit is contained in:
devZoGok
2026-06-16 20:12:10 +03:00
parent 8be00aac10
commit deac9d0fcb
2 changed files with 6 additions and 3 deletions
+3 -2
View File
@@ -212,9 +212,10 @@ namespace battleship{
}
void Map::Minimap::update(){
if(!GameManager::getSingleton()->getStateManager()->getAppStateByType(AppStateType::ACTIVE_STATE)) return;
Button *mb = ConcreteGuiManager::getSingleton()->getButton("minimap");
if(!(GameManager::getSingleton()->getStateManager()->getAppStateByType(AppStateType::ACTIVE_STATE) && mb)) return;
updateCamFrame(mb);
}
+3 -1
View File
@@ -49,8 +49,10 @@ namespace battleship{
void ResearchButton::update(){
Button::update();
ActiveGameState *activeState = (ActiveGameState*)(GameManager::getSingleton()->getStateManager()->getAppStateByType((int)AppStateType::ACTIVE_STATE));
if(!activeState) return;
vector<int> technologies = activeState->getPlayer()->getTechnologies();
bool hasTech = (find(technologies.begin(), technologies.end(), techId) != technologies.end());