1
0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-24 20:54:08 +01:00

(svn r22887) [1.1] -Backport from trunk:

- Fix: [NewGRF] DCxx text references via the textstack are not allowed, but caused crash [FS#4758] (r22882)
- Fix: Miscalculation of train curve speed limits (r22879)
- Fix: Report an error in the news if autoreplace/renew fails due to the engine type being no longer available [FS#4712] (r22876)
This commit is contained in:
frosch
2011-09-03 18:59:26 +00:00
parent daa89c982e
commit 41f777b0ec
3 changed files with 27 additions and 16 deletions

View File

@@ -57,7 +57,7 @@ StringID TTDPStringIDToOTTDStringIDMapping(StringID str)
};
/* A string straight from a NewGRF; no need to remap this as it's already mapped. */
if (IsInsideMM(str, 0xD000, 0xD7FF) || IsInsideMM(str, 0xDC00, 0xDCFF)) return str;
if (IsInsideMM(str, 0xD000, 0xD7FF)) return str;
#define TEXTID_TO_STRINGID(begin, end, stringid) if (str >= begin && str <= end) return str + (stringid - begin)
/* We have some changes in our cargo strings, resulting in some missing. */