mirror of https://github.com/OpenRCT2/OpenRCT2.git
parent
9d76c609f3
commit
93873c5e74
|
@ -2254,9 +2254,8 @@ static void populate_vehicle_type_dropdown(Ride* ride)
|
||||||
bool selectionShouldBeExpanded;
|
bool selectionShouldBeExpanded;
|
||||||
int32_t rideTypeIterator, rideTypeIteratorMax;
|
int32_t rideTypeIterator, rideTypeIteratorMax;
|
||||||
if (gCheatsShowVehiclesFromOtherTrackTypes
|
if (gCheatsShowVehiclesFromOtherTrackTypes
|
||||||
&& !(
|
&& !(ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE) || ride->type == RIDE_TYPE_MAZE
|
||||||
ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE) || ride->type == RIDE_TYPE_MAZE
|
|| ride->type == RIDE_TYPE_MINI_GOLF))
|
||||||
|| ride->type == RIDE_TYPE_MINI_GOLF))
|
|
||||||
{
|
{
|
||||||
selectionShouldBeExpanded = true;
|
selectionShouldBeExpanded = true;
|
||||||
rideTypeIterator = 0;
|
rideTypeIterator = 0;
|
||||||
|
|
|
@ -15,8 +15,8 @@
|
||||||
#include "ParkImporter.h"
|
#include "ParkImporter.h"
|
||||||
#include "PlatformEnvironment.h"
|
#include "PlatformEnvironment.h"
|
||||||
#include "actions/GameAction.h"
|
#include "actions/GameAction.h"
|
||||||
#include "actions/TrackPlaceAction.hpp"
|
|
||||||
#include "actions/RideSetSetting.hpp"
|
#include "actions/RideSetSetting.hpp"
|
||||||
|
#include "actions/TrackPlaceAction.hpp"
|
||||||
#include "config/Config.h"
|
#include "config/Config.h"
|
||||||
#include "core/DataSerialiser.h"
|
#include "core/DataSerialiser.h"
|
||||||
#include "core/Path.hpp"
|
#include "core/Path.hpp"
|
||||||
|
@ -501,6 +501,7 @@ namespace OpenRCT2
|
||||||
|
|
||||||
result.action = std::make_unique<RideSetSettingAction>(rideId, setting, value);
|
result.action = std::make_unique<RideSetSettingAction>(rideId, setting, value);
|
||||||
result.action->SetFlags(command.ebx & 0xFF);
|
result.action->SetFlags(command.ebx & 0xFF);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
throw std::runtime_error("Deprecated game command requires replay translation.");
|
throw std::runtime_error("Deprecated game command requires replay translation.");
|
||||||
|
|
|
@ -28,9 +28,9 @@
|
||||||
#include "RideDemolishAction.hpp"
|
#include "RideDemolishAction.hpp"
|
||||||
#include "RideSetAppearanceAction.hpp"
|
#include "RideSetAppearanceAction.hpp"
|
||||||
#include "RideSetColourScheme.hpp"
|
#include "RideSetColourScheme.hpp"
|
||||||
#include "RideSetSetting.hpp"
|
|
||||||
#include "RideSetName.hpp"
|
#include "RideSetName.hpp"
|
||||||
#include "RideSetPriceAction.hpp"
|
#include "RideSetPriceAction.hpp"
|
||||||
|
#include "RideSetSetting.hpp"
|
||||||
#include "RideSetStatus.hpp"
|
#include "RideSetStatus.hpp"
|
||||||
#include "RideSetVehiclesAction.hpp"
|
#include "RideSetVehiclesAction.hpp"
|
||||||
#include "SetParkEntranceFeeAction.hpp"
|
#include "SetParkEntranceFeeAction.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
|
* For a complete list of all authors, please refer to contributors.md
|
||||||
* Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
|
* Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
|
||||||
|
@ -48,7 +48,7 @@ public:
|
||||||
|
|
||||||
uint16_t GetActionFlags() const override
|
uint16_t GetActionFlags() const override
|
||||||
{
|
{
|
||||||
return GameAction::GetActionFlags();
|
return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Serialise(DataSerialiser & stream) override
|
void Serialise(DataSerialiser & stream) override
|
||||||
|
|
|
@ -15,8 +15,8 @@
|
||||||
#include "../OpenRCT2.h"
|
#include "../OpenRCT2.h"
|
||||||
#include "../ReplayManager.h"
|
#include "../ReplayManager.h"
|
||||||
#include "../Version.h"
|
#include "../Version.h"
|
||||||
#include "../actions/RideSetSetting.hpp"
|
|
||||||
#include "../actions/ClimateSetAction.hpp"
|
#include "../actions/ClimateSetAction.hpp"
|
||||||
|
#include "../actions/RideSetSetting.hpp"
|
||||||
#include "../actions/StaffSetCostumeAction.hpp"
|
#include "../actions/StaffSetCostumeAction.hpp"
|
||||||
#include "../config/Config.h"
|
#include "../config/Config.h"
|
||||||
#include "../core/Guard.hpp"
|
#include "../core/Guard.hpp"
|
||||||
|
|
|
@ -15,9 +15,9 @@
|
||||||
#include "../Game.h"
|
#include "../Game.h"
|
||||||
#include "../Input.h"
|
#include "../Input.h"
|
||||||
#include "../OpenRCT2.h"
|
#include "../OpenRCT2.h"
|
||||||
|
#include "../actions/RideSetSetting.hpp"
|
||||||
#include "../actions/RideSetVehiclesAction.hpp"
|
#include "../actions/RideSetVehiclesAction.hpp"
|
||||||
#include "../actions/TrackRemoveAction.hpp"
|
#include "../actions/TrackRemoveAction.hpp"
|
||||||
#include "../actions/RideSetSetting.hpp"
|
|
||||||
#include "../audio/AudioMixer.h"
|
#include "../audio/AudioMixer.h"
|
||||||
#include "../audio/audio.h"
|
#include "../audio/audio.h"
|
||||||
#include "../common.h"
|
#include "../common.h"
|
||||||
|
@ -7381,8 +7381,7 @@ void ride_set_to_default_inspection_interval(Ride* ride)
|
||||||
{
|
{
|
||||||
if (defaultInspectionInterval <= RIDE_INSPECTION_NEVER)
|
if (defaultInspectionInterval <= RIDE_INSPECTION_NEVER)
|
||||||
{
|
{
|
||||||
set_operating_setting(
|
set_operating_setting(ride->id, RideSetSetting::InspectionInterval, defaultInspectionInterval);
|
||||||
ride->id, RideSetSetting::InspectionInterval, defaultInspectionInterval);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,12 +13,12 @@
|
||||||
#include "../Game.h"
|
#include "../Game.h"
|
||||||
#include "../OpenRCT2.h"
|
#include "../OpenRCT2.h"
|
||||||
#include "../actions/LargeSceneryRemoveAction.hpp"
|
#include "../actions/LargeSceneryRemoveAction.hpp"
|
||||||
|
#include "../actions/RideSetSetting.hpp"
|
||||||
#include "../actions/RideSetVehiclesAction.hpp"
|
#include "../actions/RideSetVehiclesAction.hpp"
|
||||||
#include "../actions/SmallSceneryRemoveAction.hpp"
|
#include "../actions/SmallSceneryRemoveAction.hpp"
|
||||||
#include "../actions/TrackPlaceAction.hpp"
|
#include "../actions/TrackPlaceAction.hpp"
|
||||||
#include "../actions/TrackRemoveAction.hpp"
|
#include "../actions/TrackRemoveAction.hpp"
|
||||||
#include "../actions/WallRemoveAction.hpp"
|
#include "../actions/WallRemoveAction.hpp"
|
||||||
#include "../actions/RideSetSetting.hpp"
|
|
||||||
#include "../audio/audio.h"
|
#include "../audio/audio.h"
|
||||||
#include "../core/File.h"
|
#include "../core/File.h"
|
||||||
#include "../core/String.hpp"
|
#include "../core/String.hpp"
|
||||||
|
|
Loading…
Reference in New Issue