mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make review changes. Fix formating 

Reorder includes
This commit is contained in:
duncanspumpkin 2019-02-25 11:23:13 +00:00
parent 9d76c609f3
commit 93873c5e74
7 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2-ui/windows/Ride.cpp
View File

@ -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;

3
src/openrct2/ReplayManager.cpp
View File

@ -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.");

2
src/openrct2/actions/GameActionRegistration.cpp
View File

@ -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"

4
src/openrct2/actions/RideSetSetting.hpp
View File

@ -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

2
src/openrct2/interface/InteractiveConsole.cpp
View File

@ -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"

5
src/openrct2/ride/Ride.cpp
View File

@ -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);
}
}
}

2
src/openrct2/ride/TrackDesign.cpp
View File

@ -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"