dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix incorrect industry NewGRF text ID mapping

Browse Source 
In the case where the lower 16 bits of the internal string ID
was also a valid NewGRF string ID
This commit is contained in:
Jonathan G Rennison
2023-08-06 01:21:19 +01:00
parent 752b0bce47
commit 5bcc71f2c2
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/newgrf_text.cpp
View File

@@ -615,6 +615,8 @@ StringID AddGRFString(uint32 grfid, uint16 stringid, byte langid_to_add, bool ne
*/ */
StringID GetGRFStringID(uint32 grfid, StringID stringid) StringID GetGRFStringID(uint32 grfid, StringID stringid)
{ {
if (stringid > UINT16_MAX) return STR_UNDEFINED;
extern GRFFile *GetFileByGRFIDExpectCurrent(uint32 grfid); extern GRFFile *GetFileByGRFIDExpectCurrent(uint32 grfid);
GRFFile *grf = GetFileByGRFIDExpectCurrent(grfid); GRFFile *grf = GetFileByGRFIDExpectCurrent(grfid);
if (unlikely(grf == nullptr)) { if (unlikely(grf == nullptr)) {