diff options
| author | peter1138 <peter1138@openttd.org> | 2008-02-29 08:48:01 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2008-02-29 08:48:01 +0000 |
| commit | 9ccce574386eb8daf97a0b55baa01be1bf5e01e9 (patch) | |
| tree | 064d47c27a7440a3e1a27e39cc72ef4a99b5dacd /src/newgrf_text.cpp | |
| parent | 6bdc8e5fae1c7fa5bc3a681e30e78de7c9b3f76b (diff) | |
| download | openttd-9ccce574386eb8daf97a0b55baa01be1bf5e01e9.tar.xz | |
(svn r12317) -Fix [FS#1815]: Map string IDs that are embedded from other strings.
Diffstat (limited to 'src/newgrf_text.cpp')
| -rw-r--r-- | src/newgrf_text.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<char>(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); |