# HG changeset patch # User darkvater # Date 1095287557 0 # Node ID c4fcd343e90644811104346fc07c23b0131d4bc2 # Parent 4819bcce8389934f2cd9582f7158f3fe76d64590 (svn r267) -Fix: Moved EUR back in its place, savegames should not list Romanian Lei anymore, and 2002 currency is also to EUR again diff -r 4819bcce8389 -r c4fcd343e906 settings.c --- a/settings.c Wed Sep 15 18:36:33 2004 +0000 +++ b/settings.c Wed Sep 15 22:32:37 2004 +0000 @@ -780,7 +780,7 @@ 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 -r 4819bcce8389 -r c4fcd343e906 strings.c --- a/strings.c Wed Sep 15 18:36:33 2004 +0000 +++ b/strings.c Wed Sep 15 22:32:37 2004 +0000 @@ -72,8 +72,8 @@ { 50, ',', 0, "", " Kc" }, { 130, '.', 0, "", " kr" }, { 11, '.', 0, "", " kr" }, + { 2, ',', CF_ISEURO, "€", "" }, { 6, '.', 0, "", " Lei" }, - { 2, ',', CF_ISEURO, "€", "" }, }; const uint16 _currency_string_list[] = { @@ -98,8 +98,8 @@ STR_CURR_CZK, STR_CURR_ISK, STR_CURR_NOK, + STR_CURR_EUR, STR_CURR_ROL, - STR_CURR_EUR, INVALID_STRING_ID };