mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r8792) -Fix (r6623): Don't check whether a string length is 1 when you already know it isn't.
This commit is contained in:
parent
c810aef43b
commit
3c5eb8458a
|
@ -2074,7 +2074,11 @@ static void FeatureNewName(byte *buf, int len)
|
||||||
for (; id < endid && len > 0; id++) {
|
for (; id < endid && len > 0; id++) {
|
||||||
size_t ofs = strlen(name) + 1;
|
size_t ofs = strlen(name) + 1;
|
||||||
|
|
||||||
if (ofs < 128) {
|
if (ofs == 1) {
|
||||||
|
grfmsg(7, "FeatureNewName: Can't add empty name");
|
||||||
|
} else if (ofs > 127) {
|
||||||
|
grfmsg(7, "FeatureNewName: Too long a name (%d)", ofs);
|
||||||
|
} else {
|
||||||
grfmsg(8, "FeatureNewName: %d <- %s", id, name);
|
grfmsg(8, "FeatureNewName: %d <- %s", id, name);
|
||||||
|
|
||||||
switch (feature) {
|
switch (feature) {
|
||||||
|
@ -2143,14 +2147,6 @@ static void FeatureNewName(byte *buf, int len)
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
/* ofs is the string length + 1, so if the string is empty, ofs
|
|
||||||
* is 1 */
|
|
||||||
if (ofs == 1) {
|
|
||||||
grfmsg(7, "FeatureNewName: Can't add empty name");
|
|
||||||
} else {
|
|
||||||
grfmsg(7, "FeatureNewName: Too long a name (%d)", ofs);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
name += ofs;
|
name += ofs;
|
||||||
len -= (int)ofs;
|
len -= (int)ofs;
|
||||||
|
|
Loading…
Reference in New Issue