From 3467941310a422bbaf706744c99dbf88cda018ff Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Wed, 20 Feb 2019 16:10:19 +0000 Subject: [PATCH 1/2] Fix #8732 GameActions not working when in negative money. Related to the simplification to the finance code --- src/openrct2/management/Finance.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/openrct2/management/Finance.cpp b/src/openrct2/management/Finance.cpp index d2c8421a24..225c8692b0 100644 --- a/src/openrct2/management/Finance.cpp +++ b/src/openrct2/management/Finance.cpp @@ -89,6 +89,8 @@ bool finance_check_money_required(uint32_t flags) */ bool finance_check_affordability(money32 cost, uint32_t flags) { + if (cost == 0) + return true; if (finance_check_money_required(flags) == false) return true; if (cost > gCash) From 768321c5178027d193baf47a2be804896aa51dad Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Wed, 20 Feb 2019 16:15:16 +0000 Subject: [PATCH 2/2] Increment network version --- src/openrct2/network/Network.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 95a20a1e45..28cb835b19 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -30,7 +30,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 "41" +#define NETWORK_STREAM_VERSION "42" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static rct_peep* _pickup_peep = nullptr;