Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(svn r1101) -Fix: [Console] Removed magic numbers

Browse Source
pull/155/head
truelight 20 years ago
parent bd08844ab6
commit eb5b1ae72f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

16
console_cmds.c
Unescape Escape View File

@ -602,11 +602,11 @@ DEF_CONSOLE_CMD(ConSet) {
} }
if (argc == 3) { if (argc == 3) {
// Change server password // Change server password
if (strncmp(argv[2], "*", 20) == 0) { if (strncmp(argv[2], "*", NETWORK_PASSWORD_LENGTH) == 0) {
_network_game_info.server_password[0] = '\0'; _network_game_info.server_password[0] = '\0';
_network_game_info.use_password = 0; _network_game_info.use_password = 0;
} else { } else {
strncpy(_network_game_info.server_password, argv[2], 20); strncpy(_network_game_info.server_password, argv[2], sizeof(_network_game_info.server_password));
_network_game_info.use_password = 1; _network_game_info.use_password = 1;
} }
IConsolePrintF(_iconsole_color_warning, "Game-password changed to '%s'", _network_game_info.server_password); IConsolePrintF(_iconsole_color_warning, "Game-password changed to '%s'", _network_game_info.server_password);
@ -628,10 +628,10 @@ DEF_CONSOLE_CMD(ConSet) {
return NULL; return NULL;
} }
if (argc == 3) { if (argc == 3) {
if (strncmp(argv[2], "*", 20) == 0) { if (strncmp(argv[2], "*", NETWORK_PASSWORD_LENGTH) == 0) {
_network_player_info[_local_player].password[0] = '\0'; _network_player_info[_local_player].password[0] = '\0';
} else { } else {
strncpy(_network_player_info[_local_player].password, argv[2], 20); strncpy(_network_player_info[_local_player].password, argv[2], sizeof(_network_player_info[_local_player].password));
} }
if (!_network_server) if (!_network_server)
SEND_COMMAND(PACKET_CLIENT_SET_PASSWORD)(_network_player_info[_local_player].password); SEND_COMMAND(PACKET_CLIENT_SET_PASSWORD)(_network_player_info[_local_player].password);
@ -660,12 +660,12 @@ DEF_CONSOLE_CMD(ConSet) {
else { else {
if (NetworkFindName(argv[2])) { if (NetworkFindName(argv[2])) {
NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, ci->client_name, argv[2]); NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, ci->client_name, argv[2]);
ttd_strlcpy(ci->client_name, argv[2], 40); ttd_strlcpy(ci->client_name, argv[2], sizeof(ci->client_name));
NetworkUpdateClientInfo(NETWORK_SERVER_INDEX); NetworkUpdateClientInfo(NETWORK_SERVER_INDEX);
} }
} }
/* Also keep track of the new name on the client itself */ /* Also keep track of the new name on the client itself */
ttd_strlcpy(_network_player_name, argv[2], 40); ttd_strlcpy(_network_player_name, argv[2], sizeof(_network_player_name));
} else { } else {
IConsolePrint(_iconsole_color_default, "With 'set name' you can change your network-player name."); IConsolePrint(_iconsole_color_default, "With 'set name' you can change your network-player name.");
IConsolePrint(_iconsole_color_warning, "Usage: set name \"<name>\"."); IConsolePrint(_iconsole_color_warning, "Usage: set name \"<name>\".");
@ -680,9 +680,9 @@ DEF_CONSOLE_CMD(ConSet) {
return NULL; return NULL;
} }
if (argc == 3) { if (argc == 3) {
strncpy(_network_server_name, argv[2], 40); strncpy(_network_server_name, argv[2], sizeof(_network_server_name));
IConsolePrintF(_iconsole_color_warning, "Server-name changed to '%s'", _network_server_name); IConsolePrintF(_iconsole_color_warning, "Server-name changed to '%s'", _network_server_name);
ttd_strlcpy(_network_game_info.server_name, _network_server_name, 40); ttd_strlcpy(_network_game_info.server_name, _network_server_name, sizeof(_network_game_info.server_name));
} else { } else {
IConsolePrintF(_iconsole_color_default, "Current server-name is '%s'", _network_server_name); IConsolePrintF(_iconsole_color_default, "Current server-name is '%s'", _network_server_name);
IConsolePrint(_iconsole_color_warning, "Usage: set server_name \"<GameName>\"."); IConsolePrint(_iconsole_color_warning, "Usage: set server_name \"<GameName>\".");

Write Preview
Loading…
Cancel
Save