diff options
| -rw-r--r-- | newgrf.c | 2 | ||||
| -rw-r--r-- | newgrf_text.c | 18 |
2 files changed, 16 insertions, 4 deletions
@@ -1960,7 +1960,7 @@ static void FeatureNewName(byte *buf, int len) for (; id < endid && len > 0; id++) { size_t ofs = strlen(name) + 1; - if (ofs > 1 && ofs < 128) { + if (ofs < 128) { DEBUG(grf, 8) ("FeatureNewName: %d <- %s", id, name); switch (feature) { diff --git a/newgrf_text.c b/newgrf_text.c index 621e40325..0c576f006 100644 --- a/newgrf_text.c +++ b/newgrf_text.c @@ -247,9 +247,21 @@ StringID AddGRFString(uint32 grfid, uint16 stringid, byte langid_to_add, bool ne _grf_text[id].def_string = def_string; _grf_text[id].textholder = newtext; } else { - GRFText *textptr = _grf_text[id].textholder; - while (textptr->next != NULL) textptr = textptr->next; - textptr->next = newtext; + GRFText **ptext, *text; + bool replaced = false; + + /* 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; + newtext->next = text->next; + *ptext = newtext; + free(text); + replaced = true; + break; + } + + /* If a string wasn't replaced, then we must append the new string */ + if (!replaced) *ptext = newtext; } DEBUG(grf, 2)("Added 0x%X: grfid 0x%X string 0x%X lang 0x%X string %s", id, grfid, stringid, newtext->langid, newtext->text); |