mirror of https://github.com/OpenRCT2/OpenRCT2.git
parent
11c16955c5
commit
892d6dc5f7
|
@ -2248,8 +2248,7 @@ 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_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE) || ride->type == RIDE_TYPE_MAZE
|
||||
|| ride->type == RIDE_TYPE_MINI_GOLF))
|
||||
{
|
||||
selectionShouldBeExpanded = true;
|
||||
|
|
|
@ -76,7 +76,7 @@ public:
|
|||
}
|
||||
|
||||
Ride* ride = get_ride(_rideIndex);
|
||||
if (!ride || ride->type == RIDE_TYPE_NULL)
|
||||
if (ride == nullptr || ride->type == RIDE_TYPE_NULL)
|
||||
{
|
||||
log_warning("Invalid game command, ride_id = %u", _rideIndex);
|
||||
return std::make_unique<GameActionResult>(GA_ERROR::INVALID_PARAMETERS, STR_NONE);
|
||||
|
@ -116,7 +116,7 @@ public:
|
|||
GameActionResult::Ptr Execute() const override
|
||||
{
|
||||
Ride* ride = get_ride(_rideIndex);
|
||||
if (!ride)
|
||||
if (ride == nullptr)
|
||||
{
|
||||
log_warning("Invalid game command, ride_id = %u", _rideIndex);
|
||||
return std::make_unique<GameActionResult>(GA_ERROR::INVALID_PARAMETERS, STR_NONE);
|
||||
|
|
Loading…
Reference in New Issue