(svn r1307) -Fix/feature: rewrote the townname generation code. Code is much more

readable now. 'American' is replaces by 'Additional English' (Jango)

lang/english.txt

@@ -852,21 +852,21 @@ STR_0335_6							:{BLACK}6
 STR_0336_7							:{BLACK}7
 
 ############ start of townname region
-STR_TOWNNAME_ENGLISH						:English
-STR_TOWNNAME_FRENCH						:French
-STR_TOWNNAME_GERMAN						:German
-STR_TOWNNAME_AMERICAN						:American
-STR_TOWNNAME_LATIN_AMERICAN					:Latin-American
-STR_TOWNNAME_SILLY						:Silly
-STR_TOWNNAME_SWEDISH						:Swedish
-STR_TOWNNAME_DUTCH						:Dutch
-STR_TOWNNAME_FINNISH						:Finnish
-STR_TOWNNAME_POLISH						:Polish
+STR_TOWNNAME_ORIGINAL_ENGLISH 		:English (Original)
+STR_TOWNNAME_FRENCH								:French
+STR_TOWNNAME_GERMAN								:German
+STR_TOWNNAME_ADDITIONAL_ENGLISH		:English (Additional)
+STR_TOWNNAME_LATIN_AMERICAN				:Latin-American
+STR_TOWNNAME_SILLY								:Silly
+STR_TOWNNAME_SWEDISH							:Swedish
+STR_TOWNNAME_DUTCH								:Dutch
+STR_TOWNNAME_FINNISH							:Finnish
+STR_TOWNNAME_POLISH								:Polish
 STR_TOWNNAME_SLOVAKISH						:Slovakish
 STR_TOWNNAME_HUNGARIAN						:Hungarian
-STR_TOWNNAME_AUSTRIAN						:Austrian
-STR_TOWNNAME_ROMANIAN						:Romanian
-STR_TOWNNAME_CZECH						:Czech
+STR_TOWNNAME_AUSTRIAN							:Austrian
+STR_TOWNNAME_ROMANIAN							:Romanian
+STR_TOWNNAME_CZECH								:Czech
 ############ end of	townname region
 
 STR_CURR_GBP							:Pounds ({POUNDSIGN})

settings_gui.c

@@ -76,7 +76,7 @@ static void GameOptionsWndProc(Window *w, WindowEvent *e)
 		SetDParam(1, _currency_string_list[_opt_mod_ptr->currency]);
 		SetDParam(2, _opt_mod_ptr->kilometers + STR_0139_IMPERIAL_MILES);
 		SetDParam(3, STR_02E9_DRIVE_ON_LEFT + _opt_mod_ptr->road_side);
-		SetDParam(4, STR_TOWNNAME_ENGLISH + _opt_mod_ptr->town_name);
+		SetDParam(4, STR_TOWNNAME_ORIGINAL_ENGLISH + _opt_mod_ptr->town_name);
 		SetDParam(5, _autosave_dropdown[_opt_mod_ptr->autosave]);
 		SetDParam(6, SPECSTR_LANGUAGE_START + _dynlang.curr);
 		i = GetCurRes();
@@ -103,7 +103,7 @@ static void GameOptionsWndProc(Window *w, WindowEvent *e)
 		}
 		case 14: {
 			int i = _opt_mod_ptr->town_name;
-			ShowDropDownMenu(w, BuildDynamicDropdown(STR_TOWNNAME_ENGLISH, SPECSTR_TOWNNAME_LAST - SPECSTR_TOWNNAME_START + 1), i, e->click.widget, (_game_mode == GM_MENU) ? 0 : (-1) ^ (1 << i));
+			ShowDropDownMenu(w, BuildDynamicDropdown(STR_TOWNNAME_ORIGINAL_ENGLISH, SPECSTR_TOWNNAME_LAST - SPECSTR_TOWNNAME_START + 1), i, e->click.widget, (_game_mode == GM_MENU) ? 0 : (-1) ^ (1 << i));
 			return;
 		}
 		case 17: