diff options
| author | rubidium <rubidium@openttd.org> | 2008-06-03 08:04:35 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-06-03 08:04:35 +0000 |
| commit | 994779e9e288f9400b57f05340c422cd11455bc6 (patch) | |
| tree | f4465a975b5e0a16c9e1057ed8b9c384ae16a443 /src/settings.cpp | |
| parent | 0cf79d70d0d1b2cccec4053fd9afa500db542b7a (diff) | |
| download | openttd-994779e9e288f9400b57f05340c422cd11455bc6.tar.xz | |
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
-Fix: failure of changing the server password during games because the password wasn't duplicated properly.
Diffstat (limited to 'src/settings.cpp')
| -rw-r--r-- | src/settings.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/settings.cpp b/src/settings.cpp index a38da7434..88596c9f1 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1447,20 +1447,10 @@ static int32 UpdatePlayerName(int32 p1) return 0; } -static int32 UpdateServerName(int32 p1) -{ - ttd_strlcpy(_network_game_info.server_name, _settings_client.network.server_name, sizeof(_network_game_info.server_name)); - return 0; -} - static int32 UpdateServerPassword(int32 p1) { if (strcmp(_settings_client.network.server_password, "*") == 0) { _settings_client.network.server_password[0] = '\0'; - _network_game_info.use_password = false; - } else { - ttd_strlcpy(_network_game_info.server_password, _settings_client.network.server_password, sizeof(_network_game_info.server_password)); - _network_game_info.use_password = true; } return 0; @@ -1472,8 +1462,6 @@ static int32 UpdateRconPassword(int32 p1) _settings_client.network.rcon_password[0] = '\0'; } - ttd_strlcpy(_network_game_info.rcon_password, _settings_client.network.rcon_password, sizeof(_network_game_info.rcon_password)); - return 0; } @@ -1813,7 +1801,7 @@ SDTC_CONDOMANY( gui.units, SLE_ SDTC_STR(network.server_password, SLE_STRB, S, NO, NULL, STR_NULL, UpdateServerPassword), SDTC_STR(network.rcon_password, SLE_STRB, S, NO, NULL, STR_NULL, UpdateRconPassword), SDTC_STR(network.default_company_pass, SLE_STRB, S, 0, NULL, STR_NULL, NULL), - SDTC_STR(network.server_name, SLE_STRB, S, NO, NULL, STR_NULL, UpdateServerName), + SDTC_STR(network.server_name, SLE_STRB, S, NO, NULL, STR_NULL, NULL), SDTC_STR(network.connect_to_ip, SLE_STRB, S, 0, NULL, STR_NULL, NULL), SDTC_STR(network.network_id, SLE_STRB, S, NO, NULL, STR_NULL, NULL), SDTC_BOOL(network.autoclean_companies, S, NO, false, STR_NULL, NULL), @@ -2196,6 +2184,7 @@ bool SetPatchValue(uint index, const char *value) char *var = (char*)GetVariableAddress(NULL, &sd->save); ttd_strlcpy(var, value, sd->save.length); + if (sd->desc.proc != NULL) sd->desc.proc(0); return true; } |