diff options
| author | rubidium <rubidium@openttd.org> | 2010-11-05 13:21:30 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-11-05 13:21:30 +0000 |
| commit | f368d0c4492669e302bada17bcb0be20e9342d43 (patch) | |
| tree | 8d6851e040d563f0f977aa7ae453beb630b7128e | |
| parent | fc0e64586c376f96ba33f13af6c7f7d88ea4cd78 (diff) | |
| download | openttd-f368d0c4492669e302bada17bcb0be20e9342d43.tar.xz | |
(svn r21084) -Codechange: name a variable to cover its actual implementation better
| -rw-r--r-- | src/newgrf_text.cpp | 6 | ||||
| -rw-r--r-- | src/table/control_codes.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/newgrf_text.cpp b/src/newgrf_text.cpp index e7505a106..b47f1f960 100644 --- a/src/newgrf_text.cpp +++ b/src/newgrf_text.cpp @@ -259,7 +259,7 @@ char *TranslateTTDPatchCodes(uint32 grfid, const char *str) case 0x84: d += Utf8Encode(d, SCC_NEWGRF_PRINT_DATE + 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_LITRES); break; + case 0x87: d += Utf8Encode(d, SCC_NEWGRF_PRINT_WORD_VOLUME); break; case 0x88: d += Utf8Encode(d, SCC_BLUE); break; case 0x89: d += Utf8Encode(d, SCC_SILVER); break; case 0x8A: d += Utf8Encode(d, SCC_GOLD); break; @@ -716,7 +716,7 @@ uint RemapNewGRFStringControlCode(uint scc, char *buf_start, char **buff, const case SCC_NEWGRF_PRINT_HEX_WORD: case SCC_NEWGRF_PRINT_WORD_SPEED: - case SCC_NEWGRF_PRINT_WORD_LITRES: + case SCC_NEWGRF_PRINT_WORD_VOLUME: case SCC_NEWGRF_PRINT_UNSIGNED_WORD: *argv = _newgrf_textrefstack->PopUnsignedWord(); break; case SCC_NEWGRF_PRINT_DATE: @@ -764,7 +764,7 @@ uint RemapNewGRFStringControlCode(uint scc, char *buf_start, char **buff, const case SCC_NEWGRF_PRINT_WORD_SPEED: return SCC_VELOCITY; - case SCC_NEWGRF_PRINT_WORD_LITRES: + case SCC_NEWGRF_PRINT_WORD_VOLUME: return SCC_VOLUME; case SCC_NEWGRF_DISCARD_WORD: diff --git a/src/table/control_codes.h b/src/table/control_codes.h index 6306192d5..288a6b689 100644 --- a/src/table/control_codes.h +++ b/src/table/control_codes.h @@ -120,7 +120,7 @@ enum StringControlCode { 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_WORD_SPEED, ///< Read 2 bytes from the stack as signed speed - SCC_NEWGRF_PRINT_WORD_LITRES, ///< Read 2 bytes from the stack as signed litres + SCC_NEWGRF_PRINT_WORD_VOLUME, ///< Read 2 bytes from the stack as signed volume SCC_NEWGRF_PRINT_QWORD_CURRENCY, ///< Read 8 bytes from the stack as currency SCC_NEWGRF_PRINT_HEX_BYTE, ///< Read 1 byte from the stack and print it as hex SCC_NEWGRF_PRINT_HEX_WORD, ///< Read 2 bytes from the stack and print it as hex |