From c522f9cfd3815c098b95e956d86cb7f0d82c9bb7 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Wed, 3 Aug 2016 20:41:31 +0200 Subject: [PATCH] Implement max people on maze properly Last year the limit for max people on maze was raised using a hack. Since the responsible table has been implemented since then, remove the hack and update the value in the table. --- src/ride/ride_data.c | 2 +- src/windows/ride.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/ride/ride_data.c b/src/ride/ride_data.c index 8cf2d94d5f..9496f3a362 100644 --- a/src/ride/ride_data.c +++ b/src/ride/ride_data.c @@ -1857,7 +1857,7 @@ const rct_ride_properties RideProperties[91] = { 10, 12, 30, 25}, // RIDE_TYPE_CORKSCREW_ROLLER_COASTER {RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_SUPPORTS | RIDE_TYPE_FLAG_3 | RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_13 | RIDE_TYPE_FLAG_18 | RIDE_TYPE_FLAG_IN_RIDE | RIDE_TYPE_FLAG_HAS_TRACK, - 1, 16, 0, 0}, // RIDE_TYPE_MAZE + 1, 64, 0, 0}, // RIDE_TYPE_MAZE {RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_ADDITIONAL | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_SUPPORTS | RIDE_TYPE_FLAG_3 | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS | RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_13 | RIDE_TYPE_FLAG_HAS_NO_TRACK | RIDE_TYPE_FLAG_18 | diff --git a/src/windows/ride.c b/src/windows/ride.c index f6e40f242c..367fff8812 100644 --- a/src/windows/ride.c +++ b/src/windows/ride.c @@ -3138,10 +3138,7 @@ static void window_ride_mode_tweak_increase(rct_window *w) uint8 maxValue = RideProperties[ride->type].max_value; uint8 minValue = gCheatsFastLiftHill ? 0 : RideProperties[ride->type].min_value; - if (ride->mode == RIDE_MODE_MAZE) { - // Allow 64 people in mazes under non-cheat settings. The old maximum of 16 was too little for even moderately big mazes. - maxValue = 64; - } + if (gCheatsFastLiftHill) { maxValue = 255; }