salmon-engine-projects/space-game001
14
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing stupid bug

Browse Source
This commit is contained in:
Vladislav Khorev 2026-03-10 22:09:07 +03:00
parent a4d5017270
commit ca98fea2bd
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/Space.cpp
View File

@ -273,28 +273,6 @@ namespace ZL
Environment::zoom = DEFAULT_ZOOM; Environment::zoom = DEFAULT_ZOOM;
Environment::tapDownHold = false; Environment::tapDownHold = false;
playerScore = 0; playerScore = 0;
mainThreadHandler.EnqueueMainThreadTask([this]() {
if (menuManager.uiManager.findButton("minusButton"))
{
menuManager.uiManager.findButton("minusButton")->state = ButtonState::Disabled;
}
if (menuManager.uiManager.findButton("plusButton"))
{
menuManager.uiManager.findButton("plusButton")->state = ButtonState::Normal;
}
if (Environment::shipState.shipType == 0)
{
if (menuManager.uiManager.findButton("shootButton"))
{
menuManager.uiManager.findButton("shootButton")->state = ButtonState::Normal;
}
if (menuManager.uiManager.findButton("shootButton2"))
{
menuManager.uiManager.findButton("shootButton2")->state = ButtonState::Normal;
}
}
});
} }
@ -383,6 +361,26 @@ namespace ZL
this->nearPickupBox = false; this->nearPickupBox = false;
this->showPlayersButtonEnabled = false; this->showPlayersButtonEnabled = false;
if (menuManager.uiManager.findButton("minusButton"))
{
menuManager.uiManager.findButton("minusButton")->state = ButtonState::Disabled;
}
if (menuManager.uiManager.findButton("plusButton"))
{
menuManager.uiManager.findButton("plusButton")->state = ButtonState::Normal;
}
if (Environment::shipState.shipType == 0)
{
if (menuManager.uiManager.findButton("shootButton"))
{
menuManager.uiManager.findButton("shootButton")->state = ButtonState::Normal;
}
if (menuManager.uiManager.findButton("shootButton2"))
{
menuManager.uiManager.findButton("shootButton2")->state = ButtonState::Normal;
}
}
}; };
bool cfgLoaded = sparkEmitter.loadFromJsonFile("resources/config/spark_config.json", renderer, CONST_ZIP_FILE); bool cfgLoaded = sparkEmitter.loadFromJsonFile("resources/config/spark_config.json", renderer, CONST_ZIP_FILE);
@ -2225,7 +2223,7 @@ namespace ZL
titleNode->height = btnH; titleNode->height = btnH;
auto titleImage = std::make_shared<UiButton>(); auto titleImage = std::make_shared<UiButton>();
titleImage->name = "player_list_title"; titleImage->name = "player_list_title";
titleImage->texNormal = std::make_unique<Texture>(CreateTextureDataFromPng("resources/players_list_title.png", "")); titleImage->texNormal = std::make_unique<Texture>(CreateTextureDataFromPng("resources/players_list_title.png", CONST_ZIP_FILE));
titleImage->texPressed = titleImage->texNormal; titleImage->texPressed = titleImage->texNormal;
titleImage->texHover = titleImage->texNormal; titleImage->texHover = titleImage->texNormal;
titleNode->button = titleImage; titleNode->button = titleImage;