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

Do not disable ride modes in select-by-track-type mode 

The idea of a ride group is to have the ride group determine stuff like this, not the vehicle itself
This commit is contained in:
Gymnasiast 2017-09-12 10:40:19 +02:00
parent e1f40352b6
commit 179e4dd368
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/ride/ride.c
View File

@ -3795,7 +3795,8 @@ static bool ride_is_mode_valid(rct_ride *ride, uint8 mode)
rct_ride_entry *rideEntry = get_ride_entry(ride->subtype);
const uint8 *availableModes = ride_seek_available_modes(ride);
if ((rideEntry->flags & RIDE_ENTRY_DISABLE_FIRST_TWO_OPERATING_MODES) && !gCheatsShowAllOperatingModes){
if ((rideEntry->flags & RIDE_ENTRY_DISABLE_FIRST_TWO_OPERATING_MODES) && !gConfigInterface.select_by_track_type && !gCheatsShowAllOperatingModes)
{
availableModes += 2;
}
@ -5823,7 +5824,10 @@ static sint32 ride_get_default_mode(rct_ride *ride)
for (sint32 i = 0; i < ride->type; i++) {
while (*(availableModes++) != 255) {}
}
if (rideEntry->flags & RIDE_ENTRY_DISABLE_FIRST_TWO_OPERATING_MODES) {
// Since this only selects a default mode and does not prevent other modes from being used, there is no need
// to check if select-by-track-type or the all-ride-modes cheat have been enabled.
if (rideEntry->flags & RIDE_ENTRY_DISABLE_FIRST_TWO_OPERATING_MODES)
{
availableModes += 2;
}
return availableModes[0];

7
src/openrct2/windows/Ride.cpp
View File

@ -3154,11 +3154,14 @@ static void window_ride_mode_dropdown(rct_window *w, rct_widget *widget)
} while (*(mode++) != 255);
// Hide the last operating mode if the vehicle is not intended for it.
if (rideEntry->flags & RIDE_ENTRY_DISABLE_LAST_OPERATING_MODE && !gCheatsShowAllOperatingModes)
if (rideEntry->flags & RIDE_ENTRY_DISABLE_LAST_OPERATING_MODE && !gConfigInterface.select_by_track_type && !gCheatsShowAllOperatingModes)
{
numAvailableModes--;
}
// If the vehicle is not intended for them, hide those two modes (these are usually (or perhaps always) both continuous circuit modes).
if ((rideEntry->flags & RIDE_ENTRY_DISABLE_FIRST_TWO_OPERATING_MODES) && !gCheatsShowAllOperatingModes) {
if ((rideEntry->flags & RIDE_ENTRY_DISABLE_FIRST_TWO_OPERATING_MODES) && !gConfigInterface.select_by_track_type && !gCheatsShowAllOperatingModes)
{
availableModes += 2;
numAvailableModes -= 2;
}