diff options
| author | bjarni <bjarni@openttd.org> | 2006-08-20 09:26:58 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2006-08-20 09:26:58 +0000 |
| commit | 5513c6997fc98c45b7d6ef65537c4fb0daab998a (patch) | |
| tree | 39912b10782152b706753d3f12550772f92dfa28 | |
| parent | 806e8ac359298634e3364fd6735f3164e70b86ad (diff) | |
| download | openttd-5513c6997fc98c45b7d6ef65537c4fb0daab998a.tar.xz | |
(svn r5964) -Feature: FS#131 Slovenian currency (MeusH)
| -rw-r--r-- | currency.c | 2 | ||||
| -rw-r--r-- | currency.h | 2 | ||||
| -rw-r--r-- | lang/english.txt | 1 | ||||
| -rw-r--r-- | settings.c | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/currency.c b/currency.c index 997303245..0dc868118 100644 --- a/currency.c +++ b/currency.c @@ -35,6 +35,7 @@ CurrencySpec _currency_specs[] = { { 6, ' ', CF_NOEURO, "", " zl" }, // polish zloty { 6, '.', CF_NOEURO, "", " Lei" }, // romanian Lei { 5, ' ', CF_NOEURO, "", " p" }, // russian rouble + { 350, '.', CF_NOEURO, "", " SIT" }, // slovenian tolar { 13, '.', CF_NOEURO, "", " Kr" }, // swedish krona { 1, ' ', CF_NOEURO, "", "" }, // custom currency }; @@ -62,6 +63,7 @@ const StringID _currency_string_list[] = { STR_CURR_PLN, STR_CURR_ROL, STR_CURR_RUR, + STR_CURR_SIT, STR_CURR_SEK, STR_CURR_CUSTOM, INVALID_STRING_ID diff --git a/currency.h b/currency.h index d1de97e41..ea5d5436c 100644 --- a/currency.h +++ b/currency.h @@ -20,7 +20,7 @@ extern CurrencySpec _currency_specs[]; extern const StringID _currency_string_list[]; // XXX small hack, but makes the rest of the code a bit nicer to read -#define CUSTOM_CURRENCY_ID 23 +#define CUSTOM_CURRENCY_ID 24 #define _custom_currency (_currency_specs[CUSTOM_CURRENCY_ID]) #define _currency ((const CurrencySpec*)&_currency_specs[_opt_ptr->currency]) diff --git a/lang/english.txt b/lang/english.txt index f8c82b397..f8f649339 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -909,6 +909,7 @@ STR_CURR_NOK :Norwegian Krone STR_CURR_PLN :Polish Zloty (PLN) STR_CURR_ROL :Romanian Leu (ROL) STR_CURR_RUR :Russian Rubles (RUR) +STR_CURR_SIT :Slovenian Tolar (SIT) STR_CURR_SEK :Swedish Krona (SEK) STR_CURR_CUSTOM :Custom... diff --git a/settings.c b/settings.c index 6d999a260..b7a92eed7 100644 --- a/settings.c +++ b/settings.c @@ -1223,7 +1223,7 @@ static const SettingDesc _gameopt_settings[] = { SDT_GENERAL("diff_custom", SDT_INTLIST, SL_ARR, (SLE_FILE_I16 | SLE_VAR_I32), 0, 0, GameOptions, diff, 17, 0, 0, 0, NULL, STR_NULL, NULL, 0, 3), SDT_GENERAL("diff_custom", SDT_INTLIST, SL_ARR, (SLE_FILE_I16 | SLE_VAR_I32), 0, 0, GameOptions, diff, 18, 0, 0, 0, NULL, STR_NULL, NULL, 4, SL_MAX_VERSION), SDT_VAR(GameOptions, diff_level,SLE_UINT8, 0, 0, 9,0, 9, STR_NULL, NULL), - SDT_OMANY(GameOptions, currency, SLE_UINT8, N, 0, 0, CUSTOM_CURRENCY_ID, "GBP|USD|EUR|YEN|ATS|BEF|CHF|CZK|DEM|DKK|ESP|FIM|FRF|GRD|HUF|ISK|ITL|NLG|NOK|PLN|ROL|RUR|SEK|custom", STR_NULL, NULL), + SDT_OMANY(GameOptions, currency, SLE_UINT8, N, 0, 0, CUSTOM_CURRENCY_ID, "GBP|USD|EUR|YEN|ATS|BEF|CHF|CZK|DEM|DKK|ESP|FIM|FRF|GRD|HUF|ISK|ITL|NLG|NOK|PLN|ROL|RUR|SIT|SEK|custom", STR_NULL, NULL), SDT_OMANY(GameOptions, units, SLE_UINT8, N, 0, 1, 2, "imperial|metric|si", STR_NULL, NULL), SDT_OMANY(GameOptions, town_name, SLE_UINT8, 0, 0, 0, 19, "english|french|german|american|latin|silly|swedish|dutch|finnish|polish|slovakish|norwegian|hungarian|austrian|romanian|czech|swiss|danish|turkish|italian", STR_NULL, NULL), SDT_OMANY(GameOptions, landscape, SLE_UINT8, 0, 0, 0, 3, "normal|hilly|desert|candy", STR_NULL, NULL), |