mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Merge pull request #9274 from ZehMatt/fix-mp-pause-toggle

Browse Source 
Fix clients being behind one tick
This commit is contained in:
Michael Steenbeek
2019-05-19 15:09:25 +02:00
committed by GitHub
parent 1b11612e3c 8389e5119b
commit 1de25be4fb
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2/GameState.cpp
View File

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

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

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