From ca98fea2bda654770275facda2b3c08be26af7c3 Mon Sep 17 00:00:00 2001 From: Vladislav Khorev Date: Tue, 10 Mar 2026 22:09:07 +0300 Subject: [PATCH 1/2] Fixing stupid bug --- src/Space.cpp | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/src/Space.cpp b/src/Space.cpp index 1e28a28..8cc316f 100644 --- a/src/Space.cpp +++ b/src/Space.cpp @@ -273,28 +273,6 @@ namespace ZL Environment::zoom = DEFAULT_ZOOM; Environment::tapDownHold = false; 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->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); @@ -2225,7 +2223,7 @@ namespace ZL titleNode->height = btnH; auto titleImage = std::make_shared(); titleImage->name = "player_list_title"; - titleImage->texNormal = std::make_unique(CreateTextureDataFromPng("resources/players_list_title.png", "")); + titleImage->texNormal = std::make_unique(CreateTextureDataFromPng("resources/players_list_title.png", CONST_ZIP_FILE)); titleImage->texPressed = titleImage->texNormal; titleImage->texHover = titleImage->texNormal; titleNode->button = titleImage; From beac06fd456d3436b0e55cd232343e1c60513fe2 Mon Sep 17 00:00:00 2001 From: Vladislav Khorev Date: Thu, 12 Mar 2026 11:36:47 +0300 Subject: [PATCH 2/2] Production-ready, fixing server bugs --- proj-web/space-game001plain.html | 34 +---- resources/config/about.json | 144 ++++++++++++++-------- resources/rockdark3.png | 4 +- resources/sand2.png | 4 +- resources/sky/space1.png | 4 +- server/server.cpp | 2 +- src/Game.cpp | 8 -- src/Space.cpp | 1 + src/SparkEmitter.cpp | 3 + src/network/WebSocketClientEmscripten.cpp | 14 +-- 10 files changed, 110 insertions(+), 108 deletions(-) diff --git a/proj-web/space-game001plain.html b/proj-web/space-game001plain.html index 78ab463..e4acfc9 100644 --- a/proj-web/space-game001plain.html +++ b/proj-web/space-game001plain.html @@ -3,7 +3,7 @@ - Space Game + Sky Trek Tales