mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r9827) -Codechange/Fix: [NewGRF] Text strings of 1 character are perfectly valid... (fixes dbsetxl refits again...)

release/0.6
peter1138 2007-05-11 19:22:43 +00:00
parent c9018d3e7c
commit 5e00e688f8
1 changed files with 47 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/newgrf.cpp
View File

@ -2769,16 +2769,13 @@ static void FeatureNewName(byte *buf, int len)
len -= (int)name_length; len -= (int)name_length;
if (name_length == 1) { grfmsg(8, "FeatureNewName: 0x%04X <- %s", id, name);
grfmsg(7, "FeatureNewName: Can't add empty name");
} else {
grfmsg(8, "FeatureNewName: %d <- %s", id, name);
switch (feature) { switch (feature) {
case GSF_TRAIN: case GSF_TRAIN:
case GSF_ROAD: case GSF_ROAD:
case GSF_SHIP: case GSF_SHIP:
case GSF_AIRCRAFT: { case GSF_AIRCRAFT:
if (id < TOTAL_NUM_ENGINES) { if (id < TOTAL_NUM_ENGINES) {
StringID string = AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_8000_KIRBY_PAUL_TANK_STEAM + id); StringID string = AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_8000_KIRBY_PAUL_TANK_STEAM + id);
SetCustomEngineName(id, string); SetCustomEngineName(id, string);
@ -2786,7 +2783,6 @@ static void FeatureNewName(byte *buf, int len)
AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, id); AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, id);
} }
break; break;
}
case GSF_TOWNHOUSE: case GSF_TOWNHOUSE:
default: default:
@ -2808,14 +2804,13 @@ static void FeatureNewName(byte *buf, int len)
} }
break; break;
case 0xC9: { // House name case 0xC9: // House name
if (_cur_grffile->housespec == NULL || _cur_grffile->housespec[GB(id, 0, 8)] == NULL) { if (_cur_grffile->housespec == NULL || _cur_grffile->housespec[GB(id, 0, 8)] == NULL) {
grfmsg(1, "FeatureNewName: Attempt to name undefined house 0x%X, ignoring.", GB(id, 0, 8)); grfmsg(1, "FeatureNewName: Attempt to name undefined house 0x%X, ignoring.", GB(id, 0, 8));
} else { } else {
_cur_grffile->housespec[GB(id, 0, 8)]->building_name = AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED); _cur_grffile->housespec[GB(id, 0, 8)]->building_name = AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED);
} }
break; break;
}
case 0xD0: case 0xD0:
case 0xDC: case 0xDC:
@ -2850,7 +2845,6 @@ static void FeatureNewName(byte *buf, int len)
} }
} }
} }
}
/* Action 0x05 */ /* Action 0x05 */
static void GraphicsNew(byte *buf, int len) static void GraphicsNew(byte *buf, int len)