mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 03:53:07 +01:00
Code Issues Releases Wiki Activity

Reduce use of MAX_RIDES and RIDE_TYPE_NULL

Browse Source
This commit is contained in:
Ted John
2019-08-04 14:45:17 +01:00
parent 414b53b56d
commit e23638548a
19 changed files with 69 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,14 +136,12 @@ static int32_t cc_rides(InteractiveConsole& console, const arguments_t& argv)
{
if (argv[0] == "list")
{
Ride* ride;
int32_t i;
FOR_ALL_RIDES (i, ride)
for (const auto& ride : GetRideManager())
{
auto name = ride->GetName();
auto name = ride.GetName();
console.WriteFormatLine(
"ride: %03d type: %02u subtype %03u operating mode: %02u name: %s", i, ride->type, ride->subtype,
ride->mode, name.c_str());
"ride: %03d type: %02u subtype %03u operating mode: %02u name: %s", ride.id, ride.type, ride.subtype,
ride.mode, name.c_str());
}
}
else if (argv[0] == "set")
@@ -215,7 +213,7 @@ static int32_t cc_rides(InteractiveConsole& console, const arguments_t& argv)
{
console.WriteFormatLine("Invalid ride mode.");
}
else if (ride == nullptr || ride->type == RIDE_TYPE_NULL)
else if (ride == nullptr)
{
console.WriteFormatLine("No ride found with index %d", ride_index);
}
@@ -242,12 +240,12 @@ static int32_t cc_rides(InteractiveConsole& console, const arguments_t& argv)
}
else
{
Ride* ride = get_ride(ride_index);
auto ride = get_ride(ride_index);
if (mass <= 0)
{
console.WriteFormatLine("Friction value must be strictly positive");
}
else if (ride->type == RIDE_TYPE_NULL)
else if (ride == nullptr)
{
console.WriteFormatLine("No ride found with index %d", ride_index);
}
@@ -282,12 +280,12 @@ static int32_t cc_rides(InteractiveConsole& console, const arguments_t& argv)
}
else
{
Ride* ride = get_ride(ride_index);
auto ride = get_ride(ride_index);
if (excitement <= 0)
{
console.WriteFormatLine("Excitement value must be strictly positive");
}
else if (ride->type == RIDE_TYPE_NULL)
else if (ride == nullptr)
{
console.WriteFormatLine("No ride found with index %d", ride_index);
}
@@ -313,12 +311,12 @@ static int32_t cc_rides(InteractiveConsole& console, const arguments_t& argv)
}
else
{
Ride* ride = get_ride(ride_index);
auto ride = get_ride(ride_index);
if (intensity <= 0)
{
console.WriteFormatLine("Intensity value must be strictly positive");
}
else if (ride->type == RIDE_TYPE_NULL)
else if (ride == nullptr)
{
console.WriteFormatLine("No ride found with index %d", ride_index);
}
@@ -344,12 +342,12 @@ static int32_t cc_rides(InteractiveConsole& console, const arguments_t& argv)
}
else
{
Ride* ride = get_ride(ride_index);
auto ride = get_ride(ride_index);
if (nausea <= 0)
{
console.WriteFormatLine("Nausea value must be strictly positive");
}
else if (ride->type == RIDE_TYPE_NULL)
else if (ride == nullptr)
{
console.WriteFormatLine("No ride found with index %d", ride_index);
}
@@ -390,13 +388,11 @@ static int32_t cc_rides(InteractiveConsole& console, const arguments_t& argv)
if (int_valid[0] && int_valid[1])
{
uint16_t rideId{};
Ride* ride;
FOR_ALL_RIDES (rideId, ride)
for (const auto& ride : GetRideManager())
{
if (ride->type == rideType)
if (ride.type == rideType)
{
auto rideSetPrice = RideSetPriceAction(rideId, price, true);
auto rideSetPrice = RideSetPriceAction(ride.id, price, true);
GameActions::Execute(&rideSetPrice);
}
}