mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8733 from duncanspumpkin/fix_pause 

Fix pause
This commit is contained in:
Duncan 2019-02-20 19:41:56 +00:00 committed by GitHub
parent 857db39f9a 768321c517
commit 9a746c4fc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/management/Finance.cpp
View File

@ -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)

2
src/openrct2/network/Network.cpp
View File

@ -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;