Fixed the music not playing after loading a saved game (#422)

* if the save is on the same map, and while in the game.
sfall-team · Jan 19, 2022 · d2b3529 · d2b3529
1 parent f77cd85
commit d2b3529
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/sfall/Modules/LoadGameHook.cpp b/sfall/Modules/LoadGameHook.cpp
@@ -41,6 +41,7 @@
 #include "LoadOrder.h"
 #include "Message.h"
 #include "MetaruleExtender.h"
+#include "MiscPatches.h"
 #include "Movies.h"
 #include "Objects.h"
 #include "PartyControl.h"
@@ -283,6 +284,7 @@ static bool __stdcall GameReset(DWORD isGameLoad) {
 		Interface::OnGameLoad();
 		Worldmap::OnGameLoad();
 		Sound::OnGameLoad();
+		MiscPatches::OnGameLoad();
 		Inventory::Reset();
 		Objects::OnGameLoad();
 		Stats::OnGameLoad();

diff --git a/sfall/Modules/MiscPatches.cpp b/sfall/Modules/MiscPatches.cpp
@@ -935,6 +935,10 @@ static void EngineOptimizationPatches() {
 	SafeWrite8(0x47C135, 140 + 10); // jz 0x47C1CF
 }
 
+void MiscPatches::OnGameLoad() {
+	cMusicArea = -1;
+}
+
 void MiscPatches::init() {
 	EngineOptimizationPatches();
 

diff --git a/sfall/Modules/MiscPatches.h b/sfall/Modules/MiscPatches.h
@@ -26,6 +26,8 @@ class MiscPatches {
 	static const char* name() { return "MiscPatches"; }
 	static void init();
 	static void exit();
+
+	static void OnGameLoad();
 };
 
 }