From 8a09406b64d9a61825cab7def2d509f8700ef33e Mon Sep 17 00:00:00 2001
From: ocalhoun6 <7485697@gmail.com>
Date: Wed, 4 Aug 2021 04:31:53 -0700
Subject: [PATCH] =?UTF-8?q?Fix=20#13465:=20Creating=20a=20scenario=20based?=
 =?UTF-8?q?=20on=20a=20won=20save=20game=20results=20in=20a=20scenario=20t?=
 =?UTF-8?q?hat=E2=80=99s=20instantly=20won?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 contributors.md            | 1 +
 distribution/changelog.txt | 1 +
 src/openrct2/Editor.cpp    | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/contributors.md b/contributors.md
index 05b978b783..39d8b882a9 100644
--- a/contributors.md
+++ b/contributors.md
@@ -175,6 +175,7 @@ The following people are not part of the development team, but have been contrib
 * Struan Clark (xtruan)
 * Kane Shaw (seifer7)
 * Saad Rehman (SaadRehmanCS)
+* (ocalhoun6)
 
 ## Toolchain
 * (Balletie) - macOS
diff --git a/distribution/changelog.txt b/distribution/changelog.txt
index bfcd3d25e8..fc9446032b 100644
--- a/distribution/changelog.txt
+++ b/distribution/changelog.txt
@@ -2,6 +2,7 @@
 ------------------------------------------------------------------------
 - Feature: [#15084] [Plugin] Add "vehicle.crash" hook
 - Feature: [#15143] Added a shortcut key for Giant Screenshot.
+- Fix: [#13465] Creating a scenario based on a won save game results in a scenario that’s instantly won.
 - Fix: [#14316] Closing the Track Designs Manager window causes broken state.
 - Fix: [#14667] “Extreme Hawaiian Island” has unpurchaseable land tiles (original bug).
 - Fix: [#15096] Crash when placing entrances in the scenario editor near the map corner.
diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp
index 96444bb90e..d72df4dd1c 100644
--- a/src/openrct2/Editor.cpp
+++ b/src/openrct2/Editor.cpp
@@ -134,6 +134,10 @@ namespace Editor
 
         climate_reset(gClimate);
 
+        // Clear the scenario completion status
+        gParkFlags &= ~PARK_FLAGS_SCENARIO_COMPLETE_NAME_INPUT;
+        gScenarioCompletedCompanyValue = MONEY64_UNDEFINED;
+
         gScreenFlags = SCREEN_FLAGS_SCENARIO_EDITOR;
         gEditorStep = EditorStep::ObjectiveSelection;
         gScenarioCategory = SCENARIO_CATEGORY_OTHER;