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/company_cmd.cpp | |
| parent | 768da4b48f8c70177cb5dfc77a30a23a98a3ae05 (diff) | |
| download | openttd-cf61c2f11fbffe20749382feb8fe03d238a2888d.tar.xz | |
(svn r21412) -Codechange: limit company name by amount of characters, not bytes
Diffstat (limited to 'src/company_cmd.cpp')
| -rw-r--r-- | src/company_cmd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp index d44f4c4ab..3e9cf9463 100644 --- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -325,7 +325,7 @@ static void GenerateCompanyName(Company *c) { /* Reserve space for extra unicode character. We need to do this to be able * to detect too long company name. */ - char buffer[MAX_LENGTH_COMPANY_NAME_BYTES + MAX_CHAR_LENGTH]; + char buffer[(MAX_LENGTH_COMPANY_NAME_CHARS + 1) * MAX_CHAR_LENGTH]; if (c->name_1 != STR_SV_UNNAMED) return; if (c->last_build_coordinate == 0) return; @@ -346,7 +346,7 @@ verify_name:; } GetString(buffer, str, lastof(buffer)); - if (strlen(buffer) >= MAX_LENGTH_COMPANY_NAME_BYTES) goto bad_town_name; + if (Utf8StringLength(buffer) >= MAX_LENGTH_COMPANY_NAME_CHARS) goto bad_town_name; set_name:; c->name_1 = str; @@ -1049,7 +1049,7 @@ CommandCost CmdRenameCompany(TileIndex tile, DoCommandFlag flags, uint32 p1, uin bool reset = StrEmpty(text); if (!reset) { - if (strlen(text) >= MAX_LENGTH_COMPANY_NAME_BYTES) return CMD_ERROR; + if (Utf8StringLength(text) >= MAX_LENGTH_COMPANY_NAME_CHARS) return CMD_ERROR; if (!IsUniqueCompanyName(text)) return_cmd_error(STR_ERROR_NAME_MUST_BE_UNIQUE); } |