mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 19:43:06 +01:00
Code Issues Releases Wiki Activity

Use ObjectEntryIndex for entrance style

Browse Source
This commit is contained in:
Michael Steenbeek
2021-08-15 22:54:43 +02:00
committed by GitHub
parent 767dbfe41c
commit 8993e4d062
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/openrct2/actions/RideSetAppearanceAction.cpp
View File

@@ -21,7 +21,8 @@
#include "../ui/WindowManager.h"
#include "../world/Park.h"
RideSetAppearanceAction::RideSetAppearanceAction(ride_id_t rideIndex, RideSetAppearanceType type, uint8_t value, uint32_t index)
RideSetAppearanceAction::RideSetAppearanceAction(
ride_id_t rideIndex, RideSetAppearanceType type, uint16_t value, uint32_t index)
: _rideIndex(rideIndex)
, _type(type)
, _value(value)

4
src/openrct2/actions/RideSetAppearanceAction.h
View File

@@ -29,12 +29,12 @@ DEFINE_GAME_ACTION(RideSetAppearanceAction, GameCommand::SetRideAppearance, Game
private:
NetworkRideId_t _rideIndex{ RIDE_ID_NULL };
RideSetAppearanceType _type{};
uint8_t _value{};
uint16_t _value{};
uint32_t _index{};
public:
RideSetAppearanceAction() = default;
RideSetAppearanceAction(ride_id_t rideIndex, RideSetAppearanceType type, uint8_t value, uint32_t index);
RideSetAppearanceAction(ride_id_t rideIndex, RideSetAppearanceType type, uint16_t value, uint32_t index);
void AcceptParameters(GameActionParameterVisitor & visitor) override;

4
src/openrct2/ride/Ride.h
View File

@@ -363,7 +363,7 @@ public:
money64 profit;
TrackColour track_colour[NUM_COLOUR_SCHEMES];
uint8_t music;
uint8_t entrance_style;
ObjectEntryIndex entrance_style;
uint16_t vehicle_change_timeout;
uint8_t num_block_brakes;
uint8_t lift_hill_speed;
@@ -1119,7 +1119,7 @@ extern uint8_t gRideEntranceExitPlaceDirection;
extern bool gGotoStartPlacementMode;
extern uint8_t gLastEntranceStyle;
extern ObjectEntryIndex gLastEntranceStyle;
int32_t ride_get_count();
void ride_init_all();

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

@@ -78,7 +78,7 @@ uint8_t _currentSeatRotationAngle;
CoordsXYZD _unkF440C5;
uint8_t gLastEntranceStyle;
ObjectEntryIndex gLastEntranceStyle;
uint8_t gRideEntranceExitPlaceType;
ride_id_t gRideEntranceExitPlaceRideIndex;