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

Refactor constant notation in Audio.h

Browse Source 
Co-authored-by: ncerroneumich <ncerrone@umich.edu>
This commit is contained in:
Rahul Unniyampath
2024-04-20 18:12:13 -04:00
committed by GitHub
parent 7fc34ef612
commit 893ae7f0ca
5 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -526,11 +526,11 @@ namespace ObjectFactory
auto id = Json::GetString(jRoot["id"]);
// Base audio files are renamed to a common, virtual name so asset packs can override it correctly.
const bool isRCT2BaseAudio = id == OpenRCT2::Audio::AudioObjectIdentifiers::RCT2Base && !isUsingClassic();
const bool isRCTCBaseAudio = id == OpenRCT2::Audio::AudioObjectIdentifiers::RCTCBase && isUsingClassic();
const bool isRCT2BaseAudio = id == OpenRCT2::Audio::AudioObjectIdentifiers::kRCT2Base && !isUsingClassic();
const bool isRCTCBaseAudio = id == OpenRCT2::Audio::AudioObjectIdentifiers::kRCTCBase && isUsingClassic();
if (isRCT2BaseAudio || isRCTCBaseAudio)
{
id = OpenRCT2::Audio::AudioObjectIdentifiers::RCT2;
id = OpenRCT2::Audio::AudioObjectIdentifiers::kRCT2;
}
auto version = VersionTuple(Json::GetString(jRoot["version"]));