Fix #7975: Clear inspection due flag when interval set to Never

This commit is contained in:
deurklink 2018-09-07 13:08:26 +02:00 committed by Michael Steenbeek
parent 65659e2ab6
commit a5cbcb448c
3 changed files with 11 additions and 1 deletions

View File

@ -1,6 +1,7 @@
0.2.1+ (in development)
------------------------------------------------------------------------
- Feature: [#7956, #7964] Add sprite font glyphs for Hungarian and some Czech letters.
- Fix: [#7975] Inspection flag not cleared for rides which are set to never be inspected (Original bug).
- Improved: [#7930] Automatically create folders for custom content.
- Removed: [#7929] Support for scenario text objects.

View File

@ -28,7 +28,7 @@
// This string specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "0"
#define NETWORK_STREAM_VERSION "1"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
static rct_peep* _pickup_peep = nullptr;

View File

@ -2386,8 +2386,12 @@ static void ride_inspection_update(Ride* ride)
ride->last_inspection--;
int32_t inspectionIntervalMinutes = RideInspectionInterval[ride->inspection_interval];
// An inspection interval of 0 minutes means the ride is set to never be inspected.
if (inspectionIntervalMinutes == 0)
{
ride->lifecycle_flags &= ~RIDE_LIFECYCLE_DUE_INSPECTION;
return;
}
if (RideAvailableBreakdowns[ride->type] == 0)
return;
@ -4108,6 +4112,11 @@ static money32 ride_set_setting(uint8_t rideIndex, uint8_t setting, uint8_t valu
return MONEY32_UNDEFINED;
}
if (value == RIDE_INSPECTION_NEVER)
{
ride->lifecycle_flags &= ~RIDE_LIFECYCLE_DUE_INSPECTION;
}
if (flags & GAME_COMMAND_FLAG_APPLY)
{
ride->inspection_interval = value;