From b46496308abd3ef1dfa4fd2696855891ee3d2204 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sun, 1 May 2022 18:01:58 +0200 Subject: [PATCH] Remove unnecessary occurrence of clang-format off and reformat --- .../localisation/ConversionTables.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/openrct2/localisation/ConversionTables.cpp b/src/openrct2/localisation/ConversionTables.cpp index 8914ea8341..47b06c9142 100644 --- a/src/openrct2/localisation/ConversionTables.cpp +++ b/src/openrct2/localisation/ConversionTables.cpp @@ -22,9 +22,7 @@ struct encoding_convert_entry extern const encoding_convert_entry RCT2ToUnicodeTable[]; -// clang-format off -const encoding_convert_entry RCT2ToUnicodeTable[] = -{ +const encoding_convert_entry RCT2ToUnicodeTable[] = { // { 1, FORMAT_MOVE_X }, // { 2, FORMAT_ADJUST_PALETTE }, // { 5, FORMAT_NEWLINE }, @@ -88,7 +86,7 @@ const encoding_convert_entry RCT2ToUnicodeTable[] = { CSChar::road, UnicodeChar::road }, { CSChar::air, UnicodeChar::air }, { CSChar::water, UnicodeChar::water }, - { CSChar::superscript_minus_one, UnicodeChar::superscript_minus_one}, + { CSChar::superscript_minus_one, UnicodeChar::superscript_minus_one }, { CSChar::bullet, UnicodeChar::bullet }, { CSChar::small_up, UnicodeChar::small_up }, { CSChar::small_down, UnicodeChar::small_down }, @@ -107,18 +105,21 @@ const encoding_convert_entry RCT2ToUnicodeTable[] = { CSChar::z_acute, UnicodeChar::z_acute }, }; -static int32_t encoding_search_compare(const void *pKey, const void *pEntry) +static int32_t encoding_search_compare(const void* pKey, const void* pEntry) { const uint16_t key = *reinterpret_cast(pKey); - const encoding_convert_entry *entry = static_cast(pEntry); - if (key < entry->code) return -1; - if (key > entry->code) return 1; + const encoding_convert_entry* entry = static_cast(pEntry); + if (key < entry->code) + return -1; + if (key > entry->code) + return 1; return 0; } wchar_t encoding_convert_rct2_to_unicode(wchar_t rct2str) { - encoding_convert_entry * entry = static_cast(std::bsearch(&rct2str, RCT2ToUnicodeTable, std::size(RCT2ToUnicodeTable), sizeof(encoding_convert_entry), encoding_search_compare)); + encoding_convert_entry* entry = static_cast(std::bsearch( + &rct2str, RCT2ToUnicodeTable, std::size(RCT2ToUnicodeTable), sizeof(encoding_convert_entry), encoding_search_compare)); if (entry == nullptr) return rct2str; return entry->unicode;