From 8c9dd75b5bd3514793958353f89966f44da354dc Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sat, 17 Jul 2021 21:30:05 +0100 Subject: [PATCH] Fix #301: Network server local company change on load did not update network state --- src/openttd.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/openttd.cpp b/src/openttd.cpp index 4ea16b2907..1d474ccfb4 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -1251,7 +1251,11 @@ void SwitchToMode(SwitchMode new_mode) } /* Update the local company for a loaded game. It is either always * a company or in the case of a dedicated server a spectator */ - SetLocalCompany(_network_dedicated ? COMPANY_SPECTATOR : GetDefaultLocalCompany()); + if (_network_server && !_network_dedicated) { + NetworkServerDoMove(CLIENT_ID_SERVER, GetDefaultLocalCompany()); + } else { + SetLocalCompany(_network_dedicated ? COMPANY_SPECTATOR : GetDefaultLocalCompany()); + } if (_ctrl_pressed && !_network_dedicated) { DoCommandP(0, PM_PAUSED_NORMAL, 1, CMD_PAUSE); }