# HG changeset patch
# User yexo <yexo@openttd.org>
# Date 2009-05-26 12:53:34
# Node ID 7fabc7bfef6d366f900e527338babd27122ee2fc
# Parent  7238bd805bfa90eb6d6a717fc8cd5ffd89b1b977

(svn r16431) -Fix (16429): Company settings can also be changed in multiplayer games

diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -1013,7 +1013,7 @@ void SettingEntry::DrawSetting(GameSetti
 	bool disabled = false;
 
 	/* We do not allow changes of some items when we are a client in a networkgame */
-	if (!(sd->save.conv & SLF_NETWORK_NO) && _networking && !_network_server) editable = false;
+	if (!(sd->save.conv & SLF_NETWORK_NO) && _networking && !_network_server && !(sdb->flags & SGF_PER_COMPANY)) editable = false;
 	if ((sdb->flags & SGF_NETWORK_ONLY) && !_networking) editable = false;
 	if ((sdb->flags & SGF_NO_NETWORK) && _networking) editable = false;
 
@@ -1446,7 +1446,7 @@ struct GameSettingsWindow : Window {
 		const SettingDesc *sd = pe->d.entry.setting;
 
 		/* return if action is only active in network, or only settable by server */
-		if (!(sd->save.conv & SLF_NETWORK_NO) && _networking && !_network_server) return;
+		if (!(sd->save.conv & SLF_NETWORK_NO) && _networking && !_network_server && !(sd->desc.flags & SGF_PER_COMPANY)) return;
 		if ((sd->desc.flags & SGF_NETWORK_ONLY) && !_networking) return;
 		if ((sd->desc.flags & SGF_NO_NETWORK) && _networking) return;