mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(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:
maedhros 2007-02-17 23:01:42 +00:00
parent c810aef43b
commit 3c5eb8458a
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/newgrf.cpp
View File

@ -2074,7 +2074,11 @@ static void FeatureNewName(byte *buf, int len)
for (; id < endid && len > 0; id++) {
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);
switch (feature) {
@ -2143,14 +2147,6 @@ static void FeatureNewName(byte *buf, int len)
break;
#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;
len -= (int)ofs;