Mercurial > hg > openttd
changeset 18975:b3725b53d065 draft
(svn r23830) -Revert (r23804) [FS#4986]: while the idea was good, it causes too much trouble
| author | yexo <yexo@openttd.org> |
|---|---|
| date | Sat, 21 Jan 2012 13:57:24 +0000 |
| parents | 5b6770dd69ad |
| children | 58ccbea09c7c |
| files | src/newgrf_text.cpp src/strings.cpp |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/newgrf_text.cpp +++ b/src/newgrf_text.cpp @@ -1066,7 +1066,7 @@ 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; } }
--- a/src/strings.cpp +++ b/src/strings.cpp @@ -838,7 +838,7 @@ } 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;