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

Fix game action errors not showing if no round trip was done (#9175)

This commit is contained in:
ζeh Matt 2019-05-01 22:53:11 +02:00 committed by Michael Steenbeek
parent 1e1d263dae
commit 181a722c3b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}