gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-11 16:54:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r27769) -Change: [NewGRF] Extend the DCxx range to D800-DFFF.

Browse Source
This commit is contained in:
frosch 2017-03-05 14:45:13 +00:00
parent 5846aa5bfc
commit fa8d85b632
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/newgrf.cpp
View File

@ -550,9 +550,10 @@ static StringID TTDPStringIDToOTTDStringIDMapping(StringID str)
*/ */
StringID MapGRFStringID(uint32 grfid, StringID str) StringID MapGRFStringID(uint32 grfid, StringID str)
{ {
if (IsInsideMM(str, 0xDC00, 0xDD00)) { if (IsInsideMM(str, 0xD800, 0xE000)) {
/* General text provided by NewGRF. /* General text provided by NewGRF.
* In the specs this is called the 0xDCxx range (misc presistent texts). * In the specs this is called the 0xDCxx range (misc presistent texts),
* but we meanwhile extended the range to 0xD800-0xDFFF.
* Note: We are not involved in the "persistent" business, since we do not store * Note: We are not involved in the "persistent" business, since we do not store
* any NewGRF strings in savegames. */ * any NewGRF strings in savegames. */
return GetGRFStringID(grfid, str); return GetGRFStringID(grfid, str);
@ -5479,7 +5480,7 @@ static void FeatureNewName(ByteReader *buf)
break; break;
default: default:
if (IsInsideMM(id, 0xD000, 0xD400) || IsInsideMM(id, 0xDC00, 0xDD00)) { if (IsInsideMM(id, 0xD000, 0xD400) || IsInsideMM(id, 0xD800, 0xE000)) {
AddGRFString(_cur.grffile->grfid, id, lang, new_scheme, true, name, STR_UNDEFINED); AddGRFString(_cur.grffile->grfid, id, lang, new_scheme, true, name, STR_UNDEFINED);
break; break;
} }
@ -7239,7 +7240,7 @@ static void TranslateGRFStrings(ByteReader *buf)
byte num_strings = buf->ReadByte(); byte num_strings = buf->ReadByte();
uint16 first_id = buf->ReadWord(); uint16 first_id = buf->ReadWord();
if (!((first_id >= 0xD000 && first_id + num_strings <= 0xD400) || (first_id >= 0xDC00 && first_id + num_strings <= 0xDD00))) { if (!((first_id >= 0xD000 && first_id + num_strings <= 0xD400) || (first_id >= 0xD800 && first_id + num_strings <= 0xE000))) {
grfmsg(7, "TranslateGRFStrings: Attempting to set out-of-range string IDs in action 13 (first: 0x%4X, number: 0x%2X)", first_id, num_strings); grfmsg(7, "TranslateGRFStrings: Attempting to set out-of-range string IDs in action 13 (first: 0x%4X, number: 0x%2X)", first_id, num_strings);
return; return;
} }