diff options
| author | frosch <frosch@openttd.org> | 2011-08-20 21:42:05 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2011-08-20 21:42:05 +0000 |
| commit | 7394bcb813c8f98afe4936254ac72402287c2aec (patch) | |
| tree | ec9468c33dd0fe9d843e6743e72b04cbb81b2a1c | |
| parent | ca00f98d518b3c778dddf021fc7de960859ee86d (diff) | |
| download | openttd-7394bcb813c8f98afe4936254ac72402287c2aec.tar.xz | |
(svn r22775) -Fix: [NewGRF] Stringcodes 82 and 83 are the same as the date codes in old OpenTTD. (Hirundo)
| -rw-r--r-- | src/newgrf_text.cpp | 12 | ||||
| -rw-r--r-- | src/table/control_codes.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/newgrf_text.cpp b/src/newgrf_text.cpp index 91742af3e..8900acc28 100644 --- a/src/newgrf_text.cpp +++ b/src/newgrf_text.cpp @@ -454,7 +454,7 @@ char *TranslateTTDPatchCodes(uint32 grfid, uint8 language_id, const char *str, i } case 0x82: case 0x83: - case 0x84: d += Utf8Encode(d, SCC_NEWGRF_PRINT_DATE + c - 0x82); break; + case 0x84: d += Utf8Encode(d, SCC_NEWGRF_PRINT_DATE_LONG + c - 0x82); break; case 0x85: d += Utf8Encode(d, SCC_NEWGRF_DISCARD_WORD); break; case 0x86: d += Utf8Encode(d, SCC_NEWGRF_ROTATE_TOP_4_WORDS); break; case 0x87: d += Utf8Encode(d, SCC_NEWGRF_PRINT_WORD_VOLUME); break; @@ -1027,8 +1027,8 @@ uint RemapNewGRFStringControlCode(uint scc, char *buf_start, char **buff, const case SCC_NEWGRF_PRINT_WORD_STATION_NAME: case SCC_NEWGRF_PRINT_UNSIGNED_WORD: *argv = _newgrf_textrefstack.PopUnsignedWord(); break; - case SCC_NEWGRF_PRINT_DATE: - case SCC_NEWGRF_PRINT_MONTH_YEAR: *argv = _newgrf_textrefstack.PopUnsignedWord() + DAYS_TILL_ORIGINAL_BASE_YEAR; break; + case SCC_NEWGRF_PRINT_DATE_LONG: + case SCC_NEWGRF_PRINT_DATE_SHORT: *argv = _newgrf_textrefstack.PopUnsignedWord() + DAYS_TILL_ORIGINAL_BASE_YEAR; break; case SCC_NEWGRF_DISCARD_WORD: _newgrf_textrefstack.PopUnsignedWord(); break; @@ -1063,11 +1063,11 @@ uint RemapNewGRFStringControlCode(uint scc, char *buf_start, char **buff, const case SCC_NEWGRF_PRINT_STRING_ID: return SCC_NEWGRF_PRINT_STRING_ID; - case SCC_NEWGRF_PRINT_DATE: + case SCC_NEWGRF_PRINT_DATE_LONG: return SCC_DATE_LONG; - case SCC_NEWGRF_PRINT_MONTH_YEAR: - return SCC_DATE_TINY; + case SCC_NEWGRF_PRINT_DATE_SHORT: + return SCC_DATE_SHORT; case SCC_NEWGRF_PRINT_WORD_SPEED: return SCC_VELOCITY; diff --git a/src/table/control_codes.h b/src/table/control_codes.h index 73d4a2b91..2c7c9d00a 100644 --- a/src/table/control_codes.h +++ b/src/table/control_codes.h @@ -118,8 +118,8 @@ enum StringControlCode { SCC_NEWGRF_PRINT_UNSIGNED_WORD, ///< Read 2 bytes from the stack as unsigned value SCC_NEWGRF_PRINT_DWORD_CURRENCY, ///< Read 4 bytes from the stack as currency SCC_NEWGRF_PRINT_STRING_ID, ///< Read 2 bytes from the stack as String ID - SCC_NEWGRF_PRINT_DATE, ///< Read 2 bytes from the stack as base 1920 date - SCC_NEWGRF_PRINT_MONTH_YEAR, ///< Read 2 bytes from the stack as base 1920 date + SCC_NEWGRF_PRINT_DATE_LONG, ///< Read 2 bytes from the stack as base 1920 date + SCC_NEWGRF_PRINT_DATE_SHORT, ///< Read 2 bytes from the stack as base 1920 date SCC_NEWGRF_PRINT_WORD_SPEED, ///< Read 2 bytes from the stack as signed speed SCC_NEWGRF_PRINT_WORD_VOLUME, ///< Read 2 bytes from the stack as signed volume SCC_NEWGRF_PRINT_WORD_WEIGHT, ///< Read 2 bytes from the stack as signed weight |