salmon-engine-projects/shadow-over-bishkek001
14
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Vladislav Khorev committed 2026-11-09 16:21:41 +06:00
2 parents 71c654e5b6 2a7498695a
commit 8beaa76720
18 files changed
+98 -67
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/MenuManager.cpp
+4 -4
View File
@@ -1,4 +1,4 @@
#include "MenuManager.h"
#include "MenuManager.h"
#include "Game.h"
#include "Localization.h"
#include "items/ItemRegistry.h"
@@ -535,7 +535,7 @@ namespace FRG {
#if !defined(EMSCRIPTEN) && !defined(__ANDROID__)
#if !defined(__EMSCRIPTEN__) && !defined(__ANDROID__)
uiManager.setTextButtonCallback("menuExitButton", [this](const std::string&) {
audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
Environment::exitGameLoop = true;
@@ -586,7 +586,7 @@ namespace FRG {
#ifndef EMSCRIPTEN
#ifndef __EMSCRIPTEN__
uiManager.setTextButtonCallback("menuExitButton", [this](const std::string&) {
audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
Environment::exitGameLoop = true;
@@ -2401,7 +2401,7 @@ namespace FRG {
if (root.contains("soundEnabled"))
audioPlayer_.setSoundEnabled(root["soundEnabled"].get<bool>());
if (root.contains("fullscreen")) {
#ifndef EMSCRIPTEN
#ifndef __EMSCRIPTEN__
Environment::setFullscreen(root["fullscreen"].get<bool>());
#endif
}