Adapting music to web, fixing scripts, fixing bug in initial state

src/AudioPlayerAsync.cpp

@@ -6,6 +6,13 @@
 #include <android/log.h>
 #endif
 
+namespace FRG
+{
+    extern const char* CONST_MUSIC_ZIP_FILE;
+	extern const char* CONST_ZIP_FILE;
+
+}
+
 
 #ifdef __EMSCRIPTEN__
 AudioPlayerAsync::AudioPlayerAsync() {}
@@ -92,9 +99,10 @@ void AudioPlayerAsync::playSoundAsync(const std::string& filePath, int loops, in
         }
 
         if (!sound) {
-#ifdef __ANDROID__
+//#ifdef __ANDROID__
 
-            std::vector<char> buffer = FRG::readFile(filePath);
+            //Sounds are loaded from regular resource file
+            std::vector<char> buffer = FRG::readFileFromZIP(filePath, FRG::CONST_ZIP_FILE);
             if (buffer.empty()) {
 
                 FRG::logger() << "Failed to read sound file into buffer: " << filePath << std::endl;
@@ -108,9 +116,9 @@ void AudioPlayerAsync::playSoundAsync(const std::string& filePath, int loops, in
             sound = Mix_LoadWAV_RW(rw, 1); // 1 means it will free rw automatically
             //FRG::logger() << "sound = Mix_LoadWAV_RW(rw, 1); just fired " << std::endl;
 
-#else
-            sound = Mix_LoadWAV(filePath.c_str());
-#endif
+//#else
+//            sound = Mix_LoadWAV(filePath.c_str());
+//#endif
             if (!sound) {
                 FRG::logger() << "Failed to load sound " << filePath << ": " << Mix_GetError() << std::endl;
                 return;
@@ -144,6 +152,10 @@ void AudioPlayerAsync::playMusicAsync(const std::string& filePath, int loops) {
     currentTrack = filePath;
     if (!musicEnabled_) return;
 
+    if ((strlen(FRG::CONST_MUSIC_ZIP_FILE)>0) && !FRG::zipFileExists(FRG::CONST_MUSIC_ZIP_FILE)) {
+        return;
+    }
+
     auto task = [this, filePath, loops]() {
         Mix_HaltMusic();
         if (currentMusic_) {
@@ -153,17 +165,17 @@ void AudioPlayerAsync::playMusicAsync(const std::string& filePath, int loops) {
         currentMusicData_.clear();
 
         Mix_Music* music = nullptr;
-#ifdef __ANDROID__
-        currentMusicData_ = FRG::readFile(filePath);
+//#ifdef __ANDROID__
+        currentMusicData_ = FRG::readFileFromZIP(filePath, FRG::CONST_MUSIC_ZIP_FILE);
         if (!currentMusicData_.empty()) {
             SDL_RWops* rw = SDL_RWFromMem(currentMusicData_.data(), currentMusicData_.size());
             if (rw) {
                 music = Mix_LoadMUS_RW(rw, 1);
             }
         }
-#else
-        music = Mix_LoadMUS(filePath.c_str());
-#endif
+//#else
+//        music = Mix_LoadMUS(filePath.c_str());
+//#endif
 
         if (!music) {
             FRG::logger() << "Failed to load music " << filePath << ": " << Mix_GetError() << std::endl;
@@ -268,11 +280,30 @@ void AudioPlayerAsync::setSoundVolume(int volume) {
 }
 
 void AudioPlayerAsync::crossFadeMusicAsync(const std::string& filePath, int fadeDurationMs, int loops) {
+    FRG::logger() << "crossFadeMusicAsync called step 1" << std::endl;
+
     if (!initialized) return;
+    FRG::logger() << "crossFadeMusicAsync called step 1.1" << std::endl;
+
+    if ((strlen(FRG::CONST_MUSIC_ZIP_FILE) > 0) && !FRG::zipFileExists(FRG::CONST_MUSIC_ZIP_FILE)) {
+        FRG::logger() << "crossFadeMusicAsync called step 1.2" << std::endl;
+        return;
+    }
+    FRG::logger() << "crossFadeMusicAsync called step 1.3" << std::endl;
+
     if (filePath == currentTrack) return;
+    FRG::logger() << "crossFadeMusicAsync called step 1.4" << std::endl;
+
     currentTrack = filePath;
     if (!musicEnabled_) return;
 
+    FRG::logger() << "crossFadeMusicAsync called step 2" << std::endl;
+
+
+
+
+    FRG::logger() << "crossFadeMusicAsync called step 3" << std::endl;
+
     auto task = [this, filePath, fadeDurationMs, loops]() {
 #ifdef __EMSCRIPTEN__
         Mix_HaltMusic();
@@ -287,17 +318,17 @@ void AudioPlayerAsync::crossFadeMusicAsync(const std::string& filePath, int fade
         currentMusicData_.clear();
 #endif
         Mix_Music* music = nullptr;
-#ifdef __ANDROID__
-        currentMusicData_ = FRG::readFile(filePath);
+//#ifdef __ANDROID__
+        currentMusicData_ = FRG::readFileFromZIP(filePath, FRG::CONST_MUSIC_ZIP_FILE);
         if (!currentMusicData_.empty()) {
             SDL_RWops* rw = SDL_RWFromMem(currentMusicData_.data(), currentMusicData_.size());
             if (rw) {
                 music = Mix_LoadMUS_RW(rw, 1);
             }
         }
-#else
-        music = Mix_LoadMUS(filePath.c_str());
-#endif
+//#else
+//        music = Mix_LoadMUS(filePath.c_str());
+//#endif
         if (!music) {
             FRG::logger() << "Failed to load music " << filePath << ": " << Mix_GetError() << std::endl;
             return;

src/Character.cpp

@@ -438,11 +438,11 @@ void Character::update(int64_t deltaMs, const CharacterResolver& resolver) {
             if (audioPlayer) {
                 if (state.isPlayer)
                 {
-                    audioPlayer->playSoundAsync("audio/547041__cogfirestudios__hit-swing-sword-small-3.ogg");
+                    audioPlayer->playSoundAsync("resources/audio/547041__cogfirestudios__hit-swing-sword-small-3.ogg");
                 }
                 else
                 {
-					audioPlayer->playSoundAsync("audio/13925__adcbicycle__21.ogg");
+					audioPlayer->playSoundAsync("resources/audio/13925__adcbicycle__21.ogg");
                 }
 			}
         }

src/Environment.cpp

@@ -23,7 +23,7 @@ int Environment::height = CONST_DEFAULT_HEIGHT;
 float Environment::zoom = DEFAULT_ZOOM;
 
 
-bool Environment::enableLogging = false;
+bool Environment::enableLogging = true;
 
 SDL_Window* Environment::window = nullptr;
 

src/Game.cpp

@@ -36,8 +36,10 @@ namespace FRG
 
 #ifdef EMSCRIPTEN
 	const char* CONST_ZIP_FILE = "resources.zip";
+	const char* CONST_MUSIC_ZIP_FILE = "music.zip";
 #else
 	const char* CONST_ZIP_FILE = "";
+	const char* CONST_MUSIC_ZIP_FILE = "";
 #endif
 
 	float x = 0;
@@ -47,25 +49,29 @@ namespace FRG
 #ifdef EMSCRIPTEN
 	Game* Game::s_instance = nullptr;
 
+	// Коллбэк успешной загрузки resources.zip
 	void Game::onResourcesZipLoaded(unsigned /*handle*/, void* /*userData*/, const char* /*filename*/) {
-		logger() << "Resources.zip loaded successfully--0" << std::endl;
+		logger() << "Resources.zip downloaded successfully to VFS" << std::endl;
+
+		// Синхронизируем MemFS -> IndexedDB, чтобы файл сохранился между сессиями браузера
+		FRG::emscriptenSyncFs();
+
 		if (s_instance) {
 			s_instance->resourcesDownloadProgress = 1.0f;
-			// Builds the loadSteps queue (cheap, no GL work); the actual loading
-			// happens one step per frame in Game::update() so the browser tab
-			// keeps repainting/responding instead of freezing for the whole load.
 			s_instance->setupPart2();
 		}
 	}
 
-	void Game::onResourcesZipError(unsigned /*handle*/, void* /*userData*/, int /*httpStatus*/) {
-		logger() << "Failed to download resources.zip" << std::endl;
+	void Game::onResourcesZipError(unsigned /*handle*/, void* /*userData*/, int httpStatus) {
+		logger() << "Failed to download resources.zip, HTTP status: " << httpStatus << std::endl;
+		// Можно обработать ошибку или предложить пользователю перезагрузить страницу
 	}
 
 	void Game::onResourcesZipProgress(unsigned /*handle*/, void* /*userData*/, int percentComplete) {
 		if (s_instance)
 			s_instance->resourcesDownloadProgress = percentComplete / 100.0f;
 	}
+
 #endif
 
 	Location* Game::currentLocation() const {
@@ -133,12 +139,53 @@ namespace FRG
 		loadingMesh.RefreshVBO();
 
 #ifdef EMSCRIPTEN
-		// Asynchronously download resources.zip; setupPart2() is called on completion.
-		// The loading screen stays visible until the download finishes.
 		s_instance = this;
-		logger() << "Load resurces step 1-" << std::endl;
-		emscripten_async_wget2("resources.zip", "resources.zip", "GET", nullptr, nullptr,
-			onResourcesZipLoaded, onResourcesZipError, onResourcesZipProgress);
+
+		std::string resPath = FRG::getPersistentResourcePath("resources.zip");
+		std::string musicPath = FRG::getPersistentResourcePath("music.zip");
+
+		// 1. Проверяем ресурсы (resources.zip)
+		if (FRG::isZipValid(resPath)) {
+			logger() << "[Load] Valid resources.zip found in IndexedDB cache: " << resPath << std::endl;
+			resourcesDownloadProgress = 1.0f;
+
+			// Архив уже есть и цел — переходим сразу к разбору/загрузке
+			setupPart2();
+		}
+		else {
+			logger() << "[Load] Resources.zip missing or corrupt. Downloading to: " << resPath << std::endl;
+
+			// Скачиваем сразу в постоянный путь /offline/resources.zip
+			emscripten_async_wget2(
+				"resources.zip",            // URL на сервере
+				resPath.c_str(),            // Назначение в VFS Emscripten
+				"GET",
+				nullptr,
+				nullptr,
+				onResourcesZipLoaded,
+				onResourcesZipError,
+				onResourcesZipProgress
+			);
+		}
+		/*
+		// 2. Проверяем музыку (music.zip)
+		if (FRG::isZipValid(musicPath)) {
+			logger() << "[Load] Valid music.zip found in IndexedDB cache." << std::endl;
+		}
+		else {
+			logger() << "[Load] Music.zip missing or corrupt. Downloading to: " << musicPath << std::endl;
+
+			emscripten_async_wget2(
+				"music.zip",
+				musicPath.c_str(),
+				"GET",
+				nullptr,
+				nullptr,
+				onMusicZipLoaded,
+				onMusicZipError,
+				onMusicZipProgress
+			);
+		}*/
 #else
 		// Builds the loadSteps queue (cheap, no GL work); the actual loading
 		// happens one step per frame in Game::update() so the window keeps
@@ -299,12 +346,12 @@ namespace FRG
 				menuManager.onItemPickedUp(itemId);
 				const Item* item = ItemRegistry::instance().findById(itemId);
 				if (item) menuManager.showToast(menuManager.toastTextureItemAdded, item->name);
-				audioPlayer->playSoundAsync("audio/831642__ienba__generic-game-pick-up.ogg");
+				audioPlayer->playSoundAsync("resources/audio/831642__ienba__generic-game-pick-up.ogg");
 			};
 			gameState.inventory.onItemRemoved = [this](const std::string& itemId) {
 				const Item* item = ItemRegistry::instance().findById(itemId);
 				if (item) menuManager.showToast(menuManager.toastTextureItemRemoved, item->name);
-				audioPlayer->playSoundAsync("audio/831642__ienba__generic-game-pick-up.ogg");
+				audioPlayer->playSoundAsync("resources/audio/831642__ienba__generic-game-pick-up.ogg");
 			};
 
 			// Wire phone dialogue start function so MenuManager can trigger dialogues.
@@ -344,7 +391,8 @@ namespace FRG
 					performResetToInitialState();
 					gameState.currentLocationName = "location_dorm";
 					currentLocation()->scriptEngine.callLocationEnterCallback();
-					this->audioPlayer->crossFadeMusicAsync("audio/obshaga.ogg");
+					this->audioPlayer->crossFadeMusicAsync("music/obshaga.ogg");
+					menuManager.lastMusicTrack = "music/obshaga.ogg";
 				});
 			};
 
@@ -392,7 +440,8 @@ namespace FRG
 
 		loadSteps.push([this]() {
 			menuManager.loadSettings();
-			audioPlayer->crossFadeMusicAsync("audio/main menu final.ogg");
+			audioPlayer->crossFadeMusicAsync("music/main menu final.ogg");
+			menuManager.lastMusicTrack = "music/main menu final.ogg";
 		});
 
 
@@ -465,7 +514,21 @@ namespace FRG
 
 	void Game::performResetToInitialState() {
 		const std::string path = "resources/config/start_state.json";
-		const std::string content = FRG::readTextFile(path);
+
+		std::vector<char> fileData;
+		if (strlen(CONST_ZIP_FILE) > 0)
+		{
+			fileData = readFileFromZIP(path, CONST_ZIP_FILE);
+		}
+		else
+		{
+			fileData = readFile(path);
+		}
+
+		std::string content(fileData.begin(), fileData.end());
+
+		//const std::vector<char> contentVector = FRG::readFileFromZIP();
+		//const std::string content = FRG::readTextFile(path);
 		if (!content.empty()) {
 			try {
 				nlohmann::json root = nlohmann::json::parse(content);
@@ -485,10 +548,14 @@ namespace FRG
 				rearmDormOneShotCallbacks();
 				return;
 			} catch (const std::exception& e) {
-				std::cerr << "[reset] Failed to parse " << path << ": " << e.what()
+				logger() << "[reset] Failed to parse " << path << ": " << e.what()
 						  << " -- falling back to full rebuild" << std::endl;
 			}
 		}
+		else
+		{
+			logger() << "File " << path << " is empty -- falling back to full rebuild" << std::endl;
+		}
 		performFullReset();
 	}
 
@@ -616,10 +683,12 @@ namespace FRG
 		}
 
 		gameState.locations["uni_interior"]->requestDarklandsPlayBattleMusic = [this]() {
-			audioPlayer->crossFadeMusicFromPositionAsync("audio/bishkek fight.ogg");
+			audioPlayer->crossFadeMusicFromPositionAsync("music/bishkek fight.ogg");
+			menuManager.lastMusicTrack = "music/bishkek fight.ogg";
 			};
 		gameState.locations["uni_interior"]->requestDarklandsPlayNormalMusic = [this]() {
-			audioPlayer->crossFadeMusicFromPositionAsync("audio/bishkek fight calm.ogg");
+			audioPlayer->crossFadeMusicFromPositionAsync("music/bishkek fight calm.ogg");
+			menuManager.lastMusicTrack = "music/bishkek fight calm.ogg";
 			};
 
 	}
@@ -1679,7 +1748,7 @@ namespace FRG
 			return false;
 		}
 
-		audioPlayer->playSoundAsync("audio/459618__n-lerche__blow.ogg");
+		audioPlayer->playSoundAsync("resources/audio/459618__n-lerche__blow.ogg");
 		if (darklandsFlashActive) return false;
 		darklandsFlashActive = true;
 		darklandsFlashFadingIn = true;
@@ -1715,7 +1784,8 @@ namespace FRG
 						currentLocation()->scriptEngine.callTriggerNightEnterCallback();
 					}
 
-					audioPlayer->crossFadeMusicAsync("audio/bishkek night.ogg");
+					audioPlayer->crossFadeMusicAsync("music/bishkek night.ogg");
+					menuManager.lastMusicTrack = "music/bishkek night.ogg";
 
 				} else {
 					gameState.isDarklands = !gameState.isDarklands;
@@ -1725,11 +1795,13 @@ namespace FRG
 
 					if (gameState.isDarklands)
 					{
-						audioPlayer->crossFadeMusicAsync("audio/bishkek fight calm.ogg");
+						audioPlayer->crossFadeMusicAsync("music/bishkek fight calm.ogg");
+						menuManager.lastMusicTrack = "music/bishkek fight calm.ogg";
 					}
 					else
 					{
-						audioPlayer->crossFadeMusicAsync("audio/bishkek night.ogg");
+						audioPlayer->crossFadeMusicAsync("music/bishkek night.ogg");
+						menuManager.lastMusicTrack = "music/bishkek night.ogg";
 					}
 
 					if (currentLocation()) {
@@ -1845,20 +1917,24 @@ namespace FRG
 
 		if (gameState.isDarklands)
 		{
-			audioPlayer->crossFadeMusicAsync("audio/bishkek fight calm.ogg");
+			audioPlayer->crossFadeMusicAsync("music/bishkek fight calm.ogg");
+			menuManager.lastMusicTrack = "music/bishkek fight calm.ogg";
 		}
 		else if (gameState.isNight)
 		{
-			audioPlayer->crossFadeMusicAsync("audio/bishkek night.ogg");
+			audioPlayer->crossFadeMusicAsync("music/bishkek night.ogg");
+			menuManager.lastMusicTrack = "music/bishkek night.ogg";
 		}
 		else
 		{
 			if (gameState.currentLocationName == "location_dorm") {
-				audioPlayer->crossFadeMusicAsync("audio/obshaga.ogg");
+				audioPlayer->crossFadeMusicAsync("music/obshaga.ogg");
+				menuManager.lastMusicTrack = "music/obshaga.ogg";
 			}
 			else
 			{
-				audioPlayer->crossFadeMusicAsync("audio/bishkek univer day.ogg");
+				audioPlayer->crossFadeMusicAsync("music/bishkek univer day.ogg");
+				menuManager.lastMusicTrack = "music/bishkek univer day.ogg";
 			}
 		}
 	}

src/Game.h

@@ -82,6 +82,10 @@ namespace FRG {
 		MenuManager menuManager;
 		
 		void activateSlowMoEffect();
+
+#ifdef EMSCRIPTEN
+		static Game* s_instance;
+#endif
 		
 	private:
 		// Unified pointer handling: mouse-left and a single touch share one path.
@@ -160,7 +164,6 @@ namespace FRG {
 		int countNonUiPointers() const;
 
 #ifdef EMSCRIPTEN
-		static Game* s_instance;
 		static void onResourcesZipLoaded(unsigned handle, void* userData, const char* filename);
 		static void onResourcesZipError(unsigned handle, void* userData, int httpStatus);
 		static void onResourcesZipProgress(unsigned handle, void* userData, int percentComplete);

src/GameState.cpp

@@ -83,29 +83,40 @@ void GameState::save(nlohmann::json& out) const
 
 void GameState::load(const nlohmann::json& in)
 {
+    //logger() << "GameState::load step 1" << std::endl;
+
     // --- World ---
     currentLocationName = in.value("currentLocationName", currentLocationName);
     isDarklands = in.value("isDarklands", isDarklands);
     isNight     = in.value("isNight",     isNight);
     isDawn      = in.value("isDawn",      isDawn);
 
+    //() << "GameState::load step 2" << std::endl;
+
+
     // --- Player resources ---
     playerHp    = in.value("playerHp",    playerHp);
     playerMaxHp = in.value("playerMaxHp", playerMaxHp);
     money       = in.value("money",       money);
 
+    //logger() << "GameState::load step 3" << std::endl;
+
     // --- Script globals ---
     globalInts.clear();
     if (in.contains("globalInts") && in["globalInts"].is_object()) {
         for (const auto& [k, v] : in["globalInts"].items())
             globalInts[k] = v.get<int>();
     }
+    //logger() << "GameState::load step 4" << std::endl;
+
     globalFloats.clear();
     if (in.contains("globalFloats") && in["globalFloats"].is_object()) {
         for (const auto& [k, v] : in["globalFloats"].items())
             globalFloats[k] = v.get<float>();
     }
 
+    //logger() << "GameState::load step 5" << std::endl;
+
     // --- Tutorial ---
     tutorialStep        = static_cast<TutorialStep>(in.value("tutorialStep", static_cast<int>(tutorialStep)));
     uniIntTutorialState = static_cast<UniIntTutorialState>(in.value("uniIntTutorialState", static_cast<int>(uniIntTutorialState)));
@@ -115,15 +126,21 @@ void GameState::load(const nlohmann::json& in)
     tutorialJournalScreenOpened   = in.value("tutorialJournalScreenOpened",   tutorialJournalScreenOpened);
     tutorialNeedOpenTaxiScreen    = in.value("tutorialNeedOpenTaxiScreen",    tutorialNeedOpenTaxiScreen);
 
+    //logger() << "GameState::load step 6" << std::endl;
+
     // --- Phone / chat ---
     if (in.contains("chatUnread") && in["chatUnread"].is_array()) {
         for (int i = 0; i < 3 && i < static_cast<int>(in["chatUnread"].size()); ++i)
             chatUnread[i] = in["chatUnread"][i].get<bool>();
     }
+    //logger() << "GameState::load step 7" << std::endl;
+
     if (in.contains("chatPreviewMsg") && in["chatPreviewMsg"].is_array()) {
         for (int i = 0; i < 3 && i < static_cast<int>(in["chatPreviewMsg"].size()); ++i)
             chatPreviewMsg[i] = in["chatPreviewMsg"][i].get<std::string>();
     }
+    //logger() << "GameState::load step 8" << std::endl;
+
     if (in.contains("chatHistory") && in["chatHistory"].is_array()) {
         for (int i = 0; i < 3 && i < static_cast<int>(in["chatHistory"].size()); ++i) {
             chatHistory[i].clear();
@@ -136,26 +153,38 @@ void GameState::load(const nlohmann::json& in)
                 }
             }
         }
+
     }
+    //logger() << "GameState::load step 8" << std::endl;
 
     // --- Inventory ---
     if (in.contains("inventory")) inventory.load(in["inventory"]);
 
+    //logger() << "GameState::load step 9" << std::endl;
+    
     // --- Quest journal ---
     if (in.contains("questJournal")) questJournal.load(in["questJournal"]);
+    
+    logger() << "GameState::load step 10" << std::endl;
 
     // --- Locations ---
     if (in.contains("locations") && in["locations"].is_object()) {
         for (const auto& [name, locJson] : in["locations"].items()) {
+            //logger() << "GameState::load step 10.1: " << name << std::endl;
+
             auto it = locations.find(name);
             if (it != locations.end() && it->second) {
                 it->second->load(locJson);
             }
         }
     }
+    //logger() << "GameState::load step 11" << std::endl;
+
 
     // --- Taxi ---
     taxiIsCalled = in.value("taxiIsCalled", taxiIsCalled);
+    //logger() << "GameState::load step 12" << std::endl;
+
 }
 
 } // namespace FRG

src/Location.cpp

@@ -2147,10 +2147,13 @@ namespace FRG
 
 	void Location::load(const nlohmann::json& in)
 	{
+		//logger() << "Location::load step 1" << std::endl;
+
 		// Location-level state
 		if (in.contains("locationState")) {
 			state.load(in["locationState"]);
 		}
+		//logger() << "Location::load step 2" << std::endl;
 
 		// Re-sync navigation pointer from restored index
 		if (state.activeNavigationIndex >= 0 &&
@@ -2159,6 +2162,8 @@ namespace FRG
 			navigation = &navigationMaps[state.activeNavigationIndex];
 		}
 
+		//logger() << "Location::load step 3" << std::endl;
+
 		// Restore trigger zone runtime state (by id)
 		if (in.contains("triggerZoneState") && in["triggerZoneState"].is_object()) {
 			const auto& tzs = in["triggerZoneState"];
@@ -2169,6 +2174,7 @@ namespace FRG
 				}
 			}
 		}
+		//logger() << "Location::load step 4" << std::endl;
 
 		// Restore teleport zone runtime state (by id)
 		if (in.contains("teleportZoneState") && in["teleportZoneState"].is_object()) {
@@ -2180,11 +2186,15 @@ namespace FRG
 			}
 		}
 
+		//logger() << "Location::load step 5" << std::endl;
+
 		// Player character state
 		if (player && in.contains("playerState")) {
 			player->state.load(in["playerState"]);
 		}
 
+		//logger() << "Location::load step 6" << std::endl;
+
 		// NPC states
 		if (in.contains("npcStates") && in["npcStates"].is_array()) {
 			const auto& arr = in["npcStates"];
@@ -2195,6 +2205,8 @@ namespace FRG
 			}
 		}
 
+		//logger() << "Location::load step 7" << std::endl;
+
 		// Interactive object states
 		if (in.contains("interactiveObjectStates") && in["interactiveObjectStates"].is_array()) {
 			const auto& arr = in["interactiveObjectStates"];
@@ -2202,17 +2214,23 @@ namespace FRG
 				interactiveObjects[i].state.load(arr[i]);
 			}
 		}
+		//logger() << "Location::load step 8" << std::endl;
 
 		// Dialogue runtime state
 		if (in.contains("dialogueState")) {
 			dialogueSystem.loadDialogueState(in["dialogueState"]);
 		}
 
+		//logger() << "Location::load step 9" << std::endl;
+
 		// Lua globals
 		if (in.contains("scriptGlobals")) {
 			scriptEngine.loadScriptGlobals(in["scriptGlobals"]);
 		}
 
+		//logger() << "Location::load step 10" << std::endl;
+
+
 		// Re-wire in-flight, one-shot Lua callbacks (walk-arrival / animation-complete)
 		// that were serialized by name. Must run after scriptEngine has already run the
 		// location's script (guaranteed: Location::setup() always runs before load())
@@ -2220,16 +2238,24 @@ namespace FRG
 		if (player && !player->state.onArrivedCallbackName.empty()) {
 			scriptEngine.rehydrateNamedCallback(player->state.onArrivedCallbackName, player->state.onArrivedCallback);
 		}
+
+		//logger() << "Location::load step 11" << std::endl;
+
 		for (auto& npc : npcs) {
 			if (npc && !npc->state.onArrivedCallbackName.empty()) {
 				scriptEngine.rehydrateNamedCallback(npc->state.onArrivedCallbackName, npc->state.onArrivedCallback);
 			}
 		}
+		//logger() << "Location::load step 12" << std::endl;
+
 		for (auto& intObj : interactiveObjects) {
 			if (intObj.state.isAnimating && intObj.state.animTask && !intObj.state.animTask->onCompleteName.empty()) {
 				scriptEngine.rehydrateNamedCallback(intObj.state.animTask->onCompleteName, intObj.state.animTask->onComplete);
 			}
 		}
+
+		//logger() << "Location::load step 13" << std::endl;
+
 	}
 
 } // namespace FRG

src/LocationState.cpp

@@ -107,6 +107,8 @@ void LocationState::save(nlohmann::json& out) const
 
 void LocationState::load(const nlohmann::json& in)
 {
+	//logger() << "LocationState::load step 1" << std::endl;
+
     cameraAzimuth     = in.value("cameraAzimuth",     cameraAzimuth);
     cameraInclination = in.value("cameraInclination", cameraInclination);
 
@@ -122,6 +124,8 @@ void LocationState::load(const nlohmann::json& in)
 
     tutorialInteractiveObjectsLocked = in.value("tutorialInteractiveObjectsLocked", false);
 
+	//logger() << "LocationState::load step 2" << std::endl;
+
 	nlohmann::json taxiJson = in["taxi"];
 
 	taxiArrivedCallbackCalled = taxiJson.value("taxiArrivedCallbackCalled", false);
@@ -136,20 +140,18 @@ void LocationState::load(const nlohmann::json& in)
 		taxiCarJson.value("positionZ", 0.f)
 	);
 
+	//logger() << "LocationState::load step 3" << std::endl;
+
 	taxiCar.rotation = taxiCarJson.value("rotation", 0.f);
 
 	taxiCar.velocity = taxiCarJson.value("velocity", 0.f);
 
 	taxiCar.steeringAngle = taxiCarJson.value("steeringAngle", 0.f);
 
-	/*taxiCar.acceleration = taxiCarJson.value("acceleration", 20.f);
-	taxiCar.friction = taxiCarJson.value("friction", 6.f);
-	taxiCar.maxSpeed = taxiCarJson.value("maxSpeed", 24.f);
-	taxiCar.maxReverseSpeed = taxiCarJson.value("maxReverseSpeed", 8.f);
-	taxiCar.turnRate = taxiCarJson.value("turnRate", 1.8f);
-	taxiCar.maxSteerAngle = taxiCarJson.value("maxSteerAngle", 0.6f);*/
 	taxiCar.mode = static_cast<NpcCar::Mode>(taxiCarJson.value("mode", 0));
 
+	//logger() << "LocationState::load step 4" << std::endl;
+
 	taxiCar.waypoints.clear();
 	if (taxiCarJson.contains("waypoints") && taxiCarJson["waypoints"].is_array()) {
 		for (int i = 0; i < static_cast<int>(taxiCarJson["waypoints"].size()); ++i)
@@ -160,6 +162,8 @@ void LocationState::load(const nlohmann::json& in)
 			));
 	}
 
+	//logger() << "LocationState::load step 5" << std::endl;
+
 	taxiCar.currentWaypoint = taxiCarJson.value("currentWaypoint", 0);
 	taxiCar.waypointReachRadius = taxiCarJson.value("waypointReachRadius", 3.f);
 	taxiCar.wheelAngle = taxiCarJson.value("wheelAngle", 0.f);
@@ -167,6 +171,8 @@ void LocationState::load(const nlohmann::json& in)
 
 	//--------- Taxi initial state -----
 
+	//logger() << "LocationState::load step 6" << std::endl;
+
 	nlohmann::json taxiCarInitialStateJson = taxiJson["taxiCarInitialState"];
 
 	taxiCarInitialState.position = Eigen::Vector3f(
@@ -180,15 +186,12 @@ void LocationState::load(const nlohmann::json& in)
 	taxiCarInitialState.velocity = taxiCarInitialStateJson.value("velocity", 0.f);
 
 	taxiCarInitialState.steeringAngle = taxiCarInitialStateJson.value("steeringAngle", 0.f);
-	/*
-	taxiCarInitialState.acceleration = taxiCarInitialStateJson.value("acceleration", 20.f);
-	taxiCarInitialState.friction = taxiCarInitialStateJson.value("friction", 6.f);
-	taxiCarInitialState.maxSpeed = taxiCarInitialStateJson.value("maxSpeed", 24.f);
-	taxiCarInitialState.maxReverseSpeed = taxiCarInitialStateJson.value("maxReverseSpeed", 8.f);
-	taxiCarInitialState.turnRate = taxiCarInitialStateJson.value("turnRate", 1.8f);
-	taxiCarInitialState.maxSteerAngle = taxiCarInitialStateJson.value("maxSteerAngle", 0.6f);*/
+
 	taxiCarInitialState.mode = static_cast<NpcCar::Mode>(taxiCarInitialStateJson.value("mode", 0));
 
+	//logger() << "LocationState::load step 7" << std::endl;
+
+
 	taxiCarInitialState.waypoints.clear();
 	if (taxiCarInitialStateJson.contains("waypoints") && taxiCarInitialStateJson["waypoints"].is_array()) {
 		for (int i = 0; i < static_cast<int>(taxiCarInitialStateJson["waypoints"].size()); ++i)
@@ -199,11 +202,14 @@ void LocationState::load(const nlohmann::json& in)
 			));
 	}
 
+	//logger() << "LocationState::load step 8" << std::endl;
+
 	taxiCarInitialState.currentWaypoint = taxiCarInitialStateJson.value("currentWaypoint", 0);
 	taxiCarInitialState.waypointReachRadius = taxiCarInitialStateJson.value("waypointReachRadius", 3.f);
 	taxiCarInitialState.wheelAngle = taxiCarInitialStateJson.value("wheelAngle", 0.f);
 
 	
+
 	taxiCarWaypoints.clear();
 	if (taxiJson.contains("taxiDefaultWaypoints") && taxiJson["taxiDefaultWaypoints"].is_array()) {
 		for (int i = 0; i < static_cast<int>(taxiJson["taxiDefaultWaypoints"].size()); ++i)
@@ -214,6 +220,7 @@ void LocationState::load(const nlohmann::json& in)
 			));
 	}
 
+	//logger() << "LocationState::load step 9" << std::endl;
 
 	taxiCarTriggerPosition = Eigen::Vector3f(
 		taxiJson.value("taxiCarTriggerPositionX", 0.f),
@@ -221,6 +228,9 @@ void LocationState::load(const nlohmann::json& in)
 		taxiJson.value("taxiCarTriggerPositionZ", 0.f)
 	);
 
+	//logger() << "LocationState::load step 10" << std::endl;
+
+
 }
 
 } // namespace FRG

src/LocationState.h

@@ -31,7 +31,7 @@ struct LocationState : public ISaveable {
     NpcCar taxiCarInitialState;
     NpcCar taxiCar;
     bool taxiArrivedCallbackCalled = false;
-    Vector3f taxiCarTriggerPosition;
+    Vector3f taxiCarTriggerPosition = Vector3f(0,0,0);
     std::vector<Vector3f> taxiCarWaypoints;
 
     // (trigger/teleport zone runtime flags are serialised by id directly in Location::save/load)

src/MenuManager.cpp

@@ -10,8 +10,16 @@
 #include <string>
 #include <SDL.h>
 
+#ifdef __EMSCRIPTEN__
+#include <emscripten.h>
+#endif
+
 namespace FRG {
 
+#ifdef __EMSCRIPTEN__
+	//extern Game* Game::s_instance;
+#endif
+
 	// Localization
 	static const std::string EMPTY_LANGUAGE_RU = u8"(пусто)";
 	static const std::string EMPTY_LANGUAGE_EN = "(empty)";
@@ -19,6 +27,11 @@ namespace FRG {
 	static const std::string BACK_TO_MAIN_MENU_RU = u8"Вернуться в меню";
 	static const std::string BACK_TO_MAIN_MENU_EN = "Back to Main Menu";
 
+	static const std::string MUSIC_DOWNLOAD_ERROR_RU = u8"Ошибка скачивания музыки";
+	static const std::string MUSIC_DOWNLOAD_NOT_STARTED_RU = u8"Нажмите сюда, чтобы скачать и установить музыку (27 MB).";
+	static const std::string MUSIC_DOWNLOAD_PROGRESS_PREFIX_RU = u8"Загрузка музыки: ";
+	//static const std::string MUSIC_DOWNLOAD_COMPLETED_RU = u8"Музыка успешно загружена.";
+
 
 	static int questStatusPriority(Quest::QuestStatus status) {
 		switch (status) {
@@ -112,6 +125,78 @@ namespace FRG {
 		}
 	}
 
+#ifdef __EMSCRIPTEN__
+	// Коллбэк успешной загрузки music.zip
+	void MenuManager::onMusicZipLoaded(unsigned /*handle*/, void* /*userData*/, const char* /*filename*/) {
+		logger() << "File music.zip downloaded successfully to VFS" << std::endl;
+		FRG::emscriptenSyncFs();
+		if (Game::s_instance != nullptr)
+		{
+			Game::s_instance->menuManager.musicDownloadProgress = 1.f;
+			Game::s_instance->menuManager.musicDownloadStarted = false;
+			Game::s_instance->menuManager.musicDownloadError = false;
+			logger() << "onMusicZipLoaded step 2: " << Game::s_instance->menuManager.lastMusicTrack << std::endl;
+			if (Game::s_instance->menuManager.lastMusicTrack != "")
+			{
+				logger() << "onMusicZipLoaded step 3" << std::endl;
+
+				Game::s_instance->menuManager.audioPlayer_.crossFadeMusicAsync(Game::s_instance->menuManager.lastMusicTrack);
+			}
+			logger() << "onMusicZipLoaded step 4" << std::endl;
+
+			if (Game::s_instance->menuManager.playerInSettingsNoMusic)
+			{
+				if (Game::s_instance->menuManager.playerInSettingsNoMusicGraphics)
+				{
+					Game::s_instance->menuManager.uiManager.popMenu();
+					Game::s_instance->menuManager.uiManager.popMenu();
+					Game::s_instance->menuManager.showSettingsScreen();
+					Game::s_instance->menuManager.showSettingsGraphicsScreen();
+					Game::s_instance->menuManager.uiManager.updateAllLayouts();
+					Game::s_instance->menuManager.topUiManager.updateAllLayouts();
+				}
+				else
+				{
+					Game::s_instance->menuManager.uiManager.popMenu();
+					Game::s_instance->menuManager.showSettingsScreen();
+					Game::s_instance->menuManager.uiManager.updateAllLayouts();
+					Game::s_instance->menuManager.topUiManager.updateAllLayouts();
+				}
+			}
+			Game::s_instance->menuManager.playerInSettingsNoMusic = false;
+			Game::s_instance->menuManager.playerInSettingsNoMusicGraphics = false;
+			//Game::s_instance->menuManager.uiManager.setText("musicDownloadButton", musicDownloadCompleted);
+		}
+	}
+
+	void MenuManager::onMusicZipError(unsigned /*handle*/, void* /*userData*/, int httpStatus) {
+		logger() << "Failed to download music.zip, HTTP status: " << httpStatus << std::endl;
+		if (Game::s_instance != nullptr)
+		{
+			std::string musicDownloadError = MUSIC_DOWNLOAD_ERROR_RU;
+
+			Game::s_instance->menuManager.musicDownloadStarted = false;
+			Game::s_instance->menuManager.musicDownloadError = true;
+			Game::s_instance->menuManager.uiManager.setText("musicDownloadButton",
+				musicDownloadError);
+
+		}
+	}
+
+	void MenuManager::onMusicZipProgress(unsigned /*handle*/, void* /*userData*/, int percentComplete) {
+		// Прогресс для музыки при необходимости
+		if (Game::s_instance != nullptr)
+		{
+			std::string musicDownloadProgressPrefix = MUSIC_DOWNLOAD_PROGRESS_PREFIX_RU;
+
+			Game::s_instance->menuManager.musicDownloadProgress = percentComplete / 100.0f;
+			Game::s_instance->menuManager.uiManager.setText("musicDownloadButton",
+				musicDownloadProgressPrefix + std::to_string(percentComplete) + "%");
+
+		}
+	}
+#endif
+
 	MenuManager::MenuManager(Renderer& iRenderer, GameState& gameState, AudioPlayerAsync& audioPlayer) :
 		renderer(iRenderer),
 		gameState_(gameState),
@@ -254,7 +339,13 @@ namespace FRG {
 
         creditsScreenRoot = loadLocalizedUi("resources/w/ui/screen_credits.json", zipFile);
 		portraitCreditsScreenRoot = loadLocalizedUi("resources/w/ui/portrait_screen_credits.json", zipFile);
+
+#ifdef __EMSCRIPTEN__
+		settingsScreenNoMusicWebRoot = loadLocalizedUi("resources/w/ui/screen_settings_nomusic_web.json", zipFile);
+#endif
 		settingsScreenRoot = loadLocalizedUi("resources/w/ui/screen_settings.json", zipFile);
+
+
 		settingsGraphicsScreenRoot = loadLocalizedUi("resources/w/ui/screen_settings_graphics.json", zipFile);
 		languageScreenRoot = loadLocalizedUi("resources/w/ui/screen_language.json", zipFile);
 		loadSavedGameScreenRoot = loadLocalizedUi("resources/w/ui/screen_load.json", zipFile);
@@ -375,7 +466,8 @@ namespace FRG {
 	void MenuManager::showMainMenu() {
 		gameState_.currentLocationName.clear();
 
-		audioPlayer_.crossFadeMusicAsync("audio/main menu final.ogg");
+		audioPlayer_.crossFadeMusicAsync("music/main menu final.ogg");
+		lastMusicTrack = "music/main menu final.ogg";
 
 		uiState_ = GameUiState::MainMenu;
 		uiManager.clearMenuStack();
@@ -386,36 +478,46 @@ namespace FRG {
 
 
 		uiManager.setTextButtonCallback("menuStartButton", [this](const std::string&) {
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			enterGameplay();
 			
 		});
 		uiManager.setTextButtonCallback("menuAboutButton", [this](const std::string&) {
 			showAboutScreen();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 		});
 		uiManager.setTextButtonCallback("menuCreditsButton", [this](const std::string&) {
 			showCreditsScreen();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 		});
 		uiManager.setTextButtonCallback("menuSettingsButton", [this](const std::string&) {
+#ifdef __EMSCRIPTEN__
+			std::string musicPath = FRG::getPersistentResourcePath("music.zip");
+			if (FRG::isZipValid(musicPath)) {
+				showSettingsScreen();
+			}
+			else {
+				showSettingsNoMusicWebScreen();
+			}
+#else
 			showSettingsScreen();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+#endif
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 		});
 		uiManager.setTextButtonCallback("menuLanguageButton", [this](const std::string&) {
 			showLanguageScreen();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			});
 		uiManager.setTextButtonCallback("menuLoadButton", [this](const std::string&) {
 			showLoadGameScreen();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 		});
 
 
 
 #if !defined(EMSCRIPTEN) && !defined(__ANDROID__)
 		uiManager.setTextButtonCallback("menuExitButton", [this](const std::string&) {
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			Environment::exitGameLoop = true;
 		});
 #else
@@ -426,7 +528,8 @@ namespace FRG {
 	void MenuManager::showMenuAfterGameCompleted() {
 		//gameState_.currentLocationName.clear();
 		
-		audioPlayer_.crossFadeMusicAsync("audio/main menu final.ogg");
+		audioPlayer_.crossFadeMusicAsync("music/main menu final.ogg");
+		lastMusicTrack = "music/main menu final.ogg";
 
 		uiState_ = GameUiState::MainMenu;
 		uiManager.clearMenuStack();
@@ -437,36 +540,36 @@ namespace FRG {
 
 
 		uiManager.setTextButtonCallback("menuStartButton", [this](const std::string&) {
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			enterGameplay();
 
 			});
 		uiManager.setTextButtonCallback("menuAboutButton", [this](const std::string&) {
 			showAboutScreen();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			});
 		uiManager.setTextButtonCallback("menuCreditsButton", [this](const std::string&) {
 			showCreditsScreen();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			});
 		uiManager.setTextButtonCallback("menuSettingsButton", [this](const std::string&) {
 			showSettingsScreen();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			});
 		uiManager.setTextButtonCallback("menuLanguageButton", [this](const std::string&) {
 			showLanguageScreen();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			});
 		uiManager.setTextButtonCallback("menuLoadButton", [this](const std::string&) {
 			showLoadGameScreen();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			});
 
 
 
 #ifndef EMSCRIPTEN
 		uiManager.setTextButtonCallback("menuExitButton", [this](const std::string&) {
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			Environment::exitGameLoop = true;
 			});
 #else
@@ -479,21 +582,21 @@ namespace FRG {
 		uiManager.setTextButtonCallback("aboutBackButton", [this](const std::string&) {
 			uiManager.popMenu();
 			uiManager.updateAllLayouts();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			});
 
 		uiManager.setTextButtonCallback("steamButton", [this](const std::string&) {
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			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("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			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("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			SDL_OpenURL("https://discord.gg/S8jgGHXjw");
 			});
 	}
@@ -503,29 +606,29 @@ namespace FRG {
 		uiManager.setTextButtonCallback("aboutBackButton", [this](const std::string&) {
 			uiManager.popMenu();
 			uiManager.updateAllLayouts();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");	
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");	
 		});
 
 		uiManager.setTextButtonCallback("steamButton", [this](const std::string&) {
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			SDL_OpenURL("https://store.steampowered.com/app/4801010/");
 			});
 
 
 #ifdef __ANDROID__
 		uiManager.setTextButtonCallback("websiteButton", [this](const std::string&) {
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			SDL_OpenURL("https://shadowoverbishkek.com/");
 		});
 #endif
 
 		uiManager.setTextButtonCallback("telegramButton", [this](const std::string&) {
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			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("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			SDL_OpenURL("https://discord.gg/S8jgGHXjw");
 			});
 	}
@@ -561,7 +664,7 @@ namespace FRG {
 			isPlayerInCreditsMenu = false;
 			uiManager.popMenu();
 			uiManager.updateAllLayouts();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			});
 
 		uiManager.updateAllLayouts();
@@ -577,12 +680,12 @@ namespace FRG {
 			saveSettings();
 			uiManager.popMenu();
 			uiManager.updateAllLayouts();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 		});
 
 		uiManager.setTextButtonCallback("graphicsButton", [this](const std::string&) {
 			showSettingsGraphicsScreen();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			});
 
 		// Set initial slider positions before registering callbacks so
@@ -658,7 +761,7 @@ namespace FRG {
 			/*uiManager.setTextButtonColor("musicToggleButton", on
 				? std::array<float, 4>{ 0.2f, 0.9f, 0.2f, 1.0f }
 				: std::array<float, 4>{ 0.9f, 0.2f, 0.2f, 1.0f });*/
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 		});
 		uiManager.setTextButtonCallback("soundToggleButton", [this](const std::string&) {
 			audioPlayer_.setSoundEnabled(!audioPlayer_.isSoundEnabled());
@@ -667,7 +770,7 @@ namespace FRG {
 			/*uiManager.setTextButtonColor("soundToggleButton", on
 				? std::array<float, 4>{ 0.2f, 0.9f, 0.2f, 1.0f }
 				: std::array<float, 4>{ 0.9f, 0.2f, 0.2f, 1.0f });*/
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 		});
 	}
 
@@ -676,9 +779,12 @@ namespace FRG {
 		uiManager.setTextButtonCallback("settingsBackButton", [this](const std::string&) {
 			saveSettings();
 			uiManager.popMenu();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			uiManager.updateAllLayouts();
 			topUiManager.updateAllLayouts();
+#ifdef __EMSCRIPTEN__
+			playerInSettingsNoMusicGraphics = false;
+#endif
 			});
 
 
@@ -718,7 +824,7 @@ namespace FRG {
 		uiManager.setTextButtonCallback("fullScreenToggleButton", [this, refreshFullscreenToggle](const std::string&) {
 			Environment::setFullscreen(!Environment::isFullscreen);
 			refreshFullscreenToggle();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			uiManager.updateAllLayouts();
 			topUiManager.updateAllLayouts();
 			});
@@ -728,27 +834,148 @@ namespace FRG {
 			bool newValue = !this->shadowsEnabled;
 			shadowMapSettingsChangedFunc(newValue);
 			refreshShadowToggle();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			});
 	}
 
+
+#ifdef __EMSCRIPTEN__
+	void MenuManager::showSettingsNoMusicWebScreen()
+	{
+		playerInSettingsNoMusic = true;
+		uiManager.pushMenuFromSavedRoot(settingsScreenNoMusicWebRoot);
+		uiManager.setTextButtonCallback("settingsBackButton", [this](const std::string&) {
+			saveSettings();
+			uiManager.popMenu();
+			uiManager.updateAllLayouts();
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			playerInSettingsNoMusic = false;
+			});
+
+		uiManager.setTextButtonCallback("graphicsButton", [this](const std::string&) {
+			playerInSettingsNoMusicGraphics = true;
+			showSettingsGraphicsScreen();
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			});
+
+		// Set initial slider positions before registering callbacks so
+		// setSliderValue does not fire an unregistered callback.
+		const float soundFrac = audioPlayer_.getSoundVolume() / 128.0f;
+		uiManager.setSliderValue("soundVolumeSlider", soundFrac);
+
+		// Localization
+		if (g_currentLanguage == Language::English)
+		{
+			soundVolumePrefix = "Sound volume: ";
+			soundToggleOn = "Sound: ON";
+			soundToggleOff = "Sound: OFF";
+		}
+		else if (g_currentLanguage == Language::Russian)
+		{
+			soundVolumePrefix = u8"Громкость звука: ";
+			soundToggleOn = u8"Звук: ВКЛ";
+			soundToggleOff = u8"Звук: ВЫКЛ";
+		}
+
+		static std::string musicDownloadErrorString = u8"Ошибка скачивания музыки";
+		static std::string musicDownloadNotStartedString = u8"Нажмите сюда, чтобы скачать\nи установить музыку (27 MB).";
+		static std::string musicDownloadProgressPrefix = u8"Загрузка музыки: ";
+
+		//		musicDownloadStarted = false;
+		//musicDownloadError = false;
+
+		if (musicDownloadError)
+		{
+			uiManager.setText("musicDownloadButton", musicDownloadErrorString);
+
+		}
+		else
+		{
+			if (musicDownloadStarted == false)
+			{
+				uiManager.setText("musicDownloadButton", musicDownloadNotStartedString);
+			}
+			else
+			{
+				//uiManager.setText("musicDownloadButton", musicDownloadProgressString);
+				uiManager.setText("musicDownloadButton",
+				musicDownloadProgressPrefix + std::to_string(round(musicDownloadProgress*100)) + "%");
+			}
+		}
+
+		uiManager.setText("soundVolumeText",
+			soundVolumePrefix + std::to_string(audioPlayer_.getSoundVolume()));
+
+		uiManager.setSliderCallback("soundVolumeSlider",
+			[this](const std::string&, float value) {
+				const int vol = static_cast<int>(value * 128.0f + 0.5f);
+				audioPlayer_.setSoundVolume(vol);
+				uiManager.setText("soundVolumeText",
+					soundVolumePrefix + std::to_string(vol));
+			});
+
+		// Music on/off toggle — helper to sync button text and color from current state
+		auto refreshSoundToggle = [this]() {
+			const bool on = audioPlayer_.isSoundEnabled();
+			uiManager.setTextButtonText("soundToggleButton", on ? soundToggleOn : soundToggleOff);
+			/*uiManager.setTextButtonColor("soundToggleButton", on
+				? std::array<float, 4>{ 0.2f, 0.9f, 0.2f, 1.0f }
+				: std::array<float, 4>{ 0.9f, 0.2f, 0.2f, 1.0f });*/
+			};
+
+		refreshSoundToggle();
+
+
+		uiManager.setTextButtonCallback("soundToggleButton", [this](const std::string&) {
+			audioPlayer_.setSoundEnabled(!audioPlayer_.isSoundEnabled());
+			const bool on = audioPlayer_.isSoundEnabled();
+			uiManager.setTextButtonText("soundToggleButton", on ? soundToggleOn : soundToggleOff);
+			/*uiManager.setTextButtonColor("soundToggleButton", on
+				? std::array<float, 4>{ 0.2f, 0.9f, 0.2f, 1.0f }
+				: std::array<float, 4>{ 0.9f, 0.2f, 0.2f, 1.0f });*/
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			});
+
+		uiManager.setTextButtonCallback("musicDownloadButton", [this](const std::string&) {
+			if (musicDownloadStarted) return; // Already downloading, ignore further clicks
+
+			musicDownloadStarted = true;
+			musicDownloadError = false;
+
+			std::string musicPath = FRG::getPersistentResourcePath("music.zip");
+
+			emscripten_async_wget2(
+				"music.zip",
+				musicPath.c_str(),
+				"GET",
+				nullptr,
+				nullptr,
+				onMusicZipLoaded,
+				onMusicZipError,
+				onMusicZipProgress
+			);
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			});
+	}
+#endif
+
 	void MenuManager::showLanguageScreen() {
 		uiManager.pushMenuFromSavedRoot(languageScreenRoot);
 		uiManager.setTextButtonCallback("languageBackButton", [this](const std::string&) {
 			saveSettings();
 			uiManager.popMenu();
 			uiManager.updateAllLayouts();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			});
 
 		uiManager.setTextButtonCallback("languageRussianButton", [this](const std::string&) {
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			FRG::g_currentLanguage = FRG::Language::Russian;
 			reloadLocalizedGameContent();
 			saveSettings();
 			});
 		uiManager.setTextButtonCallback("languageEnglishButton", [this](const std::string&) {
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			FRG::g_currentLanguage = FRG::Language::English;
 			reloadLocalizedGameContent();
 			saveSettings();
@@ -810,7 +1037,7 @@ namespace FRG {
 		uiManager.setTextButtonCallback("loadBackButton", [this](const std::string&) {
 			uiManager.popMenu();
 			uiManager.updateAllLayouts();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 		});
 
 		static const char* kSlotButtons[4] = {
@@ -837,7 +1064,7 @@ namespace FRG {
 				uiManager.setTextButtonText(kSlotButtons[i], label);
 			}
 			uiManager.setTextButtonCallback(kSlotButtons[i], [this, slot](const std::string&) {
-				audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+				audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 				if (onLoadGame) onLoadGame(slot);
 				enterGameplay(true);
 			});
@@ -850,7 +1077,7 @@ namespace FRG {
 		uiManager.setTextButtonCallback("saveBackButton", [this](const std::string&) {
 			uiManager.popMenu();
 			uiManager.updateAllLayouts();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			});
 
 		static const char* kSlotButtons[4] = {
@@ -896,7 +1123,7 @@ namespace FRG {
 						? emptyText
 						: localizedLocationName[info.locationName][FRG::g_currentLanguage] + " " + info.savedAt;
 					uiManager.setTextButtonText(buttonName, label);
-					audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+					audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 				}
 			});
 		}
@@ -941,7 +1168,7 @@ namespace FRG {
 					selectInventoryItem(i);
 					//logger() << "Callback called for button number " << i << " END" << std::endl;
 
-					audioPlayer_.playSoundAsync("audio/sound_bag001.ogg");
+					audioPlayer_.playSoundAsync("resources/audio/sound_bag001.ogg");
 				});
 			} else {
 				uiManager.setNodeVisible(btnName, false);
@@ -953,7 +1180,7 @@ namespace FRG {
 			selectInventoryItem(0);
 		}
 
-		audioPlayer_.playSoundAsync("audio/sound_bag_open.ogg");
+		audioPlayer_.playSoundAsync("resources/audio/sound_bag_open.ogg");
 	}
 
 	void MenuManager::selectInventoryItem(int index) {
@@ -1005,7 +1232,7 @@ namespace FRG {
 		for (int i = 0; i < inventoryMenuStackDepth_; ++i) uiManager.popMenu();
 		inventoryMenuStackDepth_ = 0;
 		uiManager.updateAllLayouts();
-		audioPlayer_.playSoundAsync("audio/sound_bag_close.ogg");
+		audioPlayer_.playSoundAsync("resources/audio/sound_bag_close.ogg");
 	}
 
 	void MenuManager::openQuestJournal() {
@@ -1021,12 +1248,12 @@ namespace FRG {
 
 		uiManager.setButtonCallback("journalExitButton", [this](const std::string&) {
 			closeQuestJournal();
-			audioPlayer_.playSoundAsync("audio/656126__itsthegoodstuff__paging-through-book.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/656126__itsthegoodstuff__paging-through-book.ogg");
 		});
 
 		uiManager.setButtonCallback("journalExitButton2", [this](const std::string&) {
 			closeQuestJournal();
-			audioPlayer_.playSoundAsync("audio/656126__itsthegoodstuff__paging-through-book.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/656126__itsthegoodstuff__paging-through-book.ogg");
 			});
 
 
@@ -1041,7 +1268,7 @@ namespace FRG {
 		for (int i = 0; i < 9; ++i) {
 			uiManager.setTextButtonCallback(kItemNames[i], [this, i](const std::string&) {
 				selectQuestByIndex(i);
-				audioPlayer_.playSoundAsync("audio/255571__stradie__flipping-paper.ogg");
+				audioPlayer_.playSoundAsync("resources/audio/255571__stradie__flipping-paper.ogg");
 			});
 		}
 
@@ -1050,7 +1277,7 @@ namespace FRG {
 			selectQuestByIndex(0);
 		}
 
-		audioPlayer_.playSoundAsync("audio/255571__stradie__flipping-paper.ogg");
+		audioPlayer_.playSoundAsync("resources/audio/255571__stradie__flipping-paper.ogg");
 	}
 
 	void MenuManager::closeQuestJournal() {
@@ -1101,24 +1328,24 @@ namespace FRG {
 
 		uiManager.setButtonCallback("phoneExitButton", [this](const std::string&) {
 			closePhoneEntirely();
-			audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 		});
 		uiManager.setButtonCallback("phoneMain", [this](const std::string&) {});
 		uiManager.setButtonCallback("phoneMessenger", [this](const std::string&) {
 			openPhoneMessenger();
-			audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 		});
 		uiManager.setButtonCallback("phoneBank", [this](const std::string&) {
 			openPhoneBank();
-			audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 		});
 		uiManager.setButtonCallback("phoneVideo", [this](const std::string&) {
 			openPhoneVideo();
-			audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 		});
 		uiManager.setButtonCallback("phoneTaxi", [this](const std::string&) {
 			openPhoneTaxi();
-			audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 		});
 
 		if (gameState_.isNight)
@@ -1143,7 +1370,7 @@ namespace FRG {
 			uiManager.setNodeVisible("phoneTimeDawn", false);
 		}
 
-		audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+		audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 	}
 
 	void MenuManager::openPhoneMessenger() {
@@ -1161,23 +1388,23 @@ namespace FRG {
 
 		uiManager.setButtonCallback("phoneExitButton", [this](const std::string&) {
 			closePhoneEntirely();
-			audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 		});
 		uiManager.setButtonCallback("phoneMain", [this](const std::string&) {});
 		uiManager.setTextButtonCallback("chat1button", [this](const std::string&) {
 			gameState_.chatUnread[0] = false;
 			openPhoneChatFromList(0, isPortraitMode() ? verticalPhoneChat1Root : phoneChat1Root);
-			audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 		});
 		uiManager.setTextButtonCallback("chat2button", [this](const std::string&) {
 			gameState_.chatUnread[1] = false;
 			openPhoneChatFromList(1, isPortraitMode() ? verticalPhoneChat2Root : phoneChat2Root);
-			audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 		});
 		uiManager.setTextButtonCallback("chat3button", [this](const std::string&) {
 			gameState_.chatUnread[2] = false;
 			openPhoneChatFromList(2, isPortraitMode() ? verticalPhoneChat3Root : phoneChat3Root);
-			audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 		});
 	}
 
@@ -1213,13 +1440,13 @@ namespace FRG {
 
 		uiManager.setButtonCallback("phoneExitButton", [this](const std::string&) {
 			closePhoneEntirely();
-			audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 		});
 		uiManager.setButtonCallback("phoneMain", [this](const std::string&) {});
 		uiManager.setButtonCallback("buttonBack", [this](const std::string&) {
 			uiManager.popMenu();
 			uiManager.updateAllLayouts();
-			audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 		});
 	}
 
@@ -1229,13 +1456,13 @@ namespace FRG {
 
 		uiManager.setButtonCallback("phoneExitButton", [this](const std::string&) {
 			closePhoneEntirely();
-			audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 		});
 		uiManager.setButtonCallback("phoneMain", [this](const std::string&) {});
 		uiManager.setButtonCallback("buttonBack", [this](const std::string&) {
 			uiManager.popMenu();
 			uiManager.updateAllLayouts();
-			audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 		});
 		uiManager.setButtonCallback("videoSkip", [this](const std::string&) {
 			closePhoneEntirely();
@@ -1252,7 +1479,7 @@ namespace FRG {
 				}
 				else
 				{
-					audioPlayer_.playSoundAsync("audio/78564__joedeshon__alarm_clock_ticking_02.ogg");
+					audioPlayer_.playSoundAsync("resources/audio/78564__joedeshon__alarm_clock_ticking_02.ogg");
 					startNightTransitionFunc();
 				}
 			}
@@ -1277,13 +1504,13 @@ namespace FRG {
 
 		uiManager.setButtonCallback("phoneExitButton", [this](const std::string&) {
 			closePhoneEntirely();
-			audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 		});
 		uiManager.setButtonCallback("phoneMain", [this](const std::string&) {});
 		uiManager.setButtonCallback("buttonBack", [this](const std::string&) {
 			uiManager.popMenu();
 			uiManager.updateAllLayouts();
-			audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 		});
 		uiManager.setButtonCallback("mapGo", [this](const std::string&) {
 			gameState_.tutorialNeedOpenTaxiScreen = false;
@@ -1298,17 +1525,17 @@ namespace FRG {
 				gameState_.money -= 500;
 				closePhoneEntirely();
 				if (startDialogueFunc) startDialogueFunc("dialog_taxi002");
-				audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+				audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 			}
 			else
 			{
 				closePhoneEntirely();
 				if (startDialogueFunc) startDialogueFunc("dialog_taxi004");
-				audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+				audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 			}
 		});
 
-		audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+		audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 	}
 
 	void MenuManager::openPhoneChatFromList(int chatIndex, std::shared_ptr<UiNode> chatRoot) {
@@ -1348,12 +1575,12 @@ namespace FRG {
 
 		uiManager.setButtonCallback("phoneExitButton", [this](const std::string&) {
 			closePhoneScreenFromChat();
-			audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 		});
 		uiManager.setButtonCallback("phoneMain", [this](const std::string&) {});
 		uiManager.setTextButtonCallback("chatTitleButton", [this](const std::string&) {
 			returnToPhoneChatList();
-			audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 		});
 
 		if (chatOpenCallback) {
@@ -1437,37 +1664,37 @@ namespace FRG {
 	}
 
 	void MenuManager::showModalMenuScreen() {
-		audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+		audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 		uiManager.pushMenuFromSavedRoot(modalMenuRoot);
 		uiManager.setButtonCallback("modalExitButton", [this](const std::string&) {
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			uiManager.popMenu();
 			uiManager.updateAllLayouts();
 			});
 
 		uiManager.setButtonCallback("menuCloseButton", [this](const std::string&) {
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			uiManager.popMenu();
 			uiManager.updateAllLayouts();
 			});
 
 		uiManager.setButtonCallback("menuSaveButton", [this](const std::string&) {
 			showSaveGameScreen();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			});
 
 		uiManager.setButtonCallback("menuLoadButton", [this](const std::string&) {
 			showLoadGameScreen();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			});
 
 		uiManager.setButtonCallback("menuSettingsButton", [this](const std::string&) {
 			showSettingsScreen();
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			});
 
 		uiManager.setButtonCallback("menuExitButton", [this](const std::string&) {
-			audioPlayer_.playSoundAsync("audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg");
 			uiManager.popMenu();
 			showMainMenu();
 			});
@@ -1579,29 +1806,35 @@ namespace FRG {
 			setupGameplayHudCallbacks();
 			if (gameState_.isDarklands)
 			{
-				audioPlayer_.crossFadeMusicAsync("audio/bishkek fight calm.ogg");
+				audioPlayer_.crossFadeMusicAsync("music/bishkek fight calm.ogg");
+				lastMusicTrack = "music/bishkek fight calm.ogg";
 			}
 			else if (gameState_.isNight)
 			{
-				audioPlayer_.crossFadeMusicAsync("audio/bishkek night.ogg");
+				audioPlayer_.crossFadeMusicAsync("music/bishkek night.ogg");
+				lastMusicTrack = "music/bishkek night.ogg";
 			}
 			else
 			{
-				audioPlayer_.crossFadeMusicAsync("audio/bishkek univer day.ogg");
+				audioPlayer_.crossFadeMusicAsync("music/bishkek univer day.ogg");
+				lastMusicTrack = "music/bishkek univer day.ogg";
 			}
 		} else if (locationName == "uni_interior") {
 			applyUniIntHud();
 			if (gameState_.isDarklands)
 			{
-				audioPlayer_.crossFadeMusicAsync("audio/bishkek fight calm.ogg");
+				audioPlayer_.crossFadeMusicAsync("music/bishkek fight calm.ogg");
+				lastMusicTrack = "music/bishkek fight calm.ogg";
 			}
 			else if (gameState_.isNight)
 			{
-				audioPlayer_.crossFadeMusicAsync("audio/bishkek night.ogg");
+				audioPlayer_.crossFadeMusicAsync("music/bishkek night.ogg");
+				lastMusicTrack = "music/bishkek night.ogg";
 			}
 			else
 			{
-				audioPlayer_.crossFadeMusicAsync("audio/bishkek univer day.ogg");
+				audioPlayer_.crossFadeMusicAsync("music/bishkek univer day.ogg");
+				lastMusicTrack = "music/bishkek univer day.ogg";
 			}
 		} else {
 			// Returning to dorm: reuse step5ab, suppress already-completed hints
@@ -1611,11 +1844,13 @@ namespace FRG {
 
 			if (gameState_.isNight)
 			{
-				audioPlayer_.crossFadeMusicAsync("audio/bishkek night.ogg");
+				audioPlayer_.crossFadeMusicAsync("music/bishkek night.ogg");
+				lastMusicTrack = "music/bishkek night.ogg";
 			}
 			else
 			{
-				audioPlayer_.crossFadeMusicAsync("audio/obshaga.ogg");
+				audioPlayer_.crossFadeMusicAsync("music/obshaga.ogg");
+				lastMusicTrack = "music/obshaga.ogg";
 			}
 		}
 	}
@@ -1844,12 +2079,12 @@ namespace FRG {
 
 		uiManager.setButtonCallback("inventoryExitButton", [this](const std::string&) {
 			closePortraitInventoryItem();
-			audioPlayer_.playSoundAsync("audio/sound_bag001.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/sound_bag001.ogg");
 		});
 
 		uiManager.setButtonCallback("inventoryExitButton2", [this](const std::string&) {
 			closePortraitInventoryItem();
-			audioPlayer_.playSoundAsync("audio/sound_bag001.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/sound_bag001.ogg");
 			});
 
 		uiManager.setButtonCallback("inventoryMain", [this](const std::string&) {});
@@ -1880,12 +2115,12 @@ namespace FRG {
 
 		uiManager.setButtonCallback("journalItemExitButton", [this](const std::string&) {
 			closePortraitJournalItem();
-			audioPlayer_.playSoundAsync("audio/255571__stradie__flipping-paper.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/255571__stradie__flipping-paper.ogg");
 		});
 
 		uiManager.setButtonCallback("journalItemExitButton2", [this](const std::string&) {
 			closeQuestJournal();
-			audioPlayer_.playSoundAsync("audio/656126__itsthegoodstuff__paging-through-book.ogg");
+			audioPlayer_.playSoundAsync("resources/audio/656126__itsthegoodstuff__paging-through-book.ogg");
 			});
 
 
@@ -2085,7 +2320,7 @@ namespace FRG {
 			recomputePhoneChatPositions();
 		}
 		chatUiManager.startPopIn(nodeName, 300.0f);
-		audioPlayer_.playSoundAsync("audio/537061__imafoley__message-pop-sound.ogg");
+		audioPlayer_.playSoundAsync("resources/audio/537061__imafoley__message-pop-sound.ogg");
 	}
 
 	void MenuManager::setDarklandsMode(bool enabled)

src/MenuManager.h

@@ -130,7 +130,20 @@ namespace FRG {
 		std::shared_ptr<Texture> languageLoadingEn;
 
 		bool shadowsEnabled = true;
+		std::string lastMusicTrack;
 
+#ifdef __EMSCRIPTEN__
+		static void onMusicZipLoaded(unsigned /*handle*/, void* /*userData*/, const char* /*filename*/);
+		static void onMusicZipError(unsigned /*handle*/, void* /*userData*/, int httpStatus);
+		static void onMusicZipProgress(unsigned /*handle*/, void* /*userData*/, int percentComplete);
+
+		float musicDownloadProgress = 0.0f;
+
+		bool musicDownloadStarted = false;
+		bool musicDownloadError = false;
+		bool playerInSettingsNoMusic = false;
+		bool playerInSettingsNoMusicGraphics = false;
+#endif
 
 	protected:
 		Renderer& renderer;
@@ -176,6 +189,10 @@ namespace FRG {
 		void showCreditsScreen();
 		void showSettingsScreen();
 		void showSettingsGraphicsScreen();
+
+#ifdef __EMSCRIPTEN__
+		void showSettingsNoMusicWebScreen();
+#endif
 		void showLanguageScreen();
 		void showLoadGameScreen();
 		void showSaveGameScreen();
@@ -268,6 +285,9 @@ namespace FRG {
 		std::shared_ptr<UiNode> creditsScreenRoot;
 		std::shared_ptr<UiNode> portraitCreditsScreenRoot;
 
+#ifdef __EMSCRIPTEN__
+		std::shared_ptr<UiNode> settingsScreenNoMusicWebRoot;
+#endif
 		std::shared_ptr<UiNode> settingsScreenRoot;
 		std::shared_ptr<UiNode> settingsGraphicsScreenRoot;
 		std::shared_ptr<UiNode> languageScreenRoot;
@@ -343,6 +363,7 @@ namespace FRG {
 		std::string fullScreenToggleOff;
 		std::string shadowToggleOn;
 		std::string shadowToggleOff;
+		std::string musicDownloadProgressPrefix;
 
 	};
 

src/utils/Utils.cpp

@@ -105,12 +105,20 @@ namespace FRG
 	}
 
 	std::vector<char> readFileFromZIP(const std::string& filename, const std::string& zipfilename) {
+		if (zipfilename.empty()) {
+			logger() << "readFileFromZIP: zipfilename empty, reading from file directly..." << std::endl;
+			return readFile(filename);
+		}
+
 #ifdef EMSCRIPTEN
+
+		std::string webZipFilename = getPersistentResourcePath(zipfilename);
+
 		int zipErr = 0;
-		zip_t* archive = zip_open(zipfilename.c_str(), ZIP_RDONLY, &zipErr);
+		zip_t* archive = zip_open(webZipFilename.c_str(), ZIP_RDONLY, &zipErr);
 		if (!archive) {
-			logger() << "Failed to open ZIP: " << zipfilename << " (error code " << zipErr << ")" << std::endl;
-			throw std::runtime_error("Failed to open ZIP: " + zipfilename);
+			logger() << "Failed to open ZIP: " << webZipFilename << " (error code " << zipErr << ")" << std::endl;
+			throw std::runtime_error("Failed to open ZIP: " + webZipFilename);
 		}
 
 		std::string cleanFilename = filename;
@@ -120,14 +128,14 @@ namespace FRG
 		zip_stat_init(&fileStat);
 		if (zip_stat(archive, cleanFilename.c_str(), 0, &fileStat) != 0 || !(fileStat.valid & ZIP_STAT_SIZE)) {
 			zip_close(archive);
-			logger() << "Failed to stat file in ZIP: " << cleanFilename << " in " << zipfilename << std::endl;
+			logger() << "Failed to stat file in ZIP: " << cleanFilename << " in " << webZipFilename << std::endl;
 			throw std::runtime_error("Can't stat file in ZIP: " + cleanFilename);
 		}
 
 		zip_file_t* zipFile = zip_fopen(archive, cleanFilename.c_str(), 0);
 		if (!zipFile) {
 			zip_close(archive);
-			logger() << "Failed to open file in ZIP: " << cleanFilename << std::endl;
+			logger() << "Failed to open file in ZIP: " << cleanFilename << " in " << webZipFilename << std::endl;
 			throw std::runtime_error("Can't open file in ZIP: " + cleanFilename);
 		}
 
@@ -146,11 +154,6 @@ namespace FRG
 		return fileData;
 #else
 
-		if (zipfilename.empty()) {
-			std::cerr << "readFileFromZIP: zipfilename empty" << std::endl;
-			return {};
-		}
-
 		int zipErr = 0;
 		zip_t* archive = zip_open(zipfilename.c_str(), ZIP_RDONLY, &zipErr);
 		if (!archive) {
@@ -197,6 +200,39 @@ namespace FRG
 #endif
 	}
 
+	bool zipFileExists(const std::string& zipfilename)
+	{
+		if (zipfilename.empty()) {
+			return false;
+		}
+
+#ifdef EMSCRIPTEN
+		std::string webZipFilename = getPersistentResourcePath(zipfilename);
+
+		int zipErr = 0;
+		zip_t* archive = zip_open(webZipFilename.c_str(), ZIP_RDONLY, &zipErr);
+		if (!archive) {
+			return false;
+		}
+
+		zip_close(archive);
+		return true;
+#else
+
+		int zipErr = 0;
+		zip_t* archive = zip_open(zipfilename.c_str(), ZIP_RDONLY, &zipErr);
+		if (!archive) {
+			std::cerr << "readFileFromZIP: zip_open failed for: " << zipfilename
+				<< " (error code " << zipErr << ")" << std::endl;
+			return false;
+		}
+
+		zip_close(archive);
+
+		return true;
+#endif
+	}
+
 	bool findString(const char* in, char* list)
 	{
 		size_t thisLength = strlen(in);
@@ -481,4 +517,31 @@ namespace FRG
 		// Если логирование отключено, возвращаем заглушку.
 		return g_nullStream;
 	}
+
+
+#ifdef __EMSCRIPTEN__
+	// Получение абсолютного пути к ресурсам в хранилище сохранений (/offline/resources.zip)
+	std::string getPersistentResourcePath(const std::string& filename) {
+		namespace fs = std::filesystem;
+		return (getSaveDirectory() / filename).string();
+	}
+
+	// Проверка целостности zip-файла по указанному пути
+	bool isZipValid(const std::string& fullPath) {
+		namespace fs = std::filesystem;
+		if (!fs::exists(fullPath)) {
+			return false;
+		}
+
+		int zipErr = 0;
+		zip_t* archive = zip_open(fullPath.c_str(), ZIP_RDONLY, &zipErr);
+		if (!archive) {
+			logger() << "[VFS] ZIP file invalid or corrupted: " << fullPath
+				<< " (code " << zipErr << ")" << std::endl;
+			return false;
+		}
+		zip_close(archive);
+		return true;
+	}
+#endif
 };

src/utils/Utils.h

@@ -23,6 +23,8 @@ namespace FRG
 
 	std::vector<char> readFileFromZIP(const std::string& filename, const std::string& zipfilename);
 
+	bool zipFileExists(const std::string& zipfilename);
+	
 	bool findString(const char* in, char* list);
 
 	std::filesystem::path getSaveDirectory();
@@ -38,4 +40,10 @@ namespace FRG
 	void initLogger();
 
 	std::ostream& logger();
+
+#ifdef __EMSCRIPTEN__
+	std::string getPersistentResourcePath(const std::string& filename);
+
+	bool isZipValid(const std::string& fullPath);
+#endif
 }