From fe402f8bc4de390f71137ddfef9db8bc9347803e Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Tue, 30 Jun 2020 11:24:42 +0200 Subject: [PATCH 1/2] Fix name of 'Deutsche mark' --- src/openrct2/config/Config.cpp | 2 +- src/openrct2/localisation/Currency.h | 34 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp index 22565dc318..885d647543 100644 --- a/src/openrct2/config/Config.cpp +++ b/src/openrct2/config/Config.cpp @@ -53,7 +53,7 @@ namespace Config ConfigEnumEntry("GBP", CURRENCY_POUNDS), ConfigEnumEntry("USD", CURRENCY_DOLLARS), ConfigEnumEntry("FRF", CURRENCY_FRANC), - ConfigEnumEntry("DEM", CURRENCY_DEUTSCHMARK), + ConfigEnumEntry("DEM", CURRENCY_DEUTSCHE_MARK), ConfigEnumEntry("JPY", CURRENCY_YEN), ConfigEnumEntry("ESP", CURRENCY_PESETA), ConfigEnumEntry("ITL", CURRENCY_LIRA), diff --git a/src/openrct2/localisation/Currency.h b/src/openrct2/localisation/Currency.h index 2b186f1508..27ef82eafc 100644 --- a/src/openrct2/localisation/Currency.h +++ b/src/openrct2/localisation/Currency.h @@ -15,23 +15,23 @@ // List of currencies enum CURRENCY_TYPE { - CURRENCY_POUNDS, // British Pound - CURRENCY_DOLLARS, // US Dollar - CURRENCY_FRANC, // French Franc - CURRENCY_DEUTSCHMARK, // Deutsche Mark - CURRENCY_YEN, // Japanese Yen - CURRENCY_PESETA, // Spanish Peseta - CURRENCY_LIRA, // Italian Lira - CURRENCY_GUILDERS, // Dutch Gilder - CURRENCY_KRONA, // Swedish Krona - CURRENCY_EUROS, // Euro - CURRENCY_WON, // South Korean Won - CURRENCY_ROUBLE, // Russian Rouble - CURRENCY_CZECH_KORUNA, // Czech koruna - CURRENCY_HKD, // Hong Kong Dollar - CURRENCY_TWD, // New Taiwan Dollar - CURRENCY_YUAN, // Chinese Yuan - CURRENCY_FORINT, // Hungarian Forint + CURRENCY_POUNDS, // British Pound + CURRENCY_DOLLARS, // US Dollar + CURRENCY_FRANC, // French Franc + CURRENCY_DEUTSCHE_MARK, // Deutsche Mark + CURRENCY_YEN, // Japanese Yen + CURRENCY_PESETA, // Spanish Peseta + CURRENCY_LIRA, // Italian Lira + CURRENCY_GUILDERS, // Dutch Gilder + CURRENCY_KRONA, // Swedish Krona + CURRENCY_EUROS, // Euro + CURRENCY_WON, // South Korean Won + CURRENCY_ROUBLE, // Russian Rouble + CURRENCY_CZECH_KORUNA, // Czech koruna + CURRENCY_HKD, // Hong Kong Dollar + CURRENCY_TWD, // New Taiwan Dollar + CURRENCY_YUAN, // Chinese Yuan + CURRENCY_FORINT, // Hungarian Forint CURRENCY_CUSTOM, // Custom currency From 8b6cb7e943365f998504513717dad62aabfe3524 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Tue, 30 Jun 2020 11:27:01 +0200 Subject: [PATCH 2/2] Add config enum name for Forint --- src/openrct2/config/Config.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp index 885d647543..b06c8ef674 100644 --- a/src/openrct2/config/Config.cpp +++ b/src/openrct2/config/Config.cpp @@ -66,6 +66,7 @@ namespace Config ConfigEnumEntry("HKD", CURRENCY_HKD), ConfigEnumEntry("TWD", CURRENCY_TWD), ConfigEnumEntry("CNY", CURRENCY_YUAN), + ConfigEnumEntry("HUF", CURRENCY_FORINT), ConfigEnumEntry("CUSTOM", CURRENCY_CUSTOM), });