diff options
| author | peter1138 <peter1138@openttd.org> | 2006-10-28 18:42:57 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2006-10-28 18:42:57 +0000 |
| commit | dc58fb87ab97783bfc9e35c62719afd45fadb5c1 (patch) | |
| tree | c1619e47b26eecbb69972264cf6b77808e2283b8 /newgrf_text.c | |
| parent | 8908ea67d5d01f1a00e3d4d507ada67bc47bec9b (diff) | |
| download | openttd-dc58fb87ab97783bfc9e35c62719afd45fadb5c1.tar.xz | |
(svn r6995) - Codechange: NewGRF; strip bit 7 of the language ID earlier and handle handle a language ID of 0x7F as the preferred default language.
Diffstat (limited to 'newgrf_text.c')
| -rw-r--r-- | newgrf_text.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/newgrf_text.c b/newgrf_text.c index 884e12ee4..09a970657 100644 --- a/newgrf_text.c +++ b/newgrf_text.c @@ -233,7 +233,7 @@ StringID AddGRFString(uint32 grfid, uint16 stringid, byte langid_to_add, bool ne newtext = malloc(sizeof(*newtext) + strlen(text_to_add) + 1); newtext->next = NULL; - newtext->langid = GB(langid_to_add, 0, 6); + newtext->langid = langid_to_add; strcpy(newtext->text, text_to_add); TranslateTTDPatchCodes(newtext->text); @@ -252,7 +252,7 @@ StringID AddGRFString(uint32 grfid, uint16 stringid, byte langid_to_add, bool ne /* Loop through all languages and see if we can replace a string */ for (ptext = &_grf_text[id].textholder; (text = *ptext) != NULL; ptext = &text->next) { - if (text->langid != GB(langid_to_add, 0, 6)) continue; + if (text->langid != langid_to_add) continue; newtext->next = text->next; *ptext = newtext; free(text); @@ -310,7 +310,7 @@ char *GetGRFString(char *buff, uint16 stringid, const char* last) /* If the current string is English or American, set it as the * fallback language if the specific language isn't available. */ - if (search_text->langid == GRFLX_ENGLISH || search_text->langid == GRFLX_AMERICAN) { + if (search_text->langid == GRFLX_UNSPECIFIED || (default_text == NULL && (search_text->langid == GRFLX_ENGLISH || search_text->langid == GRFLX_AMERICAN))) { default_text = search_text; } } |