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

Make review changes fix clang format

This commit is contained in:
duncanspumpkin 2019-02-25 11:16:27 +00:00
parent c1546a92b7
commit 07b372f4c6
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@
#include "RideSetName.hpp" #include "RideSetName.hpp"
#include "RideSetPriceAction.hpp" #include "RideSetPriceAction.hpp"
#include "RideSetStatus.hpp" #include "RideSetStatus.hpp"
#include "RideSetVehiclesAction.hpp"
#include "SetParkEntranceFeeAction.hpp" #include "SetParkEntranceFeeAction.hpp"
#include "SignSetNameAction.hpp" #include "SignSetNameAction.hpp"
#include "SignSetStyleAction.hpp" #include "SignSetStyleAction.hpp"
@ -42,7 +43,6 @@
#include "TrackPlaceAction.hpp" #include "TrackPlaceAction.hpp"
#include "TrackRemoveAction.hpp" #include "TrackRemoveAction.hpp"
#include "WallRemoveAction.hpp" #include "WallRemoveAction.hpp"
#include "RideSetVehiclesAction.hpp"
namespace GameActions namespace GameActions
{ {

9
src/openrct2/actions/RideSetVehiclesAction.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 * 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
@ -57,7 +57,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
@ -229,9 +229,8 @@ private:
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;

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

@ -15,8 +15,8 @@
#include "../Game.h" #include "../Game.h"
#include "../Input.h" #include "../Input.h"
#include "../OpenRCT2.h" #include "../OpenRCT2.h"
#include "../actions/TrackRemoveAction.hpp"
#include "../actions/RideSetVehiclesAction.hpp" #include "../actions/RideSetVehiclesAction.hpp"
#include "../actions/TrackRemoveAction.hpp"
#include "../audio/AudioMixer.h" #include "../audio/AudioMixer.h"
#include "../audio/audio.h" #include "../audio/audio.h"
#include "../common.h" #include "../common.h"

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

@ -1963,15 +1963,18 @@ static money32 place_track_design(int16_t x, int16_t y, int16_t z, uint8_t flags
{ {
auto colour = ride_get_unused_preset_vehicle_colour(entryIndex); auto colour = ride_get_unused_preset_vehicle_colour(entryIndex);
auto rideSetVehicleAction = RideSetVehicleAction(ride->id, RideSetVehicleType::RideEntry, entryIndex, colour); auto rideSetVehicleAction = RideSetVehicleAction(ride->id, RideSetVehicleType::RideEntry, entryIndex, colour);
GameActions::ExecuteNested(&rideSetVehicleAction); flags& GAME_COMMAND_FLAG_APPLY ? GameActions::ExecuteNested(&rideSetVehicleAction)
: GameActions::QueryNested(&rideSetVehicleAction);
} }
game_do_command(0, flags | (td6->ride_mode << 8), 0, ride->id | (0 << 8), GAME_COMMAND_SET_RIDE_SETTING, 0, 0); game_do_command(0, flags | (td6->ride_mode << 8), 0, ride->id | (0 << 8), GAME_COMMAND_SET_RIDE_SETTING, 0, 0);
auto rideSetVehicleAction2 = RideSetVehicleAction(ride->id, RideSetVehicleType::NumTrains, td6->number_of_trains); auto rideSetVehicleAction2 = RideSetVehicleAction(ride->id, RideSetVehicleType::NumTrains, td6->number_of_trains);
GameActions::ExecuteNested(&rideSetVehicleAction2); flags& GAME_COMMAND_FLAG_APPLY ? GameActions::ExecuteNested(&rideSetVehicleAction2)
: GameActions::QueryNested(&rideSetVehicleAction2);
auto rideSetVehicleAction3 = RideSetVehicleAction( auto rideSetVehicleAction3 = RideSetVehicleAction(
ride->id, RideSetVehicleType::NumCarsPerTrain, td6->number_of_cars_per_train); ride->id, RideSetVehicleType::NumCarsPerTrain, td6->number_of_cars_per_train);
GameActions::ExecuteNested(&rideSetVehicleAction3); flags& GAME_COMMAND_FLAG_APPLY ? GameActions::ExecuteNested(&rideSetVehicleAction3)
: GameActions::QueryNested(&rideSetVehicleAction3);
game_do_command(0, flags | (td6->depart_flags << 8), 0, ride->id | (1 << 8), GAME_COMMAND_SET_RIDE_SETTING, 0, 0); game_do_command(0, flags | (td6->depart_flags << 8), 0, ride->id | (1 << 8), GAME_COMMAND_SET_RIDE_SETTING, 0, 0);
game_do_command(0, flags | (td6->min_waiting_time << 8), 0, ride->id | (2 << 8), GAME_COMMAND_SET_RIDE_SETTING, 0, 0); game_do_command(0, flags | (td6->min_waiting_time << 8), 0, ride->id | (2 << 8), GAME_COMMAND_SET_RIDE_SETTING, 0, 0);
game_do_command(0, flags | (td6->max_waiting_time << 8), 0, ride->id | (3 << 8), GAME_COMMAND_SET_RIDE_SETTING, 0, 0); game_do_command(0, flags | (td6->max_waiting_time << 8), 0, ride->id | (3 << 8), GAME_COMMAND_SET_RIDE_SETTING, 0, 0);