izzy/OpenRCT2-Unity
0
0
Fork 0
mirror of https://github.com/izzy2lost/OpenRCT2-Unity.git synced 2026-03-10 12:38:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert unintended changes in 1b08fb4

Browse Source 
Change `FORMAT_uint16_t` back to `FORMAT_UINT16`
This commit is contained in:
Ted John
2018-06-20 21:42:36 +01:00
parent f79954bde3
commit b80913df08
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/localisation/ConversionTables.cpp
View File

@@ -143,7 +143,7 @@ const encoding_convert_entry RCT2ToUnicodeTable[256] =
{ 124, FORMAT_INT32 }, { 124, FORMAT_INT32 },
{ 125, FORMAT_COMMA2DP32 }, { 125, FORMAT_COMMA2DP32 },
{ 126, FORMAT_COMMA16 }, { 126, FORMAT_COMMA16 },
{ 127, FORMAT_uint16_t }, { 127, FORMAT_UINT16 },
{ 128, FORMAT_CURRENCY2DP }, { 128, FORMAT_CURRENCY2DP },
{ 129, FORMAT_CURRENCY }, { 129, FORMAT_CURRENCY },
{ 130, FORMAT_STRINGID }, { 130, FORMAT_STRINGID },

2
src/openrct2/localisation/FormatCodes.h
View File

@@ -58,7 +58,7 @@ enum {
FORMAT_INT32, FORMAT_INT32,
FORMAT_COMMA2DP32, FORMAT_COMMA2DP32,
FORMAT_COMMA16, FORMAT_COMMA16,
FORMAT_uint16_t, FORMAT_UINT16,
FORMAT_CURRENCY2DP, FORMAT_CURRENCY2DP,
FORMAT_CURRENCY, FORMAT_CURRENCY,
FORMAT_STRINGID, FORMAT_STRINGID,

2
src/openrct2/localisation/Localisation.cpp
View File

@@ -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); format_comma_separated_integer(dest, size, value);
break; break;
case FORMAT_uint16_t: case FORMAT_UINT16:
// Pop argument // Pop argument
value = *((uint16_t*)*args); value = *((uint16_t*)*args);
*args += 2; *args += 2;