From 2add42c1cbcfdea1e4174441b6710ef3caf703b0 Mon Sep 17 00:00:00 2001 From: Vladislav Khorev Date: Sat, 25 Jul 2026 17:27:21 +0300 Subject: [PATCH] Minor changes for the Windows non-steam version --- src/Environment.cpp | 2 +- src/MenuManager.cpp | 30 ++++-------------------------- 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/src/Environment.cpp b/src/Environment.cpp index 6f39cc8..f9532b9 100644 --- a/src/Environment.cpp +++ b/src/Environment.cpp @@ -22,7 +22,7 @@ int Environment::width = CONST_DEFAULT_WIDTH; int Environment::height = CONST_DEFAULT_HEIGHT; float Environment::zoom = DEFAULT_ZOOM; -bool Environment::enableLogging = true; +bool Environment::enableLogging = false; SDL_Window* Environment::window = nullptr; diff --git a/src/MenuManager.cpp b/src/MenuManager.cpp index d2523a7..61ab985 100644 --- a/src/MenuManager.cpp +++ b/src/MenuManager.cpp @@ -345,8 +345,10 @@ namespace FRG { aboutScreenRoot = loadLocalizedUi("resources/w/ui/screen_about_android.json", zipFile); #elif defined(__EMSCRIPTEN__) aboutScreenRoot = loadLocalizedUi("resources/w/ui/screen_about_web.json", zipFile); -#else +#elif defined(STEAMSDK) aboutScreenRoot = loadLocalizedUi("resources/w/ui/screen_about.json", zipFile); +#else + aboutScreenRoot = loadLocalizedUi("resources/w/ui/screen_about_web.json", zipFile); //Windows and Linux non-steam #endif creditsScreenRoot = loadLocalizedUi("resources/w/ui/screen_credits.json", zipFile); @@ -589,28 +591,7 @@ namespace FRG { #endif //Now open the about screen: - uiManager.pushMenuFromSavedRoot(aboutScreenRoot); - uiManager.findTextButton("aboutBackButton")->text = (g_currentLanguage == Language::Russian) ? BACK_TO_MAIN_MENU_RU : BACK_TO_MAIN_MENU_EN; - uiManager.setTextButtonCallback("aboutBackButton", [this](const std::string&) { - uiManager.popMenu(); - uiManager.updateAllLayouts(); - audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg"); - }); - - uiManager.setTextButtonCallback("steamButton", [this](const std::string&) { - audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg"); - SDL_OpenURL("https://store.steampowered.com/app/4801010/"); - }); - - uiManager.setTextButtonCallback("telegramButton", [this](const std::string&) { - audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg"); - SDL_OpenURL("https://telegram.me/fishrungames"); - }); - - uiManager.setTextButtonCallback("discordButton", [this](const std::string&) { - audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg"); - SDL_OpenURL("https://discord.gg/S8jgGHXjw"); - }); + showAboutScreen(); } void MenuManager::showAboutScreen() { @@ -626,13 +607,10 @@ namespace FRG { SDL_OpenURL("https://store.steampowered.com/app/4801010/"); }); - -#ifdef __EMSCRIPTEN__ uiManager.setTextButtonCallback("websiteButton", [this](const std::string&) { audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg"); SDL_OpenURL("https://shadowoverbishkek.com/"); }); -#endif #ifdef __ANDROID__ uiManager.setTextButtonCallback("reviewButton", [this](const std::string&) {