petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(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.

Browse Source
This commit is contained in:
peter1138
2006-10-28 18:42:57 +00:00
parent 8908ea67d5
commit dc58fb87ab
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
newgrf_text.c
View File

@@ -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;
}
}