gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change: [NewGRF] Use deferred string mapping for bridge and currency names. (#13230)

Browse Source 
This means that the strings can now be defined after the properties using them, as is the case with all other features.
This commit is contained in:
Peter Nelson 2025-01-02 09:35:15 +00:00 committed by GitHub
parent 666f7bfe23
commit 4edde7d6de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/newgrf.cpp
View File

@ -2327,18 +2327,17 @@ static ChangeInfoResult BridgeChangeInfo(uint brid, int numinfo, int prop, ByteR
bridge->avail_year = Clamp(TimerGameCalendar::Year(buf.ReadDWord()), CalendarTime::MIN_YEAR, CalendarTime::MAX_YEAR);
break;
case 0x10: { // purchase string
StringID newone = GetGRFStringID(_cur.grffile->grfid, buf.ReadWord());
if (newone != STR_UNDEFINED) bridge->material = newone;
case 0x10: // purchase string
AddStringForMapping(buf.ReadWord(), &bridge->material);
break;
}
case 0x11: // description of bridge with rails or roads
case 0x12: {
StringID newone = GetGRFStringID(_cur.grffile->grfid, buf.ReadWord());
if (newone != STR_UNDEFINED) bridge->transport_name[prop - 0x11] = newone;
case 0x11: // description of bridge with rails
AddStringForMapping(buf.ReadWord(), &bridge->transport_name[0]);
break;
case 0x12: // description of bridge with roads
AddStringForMapping(buf.ReadWord(), &bridge->transport_name[1]);
break;
}
case 0x13: // 16 bits cost multiplier
bridge->price = buf.ReadWord();
@ -2790,11 +2789,13 @@ static ChangeInfoResult GlobalVarChangeInfo(uint gvid, int numinfo, int prop, By
case 0x0A: { // Currency display names
uint curidx = GetNewgrfCurrencyIdConverted(gvid + i);
StringID newone = GetGRFStringID(_cur.grffile->grfid, buf.ReadWord());
if ((newone != STR_UNDEFINED) && (curidx < CURRENCY_END)) {
_currency_specs[curidx].name = newone;
_currency_specs[curidx].code.clear();
if (curidx < CURRENCY_END) {
AddStringForMapping(buf.ReadWord(), [curidx](StringID str) {
_currency_specs[curidx].name = str;
_currency_specs[curidx].code.clear();
});
} else {
buf.ReadWord();
}
break;
}