diff options
| author | rubidium <rubidium@openttd.org> | 2010-12-05 22:25:21 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-12-05 22:25:21 +0000 |
| commit | 5c9c3f1acf9a49b8da6fcbea0e4072750181a48c (patch) | |
| tree | 2a5c4d4e8be234c7024da472f2fe9d5344417fe9 /src/townname.cpp | |
| parent | 6e69b943d685c3b485d415d4fce53af28f0eba85 (diff) | |
| download | openttd-5c9c3f1acf9a49b8da6fcbea0e4072750181a48c.tar.xz | |
(svn r21414) -Codechange: limit town name by amount of characters, not bytes
Diffstat (limited to 'src/townname.cpp')
| -rw-r--r-- | src/townname.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/townname.cpp b/src/townname.cpp index 5377a7ae5..77f0abe66 100644 --- a/src/townname.cpp +++ b/src/townname.cpp @@ -80,13 +80,13 @@ char *GetTownName(char *buff, const Town *t, const char *last) bool VerifyTownName(uint32 r, const TownNameParams *par) { /* reserve space for extra unicode character and terminating '\0' */ - char buf1[MAX_LENGTH_TOWN_NAME_BYTES + MAX_CHAR_LENGTH]; - char buf2[MAX_LENGTH_TOWN_NAME_BYTES + MAX_CHAR_LENGTH]; + char buf1[(MAX_LENGTH_TOWN_NAME_CHARS + 1) * MAX_CHAR_LENGTH]; + char buf2[(MAX_LENGTH_TOWN_NAME_CHARS + 1) * MAX_CHAR_LENGTH]; GetTownName(buf1, par, r, lastof(buf1)); /* Check size and width */ - if (strlen(buf1) >= MAX_LENGTH_TOWN_NAME_BYTES) return false; + if (Utf8StringLength(buf1) >= MAX_LENGTH_TOWN_NAME_CHARS) return false; const Town *t; FOR_ALL_TOWNS(t) { |