From 41fb257fedb652fc319e7b72855fb35b82ad216c Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Mon, 3 Oct 2022 23:36:28 +0100
Subject: [PATCH] Fix override of RCT classic audio on startup

---
 src/openrct2/audio/Audio.cpp          | 1 -
 src/openrct2/object/ObjectFactory.cpp | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp
index 17945db604..645946fdbc 100644
--- a/src/openrct2/audio/Audio.cpp
+++ b/src/openrct2/audio/Audio.cpp
@@ -109,7 +109,6 @@ namespace OpenRCT2::Audio
             baseAudio = objManager.LoadObject(AudioObjectIdentifiers::Rct2cBase);
             if (baseAudio != nullptr)
             {
-                baseAudio->SetIdentifier(AudioObjectIdentifiers::Rct2Base);
                 _soundsAudioObjectEntryIndex = objManager.GetLoadedObjectEntryIndex(baseAudio);
             }
         }
diff --git a/src/openrct2/object/ObjectFactory.cpp b/src/openrct2/object/ObjectFactory.cpp
index 25883734dc..df02b97dd9 100644
--- a/src/openrct2/object/ObjectFactory.cpp
+++ b/src/openrct2/object/ObjectFactory.cpp
@@ -10,6 +10,7 @@
 #include "ObjectFactory.h"
 
 #include "../OpenRCT2.h"
+#include "../audio/audio.h"
 #include "../core/Console.hpp"
 #include "../core/File.h"
 #include "../core/FileStream.h"
@@ -516,6 +517,10 @@ namespace ObjectFactory
         {
             auto id = Json::GetString(jRoot["id"]);
 
+            // HACK Disguise RCT Classic audio as RCT2 audio so asset packs override correctly
+            if (id == OpenRCT2::Audio::AudioObjectIdentifiers::Rct2cBase)
+                id = OpenRCT2::Audio::AudioObjectIdentifiers::Rct2Base;
+
             ObjectEntryDescriptor descriptor;
             auto originalId = Json::GetString(jRoot["originalId"]);
             if (originalId.length() == 8 + 1 + 8 + 1 + 8)