From 83511c5c7f5d7891458f4f5567215ec1f8e93f01 Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 18 May 2019 19:45:12 +0200 Subject: [PATCH 1/2] Fix clients being behind one tick at all times --- src/openrct2/GameState.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/openrct2/GameState.cpp b/src/openrct2/GameState.cpp index ebafbd0e3b..20a32182a2 100644 --- a/src/openrct2/GameState.cpp +++ b/src/openrct2/GameState.cpp @@ -230,10 +230,9 @@ void GameState::UpdateLogic() if (network_get_mode() == NETWORK_MODE_CLIENT && network_get_status() == NETWORK_STATUS_CONNECTED && network_get_authstatus() == NETWORK_AUTH_OK) { - // Can't be in sync with server, round trips won't work if we are at same level. - if (gCurrentTicks >= network_get_server_tick()) + // Don't run ahead of the server but can be on same tick. + if (gCurrentTicks > network_get_server_tick()) { - // Don't run past the server return; } } From 8389e5119bb58ff510f37897185baa670c8e6c0b Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 18 May 2019 19:57:51 +0200 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 dd48e71827..da4054c254 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -33,7 +33,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 "32" +#define NETWORK_STREAM_VERSION "33" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static Peep* _pickup_peep = nullptr;