summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-04-08 19:39:03 +0000
committerrubidium <rubidium@openttd.org>2009-04-08 19:39:03 +0000
commit1d4318c0d16cb6017fc41027fa96d042851dbf10 (patch)
tree91c5ea2dd5dd5a74a6aa38b92f45bf034da9ea7b
parent08e37a6f1026bdb2ae28d90e605230c7f864b4b9 (diff)
downloadopenttd-1d4318c0d16cb6017fc41027fa96d042851dbf10.tar.xz
(svn r15988) -Fix: inconsistency between using NETWORK_NAME_LENGTH and NETWORK_CLIENT_NAME_LENGTH for the length of client names.
-rw-r--r--src/network/network_gui.cpp2
-rw-r--r--src/settings_type.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index 8c16f4ddc..1aa201183 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -305,7 +305,7 @@ protected:
}
public:
- NetworkGameWindow(const WindowDesc *desc) : QueryStringBaseWindow(NETWORK_NAME_LENGTH, desc)
+ NetworkGameWindow(const WindowDesc *desc) : QueryStringBaseWindow(NETWORK_CLIENT_NAME_LENGTH, desc)
{
this->widget[NGWW_CLIENTS].left = this->widget[NGWW_NAME].right + 1;
this->widget[NGWW_MAPSIZE].left = this->widget[NGWW_NAME].right + 1;
diff --git a/src/settings_type.h b/src/settings_type.h
index e3f52600d..56015dc08 100644
--- a/src/settings_type.h
+++ b/src/settings_type.h
@@ -119,7 +119,7 @@ struct NetworkSettings {
char rcon_password[NETWORK_PASSWORD_LENGTH]; ///< passowrd for rconsole (server side)
bool server_advertise; ///< advertise the server to the masterserver
uint8 lan_internet; ///< search on the LAN or internet for servers
- char client_name[NETWORK_NAME_LENGTH]; ///< name of the player (as client)
+ char client_name[NETWORK_CLIENT_NAME_LENGTH]; ///< name of the player (as client)
char default_company_pass[NETWORK_PASSWORD_LENGTH]; ///< default password for new companies in encrypted form
char connect_to_ip[NETWORK_HOSTNAME_LENGTH]; ///< default for the "Add server" query
char network_id[NETWORK_UNIQUE_ID_LENGTH]; ///< semi-unique ID of the client