diff options
| author | yexo <yexo@openttd.org> | 2012-01-21 13:57:24 +0000 |
|---|---|---|
| committer | yexo <yexo@openttd.org> | 2012-01-21 13:57:24 +0000 |
| commit | f917ac0a0f5e372c96598448dbb1a00165d95f9c (patch) | |
| tree | f0d7f47d85cb359662793d9ecb46592fe7a8cdaa /src | |
| parent | d5e0be7d7fc5a0ad763f633c2b849547321c7081 (diff) | |
| download | openttd-f917ac0a0f5e372c96598448dbb1a00165d95f9c.tar.xz | |
(svn r23830) -Revert (r23804) [FS#4986]: while the idea was good, it causes too much trouble
Diffstat (limited to 'src')
| -rw-r--r-- | src/newgrf_text.cpp | 2 | ||||
| -rw-r--r-- | src/strings.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/newgrf_text.cpp b/src/newgrf_text.cpp index 99a1cf29a..be6c4713d 100644 --- a/src/newgrf_text.cpp +++ b/src/newgrf_text.cpp @@ -1066,7 +1066,7 @@ uint RemapNewGRFStringControlCode(uint scc, char *buf_start, char **buff, const case SCC_NEWGRF_UNPRINT: *buff = max(*buff - Utf8Consume(str), buf_start); break; case SCC_NEWGRF_PRINT_WORD_STRING_ID: - *argv = _newgrf_textrefstack.PopUnsignedWord(); + *argv = TTDPStringIDToOTTDStringIDMapping(_newgrf_textrefstack.PopUnsignedWord()); break; } } diff --git a/src/strings.cpp b/src/strings.cpp index 539ffcdbf..9358e6cba 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -838,7 +838,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg } case SCC_NEWGRF_PRINT_WORD_STRING_ID: { - StringID substr = TTDPStringIDToOTTDStringIDMapping(args->GetInt32(SCC_NEWGRF_PRINT_WORD_STRING_ID)); + StringID substr = args->GetInt32(SCC_NEWGRF_PRINT_WORD_STRING_ID); str_stack.push(GetStringPtr(substr)); case_index = next_substr_case_index; next_substr_case_index = 0; |