From 3f345c60c62928f118dee7447090f33ab6b39473 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Wed, 26 Jul 2017 14:51:43 +0200 Subject: [PATCH] Fix underflow in sub_68F41A() --- src/openrct2/network/network.h | 2 +- src/openrct2/peep/peep.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h index b3bb2182fb..318a5c9263 100644 --- a/src/openrct2/network/network.h +++ b/src/openrct2/network/network.h @@ -55,7 +55,7 @@ extern "C" { // 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 "7" +#define NETWORK_STREAM_VERSION "8" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION #ifdef __cplusplus diff --git a/src/openrct2/peep/peep.c b/src/openrct2/peep/peep.c index 17b8252fcb..e3b71fdc6d 100644 --- a/src/openrct2/peep/peep.c +++ b/src/openrct2/peep/peep.c @@ -998,7 +998,7 @@ static void sub_68F41A(rct_peep *peep, sint32 index) } if (peep->time_on_ride > 15){ - peep->happiness_growth_rate = min(0, peep->happiness_growth_rate - 5); + peep->happiness_growth_rate = max(0, peep->happiness_growth_rate - 5); if (peep->time_on_ride > 22){ rct_ride* ride = get_ride(peep->current_ride);