From 79971ac119941a0a31b23f211bce5c8ee64ad568 Mon Sep 17 00:00:00 2001 From: belugas Date: Fri, 15 Sep 2006 02:33:40 +0000 Subject: [PATCH] (svn r6453) -Feature: FS#305 Turkish currency (jnmbk) --- currency.c | 1 + currency.h | 2 +- lang/english.txt | 1 + settings.c | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/currency.c b/currency.c index b25ff16e89..e31972d81a 100644 --- a/currency.c +++ b/currency.c @@ -37,6 +37,7 @@ const CurrencySpec origin_currency_specs[NUM_CURRENCY] = { { 5, ' ', CF_NOEURO, "", " p", 1, STR_CURR_RUR }, // russian rouble { 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 { 1, ' ', CF_NOEURO, "", "", 0, STR_CURR_CUSTOM }, // custom currency }; diff --git a/currency.h b/currency.h index 82ee2901b7..c097c4b817 100644 --- a/currency.h +++ b/currency.h @@ -6,7 +6,7 @@ enum { CF_NOEURO = 0, CF_ISEURO = 1, - NUM_CURRENCY = 25, + NUM_CURRENCY = 26, CUSTOM_CURRENCY_ID = NUM_CURRENCY - 1 }; diff --git a/lang/english.txt b/lang/english.txt index ade86a7100..0c2cc29a18 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -911,6 +911,7 @@ STR_CURR_ROL :Romanian Leu (R STR_CURR_RUR :Russian Rubles (RUR) STR_CURR_SIT :Slovenian Tolar (SIT) STR_CURR_SEK :Swedish Krona (SEK) +STR_CURR_YTL :Turkish Lira (YTL) STR_CURR_CUSTOM :Custom... diff --git a/settings.c b/settings.c index 46c51b19b5..57a65821f4 100644 --- a/settings.c +++ b/settings.c @@ -1225,7 +1225,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|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|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),