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

Fix custom RCT1 scenarios potentially being confused with official ones (#24832)

Browse Source
This commit is contained in:
Aaron van Geffen
2025-07-24 20:12:35 +02:00
committed by GitHub
parent 8681b7f18a
commit 975b64a7fd
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/openrct2/rct1/S4Importer.cpp
View File

@@ -2424,7 +2424,14 @@ namespace OpenRCT2::RCT1
if (scNumber != -1)
{
SourceDescriptor desc;
if (ScenarioSources::TryGetById(scNumber, &desc) && !desc.textObjectId.empty())
// If no entry is found, this is a custom scenario
bool isOfficial = ScenarioSources::TryGetById(_s4.ScenarioSlotIndex, &desc);
// Perform an additional name check if this is detected to be a competition scenario
if (isOfficial && desc.category == ScenarioCategory::competitions)
isOfficial = ScenarioSources::TryGetByName(_s4.ScenarioName, &desc);
if (isOfficial && !desc.textObjectId.empty())
{
auto& objManager = GetContext()->GetObjectManager();