mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 12:33:17 +01:00
Code Issues Releases Wiki Activity

Remove queued game commands that would be impossible to execute.

Browse Source 
Added a warning instead of assert for commands that are discarded.
This commit is contained in:
ZehM4tt
2017-06-16 23:38:40 +02:00
committed by Michał Janiszewski
parent 4362314f70
commit 5bb8dfb49c
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/openrct2/network/network.cpp
View File

@@ -1333,17 +1333,36 @@ void Network::ProcessPacket(NetworkConnection& connection, NetworkPacket& packet
void Network::ProcessGameCommandQueue()
{
while (game_command_queue.begin() != game_command_queue.end()) {
// If our tick is higher than the command tick we are in trouble.
assert(game_command_queue.begin()->tick >= gCurrentTicks);
if (game_command_queue.begin()->tick != gCurrentTicks)
return;
// run all the game commands at the current tick
const GameCommand& gc = (*game_command_queue.begin());
// If our tick is higher than the command tick we are in trouble.
if (mode == NETWORK_MODE_CLIENT) {
if (game_command_queue.begin()->tick < gCurrentTicks) {
// Having old command from a tick where we have not been active yet or malicious server,
// the command is useless so lets not keep it.
game_command_queue.erase(game_command_queue.begin());
log_warning("Discarding game command from tick behind current tick, CMD: %08X, CMD Tick: %08X, Current Tick: %08X\n",
gc.esi,
gc.tick,
gCurrentTicks);
// At this point we should not return, would add the possibility to skip commands this tick.
continue;
}
if (game_command_queue.begin()->tick != gCurrentTicks)
return;
}
// run all the game commands at the current tick
if (GetPlayerID() == gc.playerid) {
game_command_callback = game_command_callback_get_callback(gc.callback);
}
game_command_playerid = gc.playerid;
sint32 command = gc.esi;
money32 cost = game_do_command_p(command, (sint32*)&gc.eax, (sint32*)&gc.ebx, (sint32*)&gc.ecx, (sint32*)&gc.edx, (sint32*)&gc.esi, (sint32*)&gc.edi, (sint32*)&gc.ebp);