diff --git a/src/openrct2-ui/windows/CustomCurrency.cpp b/src/openrct2-ui/windows/CustomCurrency.cpp index 6960ad6728..6f3210b703 100644 --- a/src/openrct2-ui/windows/CustomCurrency.cpp +++ b/src/openrct2-ui/windows/CustomCurrency.cpp @@ -72,16 +72,16 @@ namespace OpenRCT2::Ui::Windows close(); break; case WIDX_RATE_UP: - CurrencyDescriptors[EnumValue(CurrencyType::Custom)].rate += 1; - Config::Get().general.customCurrencyRate = CurrencyDescriptors[EnumValue(CurrencyType::Custom)].rate; + CurrencyDescriptors[EnumValue(CurrencyType::custom)].rate += 1; + Config::Get().general.customCurrencyRate = CurrencyDescriptors[EnumValue(CurrencyType::custom)].rate; Config::Save(); windowMgr->InvalidateAll(); break; case WIDX_RATE_DOWN: - if (CurrencyDescriptors[EnumValue(CurrencyType::Custom)].rate > 1) + if (CurrencyDescriptors[EnumValue(CurrencyType::custom)].rate > 1) { - CurrencyDescriptors[EnumValue(CurrencyType::Custom)].rate -= 1; - Config::Get().general.customCurrencyRate = CurrencyDescriptors[EnumValue(CurrencyType::Custom)].rate; + CurrencyDescriptors[EnumValue(CurrencyType::custom)].rate -= 1; + Config::Get().general.customCurrencyRate = CurrencyDescriptors[EnumValue(CurrencyType::custom)].rate; Config::Save(); windowMgr->InvalidateAll(); } @@ -94,7 +94,7 @@ namespace OpenRCT2::Ui::Windows { windowPos.x + widget->left, windowPos.y + widget->top }, widget->height() + 1, colours[1], 0, Dropdown::Flag::StayOpen, 2, widget->width() - 3); - if (CurrencyDescriptors[EnumValue(CurrencyType::Custom)].affix_unicode == CurrencyAffix::Prefix) + if (CurrencyDescriptors[EnumValue(CurrencyType::custom)].affix_unicode == CurrencyAffix::Prefix) { gDropdown.items[0].setChecked(true); } @@ -107,7 +107,7 @@ namespace OpenRCT2::Ui::Windows case WIDX_SYMBOL_TEXT: WindowTextInputRawOpen( this, WIDX_SYMBOL_TEXT, STR_CUSTOM_CURRENCY_SYMBOL_INPUT_TITLE, STR_CUSTOM_CURRENCY_SYMBOL_INPUT_DESC, - {}, CurrencyDescriptors[EnumValue(CurrencyType::Custom)].symbol_unicode, kCurrencySymbolMaxSize); + {}, CurrencyDescriptors[EnumValue(CurrencyType::custom)].symbol_unicode, kCurrencySymbolMaxSize); break; } } @@ -119,7 +119,7 @@ namespace OpenRCT2::Ui::Windows case WIDX_RATE: WindowTextInputOpen( this, WIDX_RATE, STR_RATE_INPUT_TITLE, STR_RATE_INPUT_DESC, {}, STR_FORMAT_INTEGER, - static_cast(CurrencyDescriptors[EnumValue(CurrencyType::Custom)].rate), + static_cast(CurrencyDescriptors[EnumValue(CurrencyType::custom)].rate), kCurrencyRateMaxNumDigits); break; } @@ -134,16 +134,16 @@ namespace OpenRCT2::Ui::Windows { if (dropdownIndex == 0) { - CurrencyDescriptors[EnumValue(CurrencyType::Custom)].affix_ascii = CurrencyAffix::Prefix; - CurrencyDescriptors[EnumValue(CurrencyType::Custom)].affix_unicode = CurrencyAffix::Prefix; + CurrencyDescriptors[EnumValue(CurrencyType::custom)].affix_ascii = CurrencyAffix::Prefix; + CurrencyDescriptors[EnumValue(CurrencyType::custom)].affix_unicode = CurrencyAffix::Prefix; } else if (dropdownIndex == 1) { - CurrencyDescriptors[EnumValue(CurrencyType::Custom)].affix_ascii = CurrencyAffix::Suffix; - CurrencyDescriptors[EnumValue(CurrencyType::Custom)].affix_unicode = CurrencyAffix::Suffix; + CurrencyDescriptors[EnumValue(CurrencyType::custom)].affix_ascii = CurrencyAffix::Suffix; + CurrencyDescriptors[EnumValue(CurrencyType::custom)].affix_unicode = CurrencyAffix::Suffix; } - Config::Get().general.customCurrencyAffix = CurrencyDescriptors[EnumValue(CurrencyType::Custom)].affix_unicode; + Config::Get().general.customCurrencyAffix = CurrencyDescriptors[EnumValue(CurrencyType::custom)].affix_unicode; Config::Save(); auto* windowMgr = Ui::GetWindowManager(); @@ -162,10 +162,10 @@ namespace OpenRCT2::Ui::Windows { case WIDX_SYMBOL_TEXT: String::safeUtf8Copy( - CurrencyDescriptors[EnumValue(CurrencyType::Custom)].symbol_unicode, std::string(text).c_str(), + CurrencyDescriptors[EnumValue(CurrencyType::custom)].symbol_unicode, std::string(text).c_str(), kCurrencySymbolMaxSize); - Config::Get().general.customCurrencySymbol = CurrencyDescriptors[EnumValue(CurrencyType::Custom)] + Config::Get().general.customCurrencySymbol = CurrencyDescriptors[EnumValue(CurrencyType::custom)] .symbol_unicode; Config::Save(); @@ -178,8 +178,8 @@ namespace OpenRCT2::Ui::Windows if (res.has_value()) { int32_t rate = res.value(); - CurrencyDescriptors[EnumValue(CurrencyType::Custom)].rate = rate; - Config::Get().general.customCurrencyRate = CurrencyDescriptors[EnumValue(CurrencyType::Custom)].rate; + CurrencyDescriptors[EnumValue(CurrencyType::custom)].rate = rate; + Config::Get().general.customCurrencyRate = CurrencyDescriptors[EnumValue(CurrencyType::custom)].rate; Config::Save(); windowMgr->InvalidateAll(); } @@ -198,7 +198,7 @@ namespace OpenRCT2::Ui::Windows DrawTextBasic(rt, screenCoords, STR_RATE, {}, { colours[1] }); - int32_t baseExchange = CurrencyDescriptors[EnumValue(CurrencyType::Pounds)].rate; + int32_t baseExchange = CurrencyDescriptors[EnumValue(CurrencyType::pounds)].rate; ft = Formatter(); ft.Add(baseExchange); DrawTextBasic(rt, screenCoords + ScreenCoordsXY{ 200, 0 }, STR_CUSTOM_CURRENCY_EQUIVALENCY, ft, { colours[1] }); @@ -209,11 +209,11 @@ namespace OpenRCT2::Ui::Windows screenCoords = windowPos + ScreenCoordsXY{ widgets[WIDX_SYMBOL_TEXT].left + 1, widgets[WIDX_SYMBOL_TEXT].top }; - DrawText(rt, screenCoords, { colours[1] }, CurrencyDescriptors[EnumValue(CurrencyType::Custom)].symbol_unicode); + DrawText(rt, screenCoords, { colours[1] }, CurrencyDescriptors[EnumValue(CurrencyType::custom)].symbol_unicode); auto drawPos = windowPos + ScreenCoordsXY{ widgets[WIDX_AFFIX_DROPDOWN].left + 1, widgets[WIDX_AFFIX_DROPDOWN].top }; - StringId stringId = (CurrencyDescriptors[EnumValue(CurrencyType::Custom)].affix_unicode == CurrencyAffix::Prefix) + StringId stringId = (CurrencyDescriptors[EnumValue(CurrencyType::custom)].affix_unicode == CurrencyAffix::Prefix) ? STR_PREFIX : STR_SUFFIX; DrawTextBasic(rt, drawPos, stringId, {}, { colours[1] }); diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index bf2cb6b3bb..471e03e2b0 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -1204,10 +1204,10 @@ namespace OpenRCT2::Ui::Windows case WIDX_CURRENCY_DROPDOWN: { // All the currencies plus the separator - constexpr auto numItems = EnumValue(CurrencyType::Count) + 1; + constexpr auto numItems = EnumValue(CurrencyType::count) + 1; // All the currencies except custom currency - constexpr size_t numOrdinaryCurrencies = EnumValue(CurrencyType::Count) - 1; + constexpr size_t numOrdinaryCurrencies = EnumValue(CurrencyType::count) - 1; for (size_t i = 0; i < numOrdinaryCurrencies; i++) { @@ -1217,11 +1217,11 @@ namespace OpenRCT2::Ui::Windows gDropdown.items[numOrdinaryCurrencies] = Dropdown::Separator(); gDropdown.items[numOrdinaryCurrencies + 1] = Dropdown::MenuLabel( - CurrencyDescriptors[EnumValue(CurrencyType::Custom)].stringId); + CurrencyDescriptors[EnumValue(CurrencyType::custom)].stringId); ShowDropdown(widget, numItems); - if (Config::Get().general.currencyFormat == CurrencyType::Custom) + if (Config::Get().general.currencyFormat == CurrencyType::custom) { gDropdown.items[EnumValue(Config::Get().general.currencyFormat) + 1].setChecked(true); } @@ -1283,7 +1283,7 @@ namespace OpenRCT2::Ui::Windows UpdateHeightMarkers(); break; case WIDX_CURRENCY_DROPDOWN: - if (dropdownIndex == EnumValue(CurrencyType::Custom) + 1) + if (dropdownIndex == EnumValue(CurrencyType::custom) + 1) { // Add 1 because the separator occupies a position Config::Get().general.currencyFormat = static_cast(dropdownIndex - 1); ContextOpenWindow(WindowClass::customCurrencyConfig); diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp index c88ab271fb..cafb487639 100644 --- a/src/openrct2/config/Config.cpp +++ b/src/openrct2/config/Config.cpp @@ -68,24 +68,24 @@ namespace OpenRCT2::Config }); static const auto Enum_Currency = ConfigEnum({ - ConfigEnumEntry("GBP", CurrencyType::Pounds), - ConfigEnumEntry("USD", CurrencyType::Dollars), - ConfigEnumEntry("FRF", CurrencyType::Franc), - ConfigEnumEntry("DEM", CurrencyType::DeutscheMark), - ConfigEnumEntry("JPY", CurrencyType::Yen), - ConfigEnumEntry("ESP", CurrencyType::Peseta), - ConfigEnumEntry("ITL", CurrencyType::Lira), - ConfigEnumEntry("NLG", CurrencyType::Guilders), - ConfigEnumEntry("SEK", CurrencyType::Krona), - ConfigEnumEntry("EUR", CurrencyType::Euros), - ConfigEnumEntry("KRW", CurrencyType::Won), - ConfigEnumEntry("RUB", CurrencyType::Rouble), - ConfigEnumEntry("CZK", CurrencyType::CzechKoruna), - ConfigEnumEntry("HKD", CurrencyType::HKD), - ConfigEnumEntry("TWD", CurrencyType::TWD), - ConfigEnumEntry("CNY", CurrencyType::Yuan), - ConfigEnumEntry("HUF", CurrencyType::Forint), - ConfigEnumEntry("CUSTOM", CurrencyType::Custom), + ConfigEnumEntry("GBP", CurrencyType::pounds), + ConfigEnumEntry("USD", CurrencyType::dollars), + ConfigEnumEntry("FRF", CurrencyType::franc), + ConfigEnumEntry("DEM", CurrencyType::deutscheMark), + ConfigEnumEntry("JPY", CurrencyType::yen), + ConfigEnumEntry("ESP", CurrencyType::peseta), + ConfigEnumEntry("ITL", CurrencyType::lira), + ConfigEnumEntry("NLG", CurrencyType::guilders), + ConfigEnumEntry("SEK", CurrencyType::krona), + ConfigEnumEntry("EUR", CurrencyType::euros), + ConfigEnumEntry("KRW", CurrencyType::won), + ConfigEnumEntry("RUB", CurrencyType::rouble), + ConfigEnumEntry("CZK", CurrencyType::czechKoruna), + ConfigEnumEntry("HKD", CurrencyType::hongKongDollar), + ConfigEnumEntry("TWD", CurrencyType::newTaiwanDollar), + ConfigEnumEntry("CNY", CurrencyType::yuan), + ConfigEnumEntry("HUF", CurrencyType::forint), + ConfigEnumEntry("CUSTOM", CurrencyType::custom), }); static const auto Enum_CurrencySymbolAffix = ConfigEnum({ diff --git a/src/openrct2/localisation/Currency.cpp b/src/openrct2/localisation/Currency.cpp index 9d4b17c373..fefc324a6a 100644 --- a/src/openrct2/localisation/Currency.cpp +++ b/src/openrct2/localisation/Currency.cpp @@ -21,7 +21,7 @@ namespace OpenRCT2 { // clang-format off - CurrencyDescriptor CurrencyDescriptors[EnumValue(CurrencyType::Count)] = { + CurrencyDescriptor CurrencyDescriptors[EnumValue(CurrencyType::count)] = { { "GBP", 10, CurrencyAffix::Prefix, u8"£", CurrencyAffix::Suffix, "GBP", STR_POUNDS }, // British Pound { "USD", 10, CurrencyAffix::Prefix, u8"$", CurrencyAffix::Prefix, "$", STR_DOLLARS }, // US Dollar { "FRF", 10, CurrencyAffix::Suffix, u8"F", CurrencyAffix::Suffix, "F", STR_FRANC }, // French Franc @@ -45,12 +45,12 @@ namespace OpenRCT2 void CurrencyLoadCustomCurrencyConfig() { - CurrencyDescriptors[EnumValue(CurrencyType::Custom)].rate = Config::Get().general.customCurrencyRate; - CurrencyDescriptors[EnumValue(CurrencyType::Custom)].affix_unicode = Config::Get().general.customCurrencyAffix; + CurrencyDescriptors[EnumValue(CurrencyType::custom)].rate = Config::Get().general.customCurrencyRate; + CurrencyDescriptors[EnumValue(CurrencyType::custom)].affix_unicode = Config::Get().general.customCurrencyAffix; if (!Config::Get().general.customCurrencySymbol.empty()) { String::safeUtf8Copy( - CurrencyDescriptors[EnumValue(CurrencyType::Custom)].symbol_unicode, + CurrencyDescriptors[EnumValue(CurrencyType::custom)].symbol_unicode, Config::Get().general.customCurrencySymbol.c_str(), kCurrencySymbolMaxSize); } } diff --git a/src/openrct2/localisation/Currency.h b/src/openrct2/localisation/Currency.h index e0a651f1d5..a3b16cbd5a 100644 --- a/src/openrct2/localisation/Currency.h +++ b/src/openrct2/localisation/Currency.h @@ -35,7 +35,7 @@ namespace OpenRCT2 // List of currency formats // TODO: refactor into getter - extern CurrencyDescriptor CurrencyDescriptors[EnumValue(CurrencyType::Count)]; + extern CurrencyDescriptor CurrencyDescriptors[EnumValue(CurrencyType::count)]; /** * Loads custom currency saved parameters into {@link CurrencyDescriptors}' diff --git a/src/openrct2/localisation/CurrencyTypes.h b/src/openrct2/localisation/CurrencyTypes.h index 26c5ecfaa7..a55d427f9f 100644 --- a/src/openrct2/localisation/CurrencyTypes.h +++ b/src/openrct2/localisation/CurrencyTypes.h @@ -16,27 +16,27 @@ namespace OpenRCT2 // List of currencies enum class CurrencyType : uint8_t { - Pounds, // British Pound - Dollars, // US Dollar - Franc, // French Franc - DeutscheMark, // Deutsche Mark - Yen, // Japanese Yen - Peseta, // Spanish Peseta - Lira, // Italian Lira - Guilders, // Dutch Gilder - Krona, // Swedish Krona - Euros, // Euro - Won, // South Korean Won - Rouble, // Russian Rouble - CzechKoruna, // Czech koruna - HKD, // Hong Kong Dollar - TWD, // New Taiwan Dollar - Yuan, // Chinese Yuan - Forint, // Hungarian Forint + pounds, // British Pound + dollars, // US Dollar + franc, // French Franc + deutscheMark, // Deutsche Mark + yen, // Japanese Yen + peseta, // Spanish Peseta + lira, // Italian Lira + guilders, // Dutch Gilder + krona, // Swedish Krona + euros, // Euro + won, // South Korean Won + rouble, // Russian Rouble + czechKoruna, // Czech koruna + hongKongDollar, // Hong Kong Dollar + newTaiwanDollar, // New Taiwan Dollar + yuan, // Chinese Yuan + forint, // Hungarian Forint - Custom, // Custom currency + custom, // Custom currency - Count // Last item + count, // Last item }; enum class CurrencyAffix : uint8_t diff --git a/src/openrct2/platform/Platform.Common.cpp b/src/openrct2/platform/Platform.Common.cpp index e8a3d947e5..a64aed2942 100644 --- a/src/openrct2/platform/Platform.Common.cpp +++ b/src/openrct2/platform/Platform.Common.cpp @@ -52,10 +52,10 @@ namespace OpenRCT2::Platform { if (currCode == nullptr || strlen(currCode) < 3) { - return CurrencyType::Pounds; + return CurrencyType::pounds; } - for (int32_t currency = 0; currency < EnumValue(CurrencyType::Count); ++currency) + for (int32_t currency = 0; currency < EnumValue(CurrencyType::count); ++currency) { if (strncmp(currCode, CurrencyDescriptors[currency].isoCode, 3) == 0) { @@ -63,7 +63,7 @@ namespace OpenRCT2::Platform } } - return CurrencyType::Pounds; + return CurrencyType::pounds; } RealWorldDate GetDateLocal() diff --git a/test/tests/FormattingTests.cpp b/test/tests/FormattingTests.cpp index db6397a117..5e10dcc2f3 100644 --- a/test/tests/FormattingTests.cpp +++ b/test/tests/FormattingTests.cpp @@ -140,7 +140,7 @@ TEST_F(FormattingTests, comma_large) TEST_F(FormattingTests, currency) { - Config::Get().general.currencyFormat = CurrencyType::Pounds; + Config::Get().general.currencyFormat = CurrencyType::pounds; ASSERT_EQ(u8"-£251", FormatString("{CURRENCY}", -2510)); ASSERT_EQ(u8"£1", FormatString("{CURRENCY}", 4)); ASSERT_EQ(u8"£1", FormatString("{CURRENCY}", 5)); @@ -151,7 +151,7 @@ TEST_F(FormattingTests, currency) TEST_F(FormattingTests, currency2dp) { - Config::Get().general.currencyFormat = CurrencyType::Pounds; + Config::Get().general.currencyFormat = CurrencyType::pounds; ASSERT_EQ(u8"-£251.00", FormatString("{CURRENCY2DP}", -2510)); ASSERT_EQ(u8"£0.40", FormatString("{CURRENCY2DP}", 4)); ASSERT_EQ(u8"£0.50", FormatString("{CURRENCY2DP}", 5)); @@ -162,7 +162,7 @@ TEST_F(FormattingTests, currency2dp) TEST_F(FormattingTests, currency_yen) { - Config::Get().general.currencyFormat = CurrencyType::Yen; + Config::Get().general.currencyFormat = CurrencyType::yen; ASSERT_EQ(u8"-¥25,100", FormatString("{CURRENCY}", -2510)); ASSERT_EQ(u8"¥40", FormatString("{CURRENCY2DP}", 4)); ASSERT_EQ(u8"¥50", FormatString("{CURRENCY2DP}", 5)); @@ -173,7 +173,7 @@ TEST_F(FormattingTests, currency_yen) TEST_F(FormattingTests, currency2dp_yen) { - Config::Get().general.currencyFormat = CurrencyType::Yen; + Config::Get().general.currencyFormat = CurrencyType::yen; ASSERT_EQ(u8"-¥25,100", FormatString("{CURRENCY2DP}", -2510)); ASSERT_EQ(u8"¥40", FormatString("{CURRENCY2DP}", 4)); ASSERT_EQ(u8"¥50", FormatString("{CURRENCY2DP}", 5)); @@ -184,14 +184,14 @@ TEST_F(FormattingTests, currency2dp_yen) TEST_F(FormattingTests, currency_pts) { - Config::Get().general.currencyFormat = CurrencyType::Peseta; + Config::Get().general.currencyFormat = CurrencyType::peseta; ASSERT_EQ("-251Pts", FormatString("{CURRENCY}", -2510)); ASSERT_EQ("112Pts", FormatString("{CURRENCY}", 1111)); } TEST_F(FormattingTests, currency2dp_pts) { - Config::Get().general.currencyFormat = CurrencyType::Peseta; + Config::Get().general.currencyFormat = CurrencyType::peseta; ASSERT_EQ("-251.00Pts", FormatString("{CURRENCY2DP}", -2510)); ASSERT_EQ("0.40Pts", FormatString("{CURRENCY2DP}", 4)); ASSERT_EQ("111.10Pts", FormatString("{CURRENCY2DP}", 1111));