mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-12 09:09:09 +00:00
Code Issues Activity

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

Browse Source
This commit is contained in:
yexo
2009-05-26 12:53:34 +00:00
parent af07333c78
commit 279746236b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/settings_gui.cpp
View File

@@ -1013,7 +1013,7 @@ void SettingEntry::DrawSetting(GameSettings *settings_ptr, const SettingDesc *sd
bool disabled = false; bool disabled = false;
/* We do not allow changes of some items when we are a client in a networkgame */ /* 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_NETWORK_ONLY) && !_networking) editable = false;
if ((sdb->flags & SGF_NO_NETWORK) && _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; const SettingDesc *sd = pe->d.entry.setting;
/* return if action is only active in network, or only settable by server */ /* 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_NETWORK_ONLY) && !_networking) return;
if ((sd->desc.flags & SGF_NO_NETWORK) && _networking) return; if ((sd->desc.flags & SGF_NO_NETWORK) && _networking) return;