From 181a722c3b2979eba13489a571bd69b4b513272d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= Date: Wed, 1 May 2019 22:53:11 +0200 Subject: [PATCH] Fix game action errors not showing if no round trip was done (#9175) --- src/openrct2/actions/GameAction.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/openrct2/actions/GameAction.cpp b/src/openrct2/actions/GameAction.cpp index 036f8aab3f..aab701bc92 100644 --- a/src/openrct2/actions/GameAction.cpp +++ b/src/openrct2/actions/GameAction.cpp @@ -363,7 +363,10 @@ namespace GameActions // In network mode the error should be only shown to the issuer of the action. if (network_get_mode() != NETWORK_MODE_NONE) { - if (action->GetPlayer() != network_get_current_player_id()) + // If the action was never networked and query fails locally the player id is not assigned. + // So compare only if the action went into the queue otherwise show errors by default. + const bool isActionFromNetwork = (action->GetFlags() & GAME_COMMAND_FLAG_NETWORKED) != 0; + if (isActionFromNetwork && action->GetPlayer() != network_get_current_player_id()) { shouldShowError = false; }