From 6350a3b0b4b408cfa0ee2ef74302cacece8ab84b Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 1 Mar 2019 08:26:03 +0100 Subject: [PATCH 1/2] Fix nested query not working in paused game state. --- src/openrct2/actions/GameAction.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openrct2/actions/GameAction.cpp b/src/openrct2/actions/GameAction.cpp index 240678c78a..015e174338 100644 --- a/src/openrct2/actions/GameAction.cpp +++ b/src/openrct2/actions/GameAction.cpp @@ -131,7 +131,7 @@ namespace GameActions Guard::ArgumentNotNull(action); uint16_t actionFlags = action->GetActionFlags(); - if (!CheckActionInPausedMode(actionFlags)) + if (topLevel == true && !CheckActionInPausedMode(actionFlags)) { GameActionResult::Ptr result = std::make_unique(); From df5dfa6863e9b49fd6287bb4da6fb47feb09edec Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 1 Mar 2019 10:21:09 +0100 Subject: [PATCH 2/2] Bump up 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 a5260212cf..5a2d7e1f90 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -31,7 +31,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 "49" +#define NETWORK_STREAM_VERSION "50" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static rct_peep* _pickup_peep = nullptr;