diff options
| author | frosch <frosch@openttd.org> | 2014-01-12 18:00:55 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2014-01-12 18:00:55 +0000 |
| commit | 4f419b8f84fc2e36eec9a89a1f2d3cbfb626ce5d (patch) | |
| tree | b74b8f98386c6bfac765d4695ebd3daafacea5c3 /src/strings.cpp | |
| parent | ba1779b978bb9640e278113c642b51517658c32f (diff) | |
| download | openttd-4f419b8f84fc2e36eec9a89a1f2d3cbfb626ce5d.tar.xz | |
(svn r26242) -Codechange: Use GRFFile that filled the TextRefStack to translate StringIDs from the TextRefStack, instead of passing stuff via global vars.
Diffstat (limited to 'src/strings.cpp')
| -rw-r--r-- | src/strings.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/strings.cpp b/src/strings.cpp index 37f57954f..dcaa6ae29 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -192,8 +192,8 @@ const char *GetStringPtr(StringID string) { switch (GB(string, TAB_COUNT_OFFSET, TAB_COUNT_BITS)) { case GAME_TEXT_TAB: return GetGameStringPtr(GB(string, TAB_SIZE_OFFSET, TAB_SIZE_BITS)); - /* GetGRFStringPtr doesn't handle 0xD4xx ids, we need to convert those to 0xD0xx. */ - case 26: return GetStringPtr(GetGRFStringID(0, 0xD000 + GB(string, TAB_SIZE_OFFSET, 10))); + /* 0xD0xx and 0xD4xx IDs have been converted earlier. */ + case 26: NOT_REACHED(); case 28: return GetGRFStringPtr(GB(string, TAB_SIZE_OFFSET, TAB_SIZE_BITS)); case 29: return GetGRFStringPtr(GB(string, TAB_SIZE_OFFSET, TAB_SIZE_BITS) + 0x0800); case 30: return GetGRFStringPtr(GB(string, TAB_SIZE_OFFSET, TAB_SIZE_BITS) + 0x1000); @@ -242,12 +242,7 @@ char *GetStringWithArgs(char *buffr, StringID string, StringParameters *args, co return FormatString(buffr, GetGameStringPtr(index), args, last, case_index, true); case 26: - /* Include string within newgrf text (format code 81) */ - if (HasBit(index, 10)) { - StringID string = GetGRFStringID(0, 0xD000 + GB(index, 0, 10)); - return GetStringWithArgs(buffr, string, args, last, case_index); - } - break; + NOT_REACHED(); case 28: return FormatString(buffr, GetGRFStringPtr(index), args, last, case_index); |