From 93873c5e74652c0841ab2afc035056073bb5e643 Mon Sep 17 00:00:00 2001
From: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
Date: Mon, 25 Feb 2019 11:23:13 +0000
Subject: [PATCH] Make review changes. Fix formating

Reorder includes
---
 src/openrct2-ui/windows/Ride.cpp                | 5 ++---
 src/openrct2/ReplayManager.cpp                  | 3 ++-
 src/openrct2/actions/GameActionRegistration.cpp | 2 +-
 src/openrct2/actions/RideSetSetting.hpp         | 4 ++--
 src/openrct2/interface/InteractiveConsole.cpp   | 2 +-
 src/openrct2/ride/Ride.cpp                      | 5 ++---
 src/openrct2/ride/TrackDesign.cpp               | 2 +-
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp
index 427f4f1d40..9c0dfb1069 100644
--- a/src/openrct2-ui/windows/Ride.cpp
+++ b/src/openrct2-ui/windows/Ride.cpp
@@ -2254,9 +2254,8 @@ static void populate_vehicle_type_dropdown(Ride* ride)
     bool selectionShouldBeExpanded;
     int32_t rideTypeIterator, rideTypeIteratorMax;
     if (gCheatsShowVehiclesFromOtherTrackTypes
-        && !(
-            ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE) || ride->type == RIDE_TYPE_MAZE
-            || ride->type == RIDE_TYPE_MINI_GOLF))
+        && !(ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE) || ride->type == RIDE_TYPE_MAZE
+             || ride->type == RIDE_TYPE_MINI_GOLF))
     {
         selectionShouldBeExpanded = true;
         rideTypeIterator = 0;
diff --git a/src/openrct2/ReplayManager.cpp b/src/openrct2/ReplayManager.cpp
index f7585934bc..3c3ce2e97f 100644
--- a/src/openrct2/ReplayManager.cpp
+++ b/src/openrct2/ReplayManager.cpp
@@ -15,8 +15,8 @@
 #include "ParkImporter.h"
 #include "PlatformEnvironment.h"
 #include "actions/GameAction.h"
-#include "actions/TrackPlaceAction.hpp"
 #include "actions/RideSetSetting.hpp"
+#include "actions/TrackPlaceAction.hpp"
 #include "config/Config.h"
 #include "core/DataSerialiser.h"
 #include "core/Path.hpp"
@@ -501,6 +501,7 @@ namespace OpenRCT2
 
                     result.action = std::make_unique<RideSetSettingAction>(rideId, setting, value);
                     result.action->SetFlags(command.ebx & 0xFF);
+                    break;
                 }
                 default:
                     throw std::runtime_error("Deprecated game command requires replay translation.");
diff --git a/src/openrct2/actions/GameActionRegistration.cpp b/src/openrct2/actions/GameActionRegistration.cpp
index 39618dbc20..6d8777840c 100644
--- a/src/openrct2/actions/GameActionRegistration.cpp
+++ b/src/openrct2/actions/GameActionRegistration.cpp
@@ -28,9 +28,9 @@
 #include "RideDemolishAction.hpp"
 #include "RideSetAppearanceAction.hpp"
 #include "RideSetColourScheme.hpp"
-#include "RideSetSetting.hpp"
 #include "RideSetName.hpp"
 #include "RideSetPriceAction.hpp"
+#include "RideSetSetting.hpp"
 #include "RideSetStatus.hpp"
 #include "RideSetVehiclesAction.hpp"
 #include "SetParkEntranceFeeAction.hpp"
diff --git a/src/openrct2/actions/RideSetSetting.hpp b/src/openrct2/actions/RideSetSetting.hpp
index a8b729377b..f0a8022e60 100644
--- a/src/openrct2/actions/RideSetSetting.hpp
+++ b/src/openrct2/actions/RideSetSetting.hpp
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2014-2018 OpenRCT2 developers
+ * Copyright (c) 2014-2019 OpenRCT2 developers
  *
  * For a complete list of all authors, please refer to contributors.md
  * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
@@ -48,7 +48,7 @@ public:
 
     uint16_t GetActionFlags() const override
     {
-        return GameAction::GetActionFlags();
+        return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED;
     }
 
     void Serialise(DataSerialiser & stream) override
diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp
index 2f69e4aaaf..3c50c7b5fc 100644
--- a/src/openrct2/interface/InteractiveConsole.cpp
+++ b/src/openrct2/interface/InteractiveConsole.cpp
@@ -15,8 +15,8 @@
 #include "../OpenRCT2.h"
 #include "../ReplayManager.h"
 #include "../Version.h"
-#include "../actions/RideSetSetting.hpp"
 #include "../actions/ClimateSetAction.hpp"
+#include "../actions/RideSetSetting.hpp"
 #include "../actions/StaffSetCostumeAction.hpp"
 #include "../config/Config.h"
 #include "../core/Guard.hpp"
diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp
index 27630d1b24..a9b22316d3 100644
--- a/src/openrct2/ride/Ride.cpp
+++ b/src/openrct2/ride/Ride.cpp
@@ -15,9 +15,9 @@
 #include "../Game.h"
 #include "../Input.h"
 #include "../OpenRCT2.h"
+#include "../actions/RideSetSetting.hpp"
 #include "../actions/RideSetVehiclesAction.hpp"
 #include "../actions/TrackRemoveAction.hpp"
-#include "../actions/RideSetSetting.hpp"
 #include "../audio/AudioMixer.h"
 #include "../audio/audio.h"
 #include "../common.h"
@@ -7381,8 +7381,7 @@ void ride_set_to_default_inspection_interval(Ride* ride)
     {
         if (defaultInspectionInterval <= RIDE_INSPECTION_NEVER)
         {
-            set_operating_setting(
-                ride->id, RideSetSetting::InspectionInterval, defaultInspectionInterval);
+            set_operating_setting(ride->id, RideSetSetting::InspectionInterval, defaultInspectionInterval);
         }
     }
 }
diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp
index 63ff47d95e..63e85c4ec8 100644
--- a/src/openrct2/ride/TrackDesign.cpp
+++ b/src/openrct2/ride/TrackDesign.cpp
@@ -13,12 +13,12 @@
 #include "../Game.h"
 #include "../OpenRCT2.h"
 #include "../actions/LargeSceneryRemoveAction.hpp"
+#include "../actions/RideSetSetting.hpp"
 #include "../actions/RideSetVehiclesAction.hpp"
 #include "../actions/SmallSceneryRemoveAction.hpp"
 #include "../actions/TrackPlaceAction.hpp"
 #include "../actions/TrackRemoveAction.hpp"
 #include "../actions/WallRemoveAction.hpp"
-#include "../actions/RideSetSetting.hpp"
 #include "../audio/audio.h"
 #include "../core/File.h"
 #include "../core/String.hpp"