From f2792688ea8ee36887b3bb6ad294961ca20e7a08 Mon Sep 17 00:00:00 2001 From: rwjuk Date: Sun, 28 Jan 2018 20:01:28 +0000 Subject: [PATCH] Fix #7084: SC4 scenario completion not marked correctly --- src/openrct2/rct1/S4Importer.cpp | 2 +- src/openrct2/scenario/ScenarioRepository.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 7286ac1ab7..abe9d74c27 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -340,7 +340,7 @@ private: std::string GetRCT1ScenarioName() { - const scenario_index_entry * scenarioEntry = _scenarioRepository->GetByIndex(_s4.scenario_slot_index); + const scenario_index_entry * scenarioEntry = _scenarioRepository->GetByInternalName(_s4.scenario_name); return path_get_filename(scenarioEntry->path); } diff --git a/src/openrct2/scenario/ScenarioRepository.cpp b/src/openrct2/scenario/ScenarioRepository.cpp index c37a22d1b1..06cc3d4461 100644 --- a/src/openrct2/scenario/ScenarioRepository.cpp +++ b/src/openrct2/scenario/ScenarioRepository.cpp @@ -389,7 +389,7 @@ public: for (size_t i = 0; i < _scenarios.size(); i++) { const scenario_index_entry * scenario = &_scenarios[i]; - if (scenario->source_game == SCENARIO_SOURCE_OTHER) + if (scenario->source_game == SCENARIO_SOURCE_OTHER && scenario->sc_id == SC_UNIDENTIFIED) continue; // Note: this is always case insensitive search for cross platform consistency