Attempt to fix music replacement definitions again

Store per-map music replacements in a TMap, and perform the replacements after parsing the MAPINFO
ZDoom · Sep 12, 2021 · 2297c93 · 2297c93
1 parent f675ade
commit 2297c93
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/source/core/defparser.cpp b/source/core/defparser.cpp
@@ -815,7 +815,7 @@ void parseMusic(FScanner& sc, FScriptPosition& pos)
 		if (sc.Compare("id")) sc.GetString(id);
 		else if (sc.Compare("file")) sc.GetString(file);
 	}
-	SetMusicForMap(id, file, true);
+	SetMusicReplacement(id, file);
 }
 
 //===========================================================================

diff --git a/source/core/gamecontrol.cpp b/source/core/gamecontrol.cpp
@@ -1057,6 +1057,7 @@ int RunGame()
 	gi->app_init();
 	StartScreen->Progress();
 	G_ParseMapInfo();
+	ReplaceMusics(true);
 	CreateStatusBar();
 	SetDefaultMenuColors();
 	M_Init();

diff --git a/source/core/mapinfo.cpp b/source/core/mapinfo.cpp
@@ -40,6 +40,7 @@
 #include "printf.h"
 #include "gamecontrol.h"
 #include "raze_sound.h"
+#include "zstring.h"
 
 FString gSkillNames[MAXSKILLS];
 int gDefaultVolume = 0, gDefaultSkill = 1;
@@ -48,6 +49,7 @@ GlobalCutscenes globalCutscenes;
 TArray<ClusterDef> clusters;
 TArray<VolumeRecord> volumes;
 TArray<TPointer<MapRecord>> mapList;	// must be allocated as pointers because it can whack the currentlLevel pointer if this was a flat array.
+static TMap<FString, FString> musicReplacements;
 MapRecord *currentLevel;	// level that is currently played.
 MapRecord* lastLevel;		// Same here, for the last level.
 
@@ -157,6 +159,23 @@ MapRecord* FindNextSecretMap(MapRecord* thismap)
 	return next? next : FindNextMap(thismap);
 }
 
+void SetMusicReplacement(const char *mapname, const char *music)
+{
+	musicReplacements[mapname] = music;
+}
+
+void ReplaceMusics(bool namehack)
+{
+	TMap<FString, FString>::Iterator it(musicReplacements);
+	TMap<FString, FString>::Pair* pair;
+	while (it.NextPair(pair))
+	{
+		FString mapname = pair->Key;
+		FString music = pair->Value;
+		SetMusicForMap(mapname, music, namehack);
+	}
+	musicReplacements.Clear();
+}
 
 bool SetMusicForMap(const char* mapname, const char* music, bool namehack)
 {
@@ -192,6 +211,7 @@ bool SetMusicForMap(const char* mapname, const char* music, bool namehack)
 		index->music = music;
 		return true;
 	}
+	DPrintf(DMSG_WARNING, "Could not replace %s music with %s\n", mapname, music);
 	return false;
 }
 

diff --git a/source/core/mapinfo.h b/source/core/mapinfo.h
@@ -209,6 +209,8 @@ struct SummaryInfo
 extern GlobalCutscenes globalCutscenes;
 extern MapRecord *currentLevel;	
 
+void SetMusicReplacement(const char *mapname, const char *music);
+void ReplaceMusics(bool namehack = false);
 bool SetMusicForMap(const char* mapname, const char* music, bool namehack = false);
 
 MapRecord *FindMapByName(const char *nm);