dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify town name duplicate check in VerifyTownName

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-08-01 19:08:30 +01:00
parent 665d6bf7f2
commit 2313679ee7
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/townname.cpp
View File

@@ -83,7 +83,6 @@ bool VerifyTownName(uint32 r, const TownNameParams *par, TownNames *town_names)
{
/* reserve space for extra unicode character and terminating '\0' */
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));
@@ -97,12 +96,7 @@ bool VerifyTownName(uint32 r, const TownNameParams *par, TownNames *town_names)
for (const Town *t : Town::Iterate()) {
/* We can't just compare the numbers since
* several numbers may map to a single name. */
const char *buf = t->name.empty() ? nullptr : t->name.c_str();
if (buf == nullptr) {
GetTownName(buf2, t, lastof(buf2));
buf = buf2;
}
if (strcmp(buf1, buf) == 0) return false;
if (strcmp(buf1, t->GetCachedName()) == 0) return false;
}
}