From d6bf08e407651ddf23e610cd2e186099a6aa7fb2 Mon Sep 17 00:00:00 2001 From: pss9205 Date: Sun, 28 Jan 2018 12:04:14 +0100 Subject: [PATCH] Fix #7030: Ride reliability underflows --- src/openrct2/network/network.h | 2 +- src/openrct2/ride/Ride.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h index a08be45526..7746b5fd21 100644 --- a/src/openrct2/network/network.h +++ b/src/openrct2/network/network.h @@ -51,7 +51,7 @@ typedef struct GameAction GameAction; // This define 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 "28" +#define NETWORK_STREAM_VERSION "29" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION #ifdef __cplusplus diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index a0556eb159..5b3833c6e9 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -2327,7 +2327,7 @@ static void ride_breakdown_update(sint32 rideIndex) // Calculate breakdown probability? sint32 unreliabilityAccumulator = ride->unreliability_factor + get_age_penalty(ride); - ride->reliability = Math::Max((uint16)0, (uint16)(ride->reliability - unreliabilityAccumulator)); + ride->reliability = (uint16) Math::Max(0, (ride->reliability - unreliabilityAccumulator)); ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAINTENANCE; // Random probability of a breakdown. Roughly this is 1 in