Working on minor stuff, arts, settings, cutscenes

src/Game.cpp

@@ -15,7 +15,6 @@
 #include <android/log.h>
 #endif
 
-
 #ifdef EMSCRIPTEN
 #include <emscripten.h>
 #endif
@@ -1508,12 +1507,24 @@ namespace ZL
 						currentLocation()->state.isNight = gameState.isNight;
 						currentLocation()->scriptEngine.callTriggerNightEnterCallback();
 					}
+
+					audioPlayer->crossFadeMusicAsync("audio/bishkek night.ogg");
+
 				} else {
 					gameState.isDarklands = !gameState.isDarklands;
 
 					// Change HUD
 					menuManager.setDarklandsMode(gameState.isDarklands);
 
+					if (gameState.isDarklands)
+					{
+						audioPlayer->crossFadeMusicAsync("audio/bishkek fight calm.ogg");
+					}
+					else
+					{
+						audioPlayer->crossFadeMusicAsync("audio/bishkek night.ogg");
+					}
+
 					if (currentLocation()) {
 						currentLocation()->state.isDarklands = gameState.isDarklands;
 						if (gameState.isDarklands)
@@ -1622,6 +1633,25 @@ namespace ZL
 		} catch (const std::exception& e) {
 			std::cerr << "[save] Failed to parse save file " << path << ": " << e.what() << std::endl;
 		}
+
+		if (gameState.isDarklands)
+		{
+			audioPlayer->crossFadeMusicAsync("audio/bishkek fight calm.ogg");
+		}
+		else if (gameState.isNight)
+		{
+			audioPlayer->crossFadeMusicAsync("audio/bishkek night.ogg");
+		}
+		else
+		{
+			if (gameState.currentLocationName == "location_dorm") {
+				audioPlayer->crossFadeMusicAsync("audio/obshaga.ogg");
+			}
+			else
+			{
+				audioPlayer->crossFadeMusicAsync("audio/bishkek univer day.ogg");
+			}
+		}
 	}
 
 }  // namespace ZL