From 8c9fa45a7626cde8512421ce3a156336da072291 Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Wed, 23 Dec 2020 20:15:39 -0300 Subject: [PATCH] Use switch for Ride::UpdateAll --- src/openrct2/ride/Ride.cpp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 50049f0137..c167e3ad3f 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -1984,9 +1984,22 @@ void Ride::UpdateAll() // Remove all rides if scenario editor if (gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) { - if (EnumValue(gS6Info.editor_step) <= EnumValue(EditorStep::InventionsListSetUp)) - for (auto& ride : GetRideManager()) - ride.Delete(); + switch (gS6Info.editor_step) + { + case EditorStep::ObjectSelection: + case EditorStep::LandscapeEditor: + case EditorStep::InventionsListSetUp: + for (auto& ride : GetRideManager()) + ride.Delete(); + break; + case EditorStep::OptionsSelection: + case EditorStep::ObjectiveSelection: + case EditorStep::SaveScenario: + case EditorStep::RollercoasterDesigner: + case EditorStep::DesignsManager: + case EditorStep::Invalid: + break; + } return; }