diff options
| author | rubidium <rubidium@openttd.org> | 2008-12-23 15:23:31 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-12-23 15:23:31 +0000 |
| commit | bc8984a9bbe3974c6ca606569d54947a99395244 (patch) | |
| tree | 390443f467a1fbb1d72261b3ea3a888a96ccfcb2 | |
| parent | fb7ccc6820f2d4d6ec1a72f39210f06f8c22b323 (diff) | |
| download | openttd-bc8984a9bbe3974c6ca606569d54947a99395244.tar.xz | |
(svn r14727) -Codechange: replace some magic numbers with a constant.
| -rw-r--r-- | src/network/network_server.cpp | 14 | ||||
| -rw-r--r-- | src/settings.cpp | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp index 8af01e4c9..e00e201cd 100644 --- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -1414,10 +1414,10 @@ static void NetworkAutoCleanCompanies() bool NetworkFindName(char new_name[NETWORK_CLIENT_NAME_LENGTH]) { bool found_name = false; - byte number = 0; + uint number = 0; char original_name[NETWORK_CLIENT_NAME_LENGTH]; - // We use NETWORK_CLIENT_NAME_LENGTH in here, because new_name is really a pointer + /* We use NETWORK_CLIENT_NAME_LENGTH in here, because new_name is really a pointer */ ttd_strlcpy(original_name, new_name, NETWORK_CLIENT_NAME_LENGTH); while (!found_name) { @@ -1426,22 +1426,22 @@ bool NetworkFindName(char new_name[NETWORK_CLIENT_NAME_LENGTH]) found_name = true; FOR_ALL_CLIENT_INFOS(ci) { if (strcmp(ci->client_name, new_name) == 0) { - // Name already in use + /* Name already in use */ found_name = false; break; } } - // Check if it is the same as the server-name + /* Check if it is the same as the server-name */ ci = NetworkFindClientInfoFromClientID(CLIENT_ID_SERVER); if (ci != NULL) { if (strcmp(ci->client_name, new_name) == 0) found_name = false; // name already in use } if (!found_name) { - // Try a new name (<name> #1, <name> #2, and so on) + /* Try a new name (<name> #1, <name> #2, and so on) */ - // Stop if we tried for more than 50 times.. - if (number++ > 50) break; + /* Something's really wrong when there're more names than clients */ + if (number++ > MAX_CLIENTS) break; snprintf(new_name, NETWORK_CLIENT_NAME_LENGTH, "%s #%d", original_name, number); } } diff --git a/src/settings.cpp b/src/settings.cpp index fbcf2cc89..3c2bac2ef 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1487,7 +1487,7 @@ const SettingDesc _patch_settings[] = { 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), SDTC_VAR(network.restart_game_year, SLE_INT32, S,D0|NO|NC,0, MIN_YEAR, MAX_YEAR, 1, STR_NULL, NULL), - SDTC_VAR(network.min_active_clients, SLE_UINT8, S, NO, 0, 0, 10, 0, STR_NULL, UpdateMinActiveClients), + SDTC_VAR(network.min_active_clients, SLE_UINT8, S, NO, 0, 0, MAX_CLIENTS, 0, STR_NULL, UpdateMinActiveClients), SDTC_OMANY(network.server_lang, SLE_UINT8, S, NO, 0, 35, "ANY|ENGLISH|GERMAN|FRENCH|BRAZILIAN|BULGARIAN|CHINESE|CZECH|DANISH|DUTCH|ESPERANTO|FINNISH|HUNGARIAN|ICELANDIC|ITALIAN|JAPANESE|KOREAN|LITHUANIAN|NORWEGIAN|POLISH|PORTUGUESE|ROMANIAN|RUSSIAN|SLOVAK|SLOVENIAN|SPANISH|SWEDISH|TURKISH|UKRAINIAN|AFRIKAANS|CROATIAN|CATALAN|ESTONIAN|GALICIAN|GREEK|LATVIAN", STR_NULL, NULL), SDTC_BOOL(network.reload_cfg, S, NO, false, STR_NULL, NULL), SDTC_STR(network.last_host, SLE_STRB, S, 0, "0.0.0.0", STR_NULL, NULL), |