From b80913df08687b89b9c431bd96375f7d0fad723d Mon Sep 17 00:00:00 2001 From: Ted John Date: Wed, 20 Jun 2018 21:42:36 +0100 Subject: [PATCH] Revert unintended changes in 1b08fb4 Change `FORMAT_uint16_t` back to `FORMAT_UINT16` --- src/openrct2/localisation/ConversionTables.cpp | 2 +- src/openrct2/localisation/FormatCodes.h | 2 +- src/openrct2/localisation/Localisation.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openrct2/localisation/ConversionTables.cpp b/src/openrct2/localisation/ConversionTables.cpp index b4e42b4a82..0baeffb74c 100644 --- a/src/openrct2/localisation/ConversionTables.cpp +++ b/src/openrct2/localisation/ConversionTables.cpp @@ -143,7 +143,7 @@ const encoding_convert_entry RCT2ToUnicodeTable[256] = { 124, FORMAT_INT32 }, { 125, FORMAT_COMMA2DP32 }, { 126, FORMAT_COMMA16 }, - { 127, FORMAT_uint16_t }, + { 127, FORMAT_UINT16 }, { 128, FORMAT_CURRENCY2DP }, { 129, FORMAT_CURRENCY }, { 130, FORMAT_STRINGID }, diff --git a/src/openrct2/localisation/FormatCodes.h b/src/openrct2/localisation/FormatCodes.h index e2f72de70b..8b785c56ea 100644 --- a/src/openrct2/localisation/FormatCodes.h +++ b/src/openrct2/localisation/FormatCodes.h @@ -58,7 +58,7 @@ enum { FORMAT_INT32, FORMAT_COMMA2DP32, FORMAT_COMMA16, - FORMAT_uint16_t, + FORMAT_UINT16, FORMAT_CURRENCY2DP, FORMAT_CURRENCY, FORMAT_STRINGID, diff --git a/src/openrct2/localisation/Localisation.cpp b/src/openrct2/localisation/Localisation.cpp index d5670fbb83..2d416727ef 100644 --- a/src/openrct2/localisation/Localisation.cpp +++ b/src/openrct2/localisation/Localisation.cpp @@ -936,7 +936,7 @@ static void format_string_code(uint32_t format_code, char **dest, size_t *size, format_comma_separated_integer(dest, size, value); break; - case FORMAT_uint16_t: + case FORMAT_UINT16: // Pop argument value = *((uint16_t*)*args); *args += 2;