(svn r1438) Added norwegian townnames

5 files changed, 113 insertions, 0 deletions

diff --git a/lang/english.txt b/lang/english.txt
index 968ff678a..57b5b6a31 100644
--- a/lang/english.txt
+++ b/lang/english.txt
@@ -859,6 +859,7 @@ STR_TOWNNAME_DUTCH						:Dutch
 STR_TOWNNAME_FINNISH						:Finnish
 STR_TOWNNAME_POLISH						:Polish
 STR_TOWNNAME_SLOVAKISH						:Slovakish
+STR_TOWNNAME_NORWEGIAN						:Norwegian
 STR_TOWNNAME_HUNGARIAN						:Hungarian
 STR_TOWNNAME_AUSTRIAN						:Austrian
 STR_TOWNNAME_ROMANIAN						:Romanian
diff --git a/lang/norwegian.txt b/lang/norwegian.txt
index 42ad3cccb..6652c9e2f 100644
--- a/lang/norwegian.txt
+++ b/lang/norwegian.txt
@@ -859,6 +859,7 @@ STR_TOWNNAME_DUTCH						:Nederlandsk
 STR_TOWNNAME_FINNISH						:Finsk
 STR_TOWNNAME_POLISH						:Polsk
 STR_TOWNNAME_SLOVAKISH						:Slovak
+STR_TOWNNAME_NORWEGIAN						:Norsk
 STR_TOWNNAME_HUNGARIAN						:Ungarsk
 STR_TOWNNAME_AUSTRIAN						:Østerriksk
 STR_TOWNNAME_ROMANIAN						:Rumensk
diff --git a/namegen.c b/namegen.c
index 4336549fd..1acc1305f 100644
--- a/namegen.c
+++ b/namegen.c
@@ -378,6 +378,13 @@ static byte MakeSlovakTownName(byte *buf, uint32 seed)
 	return 0;
 }
 
+static byte MakeNorwegianTownName(byte *buf, uint32 seed)
+{
+	strcpy(buf, "");
+	strcat(buf, name_norwegian_1[GetNumberBasedOnSeed(0, lengthof(name_norwegian_1), seed)]);
+	return 0;
+}
+
 static byte MakeHungarianTownName(byte *buf, uint32 seed)
 {
 	int i;
@@ -422,6 +429,7 @@ TownNameGenerator * const _town_name_generators[] = {
 	MakeFinnishTownName,
 	MakePolishTownName,
 	MakeSlovakTownName,
+	MakeNorwegianTownName,
 	MakeHungarianTownName,
 	MakeAustrianTownName,
 	MakeRomanianTownName,
diff --git a/table/namegen.h b/table/namegen.h
index 74f85c69b..fc07ff48c 100644
--- a/table/namegen.h
+++ b/table/namegen.h
@@ -1846,6 +1846,108 @@ static const char *name_slovakish_1[] = {
 	"Zvolen"
 };
 
+static const char *name_norwegian_1[] = {
+	"Alta",
+	"Arendal",
+	"Askim",
+	"Bergen",
+	"Bodø",
+	"Brevik",
+	"Bryne",
+	"Brønnøysund",
+	"Drammen",
+	"Drøbak",
+	"Egersund",
+	"Elverum",
+	"Farsund",
+	"Fauske",
+	"Finnsnes",
+	"Flekkefjord",
+	"Florø",
+	"Fosnavåg",
+	"Fredrikstad",
+	"Førde",
+	"Gjøvik",
+	"Grimstad",
+	"Halden",
+	"Hamar",
+	"Hammerfest",
+	"Harstad",
+	"Haugesund",
+	"Holmestrand",
+	"Honningsvåg",
+	"Horten",
+	"Hønefoss",
+	"Jørpeland",
+	"Kirkenes",
+	"Kolvereid",
+	"Kongsberg",
+	"Kongsvinger",
+	"Kopervik",
+	"Kragerø",
+	"Kristiansand",
+	"Kristiansund",
+	"Langesund",
+	"Larvik",
+	"Leirvik",
+	"Leknes",
+	"Levanger",
+	"Lillehammer",
+	"Lillesand",
+	"Lillestrøm",
+	"Lyngdal",
+	"Lørenskog",
+	"Mandal",
+	"Mo i Rana",
+	"Molde",
+	"Mosjøen",
+	"Moss",
+	"Mysen",
+	"Måløy",
+	"Namsos",
+	"Narvik",
+	"Notodden",
+	"Odda",
+	"Oslo",
+	"Otta",
+	"Porsgrunn",
+	"Risør",
+	"Rjukan",
+	"Røros",
+	"Sandefjord",
+	"Sandnes",
+	"Sandnessjøen",
+	"Sandvika",
+	"Sarpsborg",
+	"Sauda",
+	"Setermoen",
+	"Ski",
+	"Skien",
+	"Skudeneshavn",
+	"Sortland",
+	"Stathelle",
+	"Stavanger",
+	"Stavern",
+	"Steinkjer",
+	"Stjørdal",
+	"Stokmarknes",
+	"Svelvik",
+	"Svolvær",
+	"Tromsø",
+	"Trondheim",
+	"Tvedestrand",
+	"Tønsberg",
+	"Ulsteinvik",
+	"Vadsø",
+	"Vardø",
+	"Verdal",
+	"Voss",
+	"Åkrehamn",
+	"Ålesund",
+	"Åndalsnes",
+	"Åsgårdstrand"
+};
+
 static const char *name_hungarian_1[] = {
 	"Nagy-",
 	"Kis-",
diff --git a/ttd.h b/ttd.h
index 646f3a944..d85bd9aae 100644
--- a/ttd.h
+++ b/ttd.h
@@ -487,6 +487,7 @@ enum SpecialStrings {
 	SPECSTR_TOWNNAME_FINNISH,
 	SPECSTR_TOWNNAME_POLISH,
 	SPECSTR_TOWNNAME_SLOVAKISH,
+	SPECSTR_TOWNNAME_NORWEGIAN,
 	SPECSTR_TOWNNAME_HUNGARIAN,
 	SPECSTR_TOWNNAME_AUSTRIAN,
 	SPECSTR_TOWNNAME_ROMANIAN,