mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unnecessary occurrence of clang-format off and reformat

This commit is contained in:
Gymnasiast 2022-05-01 18:01:58 +02:00
parent aaf83b48c4
commit b46496308a
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,9 +22,7 @@ struct encoding_convert_entry
extern const encoding_convert_entry RCT2ToUnicodeTable[]; extern const encoding_convert_entry RCT2ToUnicodeTable[];
// clang-format off const encoding_convert_entry RCT2ToUnicodeTable[] = {
const encoding_convert_entry RCT2ToUnicodeTable[] =
{
// { 1, FORMAT_MOVE_X }, // { 1, FORMAT_MOVE_X },
// { 2, FORMAT_ADJUST_PALETTE }, // { 2, FORMAT_ADJUST_PALETTE },
// { 5, FORMAT_NEWLINE }, // { 5, FORMAT_NEWLINE },
@ -88,7 +86,7 @@ const encoding_convert_entry RCT2ToUnicodeTable[] =
{ CSChar::road, UnicodeChar::road }, { CSChar::road, UnicodeChar::road },
{ CSChar::air, UnicodeChar::air }, { CSChar::air, UnicodeChar::air },
{ CSChar::water, UnicodeChar::water }, { 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::bullet, UnicodeChar::bullet },
{ CSChar::small_up, UnicodeChar::small_up }, { CSChar::small_up, UnicodeChar::small_up },
{ CSChar::small_down, UnicodeChar::small_down }, { CSChar::small_down, UnicodeChar::small_down },
@ -107,18 +105,21 @@ const encoding_convert_entry RCT2ToUnicodeTable[] =
{ CSChar::z_acute, UnicodeChar::z_acute }, { 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<const uint16_t*>(pKey); const uint16_t key = *reinterpret_cast<const uint16_t*>(pKey);
const encoding_convert_entry *entry = static_cast<const encoding_convert_entry*>(pEntry); const encoding_convert_entry* entry = static_cast<const encoding_convert_entry*>(pEntry);
if (key < entry->code) return -1; if (key < entry->code)
if (key > entry->code) return 1; return -1;
if (key > entry->code)
return 1;
return 0; return 0;
} }
wchar_t encoding_convert_rct2_to_unicode(wchar_t rct2str) wchar_t encoding_convert_rct2_to_unicode(wchar_t rct2str)
{ {
encoding_convert_entry * entry = static_cast<encoding_convert_entry *>(std::bsearch(&rct2str, RCT2ToUnicodeTable, std::size(RCT2ToUnicodeTable), sizeof(encoding_convert_entry), encoding_search_compare)); encoding_convert_entry* entry = static_cast<encoding_convert_entry*>(std::bsearch(
&rct2str, RCT2ToUnicodeTable, std::size(RCT2ToUnicodeTable), sizeof(encoding_convert_entry), encoding_search_compare));
if (entry == nullptr) if (entry == nullptr)
return rct2str; return rct2str;
return entry->unicode; return entry->unicode;