(svn r5964) -Feature: FS#131 Slovenian currency (MeusH)
authorbjarni
Sun, 20 Aug 2006 09:26:58 +0000
changeset 4311 2ac86c9c0ced
parent 4310 05582a9e96cc
child 4312 9ac0363f38f5
(svn r5964) -Feature: FS#131 Slovenian currency (MeusH)
currency.c
currency.h
lang/english.txt
settings.c
--- a/currency.c	Sun Aug 20 07:04:04 2006 +0000
+++ b/currency.c	Sun Aug 20 09:26:58 2006 +0000
@@ -35,6 +35,7 @@
 	{    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 @@
 	STR_CURR_PLN,
 	STR_CURR_ROL,
 	STR_CURR_RUR,
+	STR_CURR_SIT,
 	STR_CURR_SEK,
 	STR_CURR_CUSTOM,
 	INVALID_STRING_ID
--- a/currency.h	Sun Aug 20 07:04:04 2006 +0000
+++ b/currency.h	Sun Aug 20 09:26:58 2006 +0000
@@ -20,7 +20,7 @@
 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])
 
--- a/lang/english.txt	Sun Aug 20 07:04:04 2006 +0000
+++ b/lang/english.txt	Sun Aug 20 09:26:58 2006 +0000
@@ -909,6 +909,7 @@
 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...
--- a/settings.c	Sun Aug 20 07:04:04 2006 +0000
+++ b/settings.c	Sun Aug 20 09:26:58 2006 +0000
@@ -1223,7 +1223,7 @@
 	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),