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

Fix desyncs because of GameActions ignoring the tick on client

This commit is contained in:
Matt 2019-08-23 23:06:27 +02:00
parent 91d02093f9
commit d6d480a31b
No known key found for this signature in database
GPG Key ID: 6D4C24A61C93E208
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/actions/GameAction.cpp
View File

@ -132,6 +132,10 @@ namespace GameActions
"%08X\n",
queued.uniqueId, queued.tick, currentTick);
}
else if (queued.tick > currentTick)
{
return;
}
}
// Remove ghost scenery so it doesn't interfere with incoming network command
@ -293,7 +297,9 @@ namespace GameActions
MemoryStream& output = ctx.output;
char temp[128] = {};
snprintf(temp, sizeof(temp), "[%s] GA: %s (%08X) (", GetRealm(), action->GetName(), action->GetType());
snprintf(
temp, sizeof(temp), "[%s] Tick: %u, GA: %s (%08X) (", GetRealm(), gCurrentTicks, action->GetName(),
action->GetType());
output.Write(temp, strlen(temp));