dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add passworded mechanism to change server game settings from client

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-08-20 20:42:17 +01:00
parent 17c054a650
commit ec892879f4
17 changed files with 155 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/settings.cpp
View File

@@ -806,7 +806,7 @@ void IniSaveWindowSettings(IniFile *ini, const char *grpname, void *desc)
*/
bool SettingDesc::IsEditable(bool do_command) const
{
if (!do_command && !(this->save.conv & SLF_NO_NETWORK_SYNC) && _networking && !_network_server && !(this->desc.flags & SGF_PER_COMPANY)) return false;
if (!do_command && !(this->save.conv & SLF_NO_NETWORK_SYNC) && _networking && !(_network_server || _network_settings_access) && !(this->desc.flags & SGF_PER_COMPANY)) return false;
if ((this->desc.flags & SGF_NETWORK_ONLY) && !_networking && _game_mode != GM_MENU) return false;
if ((this->desc.flags & SGF_NO_NETWORK) && _networking) return false;
if ((this->desc.flags & SGF_NEWGAME_ONLY) &&
@@ -1260,7 +1260,7 @@ static bool MaxNoAIsChange(int32 i)
{
if (GetGameSettings().difficulty.max_no_competitors != 0 &&
AI::GetInfoList()->size() == 0 &&
(!_networking || _network_server)) {
(!_networking || (_network_server || _network_settings_access))) {
ShowErrorMessage(STR_WARNING_NO_SUITABLE_AI, INVALID_STRING_ID, WL_CRITICAL);
}
@@ -1495,6 +1495,15 @@ static bool UpdateRconPassword(int32 p1)
return true;
}
static bool UpdateSettingsPassword(int32 p1)
{
if (strcmp(_settings_client.network.settings_password, "*") == 0) {
_settings_client.network.settings_password[0] = '\0';
}
return true;
}
static bool UpdateClientConfigValues(int32 p1)
{
if (_network_server) NetworkServerSendConfigUpdate();
@@ -2112,7 +2121,7 @@ bool SetSettingValue(uint index, int32 value, bool force_newgame)
}
/* send non-company-based settings over the network */
if (!_networking || (_networking && _network_server)) {
if (!_networking || (_networking && (_network_server || _network_settings_access))) {
return DoCommandP(0, index, value, CMD_CHANGE_SETTING);
}
return false;
@@ -2272,7 +2281,7 @@ void IConsoleSetSetting(const char *name, const char *value, bool force_newgame)
}
if (!success) {
if (_network_server) {
if ((_network_server || _network_settings_access)) {
IConsoleError("This command/variable is not available during network games.");
} else {
IConsoleError("This command/variable is only available to a network server.");