dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding of _t to (u)int types, and WChar to char32_t

Browse Source 
See: eaae0bb5e
This commit is contained in:
Jonathan G Rennison
2024-01-07 16:41:53 +00:00
parent 55d78a23be
commit 97e6f3062e
655 changed files with 7555 additions and 7555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/strings.cpp
View File

@@ -427,9 +427,9 @@ static void FormatHexNumber(StringBuilder builder, uint64_t number)
fmt::format_to(builder, "0x{:X}", number);
}
WChar GetDecimalSeparatorChar()
char32_t GetDecimalSeparatorChar()
{
WChar decimal_char = '.';
char32_t decimal_char = '.';
const char *decimal_separator = _settings_game.locale.digit_decimal_separator.c_str();
if (StrEmpty(decimal_separator)) decimal_separator = _langpack.langpack->digit_decimal_separator;
if (!StrEmpty(decimal_separator)) Utf8Decode(&decimal_char, decimal_separator);
@@ -1903,7 +1903,7 @@ static void FormatString(StringBuilder builder, const char *str_arg, StringParam
case SCC_VIEWPORT_TOWN_LABEL1:
case SCC_VIEWPORT_TOWN_LABEL2: { // {VIEWPORT_TOWN_LABEL1..2}
int32_t t = args.GetNextParameter<int32_t>();
uint64 data = args.GetNextParameter<uint64>();
uint64_t data = args.GetNextParameter<uint64_t>();
bool tiny = (b == SCC_VIEWPORT_TOWN_LABEL2);
StringID string_id = STR_VIEWPORT_TOWN_COLOUR;