Minor changes for the Windows non-steam version

This commit is contained in:
Vladislav Khorev committed 2026-07-25 17:27:21 +03:00
1 parent 4039c24372
commit 2add42c1cb
2 files changed
+5 -27

No files matched your search

+1 -1
View File
@@ -22,7 +22,7 @@ int Environment::width = CONST_DEFAULT_WIDTH;
int Environment::height = CONST_DEFAULT_HEIGHT; int Environment::height = CONST_DEFAULT_HEIGHT;
float Environment::zoom = DEFAULT_ZOOM; float Environment::zoom = DEFAULT_ZOOM;
bool Environment::enableLogging = true; bool Environment::enableLogging = false;
SDL_Window* Environment::window = nullptr; SDL_Window* Environment::window = nullptr;
+4 -26
View File
@@ -345,8 +345,10 @@ namespace FRG {
aboutScreenRoot = loadLocalizedUi("resources/w/ui/screen_about_android.json", zipFile); aboutScreenRoot = loadLocalizedUi("resources/w/ui/screen_about_android.json", zipFile);
#elif defined(__EMSCRIPTEN__) #elif defined(__EMSCRIPTEN__)
aboutScreenRoot = loadLocalizedUi("resources/w/ui/screen_about_web.json", zipFile); aboutScreenRoot = loadLocalizedUi("resources/w/ui/screen_about_web.json", zipFile);
#else #elif defined(STEAMSDK)
aboutScreenRoot = loadLocalizedUi("resources/w/ui/screen_about.json", zipFile); 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 #endif
creditsScreenRoot = loadLocalizedUi("resources/w/ui/screen_credits.json", zipFile); creditsScreenRoot = loadLocalizedUi("resources/w/ui/screen_credits.json", zipFile);
@@ -589,28 +591,7 @@ namespace FRG {
#endif #endif
//Now open the about screen: //Now open the about screen:
uiManager.pushMenuFromSavedRoot(aboutScreenRoot); showAboutScreen();
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");
});
} }
void MenuManager::showAboutScreen() { void MenuManager::showAboutScreen() {
@@ -626,13 +607,10 @@ namespace FRG {
SDL_OpenURL("https://store.steampowered.com/app/4801010/"); SDL_OpenURL("https://store.steampowered.com/app/4801010/");
}); });
#ifdef __EMSCRIPTEN__
uiManager.setTextButtonCallback("websiteButton", [this](const std::string&) { uiManager.setTextButtonCallback("websiteButton", [this](const std::string&) {
audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg"); audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
SDL_OpenURL("https://shadowoverbishkek.com/"); SDL_OpenURL("https://shadowoverbishkek.com/");
}); });
#endif
#ifdef __ANDROID__ #ifdef __ANDROID__
uiManager.setTextButtonCallback("reviewButton", [this](const std::string&) { uiManager.setTextButtonCallback("reviewButton", [this](const std::string&) {