# HG changeset patch # User rubidium # Date 2010-11-05 13:21:30 # Node ID 2171f2d3307ad6cb15dad30903e8d7803aafe525 # Parent 7b29732245a9f3c28a5f48cc40defe9894458f1b (svn r21084) -Codechange: name a variable to cover its actual implementation better diff --git a/src/newgrf_text.cpp b/src/newgrf_text.cpp --- a/src/newgrf_text.cpp +++ b/src/newgrf_text.cpp @@ -259,7 +259,7 @@ char *TranslateTTDPatchCodes(uint32 grfi 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 s 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 s 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 --- 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