From 9ccce574386eb8daf97a0b55baa01be1bf5e01e9 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Fri, 29 Feb 2008 08:48:01 +0000 Subject: (svn r12317) -Fix [FS#1815]: Map string IDs that are embedded from other strings. --- src/newgrf_text.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/newgrf_text.cpp') diff --git a/src/newgrf_text.cpp b/src/newgrf_text.cpp index 07d1c8323..261610f46 100644 --- a/src/newgrf_text.cpp +++ b/src/newgrf_text.cpp @@ -192,7 +192,7 @@ static GRFTextEntry _grf_text[(1 << TABSIZE) * 3]; static byte _currentLangID = GRFLX_ENGLISH; ///< by default, english is used. -char *TranslateTTDPatchCodes(const char *str) +char *TranslateTTDPatchCodes(uint32 grfid, const char *str) { char *tmp = MallocT(strlen(str) * 10 + 1); // Allocate space to allow for expansion char *d = tmp; @@ -241,7 +241,7 @@ char *TranslateTTDPatchCodes(const char *str) string = *str++; string |= *str++ << 8; d += Utf8Encode(d, SCC_STRING_ID); - d += Utf8Encode(d, string); + d += Utf8Encode(d, MapGRFStringID(grfid, string)); break; } case 0x82: @@ -345,7 +345,7 @@ StringID AddGRFString(uint32 grfid, uint16 stringid, byte langid_to_add, bool ne /* Too many strings allocated, return empty */ if (id == lengthof(_grf_text)) return STR_EMPTY; - translatedtext = TranslateTTDPatchCodes(text_to_add); + translatedtext = TranslateTTDPatchCodes(grfid, text_to_add); GRFText *newtext = GRFText::New(langid_to_add, translatedtext); -- cgit v1.2.3-54-g00ecf