diff options
| author | rubidium <rubidium@openttd.org> | 2008-07-21 13:05:43 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-07-21 13:05:43 +0000 |
| commit | bd0e52011d4d31b9a5fcaef168d448c5332dc9be (patch) | |
| tree | 535b6d460d6bac2adcb2f25c076a891092c37c18 | |
| parent | f81b3b7357bf6592a387b71f1d1323e7402da028 (diff) | |
| download | openttd-bd0e52011d4d31b9a5fcaef168d448c5332dc9be.tar.xz | |
(svn r13773) -Codechange: disable autoclean for protected/unprotected companies when the timeout is set to 0. Based on an idea by Thomas.
| -rw-r--r-- | src/network/network_server.cpp | 4 | ||||
| -rw-r--r-- | src/settings.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp index c3cf6ae3b..f85e15f29 100644 --- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -1440,13 +1440,13 @@ static void NetworkAutoCleanCompanies() _network_player_info[p->index].months_empty++; /* Is the company empty for autoclean_unprotected-months, and is there no protection? */ - if (_network_player_info[p->index].months_empty > _settings_client.network.autoclean_unprotected && _network_player_info[p->index].password[0] == '\0') { + if (_settings_client.network.autoclean_unprotected != 0 && _network_player_info[p->index].months_empty > _settings_client.network.autoclean_unprotected && _network_player_info[p->index].password[0] == '\0') { /* Shut the company down */ DoCommandP(0, 2, p->index, NULL, CMD_PLAYER_CTRL); IConsolePrintF(CC_DEFAULT, "Auto-cleaned company #%d", p->index + 1); } /* Is the compnay empty for autoclean_protected-months, and there is a protection? */ - if (_network_player_info[p->index].months_empty > _settings_client.network.autoclean_protected && _network_player_info[p->index].password[0] != '\0') { + if (_settings_client.network.autoclean_protected != 0 && _network_player_info[p->index].months_empty > _settings_client.network.autoclean_protected && _network_player_info[p->index].password[0] != '\0') { /* Unprotect the company */ _network_player_info[p->index].password[0] = '\0'; IConsolePrintF(CC_DEFAULT, "Auto-removed protection from company #%d", p->index+1); diff --git a/src/settings.cpp b/src/settings.cpp index 2e34cdbbe..97b4629e0 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1806,8 +1806,8 @@ const SettingDesc _patch_settings[] = { 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), - SDTC_VAR(network.autoclean_unprotected, SLE_UINT8, S, NO, 12, 0, 60, 0, STR_NULL, NULL), - SDTC_VAR(network.autoclean_protected, SLE_UINT8, S, NO, 36, 0, 180, 0, STR_NULL, NULL), + SDTC_VAR(network.autoclean_unprotected, SLE_UINT8, S,D0|NO, 12, 0, 240, 0, STR_NULL, NULL), + SDTC_VAR(network.autoclean_protected, SLE_UINT8, S,D0|NO, 36, 0, 240, 0, STR_NULL, NULL), SDTC_VAR(network.max_companies, SLE_UINT8, S, NO, 8, 1, MAX_PLAYERS, 0, STR_NULL, NULL), SDTC_VAR(network.max_clients, SLE_UINT8, S, NO, 10, 2, MAX_CLIENTS, 0, STR_NULL, NULL), SDTC_VAR(network.max_spectators, SLE_UINT8, S, NO, 10, 0, MAX_CLIENTS, 0, STR_NULL, NULL), |