mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-31 10:45:16 +01:00
Code Issues Releases Wiki Activity

Fix override of RCT classic audio on startup

Browse Source
This commit is contained in:
Ted John
2022-10-03 23:36:28 +01:00
parent 0defe35d75
commit 41fb257fed
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/openrct2/audio/Audio.cpp
View File

@@ -109,7 +109,6 @@ namespace OpenRCT2::Audio
baseAudio = objManager.LoadObject(AudioObjectIdentifiers::Rct2cBase);
if (baseAudio != nullptr)
{
baseAudio->SetIdentifier(AudioObjectIdentifiers::Rct2Base);
_soundsAudioObjectEntryIndex = objManager.GetLoadedObjectEntryIndex(baseAudio);
}
}

5
src/openrct2/object/ObjectFactory.cpp
View File

@@ -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)