From e1eadff208816f3fb7c27818ff96856d0f11cb45 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Sun, 3 Dec 2017 10:38:27 +0100 Subject: [PATCH] Formatting fixes --- src/openrct2/Game.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index 5a64d84a56..3186387e17 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -301,7 +301,7 @@ void update_palette_effects() { uint8 * vs = &g1->offset[j * 3]; uint8 * vd = &gGamePalette[243 * 4]; - sint32 n = 3; + sint32 n = 3; for (sint32 i = 0; i < n; i++) { vd[0] = vs[0]; @@ -649,13 +649,19 @@ sint32 game_do_command_p(uint32 command, sint32 * eax, sint32 * ebx, sint32 * ec return cost; } - if (network_get_mode() != NETWORK_MODE_NONE && !(flags & GAME_COMMAND_FLAG_NETWORKED) && !(flags & GAME_COMMAND_FLAG_GHOST) && !(flags & GAME_COMMAND_FLAG_5) && gGameCommandNestLevel == 1 /* Send only top-level commands */) + if (network_get_mode() != NETWORK_MODE_NONE && + !(flags & GAME_COMMAND_FLAG_NETWORKED) && + !(flags & GAME_COMMAND_FLAG_GHOST) && + !(flags & GAME_COMMAND_FLAG_5) && + gGameCommandNestLevel == 1) /* Send only top-level commands */ { + // Disable these commands over the network if (command != GAME_COMMAND_LOAD_OR_QUIT) - { // Disable these commands over the network + { network_send_gamecmd(*eax, *ebx, *ecx, *edx, *esi, *edi, *ebp, game_command_callback_get_index(game_command_callback)); if (network_get_mode() == NETWORK_MODE_CLIENT) - { // Client sent the command to the server, do not run it locally, just return. It will run when server sends it + { + // Client sent the command to the server, do not run it locally, just return. It will run when server sends it. game_command_callback = 0; // Decrement nest count gGameCommandNestLevel--;