summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordarkvater <darkvater@openttd.org>2004-09-15 22:32:37 +0000
committerdarkvater <darkvater@openttd.org>2004-09-15 22:32:37 +0000
commitcbcf002a91f0794cd41b256571e708c6e61752bc (patch)
tree2697cdc27615a2f328c5494cf6cba06f2c2028d2
parenta69e422cdda77f59e77c8db7bd1b8af0bf8dafdb (diff)
downloadopenttd-cbcf002a91f0794cd41b256571e708c6e61752bc.tar.xz
(svn r267) -Fix: Moved EUR back in its place, savegames should not list Romanian Lei anymore, and 2002 currency is also to EUR again
-rw-r--r--settings.c2
-rw-r--r--strings.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/settings.c b/settings.c
index 5ecbccc69..7e33dfae6 100644
--- a/settings.c
+++ b/settings.c
@@ -780,7 +780,7 @@ static const SettingDesc debug_settings[] = {
static const SettingDesc gameopt_settings[] = {
{"diff_level", SDT_UINT8, (void*)9, (void*)offsetof(GameOptions, diff_level), NULL},
{"diff_custom", SDT_INTLIST | SDT_UINT32 | (sizeof(GameDifficulty)/4) << 16, NULL, (void*)offsetof(GameOptions, diff), NULL},
- {"currency", SDT_UINT8 | SDT_ONEOFMANY, (void*)22, (void*)offsetof(GameOptions, currency), "GBP|USD|FF|DM|YEN|PT|FT|ZL|ATS|BEF|DKK|FIM|GRD|CHF|NLG|ITL|SEK|RUR|CZK|ISK|NOK|ROL|EUR" },
+ {"currency", SDT_UINT8 | SDT_ONEOFMANY, (void*)21, (void*)offsetof(GameOptions, currency), "GBP|USD|FF|DM|YEN|PT|FT|ZL|ATS|BEF|DKK|FIM|GRD|CHF|NLG|ITL|SEK|RUR|CZK|ISK|NOK|EUR|ROL" },
{"distances", SDT_UINT8 | SDT_ONEOFMANY, (void*)1, (void*)offsetof(GameOptions, kilometers), "imperial|metric" },
{"town_names", SDT_UINT8 | SDT_ONEOFMANY, (void*)0, (void*)offsetof(GameOptions, town_name), "english|french|german|american|latin|silly|swedish|dutch|finnish|polish|czech|slovakish|hungarian|romanian" },
{"landscape", SDT_UINT8 | SDT_ONEOFMANY, (void*)0, (void*)offsetof(GameOptions, landscape), "normal|hilly|desert|candy" },
diff --git a/strings.c b/strings.c
index 1b22d0693..0aeff04f5 100644
--- a/strings.c
+++ b/strings.c
@@ -72,8 +72,8 @@ static const CurrencySpec _currency_specs[] = {
{ 50, ',', 0, "", " Kc" },
{ 130, '.', 0, "", " kr" },
{ 11, '.', 0, "", " kr" },
- { 6, '.', 0, "", " Lei" },
{ 2, ',', CF_ISEURO, "€", "" },
+ { 6, '.', 0, "", " Lei" },
};
const uint16 _currency_string_list[] = {
@@ -98,8 +98,8 @@ const uint16 _currency_string_list[] = {
STR_CURR_CZK,
STR_CURR_ISK,
STR_CURR_NOK,
- STR_CURR_ROL,
STR_CURR_EUR,
+ STR_CURR_ROL,
INVALID_STRING_ID
};