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

Merge pull request #12084 from Gymnasiast/fix/currency 

Small currency fixes
This commit is contained in:
Tulio Leao 2020-06-30 07:55:25 -03:00 committed by GitHub
parent 33e86ce0d8 8b6cb7e943
commit c472a763a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/openrct2/config/Config.cpp
View File

@ -53,7 +53,7 @@ namespace Config
ConfigEnumEntry<int32_t>("GBP", CURRENCY_POUNDS),
ConfigEnumEntry<int32_t>("USD", CURRENCY_DOLLARS),
ConfigEnumEntry<int32_t>("FRF", CURRENCY_FRANC),
ConfigEnumEntry<int32_t>("DEM", CURRENCY_DEUTSCHMARK),
ConfigEnumEntry<int32_t>("DEM", CURRENCY_DEUTSCHE_MARK),
ConfigEnumEntry<int32_t>("JPY", CURRENCY_YEN),
ConfigEnumEntry<int32_t>("ESP", CURRENCY_PESETA),
ConfigEnumEntry<int32_t>("ITL", CURRENCY_LIRA),
@ -66,6 +66,7 @@ namespace Config
ConfigEnumEntry<int32_t>("HKD", CURRENCY_HKD),
ConfigEnumEntry<int32_t>("TWD", CURRENCY_TWD),
ConfigEnumEntry<int32_t>("CNY", CURRENCY_YUAN),
ConfigEnumEntry<int32_t>("HUF", CURRENCY_FORINT),
ConfigEnumEntry<int32_t>("CUSTOM", CURRENCY_CUSTOM),
});

34
src/openrct2/localisation/Currency.h
View File

@ -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