diff --git a/src/openrct2/actions/GameAction.cpp b/src/openrct2/actions/GameAction.cpp index cceb77b871..716f0bf679 100644 --- a/src/openrct2/actions/GameAction.cpp +++ b/src/openrct2/actions/GameAction.cpp @@ -23,6 +23,7 @@ extern "C" { + #include "../platform/platform.h" #include "../localisation/localisation.h" #include "../windows/error.h" #include "../world/park.h" @@ -110,6 +111,8 @@ namespace GameActions GameActionResult Execute(const IGameAction * action, uint32 flags, GameActionCallback callback) { + log_info("[%s] GameAction::Execute\n", network_get_mode() == NETWORK_MODE_CLIENT ? "cl" : "sv"); + Guard::ArgumentNotNull(action); uint16 actionFlags = action->GetFlags(); @@ -155,7 +158,7 @@ namespace GameActions // Allow autosave to commence if (gLastAutoSaveUpdate == AUTOSAVE_PAUSE) { - gLastAutoSaveUpdate = SDL_GetTicks(); + gLastAutoSaveUpdate = platform_get_ticks(); } } diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index b8796dac1d..f75670d9d4 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -1123,7 +1123,7 @@ void Network::Client_Send_GAME_ACTION(const IGameAction *action, uint32 flags = MemoryStream stream; action->Serialise(&stream); packet->Write((uint8*)stream.GetData(), stream.GetLength()); - server_connection.QueuePacket(std::move(packet)); + server_connection->QueuePacket(std::move(packet)); } void Network::Server_Send_GAME_ACTION(const IGameAction *action, uint32 flags = 0) @@ -1359,7 +1359,7 @@ void Network::ProcessGameCommandQueue() if (game_command_queue.begin()->tick != gCurrentTicks) break; } - if (gc.actionType != 0xFFFFFFFF) { + if (gc.actionType != UINT32_MAX) { IGameAction * action = GameActions::Create(gc.actionType); uint32 flags = gc.parameters->ReadValue(); action->Deserialise(gc.parameters);