Merge branch 'master' into jgrpp

Remove the viewport sign cache as this is now superseded by the kd tree
implementation

# Conflicts:
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/misc.cpp
#	src/pathfinder/follow_track.hpp
#	src/pbs.cpp
#	src/rail_cmd.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/thread/thread_morphos.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/viewport.cpp
#	src/waypoint.cpp

src/table/settings.ini

@@ -761,6 +761,21 @@ def      = true
 str      = STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS
 strhelp  = STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT
 
+[SDT_VAR]
+base     = GameSettings
+var      = economy.town_cargogen_mode
+type     = SLE_UINT8
+from     = SLV_TOWN_CARGOGEN
+guiflags = SGF_MULTISTRING
+def      = TCGM_BITCOUNT
+min      = TCGM_BEGIN
+max      = TCGM_END - 1
+interval = 1
+str      = STR_CONFIG_SETTING_TOWN_CARGOGENMODE
+strhelp  = STR_CONFIG_SETTING_TOWN_CARGOGENMODE_HELPTEXT
+strval   = STR_CONFIG_SETTING_TOWN_CARGOGENMODE_ORIGINAL
+cat      = SC_ADVANCED
+
 ; link graph
 
 [SDT_VAR]
@@ -1470,6 +1485,15 @@ str      = STR_CONFIG_SETTING_STATION_RATING_CARGO_CLASS_WAIT_TIME
 strhelp  = STR_CONFIG_SETTING_STATION_RATING_CARGO_CLASS_WAIT_TIME_HELPTEXT
 patxname = ""station_rating.station.cargo_class_rating_wait_time""
 
+[SDT_BOOL]
+base     = GameSettings
+var      = station.serve_neutral_industries
+def      = true
+from     = SLV_SERVE_NEUTRAL_INDUSTRIES
+str      = STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES
+strhelp  = STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES_HELPTEXT
+proc     = StationCatchmentChanged
+
 [SDT_BOOL]
 base     = GameSettings
 var      = order.gradual_loading
@@ -2765,6 +2789,26 @@ min      = 0
 max      = 1000000
 cat      = SC_EXPERT
 
+[SDT_VAR]
+base     = GameSettings
+var      = pf.yapf.ship_curve45_penalty
+type     = SLE_UINT
+from     = SLV_SHIP_CURVE_PENALTY
+def      = 1 * YAPF_TILE_LENGTH
+min      = 0
+max      = 1000000
+cat      = SC_EXPERT
+
+[SDT_VAR]
+base     = GameSettings
+var      = pf.yapf.ship_curve90_penalty
+type     = SLE_UINT
+from     = SLV_SHIP_CURVE_PENALTY
+def      = 6 * YAPF_TILE_LENGTH
+min      = 0
+max      = 1000000
+cat      = SC_EXPERT
+
 [SDT_VAR]
 base     = GameSettings
 var      = order.old_occupancy_smoothness

src/table/townname.h

@@ -649,7 +649,7 @@ static const char * const _name_spanish_real[] = {
 	"San Carlos",
 	"El Lim\xC3\xB3n",
 	"Coro",
-	"Corocoro",
+	"Coro Coro",
 	"Puerto Ayacucho",
 	"Elorza",
 	"Arismendi",
@@ -672,7 +672,7 @@ static const char * const _name_spanish_real[] = {
 	"Ibarra",
 	"San Lorenzo",
 	"Macas",
-	"Morana",
+	"Mora\xC3\xB1""a",
 	"Machala",
 	"Zamora",
 	"Latacunga",
@@ -2040,28 +2040,28 @@ static const char * const _name_romanian_real[] = {
 
 static const char * const _name_slovak_real[] = {
 	"Bratislava",
-	"Banovce nad Bebravou",
+	"B\xC3\xA1novce nad Bebravou",
 	"Bansk\xC3\xA1 Bystrica",
 	"Bansk\xC3\xA1 \xC5\xA0tiavnica",
 	"Bardejov",
 	"Brezno",
 	"Brezova pod Bradlom",
-	"Bytca",
-	"Cadca",
-	"Cierna nad Tisou",
+	"Byt\xC4\x8D""a",
+	"\xC4\x8C""adca",
+	"\xC4\x8Cierna nad Tisou",
 	"Detva",
 	"Pre\xC5\xA1ov",
 	"Dolny Kubin",
 	"Spi\xC5\xA1sk\xC3\xA1 Nov\xC3\xA1 Ves",
-	"Dunajska Streda",
-	"Gabcikovo",
+	"Dunajsk\xC3\xA1 Streda",
+	"Gab\xC4\x8D\xC3\xADikovo",
 	"Galanta",
 	"Gbely",
 	"Gelnica",
-	"Handlova",
+	"Handlov\xC3\xA1",
 	"Hlohovec",
-	"Holic",
-	"Humenne",
+	"Hol\xC3\xAD\xC4\x8D",
+	"Humenn\xC3\xA9",
 	"Hurbanovo",
 	"Kezmarok",
 	"Kom\xC3\xA1rno",
@@ -2070,61 +2070,61 @@ static const char * const _name_slovak_real[] = {
 	"Krompachy",
 	"Kuty",
 	"Leopoldov",
-	"Levoca",
-	"Liptovsky Mikulas",
-	"Lucenec",
+	"Levo\xC4\x8D""a",
+	"Liptovsk\xC3\xBD Mikul\xC3\xA1\xC5\xA1",
+	"Lu\xC4\x8D""enec",
 	"Malacky",
 	"Martin",
 	"Medzilaborce",
 	"Michalovce",
 	"Modra",
 	"Myjava",
-	"Namestovo",
+	"N\xC3\xA1mestovo",
 	"Nitra",
 	"Nov\xC3\xA1 Ba\xC5\x88""a",
 	"Nov\xC3\xA9"" Mesto nad V\xC3\xA1hom",
 	"Nov\xC3\xA9"" Z\xC3\xA1""mky",
-	"Partizanske",
+	"Partiz\xC3\xA1nske",
 	"Pezinok",
-	"Piestany",
-	"Poltar",
+	"Pie\xC5\xA1\xC5\xA5""any",
+	"Polt\xC3\xA1r",
 	"Poprad",
 	"Pova\xC5\xBEsk\xC3\xA1 Bystrica",
 	"Prievidza",
-	"Puchov",
-	"Revuca",
-	"Rimavska Sobota",
-	"Roznava",
-	"Ruzomberok",
+	"P\xC3\xBA""chov",
+	"Rev\xC3\xBA""ca",
+	"Rimavsk\xC3\xA1 Sobota",
+	"Ro\xC5\xBE\xC5\x88""ava",
+	"Ru\xC5\xBEomberok",
 	"Sabinov",
-	"Sala",
+	"\xC5\xA0""a\xC4\xBE""a",
 	"Senec",
 	"Senica",
-	"Sered",
+	"Sere\xC4\x8F",
 	"Skalica",
-	"Sladkovicovo",
+	"Sl\xC3\xA1""dkovi\xC3\x8Dovo",
 	"Smolenice",
 	"Snina",
-	"Stara Lubovna",
-	"Stara Tura",
-	"Strazske",
+	"Star\xC3\xA1 \xC4\xBDubov\xC5\x88""a",
+	"Star\xC3\xA1 Tur\xC3\xA1",
+	"Str\xC3\xA1\xC5\xBEske",
 	"Stropkov",
 	"Stupava",
-	"Sturovo",
-	"Sulekovo",
-	"Topolcany",
-	"Trebisov",
-	"Trencin",
+	"\xC5\xA0t\xC3\xBArovo",
+	"\xC4\xA0ulekovo",
+	"Topo\xC4\xBE\xC4\x8D""any",
+	"Trebi\xC5\xA1ov",
+	"Tren\xC4\x8D\xC3\xADn",
 	"Trnava",
-	"Turcianske Teplice",
-	"Tvrdosin",
-	"Vrable",
-	"Vranov nad Toplou",
-	"Zahorska Bystrica",
-	"Zdiar",
-	"Ziar nad Hronom",
+	"Tur\xC4\x8Dianske Teplice",
+	"Tvrdo\xC5\xA1\xC3\xADn",
+	"Vr\xC3\xA1""ble",
+	"Vranov nad Top\xC4\xBEou",
+	"Z\xC3\xA1horsk\xC3\xA1 Bystrica",
+	"\xC5\xBD""diar",
+	"\xC4\xBDiar nad Hronom",
 	"\xC5\xBDilina",
-	"Zlate Moravce",
+	"Zlat\xC3\xA9 Moravce",
 	"Zvolen",
 };
 
@@ -2838,7 +2838,7 @@ static const char * const _name_turkish_real[] = {
 	"Edirne",
 	"Elaz\xC4\xB1\xC4\x9F",
 	"Erzurum",
-	"Eskisehir",
+	"Eski\xC5\x9F""ehir",
 	"Giresun",
 	"G\xC3\xBCm\xC3\xBC\xC5\x9Fhane",
 	"Hatay",