diff options
| author | Darkvater <darkvater@openttd.org> | 2006-11-15 21:51:16 +0000 |
|---|---|---|
| committer | Darkvater <darkvater@openttd.org> | 2006-11-15 21:51:16 +0000 |
| commit | e89a2552387b2dacbd7d7977d291d86ee7ccab5e (patch) | |
| tree | 0630f32e8cfb3e72b4f00e7e21e3a4b35789dc5a | |
| parent | a353e354fddb3a242f35c7d9dcbb76ee5c92e4f1 (diff) | |
| download | openttd-e89a2552387b2dacbd7d7977d291d86ee7ccab5e.tar.xz | |
(svn r7160) -Feature [SF 1243657, 1171147]: Slovak/Brazil currency patch (gpsoft, klanticus)
| -rw-r--r-- | currency.c | 2 | ||||
| -rw-r--r-- | currency.h | 2 | ||||
| -rw-r--r-- | lang/english.txt | 2 | ||||
| -rw-r--r-- | lang/slovak.txt | 1 | ||||
| -rw-r--r-- | settings.c | 2 |
5 files changed, 7 insertions, 2 deletions
diff --git a/currency.c b/currency.c index f07cc975f..50a539fb5 100644 --- a/currency.c +++ b/currency.c @@ -38,6 +38,8 @@ static const CurrencySpec origin_currency_specs[NUM_CURRENCY] = { { 350, '.', CF_NOEURO, "", " SIT", 1, STR_CURR_SIT }, // slovenian tolar { 13, '.', CF_NOEURO, "", " Kr", 1, STR_CURR_SEK }, // swedish krona { 2, '.', CF_NOEURO, "", " YTL", 1, STR_CURR_YTL }, // turkish lira + { 50, ',', CF_NOEURO, "", " Sk", 1, STR_CURR_SKK }, // slovak koruna + { 6, ',', CF_NOEURO, "R$ ", "", 0, STR_CURR_BRR }, // brazil real { 1, ' ', CF_NOEURO, "", "", 2, STR_CURR_CUSTOM }, // custom currency }; diff --git a/currency.h b/currency.h index 46445590f..40fb553a4 100644 --- a/currency.h +++ b/currency.h @@ -6,7 +6,7 @@ enum { CF_NOEURO = 0, CF_ISEURO = 1, - NUM_CURRENCY = 26, + NUM_CURRENCY = 28, CUSTOM_CURRENCY_ID = NUM_CURRENCY - 1 }; diff --git a/lang/english.txt b/lang/english.txt index 84c1eba59..13911dec4 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -907,6 +907,8 @@ STR_CURR_RUR :Russian Rubles STR_CURR_SIT :Slovenian Tolar (SIT) STR_CURR_SEK :Swedish Krona (SEK) STR_CURR_YTL :Turkish Lira (YTL) +STR_CURR_SKK :Slovak Koruna (SKK) +STR_CURR_BRR :Brazilian Real (BRL) STR_CURR_CUSTOM :Custom... diff --git a/lang/slovak.txt b/lang/slovak.txt index fd3373b68..5e95ad14d 100644 --- a/lang/slovak.txt +++ b/lang/slovak.txt @@ -971,6 +971,7 @@ STR_CURR_RUR :Ruske Ruble (RU STR_CURR_SIT :Slovinske Toliare (SIT) STR_CURR_SEK :Svedske Koruny (SEK) STR_CURR_YTL :Turecke Liry (YTL) +STR_CURR_SKK :Slovenske Koruny (SKK) STR_CURR_CUSTOM :Vlastna ... diff --git a/settings.c b/settings.c index a8bff597d..d2473f107 100644 --- a/settings.c +++ b/settings.c @@ -1228,7 +1228,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, 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, 0, NULL, STR_NULL, NULL, 4, SL_MAX_VERSION), SDT_VAR(GameOptions, diff_level,SLE_UINT8, 0, 0, 9, 0, 9, 0, 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|YTL|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|YTL|SKK|BRR|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, 20, "english|french|german|american|latin|silly|swedish|dutch|finnish|polish|slovakish|norwegian|hungarian|austrian|romanian|czech|swiss|danish|turkish|italian|catalan", STR_NULL, NULL), SDT_OMANY(GameOptions, landscape, SLE_UINT8, 0, 0, 0, 3, "normal|hilly|desert|candy", STR_NULL, NULL), |