gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-13 02:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r23166) -Change: [NewGRF v8] Don't override rail type prop 1B with prop 09.

Browse Source
This commit is contained in:
michi_cc 2011-11-08 19:23:56 +00:00
parent fbbffe8bcb
commit aca5f7ccf5
1 changed files with 7 additions and 4 deletions

11
src/newgrf.cpp
View File

@ -3797,10 +3797,13 @@ static ChangeInfoResult RailTypeChangeInfo(uint id, int numinfo, int prop, ByteR
buf->ReadDWord(); buf->ReadDWord();
break; break;
case 0x09: // Toolbar caption of railtype (sets name as well for backwards compatibility) case 0x09: // Toolbar caption of railtype (sets name as well for backwards compatibility for grf ver < 8)
rti->strings.name = rti->strings.toolbar_caption = buf->ReadWord(); rti->strings.toolbar_caption = buf->ReadWord();
_string_to_grf_mapping[&rti->strings.toolbar_caption] = _cur.grffile->grfid; _string_to_grf_mapping[&rti->strings.toolbar_caption] = _cur.grffile->grfid;
_string_to_grf_mapping[&rti->strings.name] = _cur.grffile->grfid; if (_cur.grffile->grf_version < 8) {
rti->strings.name = rti->strings.toolbar_caption;
_string_to_grf_mapping[&rti->strings.name] = _cur.grffile->grfid;
}
break; break;
case 0x0A: // Menu text of railtype case 0x0A: // Menu text of railtype
@ -3883,7 +3886,7 @@ static ChangeInfoResult RailTypeChangeInfo(uint id, int numinfo, int prop, ByteR
rti->sorting_order = buf->ReadByte(); rti->sorting_order = buf->ReadByte();
break; break;
case 0x1B: // Name of railtype (overridden by prop 09) case 0x1B: // Name of railtype (overridden by prop 09 for grf ver < 8)
rti->strings.name = buf->ReadWord(); rti->strings.name = buf->ReadWord();
_string_to_grf_mapping[&rti->strings.name] = _cur.grffile->grfid; _string_to_grf_mapping[&rti->strings.name] = _cur.grffile->grfid;
break; break;