diff options
| author | rubidium <rubidium@openttd.org> | 2010-12-05 22:24:50 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-12-05 22:24:50 +0000 |
| commit | cf61c2f11fbffe20749382feb8fe03d238a2888d (patch) | |
| tree | f6a5ff6ee367f3a62f59d1e7099aeafcfb665b5f /src/network | |
| parent | 768da4b48f8c70177cb5dfc77a30a23a98a3ae05 (diff) | |
| download | openttd-cf61c2f11fbffe20749382feb8fe03d238a2888d.tar.xz | |
(svn r21412) -Codechange: limit company name by amount of characters, not bytes
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/core/config.h | 2 | ||||
| -rw-r--r-- | src/network/network.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/core/config.h b/src/network/core/config.h index 584e0382a..ff4d6e22e 100644 --- a/src/network/core/config.h +++ b/src/network/core/config.h @@ -40,7 +40,7 @@ static const byte NETWORK_COMPANY_INFO_VERSION = 6; ///< What version of c static const byte NETWORK_MASTER_SERVER_VERSION = 2; ///< What version of master-server-protocol do we use? static const uint NETWORK_NAME_LENGTH = 80; ///< The maximum length of the server name and map name, in bytes including '\0' -static const uint NETWORK_COMPANY_NAME_LENGTH = 31; ///< The maximum length of the company name, in bytes including '\0' +static const uint NETWORK_COMPANY_NAME_LENGTH = 128; ///< The maximum length of the company name, in bytes including '\0' static const uint NETWORK_HOSTNAME_LENGTH = 80; ///< The maximum length of the host name, in bytes including '\0' static const uint NETWORK_SERVER_ID_LENGTH = 33; ///< The maximum length of the network id of the servers, in bytes including '\0' static const uint NETWORK_REVISION_LENGTH = 15; ///< The maximum length of the revision, in bytes including '\0' diff --git a/src/network/network.cpp b/src/network/network.cpp index 242f89acf..5631643d2 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -82,7 +82,7 @@ CompanyMask _network_company_passworded; ///< Bitmask of the password status of /* Check whether NETWORK_NUM_LANDSCAPES is still in sync with NUM_LANDSCAPE */ assert_compile((int)NETWORK_NUM_LANDSCAPES == (int)NUM_LANDSCAPE); -assert_compile((int)NETWORK_COMPANY_NAME_LENGTH == MAX_LENGTH_COMPANY_NAME_BYTES); +assert_compile((int)NETWORK_COMPANY_NAME_LENGTH == MAX_LENGTH_COMPANY_NAME_CHARS * MAX_CHAR_LENGTH); extern NetworkUDPSocketHandler *_udp_client_socket; ///< udp client socket extern NetworkUDPSocketHandler *_udp_server_socket; ///< udp server socket |