diff options
| author | rubidium <rubidium@openttd.org> | 2011-11-19 22:15:44 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-11-19 22:15:44 +0000 |
| commit | b8866be0939c6b51372f92027d32555ab95b97eb (patch) | |
| tree | a2e52e85bea9791527651e6dd04fca37e673a738 /src/newgrf_text.cpp | |
| parent | d86e6b6162017976e50a4632df10bb286f448d96 (diff) | |
| download | openttd-b8866be0939c6b51372f92027d32555ab95b97eb.tar.xz | |
(svn r23269) -Codechange: rename some control/string codes/IDs to be more consistent
Diffstat (limited to 'src/newgrf_text.cpp')
| -rw-r--r-- | src/newgrf_text.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/newgrf_text.cpp b/src/newgrf_text.cpp index 5a0412854..33164a123 100644 --- a/src/newgrf_text.cpp +++ b/src/newgrf_text.cpp @@ -527,7 +527,7 @@ char *TranslateTTDPatchCodes(uint32 grfid, uint8 language_id, bool allow_newline int index = *str++; int mapped = lm != NULL ? lm->GetMapping(index, code == 0x0E) : -1; if (mapped >= 0) { - d += Utf8Encode(d, code == 0x0E ? SCC_GENDER_INDEX : SCC_SETCASE); + d += Utf8Encode(d, code == 0x0E ? SCC_GENDER_INDEX : SCC_SET_CASE); d += Utf8Encode(d, code == 0x0E ? mapped : mapped + 1); } break; @@ -593,21 +593,21 @@ char *TranslateTTDPatchCodes(uint32 grfid, uint8 language_id, bool allow_newline break; } - case 0x9E: d += Utf8Encode(d, 0x20AC); break; // Euro - case 0x9F: d += Utf8Encode(d, 0x0178); break; // Y with diaeresis - case 0xA0: d += Utf8Encode(d, SCC_UPARROW); break; - case 0xAA: d += Utf8Encode(d, SCC_DOWNARROW); break; - case 0xAC: d += Utf8Encode(d, SCC_CHECKMARK); break; - case 0xAD: d += Utf8Encode(d, SCC_CROSS); break; - case 0xAF: d += Utf8Encode(d, SCC_RIGHTARROW); break; - case 0xB4: d += Utf8Encode(d, SCC_TRAIN); break; - case 0xB5: d += Utf8Encode(d, SCC_LORRY); break; - case 0xB6: d += Utf8Encode(d, SCC_BUS); break; - case 0xB7: d += Utf8Encode(d, SCC_PLANE); break; - case 0xB8: d += Utf8Encode(d, SCC_SHIP); break; - case 0xB9: d += Utf8Encode(d, SCC_SUPERSCRIPT_M1); break; - case 0xBC: d += Utf8Encode(d, SCC_SMALLUPARROW); break; - case 0xBD: d += Utf8Encode(d, SCC_SMALLDOWNARROW); break; + case 0x9E: d += Utf8Encode(d, 0x20AC); break; // Euro + case 0x9F: d += Utf8Encode(d, 0x0178); break; // Y with diaeresis + case 0xA0: d += Utf8Encode(d, SCC_UP_ARROW); break; + case 0xAA: d += Utf8Encode(d, SCC_DOWN_ARROW); break; + case 0xAC: d += Utf8Encode(d, SCC_CHECKMARK); break; + case 0xAD: d += Utf8Encode(d, SCC_CROSS); break; + case 0xAF: d += Utf8Encode(d, SCC_RIGHT_ARROW); break; + case 0xB4: d += Utf8Encode(d, SCC_TRAIN); break; + case 0xB5: d += Utf8Encode(d, SCC_LORRY); break; + case 0xB6: d += Utf8Encode(d, SCC_BUS); break; + case 0xB7: d += Utf8Encode(d, SCC_PLANE); break; + case 0xB8: d += Utf8Encode(d, SCC_SHIP); break; + case 0xB9: d += Utf8Encode(d, SCC_SUPERSCRIPT_M1); break; + case 0xBC: d += Utf8Encode(d, SCC_SMALL_UP_ARROW); break; + case 0xBD: d += Utf8Encode(d, SCC_SMALL_DOWN_ARROW); break; default: /* Validate any unhandled character */ if (!IsValidChar(c, CS_ALPHANUMERAL)) c = '?'; @@ -1086,7 +1086,7 @@ uint RemapNewGRFStringControlCode(uint scc, char *buf_start, char **buff, const case SCC_NEWGRF_PRINT_DWORD_CURRENCY: case SCC_NEWGRF_PRINT_QWORD_CURRENCY: - return SCC_CURRENCY; + return SCC_CURRENCY_LONG; case SCC_NEWGRF_PRINT_WORD_STRING_ID: return SCC_NEWGRF_PRINT_WORD_STRING_ID; @@ -1103,13 +1103,13 @@ uint RemapNewGRFStringControlCode(uint scc, char *buf_start, char **buff, const return SCC_VELOCITY; case SCC_NEWGRF_PRINT_WORD_VOLUME_LONG: - return SCC_VOLUME; + return SCC_VOLUME_LONG; case SCC_NEWGRF_PRINT_WORD_VOLUME_SHORT: return SCC_VOLUME_SHORT; case SCC_NEWGRF_PRINT_WORD_WEIGHT_LONG: - return SCC_WEIGHT; + return SCC_WEIGHT_LONG; case SCC_NEWGRF_PRINT_WORD_WEIGHT_SHORT: return SCC_WEIGHT_SHORT; |