diff options
| author | yexo <yexo@openttd.org> | 2011-10-14 16:51:30 +0000 |
|---|---|---|
| committer | yexo <yexo@openttd.org> | 2011-10-14 16:51:30 +0000 |
| commit | 47aaf41d401ba7422f9a6cf4abb43d378e4ccdfd (patch) | |
| tree | a7297272634cb7352200f6e28860c1ed532db62c | |
| parent | 1312c35bb6504b4972ec153759daee58682a06f7 (diff) | |
| download | openttd-47aaf41d401ba7422f9a6cf4abb43d378e4ccdfd.tar.xz | |
(svn r23029) -Fix: [NewGRF] support for cases in strings was broken
| -rw-r--r-- | src/newgrf_text.cpp | 2 | ||||
| -rw-r--r-- | src/strings.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/newgrf_text.cpp b/src/newgrf_text.cpp index a5f598360..4da01d2f1 100644 --- a/src/newgrf_text.cpp +++ b/src/newgrf_text.cpp @@ -528,7 +528,7 @@ char *TranslateTTDPatchCodes(uint32 grfid, uint8 language_id, bool allow_newline int mapped = lm != NULL ? lm->GetMapping(index, code == 0x0E) : -1; if (mapped >= 0) { d += Utf8Encode(d, code == 0x0E ? SCC_GENDER_INDEX : SCC_SETCASE); - d += Utf8Encode(d, mapped); + d += Utf8Encode(d, code == 0x0E ? mapped : mapped + 1); } break; } diff --git a/src/strings.cpp b/src/strings.cpp index 393c7884f..523b76a13 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -715,6 +715,8 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg case SCC_NEWGRF_PRINT_WORD_STRING_ID: { StringID substr = args->GetInt32(SCC_NEWGRF_PRINT_WORD_STRING_ID); str_stack.push(GetStringPtr(substr)); + casei = modifier >> 24; + modifier = 0; break; } |