(svn r19667) -Release: 1.0.1-RC1

(svn r19666) [1.0] -Backport from trunk: many many string updates
(svn r19665) [1.0] -Backport from trunk:
2025-08-13 09:39:10 +00:00 · 2010-04-17 22:52:57 +00:00 · 2010-04-17 22:39:17 +00:00 · 2010-04-17 22:27:49 +00:00 · 2010-04-17 12:00:59 +00:00 · 2010-04-16 22:02:33 +00:00
265 changed files with 9357 additions and 6799 deletions
--- a/bin/ai/regression/regression.nut
+++ b/bin/ai/regression/regression.nut
@@ -192,9 +192,9 @@ function Regression::Base()
 	print("  RandRange(2): " + AIBase.RandRange(2));
 	print("  RandRange(2): " + AIBase.RandRange(2));
 	print("  RandRange(2): " + AIBase.RandRange(2));
-	print("  RandRange(9): " + AIBase.RandRange(9));
-	print("  RandRange(9): " + AIBase.RandRange(9));
-	print("  RandRange(9): " + AIBase.RandRange(9));
+	print("  RandRange(1000000): " + AIBase.RandRange(1000000)); // 32 bit tests
+	print("  RandRange(1000000): " + AIBase.RandRange(1000000));
+	print("  RandRange(1000000): " + AIBase.RandRange(1000000));
 	print("  Chance(1, 2): " + AIBase.Chance(1, 2));
 	print("  Chance(1, 2): " + AIBase.Chance(1, 2));
 	print("  Chance(1, 2): " + AIBase.Chance(1, 2));
@@ -785,6 +785,36 @@ function Regression::List()

 	list.Clear();
 	print("  IsEmpty():     " + list.IsEmpty());
+
+	for (local i = 0; i < 10; i++) {
+		list.AddItem(i, 5 + i / 2);
+	}
+
+	local it = list.Begin();
+	print("    " + it + " => " + list.GetValue(it) + "  (" + list.HasNext() + ")");
+	list.Sort(list.SORT_BY_VALUE, list.SORT_ASCENDING);
+	it = list.Next();
+	print("    " + it + " => " + list.GetValue(it) + "  (" + list.HasNext() + ")");
+
+	it = list.Begin();
+	print("    " + it + " => " + list.GetValue(it) + "  (" + list.HasNext() + ")");
+
+	list.SetValue(it + 1, -5);
+	it = list.Next();
+	print("    " + it + " => " + list.GetValue(it) + "  (" + list.HasNext() + ")");
+
+	list.RemoveValue(list.GetValue(it) + 1);
+	it = list.Next();
+	print("    " + it + " => " + list.GetValue(it) + "  (" + list.HasNext() + ")");
+
+	list.RemoveAboveValue(list.GetValue(it));
+	it = list.Next();
+	print("    " + it + " => " + list.GetValue(it) + "  (" + list.HasNext() + ")");
+
+	while (list.HasNext()) {
+		it = list.Next();
+		print("    " + it + " => " + list.GetValue(it));
+	}
 }

 function Regression::Map()
@@ -997,6 +1027,7 @@ function Regression::RailTypeList()
 	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    RailType:                " + i);
 		print("    IsRailTypeAvailable():   " + AIRail.IsRailTypeAvailable(i));
+		print("    GetMaxSpeed():           " + AIRail.GetMaxSpeed(i));
 	}
 }

--- a/bin/ai/regression/regression.txt
+++ b/bin/ai/regression/regression.txt
@@ -96,10 +96,10 @@
  RandRange(1): 0
  RandRange(2): 0
  RandRange(2): 0
-  RandRange(2): 1
-  RandRange(9): 6
-  RandRange(9): 7
-  RandRange(9): 4
+  RandRange(2): 0
+  RandRange(1000000): 987346
+  RandRange(1000000): 781750
+  RandRange(1000000): 191841
  Chance(1, 2): true
  Chance(1, 2): false
  Chance(1, 2): false
@@ -569,6 +569,14 @@
  []:
    4000 => 50
  IsEmpty():     true
+    0 => 5  (true)
+ERROR: Next() is invalid as Begin() is never called
+ERROR: HasNext() is invalid as Begin() is never called
+    0 => 5  (false)
+    0 => 5  (true)
+    2 => 6  (true)
+    3 => 6  (true)
+    9 => 0  (false)

 --Company--
  SetName():            true
@@ -7200,6 +7208,7 @@
  ListDump:
    RailType:                0
    IsRailTypeAvailable():   true
+    GetMaxSpeed():           0

 --Road--
  Road
--- a/bin/data/no_sound.obs
+++ b/bin/data/no_sound.obs
@@ -0,0 +1,49 @@
+; $Id$
+;
+; This represents more or less nothingness
+;
+[metadata]
+name              = NoSound
+shortname         = NULL
+version           = 2
+fallback          = true
+description       = A sound pack without any sounds.
+description.af_ZA = 'n Klank stel sonder enige klanke.
+description.ar_EG = مجموعة صوت بدوت اصوات مضافة
+description.bg_BG = Празен звуков пакет.
+description.ca_ES = Un joc de sons sense cap so.
+description.cs_CZ = Prázdná sada zvuků.
+description.da_DA = En lydpakke uden lyde.
+description.de_DE = Basissounds ohne Sound.
+description.el_GR = Ένα πάκετο ήχων χώρις ήχους.
+description.en_GB = A sound pack without any sounds.
+description.en_US = A sound pack without any sounds.
+description.es_ES = Un conjunto de sonidos vacío.
+description.et_ET = Ilma häälteta helipakk.
+description.fi_FI = Äänipaketti ilman ääniä.
+description.fr_FR = Un pack de sons sans sons.
+description.hr_HR = Zvučni paket bez ikakvih zvukova.
+description.hu_HU = Hang alapcsomag hangok nélkül.
+description.id_ID = Paket efek suara tanpa berisi suara.
+description.it_IT = Un pacchetto sonoro non contenente alcun suono.
+description.nb_NO = En lydpakke uten noen lyder.
+description.nl_NL = Een geluidset zonder geluid.
+description.nn_NO = Ei lydpakke utan nokon lydar.
+description.pl_PL = Zestaw dźwięków nie zawierający żadnych dźwięków.
+description.pt_PT = Um conjunto de sons vazio.
+description.ro_RO = Un set de sunete fără nici un sunet inclus.
+description.ru_RU = "Пустой" набор звукового оформления, не содержащий никаких звуков.
+description.sk_SK = Zvuková sada neobsahujúca zvuky.
+description.sl_SL = Zvočni paket brez zvoka.
+description.sr_RS = Prazan skup zvukova.
+description.sv_SE = Ett ljudpaket utan några ljud.
+description.tr_TR = Ses içermeyen boş bir ses kümesi.
+description.zh_TW = 不含任何音效的音效集。
+
+[files]
+samples      =
+
+[md5s]
+
+[origin]
+default      = This file was part of your OpenTTD installation.
--- a/bin/data/opntitle.dat
+++ b/bin/data/opntitle.dat
--- a/bin/data/orig_dos.obg
+++ b/bin/data/orig_dos.obg
@@ -4,11 +4,42 @@
 ; Tycoon Deluxe DOS CD.
 ;
 [metadata]
-name         = original_dos
-shortname    = TTDD
-version      = 1
-description  = Original Transport Tycoon Deluxe DOS edition graphics
-palette      = DOS
+name              = original_dos
+shortname         = TTDD
+version           = 1
+palette           = DOS
+description       = Original Transport Tycoon Deluxe DOS edition graphics.
+description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS uitgawe grafieke.
+description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الرسومية نسخة الدوس
+description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за DOS.
+description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a DOS.
+description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (verze pro DOS).
+description.da_DA = Originalgrafik fra Transport Tycoon Deluxe DOS-version.
+description.de_DE = Original Transport Tycoon Deluxe DOS Basisgrafiken.
+description.el_GR = Αρχικά γραφικά από το Transport Tycoon Deluxe έκδοση DOS.
+description.en_GB = Original Transport Tycoon Deluxe DOS edition graphics.
+description.en_US = Original Transport Tycoon Deluxe DOS edition graphics.
+description.es_ES = Gráficos originales de Transport Tycoon Deluxe versión DOS.
+description.et_ET = Algse Transport Tycoon Deluxe DOSi versiooni graafika.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe DOS grafiikat.
+description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version DOS).
+description.hr_HR = Originalna grafika za Transport Tycoon Deluxe DOS izdanje.
+description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS verziójának grafikája.
+description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi DOS.
+description.it_IT = Grafica originale di Transport Tycoon Deluxe, edizione DOS.
+description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for DOS.
+description.nl_NL = Originele graphics van de Transport Tycoon Deluxe DOS-versie.
+description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for DOS.
+description.pl_PL = Oryginalna edycja grafik dla Transport Tycoon Deluxe DOS.
+description.pt_PT = Gráficos originais da edição DOS de Transport Tycoon Deluxe.
+description.ro_RO = Setul grafic original al Transport Tycoon Deluxe pentru DOS.
+description.ru_RU = Оригинальная графика из Transport Tycoon Deluxe для DOS.
+description.sk_SK = Pôvodná grafika Transport Tycoon Deluxe (DOS).
+description.sl_SL = Originalna grafika Transport Tycoon Deluxe za različico DOS.
+description.sr_RS = Originalni skup grafika Transport Tycoon Deluxe DOS izdanja.
+description.sv_SE = Originalgrafiken från Transport Tycoon Deluxe, DOS-utgåvan.
+description.tr_TR = Orijinal Transport Tycoon Deluxe DOS sürümü grafikleri.
+description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版的圖形。

 [files]
 base         = TRG1.GRF
@@ -28,4 +59,4 @@ OPENTTDD.GRF = 356cf9663aacb212fdbff609d99090d6

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTDD.GRF = This file was part of your installation.
+OPENTTDD.GRF = This file was part of your OpenTTD installation.
--- a/bin/data/orig_dos.obs
+++ b/bin/data/orig_dos.obs
@@ -4,10 +4,41 @@
 ; Tycoon Deluxe DOS CD.
 ;
 [metadata]
-name         = original_dos
-shortname    = TTDO
-version      = 0
-description  = Original Transport Tycoon Deluxe DOS edition sounds
+name              = original_dos
+shortname         = TTDO
+version           = 0
+description       = Original Transport Tycoon Deluxe DOS edition sounds.
+description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS uitgawe klanke.
+description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الصوتية نسخة الدوس
+description.bg_BG = Оригинални звуци на Transport Tycoon Deluxe за DOS.
+description.ca_ES = Sons originals de Transport Tycoon Deluxe per a DOS.
+description.cs_CZ = Původní sada zvuků Transport Tycoon Deluxe (verze pro DOS).
+description.da_DA = Originallyd fra Transport Tycoon Deluxe DOS-version.
+description.de_DE = Original Transport Tycoon Deluxe DOS Basissounds.
+description.el_GR = Αρχικοί ήχοι από το Transport Tycoon Deluxe έκδοση DOS.
+description.en_GB = Original Transport Tycoon Deluxe DOS edition sounds.
+description.en_US = Original Transport Tycoon Deluxe DOS edition sounds.
+description.es_ES = Sonidos originales de Transport Tycoon Deluxe versión DOS.
+description.et_ET = Algse Transport Tycoon Deluxe DOSi versiooni helid.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe DOS äänet.
+description.hr_HR = Originalni zvukovi za Transport Tycoon Deluxe DOS izdanje.
+description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS verziójának hangjai.
+description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version DOS).
+description.id_ID = Efek suara orisinil Transport Tycoon Deluxe versi DOS.
+description.it_IT = Suoni originali di Transport Tycoon Deluxe, edizione DOS.
+description.nb_NO = Originale lyder fra Transport Tycoon Deluxe for DOS.
+description.nl_NL = Originele geluiden van de Transport Tycoon Deluxe DOS-versie.
+description.nn_NO = Originale lydar frå Transport Tycoon Deluxe for DOS.
+description.pl_PL = Oryginalna edycja dźwięków dla Transport Tycoon Deluxe DOS.
+description.pt_PT = Sons originais da edição DOS de Transport Tycoon Deluxe.
+description.ro_RO = Setul de sunete original al Transport Tycoon Deluxe pentru DOS.
+description.ru_RU = Оригинальный набор звукового оформления из игры Transport Tycoon Deluxe для DOS.
+description.sk_SK = Pôvodné zvuky Transport Tycoon Deluxe (DOS).
+description.sl_SL = Originalni zvoki Transport Tycoon Deluxe različice DOS.
+description.sr_RS = Originalni skup zvukova Transport Tycoon Deluxe DOS izdanja.
+description.sv_SE = Originalljuden från Transport Tycoon Deluxe, DOS-utgåvan.
+description.tr_TR = Orijinal Transport Tycoon Deluxe DOS sürümü sesleri.
+description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版的音效。

 [files]
 samples      = SAMPLE.CAT
--- a/bin/data/orig_dos_de.obg
+++ b/bin/data/orig_dos_de.obg
@@ -4,11 +4,42 @@
 ; Tycoon Deluxe DOS CD. It contains one broken sprite.
 ;
 [metadata]
-name         = original_dos_de
-shortname    = TTDD
-version      = 0
-description  = Original Transport Tycoon Deluxe DOS (German) edition graphics
-palette      = DOS
+name              = original_dos_de
+shortname         = TTDD
+version           = 0
+palette           = DOS
+description       = Original Transport Tycoon Deluxe DOS (German) edition graphics.
+description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS (German) uitgawe grafieke.
+description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الالمانية نسخة الدوس
+description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за DOS (немски) .
+description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a DOS (Alemany).
+description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (německá verze pro DOS).
+description.da_DA = Originalgrafik fra Transport Tycoon Deluxe DOS (Tysk) version.
+description.de_DE = Original Transport Tycoon Deluxe DOS (Deutsch) Basisgrafiken.
+description.el_GR = Αρχικά γραφικά από το Transport Tycoon Deluxe έκδοση DOS (Γερμανικό).
+description.en_GB = Original Transport Tycoon Deluxe DOS (German) edition graphics.
+description.en_US = Original Transport Tycoon Deluxe DOS (German) edition graphics.
+description.es_ES = Gráficos originales de Transport Tycoon Deluxe versión DOS (Alemán).
+description.et_ET = Algse Transport Tycoon Deluxe DOSi (Saksa) versiooni graafika.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe DOS (Saksalainen) grafiikat.
+description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version DOS allemande).
+description.hr_HR = Originalna grafika za Transport Tycoon Deluxe DOS (Njemački) izdanje.
+description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS (német) verziójának grafikája.
+description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi DOS (Jerman).
+description.it_IT = Grafica originale di Transport Tycoon Deluxe (tedesco), edizione DOS.
+description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for DOS (tysk).
+description.nl_NL = Originele graphics van de Duitse Transport Tycoon Deluxe DOS-versie.
+description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for DOS (tysk).
+description.pl_PL = Oryginalna edycja grafik dla Transport Tycoon Deluxe DOS (German).
+description.pt_PT = Gráficos originais da edição DOS (Alemã) de Transport Tycoon Deluxe.
+description.ro_RO = Setul grafic original al Transport Tycoon Deluxe pentru DOS (ediţia germană).
+description.ru_RU = Оригинальная графика из немецкой версии Transport Tycoon Deluxe для DOS.
+description.sk_SK = Pôvodná grafika Transport Tycoon Deluxe (DOS) (v jazyku nemčina).
+description.sl_SL = Originalna grafika Transport Tycoon Deluxe za nemško različico DOS.
+description.sr_RS = Originalni skup grafika nemačkog Transport Tycoon Deluxe DOS izdanja.
+description.sv_SE = Originalgrafiken från Transport Tycoon Deluxe, DOS-utgåvan (tyska).
+description.tr_TR = Orijinal Transport Tycoon Deluxe DOS (Almanca) sürümü grafikleri.
+description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版 (德國版) 的圖形。

 [files]
 base         = TRG1.GRF
@@ -28,4 +59,4 @@ OPENTTDD.GRF = 356cf9663aacb212fdbff609d99090d6

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTDD.GRF = This file was part of your installation.
+OPENTTDD.GRF = This file was part of your OpenTTD installation.
--- a/bin/data/orig_win.obg
+++ b/bin/data/orig_win.obg
@@ -4,11 +4,42 @@
 ; Tycoon Deluxe for Windows CD.
 ;
 [metadata]
-name         = original_windows
-shortname    = TTDW
-version      = 0
-description  = Original Transport Tycoon Deluxe Windows edition graphics
-palette      = Windows
+name              = original_windows
+shortname         = TTDW
+version           = 0
+palette           = Windows
+description       = Original Transport Tycoon Deluxe Windows edition graphics.
+description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe grafieke.
+description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الرسومية نسخة وندوز
+description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за Windows.
+description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a Windows.
+description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (verze pro Windows).
+description.da_DA = Originalgrafik fra Transport Tycoon Deluxe Windows-version.
+description.de_DE = Original Transport Tycoon Deluxe Windows Basisgrafiken.
+description.el_GR = Αρχικά γραφικά από το Transport Tycoon Deluxe έκδοση Windows.
+description.en_GB = Original Transport Tycoon Deluxe Windows edition graphics.
+description.en_US = Original Transport Tycoon Deluxe Windows edition graphics.
+description.es_ES = Gráficos originales de Transport Tycoon Deluxe versión Windows.
+description.et_ET = Algse Transport Tycoon Deluxe Windowsi versiooni graafika.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe Windows grafiikat.
+description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version Windows).
+description.hr_HR = Originalna grafika za Transport Tycoon Deluxe Windows izdanje.
+description.hu_HU = Az eredeti Transport Tycoon Deluxe Windows verziójának grafikája.
+description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi Windows.
+description.it_IT = Grafica originale di Transport Tycoon Deluxe, edizione Windows.
+description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for Windows.
+description.nl_NL = Originele graphics van de Transport Tycoon Deluxe Windows-versie.
+description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for Windows.
+description.pl_PL = Oryginalna edycja grafik dla Transport Tycoon Deluxe Windows.
+description.pt_PT = Gráficos originais da edição Windows de Transport Tycoon Deluxe.
+description.ro_RO = Setul grafic original al Transport Tycoon Deluxe pentru Windows.
+description.ru_RU = Оригинальная графика из Transport Tycoon Deluxe для Windows.
+description.sk_SK = Pôvodná grafika Transport Tycoon Deluxe (Windows).
+description.sl_SL = Originalna grafika Transport Tycoon Deluxe za različico oken(windows).
+description.sr_RS = Originalni skup grafika Transport Tycoon Deluxe Windows izdanja.
+description.sv_SE = Originalgrafiken från Transport Tycoon Deluxe, Windows-utgåvan.
+description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü grafikleri.
+description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的圖形。

 [files]
 base         = TRG1R.GRF
@@ -28,4 +59,4 @@ OPENTTDW.GRF = 80346ea80de167068cfb975f93963941

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTDW.GRF = This file was part of your installation.
+OPENTTDW.GRF = This file was part of your OpenTTD installation.
--- a/bin/data/orig_win.obs
+++ b/bin/data/orig_win.obs
@@ -4,10 +4,41 @@
 ; Tycoon Deluxe for Windows CD.
 ;
 [metadata]
-name         = original_windows
-shortname    = TTDO
-version      = 0
-description  = Original Transport Tycoon Deluxe Windows edition sounds
+name              = original_windows
+shortname         = TTDO
+version           = 0
+description       = Original Transport Tycoon Deluxe Windows edition sounds.
+description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe klanke.
+description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الصوتية نسخة وندوز
+description.bg_BG = Оригинални звуци на Transport Tycoon Deluxe за Windows.
+description.ca_ES = Sons originals de Transport Tycoon Deluxe per a Windows.
+description.cs_CZ = Původní sada zvuků Transport Tycoon Deluxe (verze pro Windows).
+description.da_DA = Originallyd fra Transport Tycoon Deluxe Windows-version.
+description.de_DE = Original Transport Tycoon Deluxe Windows Basissounds.
+description.el_GR = Αρχικοί ήχοι από το Transport Tycoon Deluxe έκδοση Windows.
+description.en_GB = Original Transport Tycoon Deluxe Windows edition sounds.
+description.en_US = Original Transport Tycoon Deluxe Windows edition sounds.
+description.es_ES = Sonidos originales de Transport Tycoon Deluxe versión Windows.
+description.et_ET = Algse Transport Tycoon Deluxe Windowsi versiooni helid.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe Windows äänet.
+description.hr_HR = Originalni zvukovi za Transport Tycoon Deluxe Windows izdanje.
+description.hu_HU = Az eredeti Transport Tycoon Deluxe Windows verziójának hangjai.
+description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version Windows).
+description.id_ID = Efek suara orisinil Transport Tycoon Deluxe versi Windows.
+description.it_IT = Suoni originali di Transport Tycoon Deluxe, edizione Windows.
+description.nb_NO = Originale lyder fra Transport Tycoon Deluxe for Windows.
+description.nl_NL = Originele geluiden van de Transport Tycoon Deluxe Windows-versie.
+description.nn_NO = Originale lydar frå Transport Tycoon Deluxe for Windows.
+description.pl_PL = Oryginalna edycja dźwięków dla Transport Tycoon Deluxe Windows.
+description.pt_PT = Sons originais da edição Windows de Transport Tycoon Deluxe.
+description.ro_RO = Setul de sunete original al Transport Tycoon Deluxe pentru Windows.
+description.ru_RU = Оригинальный набор звукового оформления из игры Transport Tycoon Deluxe для Windows.
+description.sk_SK = Pôvodné zvuky Transport Tycoon Deluxe (Windows).
+description.sl_SL = Originalni zvoki Transport Tycoon Deluxe različice oken(windows).
+description.sr_RS = Originalni skup zvukova Transport Tycoon Deluxe Windows izdanja.
+description.sv_SE = Originalljuden från Transport Tycoon Deluxe, Windows-utgåvan.
+description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü sesleri.
+description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的音效。

 [files]
 samples      = SAMPLE.CAT
--- a/bin/gm/no_music.obm
+++ b/bin/gm/no_music.obm
@@ -3,10 +3,42 @@
 ; This represents more or less nothingness
 ;
 [metadata]
-name         = NoMusic
-shortname    = NOMU
-version      = 0
-description  = A music pack without actual music
+name              = NoMusic
+shortname         = NULL
+version           = 0
+fallback          = true
+description       = A music pack without actual music.
+description.af_ZA = 'n Musiek stel sonder enige musiek.
+description.ar_EG = مجموعة موسيقى بدون موسيقى
+description.bg_BG = Празен музикален пакет.
+description.ca_ES = Un joc de música sense cap música.
+description.cs_CZ = Prázná hudební sada.
+description.da_DA = En musikpakke uden musik.
+description.de_DE = Ein Musikset ohne Musik.
+description.el_GR = Ένα πάκετο μουσικής χωρίς πραγματική μουσική.
+description.en_GB = A music pack without actual music.
+description.en_US = A music pack without actual music.
+description.es_ES = Un conjunto de música vacío.
+description.et_ET = Muusikakomplekt ilma igasuguse muusikata.
+description.fi_FI = Musiikkipaketti, jossa ei ole musiikkia.
+description.fr_FR = Un pack de musiques sans musiques.
+description.hr_HR = Muzički paket bez ikakve muzike.
+description.hu_HU = Zenei alapcsomag zene nélkül.
+description.id_ID = Paket musik tanpa berisi musik.
+description.it_IT = Un pacchetto musicale non contenente alcuna musica.
+description.nb_NO = En musikkpakke uten noe musikk.
+description.nl_NL = Een muziekset zonder muziek.
+description.nn_NO = Ei musikkpakke utan noko musikk.
+description.pl_PL = Zestaw utworów muzycznych nie zawierający żadnej muzyki.
+description.pt_PT = Um conjunto de música vazio.
+description.ro_RO = Un set de muzică fără muzică inclusă.
+description.ru_RU = "Пустой" набор музыкального оформления, не содержащий никакой музыки.
+description.sk_SK = Sada hudby neobsahujúca hudbu.
+description.sl_SL = Glasbeni paket z vključeno glasbo.
+description.sr_RS = Prazan skup muzičkih numera.
+description.sv_SE = Ett musikpaket utan någon musik.
+description.tr_TR = Müzik içermeyen boş bir müzik paketi.
+description.zh_TW = 不含任何音樂的音樂集。

 [files]
 theme =
@@ -46,3 +78,4 @@ ezy_9 =
 [names]

 [origin]
+default      = This file was part of your OpenTTD installation.
--- a/bin/gm/orig_win.obm
+++ b/bin/gm/orig_win.obm
@@ -4,10 +4,41 @@
 ; Tycoon Deluxe for Windows CD.
 ;
 [metadata]
-name         = original_windows
-shortname    = TTDW
-version      = 1
-description  = Original Transport Tycoon Deluxe Windows edition music
+name              = original_windows
+shortname         = TTDW
+version           = 1
+description       = Original Transport Tycoon Deluxe Windows edition music.
+description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe musiek.
+description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الموسيقية نسخة وندوز
+description.bg_BG = Оригинална музика на Transport Tycoon Deluxe за Windows.
+description.ca_ES = Música Original de Transport Tycoon Deluxe per a Windows.
+description.cs_CZ = Původní hudba Transport Tycoon Deluxe (verze pro Windows).
+description.da_DA = Originalmusik fra Transport Tycoon Deluxe Windows-version.
+description.de_DE = Original Transport Tycoon Deluxe Windows Musikset.
+description.el_GR = Αρχική μουσική από το Transport Tycoon Deluxe έκδοση Windows.
+description.en_GB = Original Transport Tycoon Deluxe Windows edition music.
+description.en_US = Original Transport Tycoon Deluxe Windows edition music.
+description.es_ES = Música original de Transport Tycoon Deluxe versión Windows.
+description.et_ET = Algse Transport Tycoon Deluxe Windowsi versiooni muusika.
+description.fi_FI = Alkuperäinen Transport Tycoon Deluxe Windows musiikki.
+description.fr_FR = Musiques originales de Transport Tycoon Deluxe (version Windows).
+description.hr_HR = Originalna muzika za Transport Tycoon Deluxe Windows izdanje.
+description.hu_HU = Az eredeti Transport Tycoon Deluxe Windows verziójának zenéje.
+description.id_ID = Musik pengiring orisinil Transport Tycoon Deluxe versi Windows.
+description.it_IT = Musica originale di Transport Tycoon Deluxe, edizione Windows.
+description.nb_NO = Original musikk fra Transport Tycoon Deluxe for Windows.
+description.nl_NL = Originele muziek van de Transport Tycoon Deluxe Windows-versie.
+description.nn_NO = Original musikk frå Transport Tycoon Deluxe for Windows.
+description.pl_PL = Oryginalna edycja utworów muzycznych w Transport Tycoon Deluxe Windows.
+description.pt_PT = Música original da edição Windows de Transport Tycoon Deluxe.
+description.ro_RO = Setul de muzică original al Transport Tycoon Deluxe pentru Windows.
+description.ru_RU = Оригинальный набор музыкального оформления из игры Transport Tycoon Deluxe.
+description.sk_SK = Pôvodná hudba z Transport Tycoon Deluxe (Windows).
+description.sl_SL = Originalna glasba Transport Tycoon Deluxe različice oken(windows).
+description.sr_RS = Originalni skup muzičkih numera Transport Tycoon Deluxe Windows izdanja.
+description.sv_SE = Originalmusiken från Transport Tycoon Deluxe, Windows-utgåvan.
+description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü müzikleri.
+description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的音樂。

 [files]
 theme = GM_TT00.GM
@@ -91,4 +122,4 @@ GM_TT20.GM = Jammit
 GM_TT21.GM = Movin' On

 [origin]
-default = You can find it on your Transport Tycoon Deluxe CD-ROM.
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,153 @@
+1.0.1-RC1 (2010-04-17)
+------------------------------------------------------------------------
+- Feature: [NewGRF] Support for extended text code 0x9A 11, print qword (r19570)
+- Feature: Give more detailed error message when trying to build a too long bridge (r19561)
+- Feature: Add rail speed limit to land area information window (r19556, r19434)
+- Add: [NoAI] AIRail::GetMaxSpeed(RailType) to get the speed limit of railtypes (r19591)
+- Change: Sync Debian packaging updates from Debian, but keep building a single package (r19572)
+- Fix: Crash of a dedicated server if the null blitter is overridden and (after a while) there is no company 0 on new year anymore [FS#3749] (r19664)
+- Fix: In rare cases, update of signals could be missed (r19663)
+- Fix: Various improvements of command handling, missing error messages (r19658, r19657, r19656, r19655, r19654, r19637, r19633, r19621, r19616, r19605, r19604)
+- Fix: Industry generation failed for large maps and lots of industry types (r19652, r19643)
+- Fix: When a company is sold, move connected clients to spectators [FS#3745] (r19651)
+- Fix: A client would not be properly moved when moved while joining, e.g. when entering a company's password. This caused the client to be in the wrong company (according to the rest of the clients) and the client being kicked on the first command [FS#3760] (r19648)
+- Fix: Trains loaded above the original IDs did not have a default railtypelabel assigned to them, causing them to be unavailable. Could cause desyncs if the multiplayer game was not started from a savegame [FS#3768] (r19647)
+- Fix: Do not allow building cacti outside of the desert or rain forest trees outside of the rain forest area. This to prevent people from thinking planting rain forest trees makes the rain forest bigger and thus adds more place to build a lumber mill [FS#3728] (r19644, r19635, r19634)
+- Fix: Desync when taking over companies (r19636)
+- Fix: Chat message caused glitch when rejoining a network game [FS#3757] (r19629)
+- Fix: Desync when a command is received and in the queue while a client starts joining, i.e. save the game state. This can happen in two ways: with frame_freq > 1 a command received in a previous frame might not be executed yet or when a command is received in the same frame as the join but before the savegame is made. In both cases the joining client would not get all commands to get in-sync with the server (and the other clients) (r19620)
+- Fix: Company related graphs were not updated correctly after changing the company colour [FS#3763] (r19615)
+- Fix: Possible invalid read when server moves client to spectators before he finishes joining [FS#3755] (r19613)
+- Fix: Crash when opening a savegame with a waypoint from around 0.4.0 [FS#3756] (r19612)
+- Fix: Improve joining behaviour; kicking clients when entering passwords that was just cleared, 'connection lost' for people failing the password (r19610, r19609, r19608, r19607, r19606)
+- Fix: Desync debugging; false positives in the cache validity checks and saving/loading the command stream (r19619, r19617, r19602, r19601, r19600, r19596, r19593, r19592, r19589, r19587, r19586)
+- Fix: Presence of online content was not properly updated after download due to duplicate slashes in the path (r19600)
+- Fix: [NewGRF] Setting industry prop 0x24 to 0 caused empty station names (r19590)
+- Fix: Crash when pressing 'h' (non-stop) in the order window of a ship or aircraft [FS#3744] (r19584)
+- Fix: Graphs were not properly updated when going toggling keys (i.e. companies) (r19574)
+- Fix: The timetable button was not automatically raised [FS#3739] (r19571)
+- Fix: [NewGRF] Possible buffer underflow in NewGRF string code (r19569)
+- Fix: [NewGRF] Do not return a random colour for unowned industries in var 45; TTDPatch does not seem to set the colour data in that case either and it could lead to desyncs (r19566)
+- Fix: Window::OnResize() was not always called while resizing a window causing incorrect windows [FS#3730] (r19563, r19558)
+- Fix: Bridge build error message should not show the same message twice (r19560, r19559)
+- Fix: [NewGRF] During NewGRF loading, store rail type labels in temporary data and process after loading has finished. This avoids deactivated rail vehicles being reactivated if the climate property is set after the rail type property (r19557, r19502)
+- Fix: Improperly scaled cargo payment graph when having lots of cargo (r19550, 19543)
+- Fix: [NewGRF] Properties set before property 08 (house, industry, industry tiles) should be ignored, not trigger the NewGRF to be disabled [FS#3725] (r19547)
+- Fix: Sorting industries by production was broken for NewGRF industries (r19538)
+- Fix: Vehicle details window did not resize correctly after refitting a road vehicle to a longer variant [FS#3720] (r19533)
+- Fix: Prevent drawing industries disabled at the smallmap as land tiles when they are built on water (r19523)
+- Fix: Tunnels, bridges and roadstops are build with only one roadtype (r19506)
+- Fix: Remove same_industry_close setting did not do what it said and caused NewGRF trouble (r19499)
+- Fix: Keep number padding intact when cloning vehicle names [FS#3710] (r19498)
+- Fix: [NewGRF] Bytes and words get sign-extended for temporary/persistent storage (r19497)
+- Fix: Stop reducing the size of the vehicle list after selecting a vehicle with a long description (r19480)
+- Fix: Implement custom sound effect for helicopter take-off [FS#3668] (r19364)
+- Update: Plural type of Slovak (r19452)
+
+
+1.0.0 (2010-04-01)
+------------------------------------------------------------------------
+- Fix: Network clients would crash while connecting to a server with AIs (r19526)
+- Fix: [NPF] Crash when finding a waypoint before finding the closest depot [FS#3703] (r19460)
+
+
+1.0.0-RC3 (2010-03-18)
+------------------------------------------------------------------------
+- Feature: Append rail type speed limit (if set) to rail type selection list, and toolbar title (r19431)
+- Feature: [NewGRF] Smallmap colours for railtypes (r19307)
+- Change: Make the drive through and cargo list consistency checks only run when 'desync' debugging is enabled (r19403, r19398)
+- Change: Update documentation for console command connect to use ip:port#company parameter format, in line with command line help (r19374)
+- Change: [NewGRF] Increase railtype cost range (r19306)
+- Fix: Mark industry windows dirty more often [FS#3701] (r19443)
+- Fix: Custom group names are misaligned with default ones when using rtl languages [FS#3700] (r19438)
+- Fix: With certain game settings one could clear tiles for free when building long roads (r19436)
+- Fix: When loading a savegame created with a house NewGRF without that NewGRF available all houses became tall office blocks (r19435)
+- Fix: Limit rail clearance earnings to 3/4s of rail build cost, to avoid money making loophole when rail build cost is less than rail removal earnings (r19433)
+- Fix: Crash when the error message 'owned by <town>' was shown [FS#3696] (r19432)
+- Fix: [NoAI] When the title game contains an AIPL block the AI settings where overwritten by those from the title game (r19429)
+- Fix: Gracefully handle the case where we cannot open a .tar file (r19427)
+- Fix: [YAPP] A train on a bridge/tunnel was not always found when checking for trains on a reserved path (r19425)
+- Fix: [NoAI] The AI Debug window did not open if an AI or library fails to compile when loading a savegame [FS#3669] (r19395)
+- Fix: One could not level the whole map anymore at once (r19392)
+- Fix: Only show the 'No AIs available' error message when explicitly changing the number of AI opponents [FS3676] (r19389)
+- Fix: [NoAI] When reloading a savegame, an AI failing to compile could trigger (trying) to read the not yet loaded information of another AI via the AI Debug window and its "open with the most recently used AI" feature [FS#3666] (r19388)
+- Fix: Close all orders windows when switching companies [FS#3671] (r19387)
+- Fix: [IPv6] Netmask calculations were wrong if cidr >= 32 [FS#3684] (r19385)
+- Fix: Overbuilding bridges, rail stations did not properly update PBS reservation [FS#3680] (r19384, r19383)
+- Fix: [NoAI] List valuator could cause invalid iterators [FS#3665] (r19367)
+- Fix: Close error messages about missing ownership when the company closes or is taken over [FS#3663] (r19358, r19357)
+
+
+1.0.0-RC2 (2010-03-04)
+------------------------------------------------------------------------
+- Feature: [YAPF] Consider the railtype imposed speed limit for pathfinding (r19301)
+- Feature: BaNaNaS support for music sets (r19262)
+- Feature: [NewGRF] Add 2 bits of pseudo-random data for rail types, based on tile location (r19235)
+- Feature: [Windows] Add OpenMSX to the installer (r19220, r19219)
+- Feature: [NewGRF] Add CB36 support for aircraft properties 0F and 11 (r19218)
+- Feature: Scroll to current order destination when ctrl+clicking the start/stop bar (r19216, r19215)
+- Feature: Concept of fallback base sets, i.e. do not automatically load the NoMusic/NoSound sets when there is another set; make NoSound part of base installations (r19214, r19213, r19212, r19211, r19206)
+- Feature: Support for genders for cargos, industries, vehicles, stations (r19180, r19179, r19178, r19177)
+- Change: Increase the default small font size for freetype fonts as 6 point fonts are usually unreadable [FS#3655] (r19308)
+- Change: [NewGRF] Railtype cost factor from byte to word value (r19306)
+- Change: Improve error message with track building when signals are in the way (r19190, r19189)
+- Change: Do not print the absolute path to AI script files in the AI debug window, use the relative path from /ai/ instead (r19166)
+- Change: The Debian packaging; bring it in sync with the packaging used at Debian excluding package splitting (r19162)
+- Fix: [Windows] Disable sound when a sound error happens instead of crashing [FS#3652] (r19304)
+- Fix: [NewGRF] Return the TTD airport type in station var 0xF1 (r19299)
+- Fix: [NewGRF] Segfault when station vars 0xF2/0xF3 is accessed when there is no truck/bus stop (r19298)
+- Fix: [NoAI] Some methods of AIAbstractList left invalid iterators [FS#3566] (r19293)
+- Fix: [YAPP] If reversing at path signals was disabled, a train would not reverse when hitting the back of an one-way signal (r19286)
+- Fix: [NewGRF] Ensure prices cannot be set to zero. Zero prices break a lot of the internal logic to determine whether something has been done [FS#3646] (r19277)
+- Fix: 'Cannot build <industry> here... <industry> in the way' showed the to-be-built industry twice, instead of the to-be-built industry and the industry that is in the way [FS#3618] (r19265)
+- Fix: Writing (console) output to a file failed on Windows if the date would not be logged [FS#3639] (r19252)
+- Fix: [NewGRF] Some GRF error messages did not free the previous error messages, creating a memory leak (r19251)
+- Fix: With RTL languages clicking a horizontal scrollbar that could not scroll could cause a crash [FS#3643] (r19250)
+- Fix: Start and end tiles were swapped in CMD_REMOVE_LONG_ROAD causing too much road to be removed [FS#3642] (r19249)
+- Fix: DOS 'port' did not compile anymore (r19248)
+- Fix: The -M command line option did not work (r19233)
+- Fix: GetDestination() is invalid for nearest-depot orders (r19210)
+- Fix: Compilation was broken for gcc 3.3 (r19207)
+- Fix: The vehicle info in the autoreplace gui was drawn even when the window was shaded [FS#3634] (r19187)
+- Fix: When selecting 'build many industries' in the scenario editor the 'build' button was not enabled [FS#3632] (r19176)
+- Fix: Buoys are no Stations, only BaseStations (r19174)
+- Fix: Under some circumstances timidity (via extmidi) would not shut down properly causing all kinds of trouble (e.g. blocked audio output). Try harder to shut down timidity and first shut down the music so shut down order is the inverse of initialisation order (r19168)
+- Fix: Industry 0 could be choosen even if not available [FS#3631] (r19167)
+- Fix: Vehicle running costs should not be changed in a running game [FS#3629] (r19165)
+
+
+1.0.0-RC1 (2010-02-18)
+------------------------------------------------------------------------
+- Feature: Allow to select different land colours for the smallmap (r19064)
+- Feature: [NewGRF] Action 3/2/1 (i.e. new graphics) support for rail types (r19056)
+- Feature: Add zoom-out to smallmap (r19039)
+- Add: [NoAI] AIOrder::[G|S]etStopLocation to get/set the stop location of trains in a rail station (r19014)
+- Change: Move home directory to a better place in Haiku [FS#3625] (r19151)
+- Change: Do not load the 'new game' NewGRFs when you are certain the savegame would not have been saved with them, i.e. do not load the 'new game' NewGRFs for TTO savegames (r19044)
+- Fix: Invisible depots draw the track, so also draw the overlays (r19154)
+- Fix: [v]seprintf should return the number of added characters excluding '\0' on truncation [FS#3627] (r19149, r19148)
+- Fix: [YAPF] Look-ahead for multitile waypoints 'made up' data that should not go into the cache, causing desyncs in MP [FS#3619] (r19141)
+- Fix: Report a more useful error when failing to build a bubble generator (r19137)
+- Fix: Resize station cargo widget when needed to display all accepted cargo types [FS#3617] (r19123)
+- Fix: [NewGRF] Industry property 0x17 was interpreted incorrectly and in some cases circumvented the density difficulty setting (r19120)
+- Fix: removing towns (in the scenario editor) that had stations/depots refer to them or vehicles were on the town's road could cause a crash [FS#3616] (r19119)
+- Fix: In the order window the Non-stop dropdown was not enabled for depot and waypoint orders and some buttons were raised too soon [FS#3593] (r19118, r19117)
+- Fix: Do not crash on broken lng file and prevent it from happening again [FS#3611] (r19113, r19112)
+- Fix: Not all news data was properly freed when starting a new game [FS#3614] (r19105)
+- Fix: The BeMidi driver was broken [FS#3610] (r19097)
+- Fix: Crash when one of the items in the news_display group in the config file has no value (r19096)
+- Fix: Crash when a baseset has an empty metadata field (r19095)
+- Fix: Possible read/write after free when the client triggered the server to close the connection [FS#3599] (r19072)
+- Fix: Remove Bidi control characters from the reordered text so they are not drawn [FS#3604] (r19067)
+- Fix: [NewGRF] Settings that are part of the "TTPatch flags" can cause desyncs if they are changed in network games (r19066)
+- Fix: When banning yourself via rcon do not send the 'command response' to the client as the connection has already been terminated [FS#3598] (r19054)
+- Fix: Mass stopping/starting/autoreplacing gave empty errors when there were no vehicles [FS#3577] (r19024)
+- Fix: City airport introduction date had become 5 years later (r19023)
+- Fix: Loading old (0.1-ish) savegames failed (r19022)
+- Fix: Do not NULL the pointers when saving the savegame on an error during saving; the savegame is still valid, so do not make it invalid [FS#3570] (r19021)
+- Fix: When removing roads, the player was also charged for removing the foundations [FS#3591] (r19016)
+
+
 1.0.0-beta4 (2010-02-04)
 ------------------------------------------------------------------------
 - Feature: Content mirroring support (r18994)
--- a/config.lib
+++ b/config.lib
@@ -11,7 +11,7 @@ log() {
 }

 set_default() {
-	released_version=""
+	released_version="1.0.1-RC1"

 	ignore_extra_parameters="0"
 	# We set all kinds of defaults for params. Later on the user can override
@@ -1018,7 +1018,7 @@ check_params() {
 	fi

 	if [ "$personal_dir" = "1" ]; then
-		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ] || [ "$os" = "DOS" ]; then
+		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ] || [ "$os" = "DOS" ] || [ "$os" = "HAIKU" ]; then
 			personal_dir="OpenTTD"
 		elif [ "$os" = "OSX" ]; then
 			personal_dir="Documents/OpenTTD"
@@ -3154,6 +3154,7 @@ showhelp() {
 	echo "  --with-midi=midi               define which midi-player to use"
 	echo "  --with-midi-arg=arg            define which args to use for the"
 	echo "                                 midi-player"
+	echo "  --with-libtimidity             enables libtimidity support"
 	echo "  --with-allegrol[=allegro-config]"
 	echo "                                 enables Allegro video driver support"
 	echo "  --with-cocoa                   enables COCOA video driver (OSX ONLY)"
--- a/docs/openttd.6
+++ b/docs/openttd.6
@@ -1,6 +1,6 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd Jan 18, 2010
+.Dd Apr 01, 2010
 .Dt OPENTTD 6
 .Sh NAME
 .Nm openttd
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2010-02-04
-Release version: 1.0.0-beta4
+Last updated:    2010-04-17
+Release version: 1.0.1-RC1
 ------------------------------------------------------------------------


@@ -34,6 +34,12 @@ that you can find at: http://bugs.openttd.org
 If the bugs are closed but still listed here it means that the bug is fixed
 and that the nightlies and next major release will not have that bug.

+- 3714	Some corrupted savegames can cause crashes
+- 3695	Behaviour inconsistency building railway/road down towards water
+- 3651	[OSX] Crash when selecting full screen
+- 3648	[OSX] Crash when selecting music
+- 3637	Second highest competing station gets penalised twice
+- 3546	Ignoring signals might crash trains
 - 3447	[OSX] SDL port is unuseable
 - 2782	[OSX] Port hopelessly outdated
 - 2585	[OSX] OS' mouse pointer showing
@@ -131,6 +137,7 @@ Duplicate (station) names after renaming [FS#3204]
 	to the automatically generated names.

 Extreme CPU usage/hangs when using SDL and PulseAudio [FS#3294]
+OpenTTD hangs/freezes when closing, OpenTTD is slow, OpenTTD uses a lot of CPU
 	OpenTTD can be extremely slow/use a lot of CPU when the sound is
 	played via SDL and then through PulseAudio's ALSA wrapper. Under the
 	same configuration OpenTTD, or rather SDL, might hang when exiting
@@ -168,3 +175,11 @@ OpenTTD not properly resizing with SDL on X [FS#3305]
 	Window managers that are known to exhibit this behaviour are KDE's
 	and GNOME's. With the XFCE's and LXDE's window managers the resize
 	event is sent when the user releases the mouse.
+
+Content files not properly extracted with zlib 1.2.3.5-1.2.4 [FS#3753]
+	With zlib 1.2.3.5 up to and including 1.2.4 the function "gzeof",
+	which tells when we read the whole file, is broken in such a way
+	that OpenTTD thinks it has extracted and written the whole file
+	while the last few hundred/thousand bytes are not extracted yet.
+	This causes problems for everything that is downloaded from the
+	online content system when using one of those versions of zlib.
--- a/os/debian/NEWS
+++ b/os/debian/NEWS
@@ -0,0 +1,25 @@
+openttd (1.0.0~rc3-2) unstable; urgency=low
+
+    The openttd package has been moved from contrib into main. Since the
+    OpenGFX free graphics set has been packaged for Debian, one can now run
+    OpenTTD without needing any of the resources from the original game
+    (though the original resources are still supported).
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 18 Mar 2010 13:09:35 +0100
+
+openttd (0.7.0-1) unstable; urgency=low
+
+    Handling of AI players has changed in 0.7.0. This package no longer
+    contains any AI players, so playing against the computer is not possible
+    out of the box any longer. However, you can easily download AI players
+    through the new "Content Downloading Service", after which playing with
+    computer players is possible.
+
+    Loading old savegames with computer players is supported (AI players will
+    be converted according to the current AI settings), but at this moment
+    there are no AIs that completely handle any existing infrastructure built
+    by the old AI, so starting a new game might be more fun (especially since
+    most of the new AIs are a lot less erratic).
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 13 Apr 2009 15:11:20 +0200
+
--- a/os/debian/README.Debian
+++ b/os/debian/README.Debian
@@ -1,31 +1,41 @@
-openttd for Debian
+OpenTTD for Debian
 ------------------

-To properly play this game, original data files are needed.
-You should copy the data files from the original TTD into the data directory
-(/usr/share/games/openttd/data). You should copy these files:
-* trg1r.grf
-* trgcr.grf
-* trghr.grf
-* trgir.grf
-* trgtr.grf
-* sample.cat
+To properly play this game, you need a base graphics and sound set.
+Currently, the graphics, sound and music files from the original
+Transport Tycoon Deluxe game (Windows and DOS versions) are supported,
+as well as the free graphics replacement set "OpenGFX", sound
+replacement set "OpenSFX" (which is in non-free due to a restrictive
+license) and the free music replacement set "OpenMSX".

-Music
-	For in game music (optional), you should copy all files in the gm/
-	subdir of your ttd installation to /usr/share/games/openttd/gm.  You
-	should also install timidity and a soundfont (freepats is packaged in
-	Debian and works out of the box).
+Normally, installing the openttd package should automatically install
+openttd-opengfx as well, allowing OpenTTD to run out of the box. If you
+want sound, you'll have to enable non-free sources and install the
+openttd-opensfx package manually (or install the original Transport
+Tyccon Deluxe sound files).

-	Don't forget to use -m extmidi if you want music, and if you have
-	problems, remember that not all audio devices support multiple
-	audiostreams (music and sound), so you might have to use software
-	mixing. My VIA AC97 device cannot do hardware mixing, for example.
+The easiest way to install the OpenMSX music files is to use the in-game
+content download system, which should offer the latest version of the
+music files.
+
+To find out how to install the original Transport Tycoon Deluxe graphics
+sound files and music files, see readme.txt, section 4.1.
+
+-Playing Music
+	In addition to installing a music set (see above), you'll also need
+	to install the timidity midi player, available in the timidity
+	package.
+
+	Remember that not all audio devices support multiple audiostreams
+	(music and sound), so you might have to use alsa software mixing or
+	pulseaudio.

 -Scenarios
 	There are no scenarios included in this release. Scenarios can be
-	downloaded separately from the OpenTTD website and all over the
-	internet. Place scenarios in your ~/.openttd/scenario directory to
-	use them.
+	downloaded using OpenTTD's content service, which is available from
+	OpenTTD's main menu. If you have obtained a scenario through other
+	means, you can place it either in your ~/.openttd/scenario directory
+	or in the system-wide /usr/share/games/openttd/scenario directory.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 01 Feb 2010 10:42:11 +0100

- -- Matthijs Kooijman <matthijs@stdin.nl>, Tue, 25 Jan 2004 14:11:01 +0200
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,147 +1,166 @@
-openttd (1.0~svn-1) UNRELEASED; urgency=low
+openttd (1.0.1~rc1-0) unstable; urgency=low

-  * Unreleased SVN version. Versioned to allow normal upgrades to released
+  * New upstream release 1.0.1-RC1
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 17 Apr 2010 23:36:21 +0000
+
+openttd (1.0.0-1) unstable; urgency=low
+
+  * [30a2162] New upstream release 1.0.0. (Closes: #570104)
+  * [102698a] Make openttd-wrapper work with older mktemp versions.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 02 Apr 2010 23:36:21 +0200
+
+openttd (1.0.0~rc3-2) unstable; urgency=low
+
+  * [279c5ef] Recommend openttd-opengfx and suggest openttd-opensfx.
+  * [9330ad7] Update README.Debian concerning music files.
+  * [07bde24] Move openttd from contrib to main. (Closes: #560810)
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 18 Mar 2010 13:16:32 +0100
+
+openttd (1.0.0~rc3-1) unstable; urgency=low
+
+  * [412d153] New upstream release 1.0.0~rc3.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 18 Mar 2010 10:09:33 +0100
+
+openttd (1.0.0~rc2-1) unstable; urgency=low
+
+  * [9c99af4] New upstream release 1.0.0~rc2.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 04 Mar 2010 12:22:28 +0100
+
+openttd (1.0.0~rc1-1) unstable; urgency=low
+
+  * [fe4eb51] New upstream release 1.0.0~rc1.
+  * [6aa2be0] Note that the embedded md5 implementation has a different
+    license.
+  * [39eb336] Remove lintian override for empty gm directory.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 19 Feb 2010 13:00:53 +0100
+
+openttd (1.0.0~beta4-1) unstable; urgency=low
+
+  * [6718224] New upstream release 1.0.0~beta4.
+  * [7b0fa8d] Remove some more docs that we don't want in the package.
+  * [bb9d744] Use liblzo2 instead of an embedded minilzo version.
+  * [949c06b] Explicitly disable iconv support.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 19 Feb 2010 12:59:27 +0100
+
+openttd (0.7.5-4) unstable; urgency=low
+
+  * [174d0b1] Don't use deprecated < in Replaces.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 15 Feb 2010 00:35:33 +0100
+
+openttd (0.7.5-3) unstable; urgency=low
+
+  * [d12fc5a] Make openttd-data replace openttd (< 0.7.5-2).
+    (Closes: #569679)
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 14 Feb 2010 16:56:31 +0100
+
+openttd (0.7.5-2) unstable; urgency=low
+
+  [ Matthijs Kooijman ]
+  * [fbab21d] Switch to source format 3.0 (quilt).
+  * [85c0c7d] No longer check for (and complain about missing) datafiles
+    on installation and upgrades. (Closes: #524651, 562574)
+  * [827eb61] Split the architecture independent data into openttd-data.
+    (Closes: #492462)
+  * [6fbd9c7] Update README.Debian.
+  * [76a5148] Support cross compilation. (Closes: #550951)
+  * [2005bf8] Simplify the rules file, make debhelper do more stuff.
+  * [fc0500e] Remove some configure arguments.
+  * [8ca38bb] Explicitly enable or disable all of the dependencies.
+  * [e38fb3e] Let the upstream Makefile install documentation.
+  * [5954fcf] Update the watch file to the new upstream url scheme.
+  * [7249594] Fix typo in copyright file.
+  * [660fb61] Bump the Standards-Version to 3.8.4, with no changes
+    required.
+  * [f94ab89] Move the packaging git repository to git.debian.org.
+
+ -- Jordi Mallach <jordi@debian.org>  Tue, 09 Feb 2010 21:40:24 +0100
+
+openttd (0.7.5-1) unstable; urgency=high
+
+  * [cdcb73a] Imported Upstream version 0.7.5. This release fixes
+    CVE-2009-4007.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 24 Dec 2009 00:55:45 +0100
+
+openttd (0.7.4-1) unstable; urgency=low
+
+  * [a2c297b0] Imported Upstream version 0.7.4
+  * [0232a645] Make Debian-specific patches executable.
+  * [76be04b] Switch the Debian packaging to git.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 15 Dec 2009 22:11:52 +0100
+
+openttd (0.7.3-1) unstable; urgency=low
+
+  [ Matthijs Kooijman ]
+  * New upstream release
+  * Use printf instead of echo -en in openttd-wrapper to make it POSIX
+    compatible (Closes: #547758).
+  * Remove three patches that are now included in upstream.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 01 Oct 2009 22:52:59 +0200
+
+openttd (0.7.2-1) unstable; urgency=low
+
+  [ Matthijs Kooijman ]
+  * New upstream release
+  * Bump Standards-Version to 3.8.3, with no changes required.
+  * Clean up the rules file a bit and add some lintian overrides.
+  * Explain why openttd is in contrib (Closes: #539381).
+  * Add the DM-Upload-Allowed control field.
+  * Re-add dpatch infrastructure.
+  * Fix the copyright file, since upstream only allows GPLv2, not later
    versions.
+  * Add a section to the copyright file on the different license used by the
+    "Squirrel" programming language, which is shipped with OpenTTD since
+     0.7.0.
+  * Backport upstream r17226, which removes the deprecated Encoding entry from
+    the .desktop file.
+  * Add a wrapper script for openttd, which captures any stderr output and
+    displays it when openttd returns an error code (Closes: #533557).
+  * Recommend x11-utils, since we use xmessage for displaying errors. Don't
+    depend on it, since openttd will still run fine without it, you just won't
+    see any errors.
+  * Backport upstream r17227 and r17229, which prevents terminal escape codes
+    from ending up in the captured error output.
+  * Backport upstream r17240, which improves stderr output when files are
+    missing or corrupt.

- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 24 Dec 2009 01:02:03 +0100
+ -- Jordi Mallach <jordi@debian.org>  Fri, 21 Aug 2009 15:27:26 +0200

-openttd (1.0.0~beta4) unstable; urgency=low
+openttd (0.7.1-1) unstable; urgency=low

+  [ Matthijs Kooijman ]
  * New upstream release.
+  * Link against libicu to enable right-to-left language support.

- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 04 Feb 2010 18:36:02 +0100
+ -- Jordi Mallach <jordi@debian.org>  Tue, 09 Jun 2009 21:46:28 +0200

-openttd (1.0.0~beta3) unstable; urgency=low
+openttd (0.7.0-1) unstable; urgency=low

+  [ Matthijs Kooijman ]
  * New upstream release.
+  * Remove Debian specific desktop file, upstream provides one now.
+  * Add debian/watch file.

- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 21 Jan 2010 00:01:02 +0100
+  [ Jordi Mallach ]
+  * Bump Standards-Version to 3.8.1, with no changes required.
+  * Move to debhelper compat 7. Bump Build-Depends accordingly.
+  * Use dh_prep.
+  * Add "set -e" to config script.
+  * Remove a few extra doc files that get installed by upstream Makefile.
+  * Add more complete copyright information.

-openttd (1.0.0~beta2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 05 Jan 2010 21:36:51 +0100
-
-openttd (1.0.0~beta1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 24 Dec 2009 01:01:01 +0100
-
-openttd (0.7.5) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 23 Dec 2009 20:52:34 +0100
-
-openttd (0.7.5~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 14 Dec 2009 19:28:37 +0100
-
-openttd (0.7.4) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 01 Dec 2009 01:23:45 +0100
-
-openttd (0.7.4~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 15 Nov 2009 16:30:07 +0100
-
-openttd (0.7.3) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 01 Oct 2009 12:35:47 +0200
-
-openttd (0.7.3~RC2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 24 Sep 2009 21:30:43 +0200
-
-openttd (0.7.3~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 13 Sep 2009 10:25:56 +0200
-
-openttd (0.7.2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 01 Aug 2009 00:19:43 +0200
-
-openttd (0.7.2~RC2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 21 Jul 2009 20:25:56 +0200
-
-openttd (0.7.2~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 15 Jul 2009 22:25:56 +0200
-
-openttd (0.7.1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 09 Jun 2009 01:34:56 +0200
-
-openttd (0.7.1~RC3) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 03 Jun 2009 15:34:56 +0200
-
-openttd (0.7.1~RC2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 21 Mar 2009 14:34:56 +0200
-
-openttd (0.7.1~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 11 Mar 2009 17:34:56 +0200
-
-openttd (0.7.0) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 01 Apr 2009 13:37:42 +0000
-
-openttd (0.7.0~RC2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 23 Mar 2009 00:42:00 +0200
-
-openttd (0.7.0~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 16 Mar 2009 00:07:00 +0200
-
-openttd (0.7.0~beta2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 10 Mar 2009 00:33:05 +0100
-
-openttd (0.7.0~beta1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 16 Feb 2009 23:07:05 +0100
+ -- Jordi Mallach <jordi@debian.org>  Wed, 15 Apr 2009 18:22:10 +0200

 openttd (0.6.3-1) unstable; urgency=low

@@ -150,7 +169,7 @@ openttd (0.6.3-1) unstable; urgency=low

  [ Jordi Mallach ]
  * Add Spanish Debconf template translation, after fixing its corrupted
-    encoding.
+    encoding (thanks, Germana Oliveira, closes: #499214).

 -- Jordi Mallach <jordi@debian.org>  Thu, 02 Oct 2008 16:59:03 +0200

--- a/os/debian/compat
+++ b/os/debian/compat
@@ -1 +1 @@
-4
+7
--- a/os/debian/config
+++ b/os/debian/config
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-FILES="trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf sample.cat"
-DATADIR=/usr/share/games/openttd/data
-
-MISSING="No"
-for FILE in $FILES; do
-	# Check if all the files needed are here.
-	if [ ! -e $DATADIR/$FILE ]; then
-		MISSING="Yes"
-		break
-	fi;
-done
-
-if [ $MISSING = "Yes" ]; then
-	db_input high openttd/datafiles || true
-	db_go
-fi
--- a/os/debian/control
+++ b/os/debian/control
@@ -1,21 +1,27 @@
 Source: openttd
-Section: contrib/games
+Section: games
 Priority: optional
 Maintainer: Matthijs Kooijman <matthijs@stdin.nl>
 Uploaders: Jordi Mallach <jordi@debian.org>
-Build-Depends: debhelper (>= 4.0.0), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev, liblzo2-dev
-Standards-Version: 3.7.3
-Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/openttd/trunk/
-Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/openttd/trunk
+DM-Upload-Allowed: yes
+Build-Depends: debhelper (>= 7.0.50), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev, libicu-dev, liblzo2-dev
+Standards-Version: 3.8.4
+Vcs-Browser: http://git.debian.org/?p=collab-maint/openttd.git
+Vcs-Git: git://git.debian.org/collab-maint/openttd.git
 Homepage: http://www.openttd.org/

 Package: openttd
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: timidity, freepats
+Recommends: openttd-opengfx, x11-utils
+Replaces: openttd-data
+Conflicts: openttd-data
+Suggests: openttd-opensfx, timidity, freepats
 Description: reimplementation of Transport Tycoon Deluxe with enhancements
 OpenTTD is a reimplementation of the Microprose game "Transport
- Tycoon Deluxe" with lots of new features and enhancements. The data
- files of the original Transport Tycoon Deluxe for Windows are
- mandatory to play the game. They must be manually copied to the game
- data directory (see README.Debian for details).
+ Tycoon Deluxe" with lots of new features and enhancements.
+ .
+ OpenTTD is playable with the free graphics files from the openttd-opengfx
+ package and optional sound files from the openttd-opensfx package (which is in
+ non-free). Alternatively, OpenTTD can use the graphics files from the original
+ Transport Tycoon Deluxe game (See README.Debian on how to set this up).
--- a/os/debian/copyright
+++ b/os/debian/copyright
@@ -1,25 +1,77 @@
-This package was debianized by Matthijs Kooijman <m.kooijman@student.utwente.nl>
+This package was debianized by Matthijs Kooijman <matthijs@stdin.nl>
 on Wed, 15 Sep 2004 00:24:01 +0200.

-It was downloaded from http://sourceforge.net/projects/openttd
-
 Upstream author: Ludvig Strigeus (ludde) and many others.
+Upstream homepage: http://www.openttd.org

-License:
+Copyright © 2004-2009 Ludvig Strigeous and others.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+OpenTTD License:

-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License version 2.0 as
+	published by the Free Software Foundation;

-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.

-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+	You should have received a copy of the GNU General Public License
+	along with this package; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+This package contains an embedded version of the "Squirrel" programming
+language, which is shipped under the following license:
+
+	Copyright (c) 2003-2009 Alberto Demichelis
+
+	This software is provided 'as-is', without any
+	express or implied warranty. In no event will the
+	authors be held liable for any damages arising from
+	the use of this software.
+
+	Permission is granted to anyone to use this software
+	for any purpose, including commercial applications,
+	and to alter it and redistribute it freely, subject
+	to the following restrictions:
+
+		1. The origin of this software must not be
+		misrepresented; you must not claim that
+		you wrote the original software. If you
+		use this software in a product, an
+		acknowledgment in the product
+		documentation would be appreciated but is
+		not required.
+
+		2. Altered source versions must be plainly
+		marked as such, and must not be
+		misrepresented as being the original
+		software.
+
+		3. This notice may not be removed or
+		altered from any source distribution.
+
+This package contains an implementation of the md5 hash algorithm, which
+is shipped under the following license:
+
+	Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
+
+	This software is provided 'as-is', without any express or implied
+	warranty.  In no event will the authors be held liable for any damages
+	arising from the use of this software.
+
+	Permission is granted to anyone to use this software for any purpose,
+	including commercial applications, and to alter it and redistribute it
+	freely, subject to the following restrictions:
+
+	1. The origin of this software must not be misrepresented; you must not
+	   claim that you wrote the original software. If you use this software
+	   in a product, an acknowledgment in the product documentation would be
+	   appreciated but is not required.
+	2. Altered source versions must be plainly marked as such, and must not be
+	   misrepresented as being the original software.
+	3. This notice may not be removed or altered from any source distribution.
--- a/os/debian/docs
+++ b/os/debian/docs
@@ -1,2 +0,0 @@
-readme.txt
-docs/multiplayer.txt
--- a/os/debian/gbp.conf
+++ b/os/debian/gbp.conf
@@ -0,0 +1,13 @@
+[DEFAULT]
+# Use pristine-tar
+pristine-tar = True
+
+[git-dch]
+# We use metaheaders in commit messages.
+meta = True
+# Put git commit ids in the debian changelog.
+id-length = 7
+
+[git-import-orig]
+# Use a custom commit message for upstream imports.
+import-msg = New upstream release %(version)s.
--- a/os/debian/menu
+++ b/os/debian/menu
@@ -1,2 +1,2 @@
 ?package(openttd):needs="X11" section="Games/Simulation" title="OpenTTD"\
-command="/usr/games/openttd" icon="/usr/share/pixmaps/openttd.32.xpm"
+command="/usr/share/games/openttd/openttd-wrapper" icon="/usr/share/pixmaps/openttd.32.xpm"
--- a/os/debian/openttd-wrapper
+++ b/os/debian/openttd-wrapper
@@ -0,0 +1,28 @@
+#!/bin/sh
+# This is a wrapper script that checks openttd's exit status and
+# displays its stderr output
+
+# Get a file to capture stderr to. Use the deprecated -t option, so this
+# works on the old mktemp from the mktemp package (which has been
+# replaced by the version from the coreutils package).
+TMPFILE=`mktemp -t openttd.errout.XXXXXXXXX`
+
+if [ ! -w "$TMPFILE" ]; then
+	xmessage "Could not create temporary file for error messages. Not starting OpenTTD."
+	exit 1;
+fi
+
+# Capture stderr
+openttd "$@" 2> "$TMPFILE"
+ERRCODE=$?
+if [ "$ERRCODE" -ne 0 ]; then
+	CODEMSG="OpenTTD returned with error code $ERRCODE."
+	if [ -s "$TMPFILE" ]; then
+		MESSAGE="$CODEMSG The following error messages were produced:\n\n"
+		printf "$MESSAGE" | cat - "$TMPFILE" | fold -s | xmessage -file -
+	else
+		xmessage "$CODEMSG No error messages were produced."
+	fi
+fi
+
+rm -f "$TMPFILE"
--- a/os/debian/patches/run-openttd-wrapper.patch
+++ b/os/debian/patches/run-openttd-wrapper.patch
@@ -0,0 +1,19 @@
+From: Matthijs Kooijman <matthijs@stdin.nl>
+Subject: Use a wrapper script for running openttd
+
+The wrapper script captures stderr from openttd and displays this in
+case of an error. This patch makes the the .desktop file call the
+wrapper instead of the openttd binary directly.
+
+Index: media/openttd.desktop.in
+===================================================================
+--- a/media/openttd.desktop.in	(revision 17228)
+++ b/media/openttd.desktop.in	(working copy)
+@@ -6,6 +6,6 @@
+ Name=!!MENU_NAME!!
+ Comment=A clone of Transport Tycoon Deluxe
+ Icon=openttd
+-Exec=!!TTD!!
+Exec=/usr/share/games/openttd/openttd-wrapper
+ Terminal=false
+ Categories=!!MENU_GROUP!!
--- a/os/debian/patches/series
+++ b/os/debian/patches/series
@@ -0,0 +1 @@
+run-openttd-wrapper.patch
--- a/os/debian/po/POTFILES.in
+++ b/os/debian/po/POTFILES.in
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] templates
--- a/os/debian/po/ca.po
+++ b/os/debian/po/ca.po
@@ -1,40 +0,0 @@
-# Catalan translation of openttd's Debconf templates.
-# Copyright © 2007 Software in the Public Interest, Inc.
-# This file is distributed under the same license as the openttd package.
-# Jordi Mallach <jordi@debian.org>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd 0.5.2-1\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-06-01 00:45+0200\n"
-"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
-"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Es necessiten els fitxers de dades"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Per a funcionar, OpenTTD necessita els fitxers de dades del joc "
-"Transport Tycoon Deluxe original."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr "Vegeu el fitxer /usr/share/doc/openttd/README.Debian per a obtenir-ne més detalls sobre els fitxers necessaris i la seua ubicació."
--- a/os/debian/po/cs.po
+++ b/os/debian/po/cs.po
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 10:52+0200\n"
-"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
-"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Vyžadovány datové soubory"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Pro svůj běh vyžaduje OpenTTD datové soubory z původní hry Transport Tycoon "
-"Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Podrobnosti o vyžadovaných souborech a jejich umístění naleznete v souboru /"
-"usr/share/doc/openttd/README.Debian."
--- a/os/debian/po/de.po
+++ b/os/debian/po/de.po
@@ -1,55 +0,0 @@
-# Translation of openttd debconf templates to German
-# Copyright (C) Helge Kreutzmann <debian@helgefjell.de>, 2007.
-# This file is distributed under the same license as the openttd package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd 0.5.0-2\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 21:21+0200\n"
-"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
-"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Ben<65>tigte Datendateien"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Zum Betrieb ben<65>tigt OpenTTD Datendateien aus dem Originalspiel Transport "
-"Tycoon Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Lesen Sie die Datei /usr/share/doc/openttd/README.Debian f<>r weitere Details "
-"<22>ber die ben<65>tigten Dateien und ihren Ort."
-
-#~ msgid "You need to install data files"
-#~ msgstr "Sie m<>ssen Daten-Dateien installieren"
-
-#~ msgid ""
-#~ "OpenTTD needs the data files from the original Transport Tycoon Deluxe "
-#~ "game to run. You should install these data files before you can play the "
-#~ "game. See README.Debian for more details on which files need to be copied "
-#~ "where."
-#~ msgstr ""
-#~ "OpenTTD ben<65>tigt zur Ausf<73>hrung Daten-Dateien aus dem Originalspiel "
-#~ "<22>Transport Tycoon Deluxe<78>. Sie sollten diese Daten-Dateien installieren, "
-#~ "bevor Sie das Spiel spielen k<>nnen. Lesen Sie README.Debian f<>r weitere "
-#~ "Details dar<61>ber, welche Dateien wohin kopiert werden m<>ssen."
--- a/os/debian/po/eu.po
+++ b/os/debian/po/eu.po
@@ -1,42 +0,0 @@
-# OpenTTD debconf template basque translation
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Piarres eobide <pi@beobide.net>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenTTD Debconf\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 09:55+0200\n"
-"Last-Translator: Piarres eobide <pi@beobide.net>\n"
-"Language-Team: Euskara <Librezale@librezale.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Datu fitxategiak behar dira"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Funtziona dezan, OpenTTD-ek jatorrizko 'Transport Tycoon Deluxe' jokoaren "
-"datu fitxategiak behar ditu."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"/usr/share/doc/openttd/README.Debian fitxategia begiratu beharrezko "
-"fitategien eta bere kokapenari buruz xehetasun gehiago ikusteko."
--- a/os/debian/po/fi.po
+++ b/os/debian/po/fi.po
@@ -1,32 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd_0.5.3-1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-19 04:33+0200\n"
-"PO-Revision-Date: 2007-12-18 20:01+0200\n"
-"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
-"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Finnish\n"
-"X-Poedit-Country: Finland\n"
-
-#. Type: error
-#. Description
-#: ../templates:1001
-msgid "Data files needed"
-msgstr "Datatiedostoja puuttuu"
-
-#. Type: error
-#. Description
-#: ../templates:1001
-msgid "For its operation, OpenTTD needs the data files from the original Transport Tycoon Deluxe game."
-msgstr "OpenTTD tarvitsee toimiakseen datatiedostoja alkuperäisestä Transport Tycoon Deluxe -pelistä."
-
-#. Type: error
-#. Description
-#: ../templates:1001
-msgid "See the /usr/share/doc/openttd/README.Debian file for more details about the needed files and their location."
-msgstr "Tiedostossa /usr/share/doc/openttd/README.Debian on (englanniksi) lisätietoja tarvittavista tiedostoista ja niiden sijainnista."
-
--- a/os/debian/po/fr.po
+++ b/os/debian/po/fr.po
@@ -1,42 +0,0 @@
-# debian-l10n-french translation of 0.5.1-1.
-# Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Ivan Buresi <err747@free.fr>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: 0.5.1-1\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 11:41+0200\n"
-"Last-Translator: Ivan Buresi <err747@free.fr>\n"
-"Language-Team: debian-l10n-french <debian-l10n-french@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Fichiers de données indispensables"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Pour fonctionner correctement, OpenTTD a besoin des fichiers de données du "
-"jeu « Transport Tycoon Deluxe » original."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Veuillez lire le fichier /usr/share/doc/openttd/README.Debian pour plus "
-"d'informations sur les fichiers requis et leur emplacement."
--- a/os/debian/po/gl.po
+++ b/os/debian/po/gl.po
@@ -1,41 +0,0 @@
-# Galician translation of openttd's debconf templates
-# This file is distributed under the same license as the openttd package.
-# Jacobo Tarrio <jtarrio@debian.org>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 13:12+0200\n"
-"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
-"Language-Team: Galician <proxecto@trasno.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Precísase de ficheiros de datos"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Para o seu funcionamento, OpenTTD precisa dos ficheiros de datos do xogo "
-"Transport Tycoon Deluxe orixinal."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Consulte o ficheiro /usr/share/doc/openttd/README.Debian para máis "
-"información sobre os ficheiros necesarios e as súas ubicacións."
--- a/os/debian/po/nl.po
+++ b/os/debian/po/nl.po
@@ -1,43 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-16 19:25+0100\n"
-"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
-"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Dutch\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Databestanden zijn vereist"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Om te werken heeft OpenTTD de databestanden van het oorspronkelijkee "
-"'Transport Tycoon Deluxe'-spel nodig."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Meer informatie over de vereiste bestanden en hun locatie vindt u in /usr/"
-"share/doc/openttd/README.Debian . "
--- a/os/debian/po/pt.po
+++ b/os/debian/po/pt.po
@@ -1,42 +0,0 @@
-# Portuguese translation of openttd's debconf messages.
-# Copyright (C) 2007
-# This file is distributed under the same license as the openttd package.
-# Ricardo Silva <ardoric@gmail.com>, 2007
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-09 09:37+0100\n"
-"Last-Translator: Ricardo Silva <ardoric@gmail.com>\n"
-"Language-Team: Portuguese <traduz@debianpt.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "São necessários ficheiros de dados"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Para esta operação o OpenTTD precisa dos ficheiros de dados do jogo original "
-"Transport Tycool Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Veja o ficheiro /usr/share/doc/openttd/README.Debian para mais detalhes "
-"sobre os ficheiros que são necessários e a sua localização."
--- a/os/debian/po/pt_BR.po
+++ b/os/debian/po/pt_BR.po
@@ -1,43 +0,0 @@
-# openttd Brazilian Portuguese translation
-# Copyright (C) 2007, Eder L. Marques
-# This file is distributed under the same license as the openttd package.
-# Eder L. Marques <frolic@debian-ce.org>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd 0.5.0-2\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 11:00-0300\n"
-"Last-Translator: Eder L. Marques <frolic@debian-ce.org>\n"
-"Language-Team: l10n Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"pt_BR utf-8\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Arquivos de dados necessários"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Para sua operação, o OpenTTD necessita dos arquivos de dados do jogo "
-"Transport Tycoon Deluxe original."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Veja o arquivo /usr/share/doc/openttd/README.Debian para maiores detalhes "
-"sobre os arquivos necessários e suas localizações."
--- a/os/debian/po/ru.po
+++ b/os/debian/po/ru.po
@@ -1,45 +0,0 @@
-# translation of openttd_debconf_ru.po to Russian
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Yuri Kozlov <kozlov.y@gmail.com>, 2007.
-msgid ""
-msgstr ""
-"Project-Id-Version: 0.5.1-1\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-10 21:45+0400\n"
-"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
-"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Необходимы файлы данных"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Для работы OpenTTD требуются файлы данных от оригинальной игры Transport "
-"Tycoon Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"В файле /usr/share/doc/openttd/README.Debian приведена информация о том, "
-"какие файлы нужны и где они лежат."
--- a/os/debian/po/sv.po
+++ b/os/debian/po/sv.po
@@ -1,56 +0,0 @@
-# Swedish translation for openttd debconf template.
-# Copyright (C) 2007 Free Software Foundation, Inc.
-# This file is distributed under the same license as the openttd package.
-# Daniel Nylander <po@danielnylander.se>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 09:47+0100\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
-"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Datafiler behövs"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"För att fungera behöva OpenTTD datafilerna från det ursprungliga spelet "
-"Transport Tycoon Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Se filen /usr/share/doc/openttd/README.Debian för mer information om de "
-"nödvändiga filera och var de finns någonstans."
-
-#~ msgid "You need to install data files"
-#~ msgstr "Du behöver installera datafilerna"
-
-#~ msgid ""
-#~ "OpenTTD needs the data files from the original Transport Tycoon Deluxe "
-#~ "game to run. You should install these data files before you can play the "
-#~ "game. See README.Debian for more details on which files need to be copied "
-#~ "where."
-#~ msgstr ""
-#~ "OpenTTD behöver datafilerna från det ursprungliga spelet Transport Tycoon "
-#~ "Deluxe för att kunna köras. Du måste installera dessa datafiler innan du "
-#~ "kan spela spelet. Se README.Debian för fler detaljer om vilka filer som "
-#~ "behöver kopieras."
--- a/os/debian/po/ta.po
+++ b/os/debian/po/ta.po
@@ -1,43 +0,0 @@
-# translation of openttd.po to TAMIL
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Dr.T.Vasudevan <agnihot3@gmail.com>, 2007.
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 15:04+0530\n"
-"Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
-"Language-Team: TAMIL <ubuntu-l10n-tam@lists.ubuntu.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "தேவையான தரவு கோப்புகள்"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"இயங்குவதற்கு ஓபன் டிடிடி(OpenTTD) க்கு ட்ரான்ஸ்போர்ட் டைகூன் டீலக்ஸ் விளையாட்டிலிருந்து "
-"தரவு கோப்புகள் தேவை."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"தேவையான கோப்புகள் அவற்றின் இடம்  ஆகியவற்றை அறிய /usr/share/doc/openttd/README "
-"டெபியன் கோப்பை பார்க்கவும்."
--- a/os/debian/po/templates.pot
+++ b/os/debian/po/templates.pot
@@ -1,39 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
--- a/os/debian/postinst
+++ b/os/debian/postinst
@@ -1,8 +0,0 @@
-#! /bin/sh
-
-set -e
-
-
-. /usr/share/debconf/confmodule
-
-#DEBHELPER#
--- a/os/debian/rules
+++ b/os/debian/rules
@@ -1,88 +1,43 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# Makefile to build the openttd debian package.

-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# Use debhelper default for all targets (but some are overridden below).
+%:
+	dh $@

-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
+DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif

-	touch configure-stamp
+# Pass custom options to configure. Since it's not autoconf but a custom
+# script, some of the option names are slightly different. We also need
+# to be explicit about the dependencies, in case we're not running in a
+# clean build root.
+override_dh_auto_configure:
+	./configure $(CROSS) --prefix-dir=/usr --install-dir=debian/openttd --without-allegro --with-zlib --with-sdl --with-png --with-freetype --with-fontconfig --with-icu --with-liblzo2 --without-iconv

-
-build: configure build-stamp
-build-stamp:
-	dh_testdir
-
-	# Add here commands to compile the package.
-	
-	./configure --prefix-dir=/usr --binary-dir=games --data-dir=share/games/openttd --icon-dir=share/pixmaps --personal-dir=.openttd --install-dir=debian/openttd
-	$(MAKE)
-
-	#/usr/bin/docbook-to-man debian/openttd.sgml > openttd.1
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	# We check for Makefile presence, because clean is called at the
-	# start of the build process (before configure) where we don't
-	# have a Makefile yet.
-	[ ! -f Makefile ] || $(MAKE) mrproper
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/openttd.
+# Do some extra installation
+override_dh_auto_install:
 	$(MAKE) install

-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+	# Install the wrapper and make it executable
+	install -d debian/openttd/usr/share/games/openttd/
+	install -m755 debian/openttd-wrapper debian/openttd/usr/share/games/openttd/

-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs changelog.txt
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-	dh_installmenu
-	dh_installdebconf
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman docs/openttd.6
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	# Since 0.7.0, upstream Makefile installs some unwanted stuff.
+	-rm $(CURDIR)/debian/openttd/usr/share/doc/openttd/COPYING
+	-rm $(CURDIR)/debian/openttd/usr/share/doc/openttd/changelog.txt
+	-rm $(CURDIR)/debian/openttd/usr/share/doc/openttd/ob*_format.txt

-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+# Don't do testing. Because the OpenTTD Makefile always does dependency
+# generation (even on invalid targets), dh_auto_test thinks there is a
+# "test" target, while there isn't.
+override_dh_auto_test:
+
+# Call mrproper. Again, dh_auto_clean thinks there is a distclean
+# target, while there isn't.
+override_dh_auto_clean:
+	[ ! -f Makefile ] || $(MAKE) mrproper
--- a/os/debian/source/format
+++ b/os/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--- a/os/debian/templates
+++ b/os/debian/templates
@@ -1,16 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# for an advice to debian-l10n-english@lists.debian.org
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-Template: openttd/datafiles
-Type: error
-_Description: Data files needed
- For its operation, OpenTTD needs the data files from the original
- Transport Tycoon Deluxe game.
- .
- See the /usr/share/doc/openttd/README.Debian file for more details
- about the needed files and their location.
--- a/os/debian/watch
+++ b/os/debian/watch
@@ -0,0 +1,5 @@
+version=3
+
+options=downloadurlmangle=s/(.*)\/index.html$/\1\/openttd-\1-source.tar.gz/ \
+http://master.binaries.openttd.org/releases/ \
+(\d+(?:\.\d+)*)/index.html
--- a/os/os2/installer/make_installer.cmd
+++ b/os/os2/installer/make_installer.cmd
@@ -1,6 +1,6 @@
@echo off

-set OPENTTD_VERSION=1.0.0-beta4
+set OPENTTD_VERSION=1.0.0
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
 set OPENGFX_VERSION=0.7.0
--- a/os/windows/installer/install.nsi
+++ b/os/windows/installer/install.nsi
@@ -1,9 +1,9 @@
 # Version numbers to update
 !define APPV_MAJOR 1
 !define APPV_MINOR 0
-!define APPV_MAINT 0
-!define APPV_BUILD 3
-!define APPV_EXTRA "-beta4"
+!define APPV_MAINT 1
+!define APPV_BUILD 0
+!define APPV_EXTRA "-RC1"

 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"  ; Define application version
@@ -16,7 +16,7 @@

 !define OPENGFX_BASE_VERSION "0.7.0"
 !define OPENSFX_BASE_VERSION "0.8.0"
-!define NOSOUND_BASE_VERSION "0.8.0"
+!define OPENMSX_BASE_VERSION "1.0.0"

 !define MUI_ICON "..\..\..\media\openttd.ico"
 !define MUI_UNICON "..\..\..\media\openttd.ico"
@@ -238,21 +238,21 @@ Done:
 SectionEnd

 ;----------------------------------------------------------------------------------
-; NoSound files install section. Downloads NoSound and installs it
-Section "Download NoSound (free sound set)" Section5
+; OpenMSX files install section. Downloads OpenMSX and installs it
+Section "Download OpenMSX (free music set)" Section5
 	SetOverwrite try

-	NSISdl::download "http://binaries.openttd.org/installer/nosound-${NOSOUND_BASE_VERSION}.7z" "$INSTDIR\data\nosound.7z"
+	NSISdl::download "http://binaries.openttd.org/installer/openmsx-${OPENMSX_BASE_VERSION}.7z" "$INSTDIR\gm\openmsx.7z"
 	Pop $R0 ;Get the return value
 	StrCmp $R0 "success" +3
-		MessageBox MB_OK "Downloading of NoSound failed"
+		MessageBox MB_OK "Downloading of OpenMSX failed"
 		Goto Done

 	; Let's extract the files
-	SetOutPath "$INSTDIR\data\"
-	NSIS7z::Extract "$INSTDIR\data\nosound.7z"
+	SetOutPath "$INSTDIR\gm\"
+	NSIS7z::Extract "$INSTDIR\gm\openmsx.7z"

-	Delete "$INSTDIR\data\nosound.7z"
+	Delete "$INSTDIR\gm\openmsx.7z"
 	SetOutPath "$INSTDIR\"
 Done:

@@ -294,8 +294,8 @@ SectionEnd
 	!insertmacro MUI_DESCRIPTION_TEXT ${Section6} "Translations of OpenTTD."
 	!insertmacro MUI_DESCRIPTION_TEXT ${Section3} "Download the free OpenGFX game graphics set. This download is about 3 MiB."
 	!insertmacro MUI_DESCRIPTION_TEXT ${Section4} "Download the free OpenSFX game sound set. This download is about 10 MiB."
-	!insertmacro MUI_DESCRIPTION_TEXT ${Section5} "Download the free NoSound game sound set. You will not hear anything with this. This download is about 7 KiB."
-	!insertmacro MUI_DESCRIPTION_TEXT ${Section2} "Copies the game graphics and sounds from the Transport Tycoon Deluxe CD."
+	!insertmacro MUI_DESCRIPTION_TEXT ${Section5} "Download the free OpenMSX game music set. This download is about 200 KiB."
+	!insertmacro MUI_DESCRIPTION_TEXT ${Section2} "Copies the game graphics, sounds and music from the Transport Tycoon Deluxe CD."
 !insertmacro MUI_FUNCTION_DESCRIPTION_END

 ;-----------------------------------------------
@@ -377,6 +377,7 @@ Section "Uninstall"
 	Delete "$INSTDIR\data\orig_dos_de.obg"
 	Delete "$INSTDIR\data\orig_win.obs"
 	Delete "$INSTDIR\data\orig_dos.obs"
+	Delete "$INSTDIR\data\no_sound.obs"

 	Delete "$INSTDIR\data\sample.cat"
 	; Windows Data files
@@ -395,13 +396,13 @@ Section "Uninstall"
 	; Music
 	Delete "$INSTDIR\gm\*.gm"

-	; Downloaded OpenGFX/OpenSFX/NoSound
+	; Downloaded OpenGFX/OpenSFX/OpenMSX
 	Delete "$INSTDIR\data\opengfx\*"
 	RMDir  "$INSTDIR\data\opengfx"
 	Delete "$INSTDIR\data\opensfx\*"
 	RMDir  "$INSTDIR\data\opensfx"
-	Delete "$INSTDIR\data\nosound\*"
-	RMDir  "$INSTDIR\data\nosound"
+	Delete "$INSTDIR\gm\openmsx\*"
+	RMDir  "$INSTDIR\gm\openmsx"

 	; Language files
 	Delete "$INSTDIR\lang\*.lng"
@@ -549,7 +550,7 @@ Function .onInit

 	SectionSetSize ${Section3} 6144
 	SectionSetSize ${Section4} 13312
-	SectionSetSize ${Section5} 30
+	SectionSetSize ${Section5} 1024

 	SectionSetFlags 0 17

--- a/projects/determineversion.vbs
+++ b/projects/determineversion.vbs
@@ -39,6 +39,7 @@ Sub UpdateFiles(version)
 		modified = Mid(version, InStrRev(version, Chr(9)) + 1)
 		version  = Mid(version, 1, InStr(version, Chr(9)) - 1)
 	Else
+		version = "1.0.1-RC1"
 		revision = 0
 		modified = 1
 	End If
--- a/projects/generate
+++ b/projects/generate
@@ -161,8 +161,8 @@ load_lang_data() {
 				<Tool
 					Name=\"VCCustomBuildTool\"
 					Description=\"Generating "$i" language file\"
-					CommandLine=\"..\\objs\\strgen\\strgen.exe -s ..\\src\\lang -d ..\\bin\\lang &quot;\$(InputPath)&quot;&#x0D;&#x0A;exit 0\"
-					AdditionalDependencies=\"..\\src\\lang\\english.txt\"
+					CommandLine=\"..\\objs\\strgen\\strgen.exe -s ..\\src\\lang -d ..\\bin\\lang &quot;\$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;\"
+					AdditionalDependencies=\"..\\src\\lang\\english.txt;..\\objs\\strgen\\strgen.exe\"
 					Outputs=\"..\\bin\\lang\\"$i".lng\"
 				/>
 			</FileConfiguration>
--- a/projects/generate.vbs
+++ b/projects/generate.vbs
@@ -210,8 +210,8 @@ Function load_lang_data(dir)
 			& vbCrLf & "				<Tool" _
 			& vbCrLf & "					Name=" & Chr(34) & "VCCustomBuildTool" & Chr(34) _
 			& vbCrLf & "					Description=" & Chr(34) & "Generating " & file & " language file" & Chr(34) _
-			& vbCrLf & "					CommandLine=" & Chr(34) & "..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0" & Chr(34) _
-			& vbCrLf & "					AdditionalDependencies=" & Chr(34) & "..\src\lang\english.txt" & Chr(34) _
+			& vbCrLf & "					CommandLine=" & Chr(34) & "..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;" & Chr(34) _
+			& vbCrLf & "					AdditionalDependencies=" & Chr(34) & "..\src\lang\english.txt;..\objs\strgen\strgen.exe" & Chr(34) _
 			& vbCrLf & "					Outputs=" & Chr(34) & "..\bin\lang\" & file & ".lng" & Chr(34) _
 			& vbCrLf & "				/>" _
 			& vbCrLf & "			</FileConfiguration>" _
--- a/projects/langs_vs80.vcproj
+++ b/projects/langs_vs80.vcproj
@@ -55,8 +55,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating afrikaans language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\afrikaans.lng"
 				/>
 			</FileConfiguration>
@@ -70,8 +70,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating arabic_egypt language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\arabic_egypt.lng"
 				/>
 			</FileConfiguration>
@@ -85,8 +85,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating brazilian_portuguese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\brazilian_portuguese.lng"
 				/>
 			</FileConfiguration>
@@ -100,8 +100,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating bulgarian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\bulgarian.lng"
 				/>
 			</FileConfiguration>
@@ -115,8 +115,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating catalan language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\catalan.lng"
 				/>
 			</FileConfiguration>
@@ -130,8 +130,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating croatian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\croatian.lng"
 				/>
 			</FileConfiguration>
@@ -145,8 +145,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating czech language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\czech.lng"
 				/>
 			</FileConfiguration>
@@ -160,8 +160,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating danish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\danish.lng"
 				/>
 			</FileConfiguration>
@@ -175,8 +175,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating dutch language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\dutch.lng"
 				/>
 			</FileConfiguration>
@@ -190,8 +190,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating english language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\english.lng"
 				/>
 			</FileConfiguration>
@@ -205,8 +205,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating english_US language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\english_US.lng"
 				/>
 			</FileConfiguration>
@@ -220,8 +220,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating esperanto language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\esperanto.lng"
 				/>
 			</FileConfiguration>
@@ -235,8 +235,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating estonian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\estonian.lng"
 				/>
 			</FileConfiguration>
@@ -250,8 +250,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating finnish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\finnish.lng"
 				/>
 			</FileConfiguration>
@@ -265,8 +265,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating french language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\french.lng"
 				/>
 			</FileConfiguration>
@@ -280,8 +280,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating galician language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\galician.lng"
 				/>
 			</FileConfiguration>
@@ -295,8 +295,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating german language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\german.lng"
 				/>
 			</FileConfiguration>
@@ -310,8 +310,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating greek language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\greek.lng"
 				/>
 			</FileConfiguration>
@@ -325,8 +325,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating hebrew language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\hebrew.lng"
 				/>
 			</FileConfiguration>
@@ -340,8 +340,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating hungarian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\hungarian.lng"
 				/>
 			</FileConfiguration>
@@ -355,8 +355,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating icelandic language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\icelandic.lng"
 				/>
 			</FileConfiguration>
@@ -370,8 +370,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating indonesian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\indonesian.lng"
 				/>
 			</FileConfiguration>
@@ -385,8 +385,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating italian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\italian.lng"
 				/>
 			</FileConfiguration>
@@ -400,8 +400,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating japanese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\japanese.lng"
 				/>
 			</FileConfiguration>
@@ -415,8 +415,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating korean language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\korean.lng"
 				/>
 			</FileConfiguration>
@@ -430,8 +430,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating latvian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\latvian.lng"
 				/>
 			</FileConfiguration>
@@ -445,8 +445,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating lithuanian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\lithuanian.lng"
 				/>
 			</FileConfiguration>
@@ -460,8 +460,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating luxembourgish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\luxembourgish.lng"
 				/>
 			</FileConfiguration>
@@ -475,8 +475,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating malay language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\malay.lng"
 				/>
 			</FileConfiguration>
@@ -490,8 +490,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating norwegian_bokmal language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\norwegian_bokmal.lng"
 				/>
 			</FileConfiguration>
@@ -505,8 +505,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating norwegian_nynorsk language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\norwegian_nynorsk.lng"
 				/>
 			</FileConfiguration>
@@ -520,8 +520,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating polish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\polish.lng"
 				/>
 			</FileConfiguration>
@@ -535,8 +535,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating portuguese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\portuguese.lng"
 				/>
 			</FileConfiguration>
@@ -550,8 +550,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating romanian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\romanian.lng"
 				/>
 			</FileConfiguration>
@@ -565,8 +565,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating russian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\russian.lng"
 				/>
 			</FileConfiguration>
@@ -580,8 +580,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating serbian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\serbian.lng"
 				/>
 			</FileConfiguration>
@@ -595,8 +595,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating simplified_chinese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\simplified_chinese.lng"
 				/>
 			</FileConfiguration>
@@ -610,8 +610,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating slovak language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\slovak.lng"
 				/>
 			</FileConfiguration>
@@ -625,8 +625,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating slovenian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\slovenian.lng"
 				/>
 			</FileConfiguration>
@@ -640,8 +640,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating spanish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\spanish.lng"
 				/>
 			</FileConfiguration>
@@ -655,8 +655,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating swedish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\swedish.lng"
 				/>
 			</FileConfiguration>
@@ -670,8 +670,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating traditional_chinese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\traditional_chinese.lng"
 				/>
 			</FileConfiguration>
@@ -685,8 +685,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating turkish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\turkish.lng"
 				/>
 			</FileConfiguration>
@@ -700,8 +700,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating ukrainian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\ukrainian.lng"
 				/>
 			</FileConfiguration>
@@ -715,8 +715,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating vietnamese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\vietnamese.lng"
 				/>
 			</FileConfiguration>
@@ -730,8 +730,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating welsh language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\welsh.lng"
 				/>
 			</FileConfiguration>
--- a/projects/langs_vs90.vcproj
+++ b/projects/langs_vs90.vcproj
@@ -56,8 +56,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating afrikaans language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\afrikaans.lng"
 				/>
 			</FileConfiguration>
@@ -71,8 +71,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating arabic_egypt language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\arabic_egypt.lng"
 				/>
 			</FileConfiguration>
@@ -86,8 +86,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating brazilian_portuguese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\brazilian_portuguese.lng"
 				/>
 			</FileConfiguration>
@@ -101,8 +101,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating bulgarian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\bulgarian.lng"
 				/>
 			</FileConfiguration>
@@ -116,8 +116,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating catalan language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\catalan.lng"
 				/>
 			</FileConfiguration>
@@ -131,8 +131,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating croatian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\croatian.lng"
 				/>
 			</FileConfiguration>
@@ -146,8 +146,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating czech language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\czech.lng"
 				/>
 			</FileConfiguration>
@@ -161,8 +161,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating danish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\danish.lng"
 				/>
 			</FileConfiguration>
@@ -176,8 +176,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating dutch language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\dutch.lng"
 				/>
 			</FileConfiguration>
@@ -191,8 +191,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating english language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\english.lng"
 				/>
 			</FileConfiguration>
@@ -206,8 +206,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating english_US language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\english_US.lng"
 				/>
 			</FileConfiguration>
@@ -221,8 +221,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating esperanto language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\esperanto.lng"
 				/>
 			</FileConfiguration>
@@ -236,8 +236,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating estonian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\estonian.lng"
 				/>
 			</FileConfiguration>
@@ -251,8 +251,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating finnish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\finnish.lng"
 				/>
 			</FileConfiguration>
@@ -266,8 +266,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating french language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\french.lng"
 				/>
 			</FileConfiguration>
@@ -281,8 +281,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating galician language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\galician.lng"
 				/>
 			</FileConfiguration>
@@ -296,8 +296,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating german language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\german.lng"
 				/>
 			</FileConfiguration>
@@ -311,8 +311,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating greek language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\greek.lng"
 				/>
 			</FileConfiguration>
@@ -326,8 +326,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating hebrew language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\hebrew.lng"
 				/>
 			</FileConfiguration>
@@ -341,8 +341,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating hungarian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\hungarian.lng"
 				/>
 			</FileConfiguration>
@@ -356,8 +356,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating icelandic language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\icelandic.lng"
 				/>
 			</FileConfiguration>
@@ -371,8 +371,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating indonesian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\indonesian.lng"
 				/>
 			</FileConfiguration>
@@ -386,8 +386,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating italian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\italian.lng"
 				/>
 			</FileConfiguration>
@@ -401,8 +401,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating japanese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\japanese.lng"
 				/>
 			</FileConfiguration>
@@ -416,8 +416,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating korean language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\korean.lng"
 				/>
 			</FileConfiguration>
@@ -431,8 +431,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating latvian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\latvian.lng"
 				/>
 			</FileConfiguration>
@@ -446,8 +446,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating lithuanian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\lithuanian.lng"
 				/>
 			</FileConfiguration>
@@ -461,8 +461,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating luxembourgish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\luxembourgish.lng"
 				/>
 			</FileConfiguration>
@@ -476,8 +476,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating malay language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\malay.lng"
 				/>
 			</FileConfiguration>
@@ -491,8 +491,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating norwegian_bokmal language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\norwegian_bokmal.lng"
 				/>
 			</FileConfiguration>
@@ -506,8 +506,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating norwegian_nynorsk language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\norwegian_nynorsk.lng"
 				/>
 			</FileConfiguration>
@@ -521,8 +521,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating polish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\polish.lng"
 				/>
 			</FileConfiguration>
@@ -536,8 +536,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating portuguese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\portuguese.lng"
 				/>
 			</FileConfiguration>
@@ -551,8 +551,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating romanian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\romanian.lng"
 				/>
 			</FileConfiguration>
@@ -566,8 +566,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating russian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\russian.lng"
 				/>
 			</FileConfiguration>
@@ -581,8 +581,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating serbian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\serbian.lng"
 				/>
 			</FileConfiguration>
@@ -596,8 +596,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating simplified_chinese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\simplified_chinese.lng"
 				/>
 			</FileConfiguration>
@@ -611,8 +611,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating slovak language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\slovak.lng"
 				/>
 			</FileConfiguration>
@@ -626,8 +626,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating slovenian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\slovenian.lng"
 				/>
 			</FileConfiguration>
@@ -641,8 +641,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating spanish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\spanish.lng"
 				/>
 			</FileConfiguration>
@@ -656,8 +656,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating swedish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\swedish.lng"
 				/>
 			</FileConfiguration>
@@ -671,8 +671,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating traditional_chinese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\traditional_chinese.lng"
 				/>
 			</FileConfiguration>
@@ -686,8 +686,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating turkish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\turkish.lng"
 				/>
 			</FileConfiguration>
@@ -701,8 +701,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating ukrainian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\ukrainian.lng"
 				/>
 			</FileConfiguration>
@@ -716,8 +716,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating vietnamese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\vietnamese.lng"
 				/>
 			</FileConfiguration>
@@ -731,8 +731,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating welsh language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0"
-					AdditionalDependencies="..\src\lang\english.txt"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
+					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\welsh.lng"
 				/>
 			</FileConfiguration>
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2010-02-04
-Release version: 1.0.0-beta4
+Last updated:    2010-04-17
+Release version: 1.0.1-RC1
 ------------------------------------------------------------------------


@@ -202,10 +202,11 @@ when using other versions of the game.

 4.1.1) Free graphics and sound files
 ------ -----------------------------
-The free data files, split into OpenGFX for graphics and OpenSFX for sounds
-can be found at:
+The free data files, split into OpenGFX for graphics, OpenSFX for sounds and
+OpenMSX for music can be found at:
 - http://bundles.openttdcoop.org/opengfx/releases/ for OpenGFX
 - http://bundles.openttdcoop.org/opensfx/releases/ for OpenSFX
+ - http://bundles.openttdcoop.org/openmsx/releases/ for OpenMSX
 Please follow the readme of these packages about the installation procedure.
 The Windows installer can optionally download and install these packages.

@@ -508,8 +509,12 @@ debugging messages. This is mostly undocumented so best is to look in the
 source code file debug.c for the various debugging types. For more information
 look at http://wiki.openttd.org/index.php/Command_line.

-The most frequent problem is missing data files. Don't forget to put all GRF
-files from TTD into your data/ folder including sample.cat!
+The most frequent problem is missing data files. Please install OpenGFX and
+possibly OpenSFX and OpenMSX. See section 4.1.1 for more information.
+
+Under, especially, Ubuntu OpenTTD can be extremely slow and freeze/hand under
+certain circumstance. See known-bugs.txt for more information and how to
+solve this problem on your computer.

 Under Windows 98 and lower it is impossible to use a dedicated server; it will
 fail to start. Perhaps this is for the better because those OSes are not known
--- a/src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp
+++ b/src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp
@@ -2,6 +2,7 @@
 #include <squirrel.h>
 #include <sqstdaux.h>
 #include <assert.h>
+#include <string.h>

 void sqstd_printcallstack(HSQUIRRELVM v)
 {
@@ -21,7 +22,19 @@ void sqstd_printcallstack(HSQUIRRELVM v)
 			const SQChar *fn=_SC("unknown");
 			const SQChar *src=_SC("unknown");
 			if(si.funcname)fn=si.funcname;
-			if(si.source)src=si.source;
+			if(si.source) {
+				/* We don't want to bother users with absolute paths to all AI files.
+				 * Since the path only reaches NoAI code in a formatted string we have
+				 * to strip it here. Let's hope nobody installs openttd in a subdirectory
+				 * of a directory named /ai/. */
+				src = scstrstr(si.source, _SC("\\ai\\"));
+				if (!src) src = scstrstr(si.source, _SC("/ai/"));
+				if (src) {
+					src += 4;
+				} else {
+					src = si.source;
+				}
+			}
 			pf(v,_SC("*FUNCTION [%s()] %s line [%d]\n"),fn,src,si.line);
 			level++;
 		}
--- a/src/ai/ai_config.cpp
+++ b/src/ai/ai_config.cpp
@@ -93,13 +93,13 @@ const AIConfigItemList *AIConfig::GetConfigList()
 	return this->config_list;
 }

-AIConfig *AIConfig::GetConfig(CompanyID company, bool forceNewgameSetting)
+AIConfig *AIConfig::GetConfig(CompanyID company, AISettingSource source)
 {
 	AIConfig **config;
-	if (!forceNewgameSetting) {
-		config = (_game_mode == GM_MENU) ? &_settings_newgame.ai_config[company] : &_settings_game.ai_config[company];
-	} else {
+	if (source == AISS_FORCE_NEWGAME || (source == AISS_DEFAULT && _game_mode == GM_MENU)) {
 		config = &_settings_newgame.ai_config[company];
+	} else {
+		config = &_settings_game.ai_config[company];
 	}
 	if (*config == NULL) *config = new AIConfig();
 	return *config;
--- a/src/ai/ai_config.hpp
+++ b/src/ai/ai_config.hpp
@@ -61,10 +61,18 @@ public:
 	 */
 	const AIConfigItemList *GetConfigList();

+	/* Where to get the config from, either default (depends on current game
+	 * mode) or force either newgame or normal */
+	enum AISettingSource {
+		AISS_DEFAULT,       ///< Get the AI config from the current game mode
+		AISS_FORCE_NEWGAME, ///< Get the newgame AI config
+		AISS_FORCE_GAME,    ///< Get the AI config from the current game
+	};
+
 	/**
 	 * Get the config of a company.
 	 */
-	static AIConfig *GetConfig(CompanyID company, bool forceNewgameSetting = false);
+	static AIConfig *GetConfig(CompanyID company, AISettingSource source = AISS_DEFAULT);

 	/**
 	 * Get the value of a setting for this config. It might fallback to his
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -1016,3 +1016,26 @@ void ShowAIDebugWindow(CompanyID show_company)
 		ShowErrorMessage(STR_ERROR_AI_DEBUG_SERVER_ONLY, INVALID_STRING_ID, 0, 0);
 	}
 }
+
+/**
+ * Reset the AI windows to their initial state.
+ */
+void InitializeAIGui()
+{
+	AIDebugWindow::ai_debug_company = INVALID_COMPANY;
+}
+
+/** Open the AI debug window if one of the AI scripts has crashed. */
+void ShowAIDebugWindowIfAIError()
+{
+	/* Network clients can't debug AIs. */
+	if (_networking && !_network_server) return;
+
+	Company *c;
+	FOR_ALL_COMPANIES(c) {
+		if (c->is_ai && c->ai_instance->IsDead()) {
+			ShowAIDebugWindow(c->index);
+			break;
+		}
+	}
+}
--- a/src/ai/ai_gui.hpp
+++ b/src/ai/ai_gui.hpp
@@ -17,7 +17,10 @@
 #ifdef ENABLE_AI
 void ShowAIDebugWindow(CompanyID show_company = INVALID_COMPANY);
 void ShowAIConfigWindow();
+void ShowAIDebugWindowIfAIError();
+void InitializeAIGui();
 #else
+#include "../gui.h"
 #include "table/strings.h"

 static inline void ShowAIConfigWindow()
@@ -25,6 +28,8 @@ static inline void ShowAIConfigWindow()
 	ShowErrorMessage(STR_ERROR_NO_AI, STR_ERROR_NO_AI_SUB, 0, 0);
 }
 static inline void ShowAIDebugWindow(CompanyID show_company = INVALID_COMPANY) {ShowAIConfigWindow();}
+static inline void ShowAIDebugWindowIfAIError() {}
+static inline void InitializeAIGui() {}
 #endif /* ENABLE_AI */

 #endif /* AI_GUI_HPP */
--- a/src/ai/api/ai_abstractlist.cpp
+++ b/src/ai/api/ai_abstractlist.cpp
@@ -437,8 +437,8 @@ int32 AIAbstractList::Begin()
 int32 AIAbstractList::Next()
 {
 	if (this->initialized == false) {
-		DEBUG(ai, 0, "ERROR: Next() is invalid as Begin() is never called");
-		return false;
+		DEBUG(ai, 0, "Next() is invalid as Begin() is never called");
+		return 0;
 	}
 	return this->sorter->Next();
 }
@@ -451,7 +451,7 @@ bool AIAbstractList::IsEmpty()
 bool AIAbstractList::HasNext()
 {
 	if (this->initialized == false) {
-		DEBUG(ai, 0, "ERROR: HasNext() is invalid as Begin() is never called");
+		DEBUG(ai, 0, "HasNext() is invalid as Begin() is never called");
 		return false;
 	}
 	return this->sorter->HasNext();
@@ -517,6 +517,7 @@ void AIAbstractList::Sort(SorterType sorter, bool ascending)
 	}
 	this->sorter_type    = sorter;
 	this->sort_ascending = ascending;
+	this->initialized    = false;
 }

 void AIAbstractList::AddList(AIAbstractList *list)
@@ -534,12 +535,7 @@ void AIAbstractList::RemoveAboveValue(int32 value)

 	for (AIAbstractListMap::iterator next_iter, iter = this->items.begin(); iter != this->items.end(); iter = next_iter) {
 		next_iter = iter; next_iter++;
-		if ((*iter).second > value) this->items.erase(iter);
-	}
-
-	for (AIAbstractListBucket::iterator next_iter, iter = this->buckets.begin(); iter != this->buckets.end(); iter = next_iter) {
-		next_iter = iter; next_iter++;
-		if ((*iter).first > value) this->buckets.erase(iter);
+		if ((*iter).second > value) this->RemoveItem((*iter).first);
 	}
 }

@@ -549,12 +545,7 @@ void AIAbstractList::RemoveBelowValue(int32 value)

 	for (AIAbstractListMap::iterator next_iter, iter = this->items.begin(); iter != this->items.end(); iter = next_iter) {
 		next_iter = iter; next_iter++;
-		if ((*iter).second < value) this->items.erase(iter);
-	}
-
-	for (AIAbstractListBucket::iterator next_iter, iter = this->buckets.begin(); iter != this->buckets.end(); iter = next_iter) {
-		next_iter = iter; next_iter++;
-		if ((*iter).first < value) this->buckets.erase(iter);
+		if ((*iter).second < value) this->RemoveItem((*iter).first);
 	}
 }

@@ -564,12 +555,7 @@ void AIAbstractList::RemoveBetweenValue(int32 start, int32 end)

 	for (AIAbstractListMap::iterator next_iter, iter = this->items.begin(); iter != this->items.end(); iter = next_iter) {
 		next_iter = iter; next_iter++;
-		if ((*iter).second > start && (*iter).second < end) this->items.erase(iter);
-	}
-
-	for (AIAbstractListBucket::iterator next_iter, iter = this->buckets.begin(); iter != this->buckets.end(); iter = next_iter) {
-		next_iter = iter; next_iter++;
-		if ((*iter).first > start && (*iter).first < end) this->buckets.erase(iter);
+		if ((*iter).second > start && (*iter).second < end) this->RemoveItem((*iter).first);
 	}
 }

@@ -579,12 +565,7 @@ void AIAbstractList::RemoveValue(int32 value)

 	for (AIAbstractListMap::iterator next_iter, iter = this->items.begin(); iter != this->items.end(); iter = next_iter) {
 		next_iter = iter; next_iter++;
-		if ((*iter).second == value) this->items.erase(iter);
-	}
-
-	for (AIAbstractListBucket::iterator next_iter, iter = this->buckets.begin(); iter != this->buckets.end(); iter = next_iter) {
-		next_iter = iter; next_iter++;
-		if ((*iter).first == value) this->buckets.erase(iter);
+		if ((*iter).second == value) this->RemoveItem((*iter).first);
 	}
 }

@@ -677,12 +658,7 @@ void AIAbstractList::KeepAboveValue(int32 value)

 	for (AIAbstractListMap::iterator next_iter, iter = this->items.begin(); iter != this->items.end(); iter = next_iter) {
 		next_iter = iter; next_iter++;
-		if ((*iter).second <= value) this->items.erase(iter);
-	}
-
-	for (AIAbstractListBucket::iterator next_iter, iter = this->buckets.begin(); iter != this->buckets.end(); iter = next_iter) {
-		next_iter = iter; next_iter++;
-		if ((*iter).first <= value) this->buckets.erase(iter);
+		if ((*iter).second <= value) this->RemoveItem((*iter).first);
 	}
 }

@@ -692,12 +668,7 @@ void AIAbstractList::KeepBelowValue(int32 value)

 	for (AIAbstractListMap::iterator next_iter, iter = this->items.begin(); iter != this->items.end(); iter = next_iter) {
 		next_iter = iter; next_iter++;
-		if ((*iter).second >= value) this->items.erase(iter);
-	}
-
-	for (AIAbstractListBucket::iterator next_iter, iter = this->buckets.begin(); iter != this->buckets.end(); iter = next_iter) {
-		next_iter = iter; next_iter++;
-		if ((*iter).first >= value) this->buckets.erase(iter);
+		if ((*iter).second >= value) this->RemoveItem((*iter).first);
 	}
 }

@@ -707,12 +678,7 @@ void AIAbstractList::KeepBetweenValue(int32 start, int32 end)

 	for (AIAbstractListMap::iterator next_iter, iter = this->items.begin(); iter != this->items.end(); iter = next_iter) {
 		next_iter = iter; next_iter++;
-		if ((*iter).second <= start || (*iter).second >= end) this->items.erase(iter);
-	}
-
-	for (AIAbstractListBucket::iterator next_iter, iter = this->buckets.begin(); iter != this->buckets.end(); iter = next_iter) {
-		next_iter = iter; next_iter++;
-		if ((*iter).first <= start || (*iter).first >= end) this->buckets.erase(iter);
+		if ((*iter).second <= start || (*iter).second >= end) this->RemoveItem((*iter).first);
 	}
 }

@@ -722,12 +688,7 @@ void AIAbstractList::KeepValue(int32 value)

 	for (AIAbstractListMap::iterator next_iter, iter = this->items.begin(); iter != this->items.end(); iter = next_iter) {
 		next_iter = iter; next_iter++;
-		if ((*iter).second != value) this->items.erase(iter);
-	}
-
-	for (AIAbstractListBucket::iterator next_iter, iter = this->buckets.begin(); iter != this->buckets.end(); iter = next_iter) {
-		next_iter = iter; next_iter++;
-		if ((*iter).first != value) this->buckets.erase(iter);
+		if ((*iter).second != value) this->RemoveItem((*iter).first);
 	}
 }

@@ -823,13 +784,10 @@ SQInteger AIAbstractList::Valuate(HSQUIRRELVM vm)
 	/* Push the function to call */
 	sq_push(vm, 2);

-	/* Walk all items, and query the result */
-	this->buckets.clear();
-
-	/* Check for changing of items. */
-	int begin_modification_count = this->modifications;
-
 	for (AIAbstractListMap::iterator iter = this->items.begin(); iter != this->items.end(); iter++) {
+		/* Check for changing of items. */
+		int previous_modification_count = this->modifications;
+
 		/* Push the root table as instance object, this is what squirrel does for meta-functions. */
 		sq_pushroottable(vm);
 		/* Push all arguments for the valuator function. */
@@ -867,7 +825,7 @@ SQInteger AIAbstractList::Valuate(HSQUIRRELVM vm)
 		}

 		/* Was something changed? */
-		if (begin_modification_count != this->modifications) {
+		if (previous_modification_count != this->modifications) {
 			/* See below for explanation. The extra pop is the return value. */
 			sq_pop(vm, nparam + 4);

@@ -875,8 +833,7 @@ SQInteger AIAbstractList::Valuate(HSQUIRRELVM vm)
 			return sq_throwerror(vm, _SC("modifying valuated list outside of valuator function"));
 		}

-		(*iter).second = (int32)value;
-		this->buckets[(int32)value].insert((*iter).first);
+		this->SetValue((*iter).first, value);

 		/* Pop the return value. */
 		sq_poptop(vm);
--- a/src/ai/api/ai_abstractlist.hpp
+++ b/src/ai/api/ai_abstractlist.hpp
@@ -63,6 +63,7 @@ protected:
 	/**
 	 * Remove a single item from the list.
 	 * @param item the item to remove. If not existing, it is ignored.
+	 * @note Always use this function for removing items. It keeps the iterator valid!
 	 */
 	void RemoveItem(int32 item);

--- a/src/ai/api/ai_changelog.hpp
+++ b/src/ai/api/ai_changelog.hpp
@@ -14,9 +14,12 @@
 * functions may still be available if you return an older API version
 * in GetAPIVersion() in info.nut.
 *
- * \b 1.0.0
+ * \b 1.0.1
 *
- * 1.0.0 is not yet released. The following changes are not set in stone yet.
+ * API additions:
+ * \li AIRail::GetMaxSpeed
+ *
+ * \b 1.0.0
 *
 * API additions:
 * \li AIBaseStation
--- a/src/ai/api/ai_rail.cpp
+++ b/src/ai/api/ai_rail.cpp
@@ -469,3 +469,10 @@ static bool IsValidSignalType(int signal_type)
 		default: return -1;
 	}
 }
+
+/* static */ int32 AIRail::GetMaxSpeed(RailType railtype)
+{
+	if (!AIRail::IsRailTypeAvailable(railtype)) return -1;
+
+	return ::GetRailTypeInfo((::RailType)railtype)->max_speed;
+}
--- a/src/ai/api/ai_rail.hpp
+++ b/src/ai/api/ai_rail.hpp
@@ -440,6 +440,18 @@ public:
 	 * @return The baseprice of building the given object.
 	 */
 	static Money GetBuildCost(RailType railtype, BuildType build_type);
+
+	/**
+	 * Get the maximum speed of trains running on this railtype.
+	 * @param railtype The railtype to get the maximum speed of.
+	 * @pre IsRailTypeAvailable(railtype)
+	 * @return The maximum speed trains can run on this railtype
+	 *   or 0 if there is no limit.
+	 * @note The speed is in OpenTTD's internal speed unit.
+	 *       This is mph / 1.6, which is roughly km/h.
+	 *       To get km/h multiply this number by 1.00584.
+	 */
+	static int32 GetMaxSpeed(RailType railtype);
 };

 #endif /* AI_RAIL_HPP */
--- a/src/ai/api/ai_rail.hpp.sq
+++ b/src/ai/api/ai_rail.hpp.sq
@@ -106,6 +106,7 @@ void SQAIRail_Register(Squirrel *engine)
 	SQAIRail.DefSQStaticMethod(engine, &AIRail::BuildSignal,                     "BuildSignal",                     4, ".iii");
 	SQAIRail.DefSQStaticMethod(engine, &AIRail::RemoveSignal,                    "RemoveSignal",                    3, ".ii");
 	SQAIRail.DefSQStaticMethod(engine, &AIRail::GetBuildCost,                    "GetBuildCost",                    3, ".ii");
+	SQAIRail.DefSQStaticMethod(engine, &AIRail::GetMaxSpeed,                     "GetMaxSpeed",                     2, ".i");

 	SQAIRail.PostRegister(engine);
 }
--- a/src/ai/api/ai_road.cpp
+++ b/src/ai/api/ai_road.cpp
@@ -549,7 +549,7 @@ static bool NeighbourHasReachableRoad(::RoadTypes rts, TileIndex start_tile, Dia
 	EnforcePrecondition(false, ::TileX(start) == ::TileX(end) || ::TileY(start) == ::TileY(end));
 	EnforcePrecondition(false, IsRoadTypeAvailable(GetCurrentRoadType()));

-	return AIObject::DoCommand(end, start, (::TileY(start) != ::TileY(end) ? 4 : 0) | (start < end ? 1 : 2) | (AIObject::GetRoadType() << 3), CMD_REMOVE_LONG_ROAD);
+	return AIObject::DoCommand(start, end, (::TileY(start) != ::TileY(end) ? 4 : 0) | (start < end ? 1 : 2) | (AIObject::GetRoadType() << 3), CMD_REMOVE_LONG_ROAD);
 }

 /* static */ bool AIRoad::RemoveRoadFull(TileIndex start, TileIndex end)
@@ -559,7 +559,7 @@ static bool NeighbourHasReachableRoad(::RoadTypes rts, TileIndex start_tile, Dia
 	EnforcePrecondition(false, ::TileX(start) == ::TileX(end) || ::TileY(start) == ::TileY(end));
 	EnforcePrecondition(false, IsRoadTypeAvailable(GetCurrentRoadType()));

-	return AIObject::DoCommand(end, start, (::TileY(start) != ::TileY(end) ? 4 : 0) | (start < end ? 2 : 1) | (AIObject::GetRoadType() << 3), CMD_REMOVE_LONG_ROAD);
+	return AIObject::DoCommand(start, end, (::TileY(start) != ::TileY(end) ? 4 : 0) | (start < end ? 2 : 1) | (AIObject::GetRoadType() << 3), CMD_REMOVE_LONG_ROAD);
 }

 /* static */ bool AIRoad::RemoveRoadDepot(TileIndex tile)
--- a/src/ai/api/ai_tile.cpp
+++ b/src/ai/api/ai_tile.cpp
@@ -248,7 +248,7 @@
 {
 	EnforcePrecondition(false, ::IsValidTile(tile));

-	return AIObject::DoCommand(tile, UINT_MAX, tile, CMD_PLANT_TREE);
+	return AIObject::DoCommand(tile, TREE_INVALID, tile, CMD_PLANT_TREE);
 }

 /* static */ bool AITile::PlantTreeRectangle(TileIndex tile, uint width, uint height)
@@ -258,7 +258,7 @@
 	EnforcePrecondition(false, height >= 1 && height <= 20);
 	TileIndex end_tile = tile + ::TileDiffXY(width - 1, height - 1);

-	return AIObject::DoCommand(tile, UINT_MAX, end_tile, CMD_PLANT_TREE);
+	return AIObject::DoCommand(tile, TREE_INVALID, end_tile, CMD_PLANT_TREE);
 }

 /* static */ bool AITile::IsWithinTownInfluence(TileIndex tile, TownID town_id)
--- a/src/ai/api/ai_tunnel.cpp
+++ b/src/ai/api/ai_tunnel.cpp
@@ -77,10 +77,10 @@ static void _DoCommandReturnBuildTunnel1(class AIInstance *instance)

 	uint type = 0;
 	if (vehicle_type == AIVehicle::VT_ROAD) {
-		type |= (TRANSPORT_ROAD << 9);
+		type |= (TRANSPORT_ROAD << 8);
 		type |= ::RoadTypeToRoadTypes((::RoadType)AIObject::GetRoadType());
 	} else {
-		type |= (TRANSPORT_RAIL << 9);
+		type |= (TRANSPORT_RAIL << 8);
 		type |= AIRail::GetCurrentRailType();
 	}

--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -237,9 +237,10 @@ void GetAircraftSpriteSize(EngineID engine, uint &width, uint &height)
 */
 CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
-	if (!IsEngineBuildable(p1, VEH_AIRCRAFT, _current_company)) return_cmd_error(STR_ERROR_AIRCRAFT_NOT_AVAILABLE);
+	EngineID eid = GB(p1, 0, 16);
+	if (!IsEngineBuildable(eid, VEH_AIRCRAFT, _current_company)) return_cmd_error(STR_ERROR_AIRCRAFT_NOT_AVAILABLE);

-	const Engine *e = Engine::Get(p1);
+	const Engine *e = Engine::Get(eid);
 	const AircraftVehicleInfo *avi = &e->u.air;
 	CommandCost value(EXPENSES_NEW_VEHICLES, e->GetCost());

@@ -252,7 +253,7 @@ CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
 	if (!IsHangarTile(tile) || !IsTileOwner(tile, _current_company)) return CMD_ERROR;

 	/* Prevent building aircraft types at places which can't handle them */
-	if (!CanVehicleUseStation(p1, Station::GetByTile(tile))) return CMD_ERROR;
+	if (!CanVehicleUseStation(eid, Station::GetByTile(tile))) return CMD_ERROR;

 	/* We will need to allocate 2 or 3 vehicle structs, depending on type */
 	if (!Vehicle::CanAllocateItem(avi->subtype & AIR_CTOL ? 2 : 3)) {
@@ -299,8 +300,8 @@ CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, uint32 p1, uin

 		v->max_speed = avi->max_speed;
 		v->acceleration = avi->acceleration;
-		v->engine_type = p1;
-		u->engine_type = p1;
+		v->engine_type = eid;
+		u->engine_type = eid;

 		v->subtype = (avi->subtype & AIR_CTOL ? AIR_AIRCRAFT : AIR_HELICOPTER);
 		v->UpdateDeltaXY(INVALID_DIR);
@@ -362,7 +363,7 @@ CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
 		/* Aircraft with 3 vehicles (chopper)? */
 		if (v->subtype == AIR_HELICOPTER) {
 			Aircraft *w = new Aircraft();
-			w->engine_type = p1;
+			w->engine_type = eid;
 			w->direction = DIR_N;
 			w->owner = _current_company;
 			w->x_pos = v->x_pos;
@@ -387,7 +388,7 @@ CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
 		if (IsLocalCompany())
 			InvalidateAutoreplaceWindow(v->engine_type, v->group_id); // updates the replace Aircraft window

-		Company::Get(_current_company)->num_engines[p1]++;
+		Company::Get(_current_company)->num_engines[eid]++;
 	}

 	return value;
@@ -876,7 +877,11 @@ static bool AircraftController(Aircraft *v)
 		/* Make sure the rotors don't rotate too fast */
 		if (u->cur_speed > 32) {
 			v->cur_speed = 0;
-			if (--u->cur_speed == 32) SndPlayVehicleFx(SND_18_HELICOPTER, v);
+			if (--u->cur_speed == 32) {
+				if (!PlayVehicleSound(v, VSE_START)) {
+					SndPlayVehicleFx(SND_18_HELICOPTER, v);
+				}
+			}
 		} else {
 			u->cur_speed = 32;
 			count = UpdateAircraftSpeed(v);
--- a/src/autoreplace_gui.cpp
+++ b/src/autoreplace_gui.cpp
@@ -382,20 +382,22 @@ public:

 		this->DrawWidgets();

-		int needed_height = this->details_height;
-		/* Draw details panels. */
-		for (int side = 0; side < 2; side++) {
-			if (this->sel_engine[side] != INVALID_ENGINE) {
-				NWidgetBase *nwi = this->GetWidget<NWidgetBase>(side == 0 ? RVW_WIDGET_LEFT_DETAILS : RVW_WIDGET_RIGHT_DETAILS);
-				int text_end = DrawVehiclePurchaseInfo(nwi->pos_x + WD_FRAMETEXT_LEFT, nwi->pos_x + nwi->current_x - WD_FRAMETEXT_RIGHT,
-						nwi->pos_y + WD_FRAMERECT_TOP, this->sel_engine[side]);
-				needed_height = max(needed_height, text_end - (int)nwi->pos_y + WD_FRAMERECT_BOTTOM);
+		if (!this->IsShaded()) {
+			int needed_height = this->details_height;
+			/* Draw details panels. */
+			for (int side = 0; side < 2; side++) {
+				if (this->sel_engine[side] != INVALID_ENGINE) {
+					NWidgetBase *nwi = this->GetWidget<NWidgetBase>(side == 0 ? RVW_WIDGET_LEFT_DETAILS : RVW_WIDGET_RIGHT_DETAILS);
+					int text_end = DrawVehiclePurchaseInfo(nwi->pos_x + WD_FRAMETEXT_LEFT, nwi->pos_x + nwi->current_x - WD_FRAMETEXT_RIGHT,
+							nwi->pos_y + WD_FRAMERECT_TOP, this->sel_engine[side]);
+					needed_height = max(needed_height, text_end - (int)nwi->pos_y + WD_FRAMERECT_BOTTOM);
+				}
+			}
+			if (needed_height != this->details_height) { // Details window are not high enough, enlarge them.
+				this->details_height = needed_height;
+				this->ReInit();
+				return;
 			}
-		}
-		if (!this->IsShaded() && needed_height != this->details_height) { // Details window are not high enough, enlarge them.
-			this->details_height = needed_height;
-			this->ReInit();
-			return;
 		}
 	}

--- a/src/base_media_base.h
+++ b/src/base_media_base.h
@@ -59,6 +59,7 @@ struct BaseSet {
 	TranslatedStrings description; ///< Description of the base set
 	uint32 shortname;              ///< Four letter short variant of the name
 	uint32 version;                ///< The version of this base set
+	bool fallback;                 ///< This set is a fallback set, i.e. it should be used only as last resort

 	MD5File files[NUM_FILES];      ///< All files part of this set
 	uint found_files;              ///< Number of the files that could be found
@@ -107,9 +108,10 @@ struct BaseSet {
 	 * Read the set information from a loaded ini.
 	 * @param ini      the ini to read from
 	 * @param path     the path to this ini file (for filenames)
+	 * @param allow_empty_filename empty filenames are valid
 	 * @return true if loading was successful.
 	 */
-	bool FillSetDetails(IniFile *ini, const char *path);
+	bool FillSetDetails(IniFile *ini, const char *path, bool allow_empty_filename = true);

 	/**
 	 * Get the description for the given ISO code.
@@ -168,7 +170,9 @@ public:
 	static uint FindSets()
 	{
 		BaseMedia<Tbase_set> fs;
-		return fs.Scan(GetExtension(), Tbase_set::SUBDIR);
+		/* GM_DIR == music set. Music sets don't support tars,
+		 * so there is no need to search for tars in that case. */
+		return fs.Scan(GetExtension(), Tbase_set::SUBDIR, Tbase_set::SUBDIR != GM_DIR);
 	}

 	/**
--- a/src/base_media_func.h
+++ b/src/base_media_func.h
@@ -30,7 +30,7 @@ template <class Tbase_set> /* static */ Tbase_set *BaseMedia<Tbase_set>::availab
 	}

 template <class T, size_t Tnum_files, Subdirectory Tsubdir>
-bool BaseSet<T, Tnum_files, Tsubdir>::FillSetDetails(IniFile *ini, const char *path)
+bool BaseSet<T, Tnum_files, Tsubdir>::FillSetDetails(IniFile *ini, const char *path, bool allow_empty_filename)
 {
 	memset(this, 0, sizeof(*this));

@@ -58,6 +58,9 @@ bool BaseSet<T, Tnum_files, Tsubdir>::FillSetDetails(IniFile *ini, const char *p
 	fetch_metadata("version");
 	this->version = atoi(item->value);

+	item = metadata->GetItem("fallback", false);
+	this->fallback = (item != NULL && strcmp(item->value, "0") != 0 && strcmp(item->value, "false") != 0);
+
 	/* For each of the file types we want to find the file, MD5 checksums and warning messages. */
 	IniGroup *files  = ini->GetGroup("files");
 	IniGroup *md5s   = ini->GetGroup("md5s");
@@ -66,7 +69,7 @@ bool BaseSet<T, Tnum_files, Tsubdir>::FillSetDetails(IniFile *ini, const char *p
 		MD5File *file = &this->files[i];
 		/* Find the filename first. */
 		item = files->GetItem(BaseSet<T, Tnum_files, Tsubdir>::file_names[i], false);
-		if (item == NULL) {
+		if (item == NULL || (item->value == NULL && !allow_empty_filename)) {
 			DEBUG(grf, 0, "No " SET_TYPE " file for: %s", BaseSet<T, Tnum_files, Tsubdir>::file_names[i]);
 			return false;
 		}
--- a/src/bridge.h
+++ b/src/bridge.h
@@ -67,7 +67,7 @@ static inline const BridgeSpec *GetBridgeSpec(BridgeType i)

 void DrawBridgeMiddle(const TileInfo *ti);

-bool CheckBridge_Stuff(BridgeType bridge_type, uint bridge_len, DoCommandFlag flags = DC_NONE);
+CommandCost CheckBridgeAvailability(BridgeType bridge_type, uint bridge_len, DoCommandFlag flags = DC_NONE);
 int CalcBridgeLenCostFactor(int x);

 void ResetBridges();
--- a/src/bridge_gui.cpp
+++ b/src/bridge_gui.cpp
@@ -375,7 +375,7 @@ void ShowBuildBridgeWindow(TileIndex start, TileIndex end, TransportType transpo
 		case TRANSPORT_RAIL: last_bridge_type = _last_railbridge_type; break;
 		default: break; // water ways and air routes don't have bridge types
 	}
-	if (_ctrl_pressed && CheckBridge_Stuff(last_bridge_type, bridge_len)) {
+	if (_ctrl_pressed && CheckBridgeAvailability(last_bridge_type, bridge_len).Succeeded()) {
 		DoCommandP(end, start, type | last_bridge_type, CMD_BUILD_BRIDGE | CMD_MSG(STR_ERROR_CAN_T_BUILD_BRIDGE_HERE), CcBuildBridge);
 		return;
 	}
@@ -396,7 +396,7 @@ void ShowBuildBridgeWindow(TileIndex start, TileIndex end, TransportType transpo

 		/* loop for all bridgetypes */
 		for (BridgeType brd_type = 0; brd_type != MAX_BRIDGES; brd_type++) {
-			if (CheckBridge_Stuff(brd_type, bridge_len)) {
+			if (CheckBridgeAvailability(brd_type, bridge_len).Succeeded()) {
 				/* bridge is accepted, add to list */
 				BuildBridgeData *item = bl->Append();
 				item->index = brd_type;
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -1122,8 +1122,9 @@ struct BuildVehicleWindow : Window {
 				}
 			}
 			if (needed_height != this->details_height) { // Details window are not high enough, enlarge them.
+				int resize = needed_height - this->details_height;
 				this->details_height = needed_height;
-				this->ReInit();
+				this->ReInit(0, resize);
 				return;
 			}
 		}
--- a/src/cmd_helper.h
+++ b/src/cmd_helper.h
@@ -12,25 +12,16 @@
 #ifndef CMD_HELPER_H
 #define CMD_HELPER_H

-#include "direction_type.h"
-#include "road_type.h"
+#include "core/enum_type.hpp"

-
-template<uint N> static inline void ExtractValid();
-template<> inline void ExtractValid<1>() {}
-
-
-template<typename T> struct ExtractBits;
-template<> struct ExtractBits<Axis>          { static const uint Count =  1; };
-template<> struct ExtractBits<DiagDirection> { static const uint Count =  2; };
-template<> struct ExtractBits<RoadBits>      { static const uint Count =  4; };
-
-
-template<typename T, uint N, typename U> static inline T Extract(U v)
+template<typename T, uint S, uint N, typename U> static inline T Extract(U v)
 {
 	/* Check if there are enough bits in v */
-	ExtractValid<N + ExtractBits<T>::Count <= sizeof(U) * 8>();
-	return (T)GB(v, N, ExtractBits<T>::Count);
+	assert_tcompile(N == EnumPropsT<T>::num_bits);
+	assert_tcompile(S + N <= sizeof(U) * 8);
+	assert_tcompile(EnumPropsT<T>::end <= (1 << N));
+	U masked = GB(v, S, N);
+	return IsInsideMM(masked, EnumPropsT<T>::begin, EnumPropsT<T>::end) ? (T)masked : EnumPropsT<T>::invalid;
 }

 #endif
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -188,6 +188,8 @@ CommandProc CmdSetVehicleOnTime;
 CommandProc CmdAutofillTimetable;
 CommandProc CmdSetTimetableStart;

+#define DEF_CMD(proc, flags) {proc, #proc, flags}
+
 /**
 * The master command table
 *
@@ -196,141 +198,141 @@ CommandProc CmdSetTimetableStart;
 * as the value from the CMD_* enums.
 */
 static const Command _command_proc_table[] = {
-	{CmdBuildRailroadTrack,   CMD_NO_WATER | CMD_AUTO}, // CMD_BUILD_RAILROAD_TRACK
-	{CmdRemoveRailroadTrack,                 CMD_AUTO}, // CMD_REMOVE_RAILROAD_TRACK
-	{CmdBuildSingleRail,      CMD_NO_WATER | CMD_AUTO}, // CMD_BUILD_SINGLE_RAIL
-	{CmdRemoveSingleRail,                    CMD_AUTO}, // CMD_REMOVE_SINGLE_RAIL
-	{CmdLandscapeClear,                             0}, // CMD_LANDSCAPE_CLEAR
-	{CmdBuildBridge,                         CMD_AUTO}, // CMD_BUILD_BRIDGE
-	{CmdBuildRailStation,     CMD_NO_WATER | CMD_AUTO}, // CMD_BUILD_RAIL_STATION
-	{CmdBuildTrainDepot,      CMD_NO_WATER | CMD_AUTO}, // CMD_BUILD_TRAIN_DEPOT
-	{CmdBuildSingleSignal,                   CMD_AUTO}, // CMD_BUILD_SIGNALS
-	{CmdRemoveSingleSignal,                  CMD_AUTO}, // CMD_REMOVE_SIGNALS
-	{CmdTerraformLand,       CMD_ALL_TILES | CMD_AUTO}, // CMD_TERRAFORM_LAND
-	{CmdPurchaseLandArea,     CMD_NO_WATER | CMD_AUTO}, // CMD_PURCHASE_LAND_AREA
-	{CmdSellLandArea,                               0}, // CMD_SELL_LAND_AREA
-	{CmdBuildTunnel,                         CMD_AUTO}, // CMD_BUILD_TUNNEL
-	{CmdRemoveFromRailStation,                      0}, // CMD_REMOVE_FROM_RAIL_STATION
-	{CmdConvertRail,                                0}, // CMD_CONVERT_RAILD
-	{CmdBuildRailWaypoint,                          0}, // CMD_BUILD_RAIL_WAYPOINT
-	{CmdRenameWaypoint,                             0}, // CMD_RENAME_WAYPOINT
-	{CmdRemoveFromRailWaypoint,                     0}, // CMD_REMOVE_FROM_RAIL_WAYPOINT
+	DEF_CMD(CmdBuildRailroadTrack,       CMD_NO_WATER | CMD_AUTO), // CMD_BUILD_RAILROAD_TRACK
+	DEF_CMD(CmdRemoveRailroadTrack,                     CMD_AUTO), // CMD_REMOVE_RAILROAD_TRACK
+	DEF_CMD(CmdBuildSingleRail,          CMD_NO_WATER | CMD_AUTO), // CMD_BUILD_SINGLE_RAIL
+	DEF_CMD(CmdRemoveSingleRail,                        CMD_AUTO), // CMD_REMOVE_SINGLE_RAIL
+	DEF_CMD(CmdLandscapeClear,                                 0), // CMD_LANDSCAPE_CLEAR
+	DEF_CMD(CmdBuildBridge,                             CMD_AUTO), // CMD_BUILD_BRIDGE
+	DEF_CMD(CmdBuildRailStation,         CMD_NO_WATER | CMD_AUTO), // CMD_BUILD_RAIL_STATION
+	DEF_CMD(CmdBuildTrainDepot,          CMD_NO_WATER | CMD_AUTO), // CMD_BUILD_TRAIN_DEPOT
+	DEF_CMD(CmdBuildSingleSignal,                       CMD_AUTO), // CMD_BUILD_SIGNALS
+	DEF_CMD(CmdRemoveSingleSignal,                      CMD_AUTO), // CMD_REMOVE_SIGNALS
+	DEF_CMD(CmdTerraformLand,           CMD_ALL_TILES | CMD_AUTO), // CMD_TERRAFORM_LAND
+	DEF_CMD(CmdPurchaseLandArea,         CMD_NO_WATER | CMD_AUTO), // CMD_PURCHASE_LAND_AREA
+	DEF_CMD(CmdSellLandArea,                                   0), // CMD_SELL_LAND_AREA
+	DEF_CMD(CmdBuildTunnel,                             CMD_AUTO), // CMD_BUILD_TUNNEL
+	DEF_CMD(CmdRemoveFromRailStation,                          0), // CMD_REMOVE_FROM_RAIL_STATION
+	DEF_CMD(CmdConvertRail,                                    0), // CMD_CONVERT_RAILD
+	DEF_CMD(CmdBuildRailWaypoint,                              0), // CMD_BUILD_RAIL_WAYPOINT
+	DEF_CMD(CmdRenameWaypoint,                                 0), // CMD_RENAME_WAYPOINT
+	DEF_CMD(CmdRemoveFromRailWaypoint,                         0), // CMD_REMOVE_FROM_RAIL_WAYPOINT

-	{CmdBuildRoadStop,        CMD_NO_WATER | CMD_AUTO}, // CMD_BUILD_ROAD_STOP
-	{CmdRemoveRoadStop,                             0}, // CMD_REMOVE_ROAD_STOP
-	{CmdBuildLongRoad,        CMD_NO_WATER | CMD_AUTO}, // CMD_BUILD_LONG_ROAD
-	{CmdRemoveLongRoad,        CMD_NO_TEST | CMD_AUTO}, // CMD_REMOVE_LONG_ROAD; towns may disallow removing road bits (as they are connected) in test, but in exec they're removed and thus removing is allowed.
-	{CmdBuildRoad,            CMD_NO_WATER | CMD_AUTO}, // CMD_BUILD_ROAD
-	{CmdBuildRoadDepot,       CMD_NO_WATER | CMD_AUTO}, // CMD_BUILD_ROAD_DEPOT
+	DEF_CMD(CmdBuildRoadStop,            CMD_NO_WATER | CMD_AUTO), // CMD_BUILD_ROAD_STOP
+	DEF_CMD(CmdRemoveRoadStop,                                 0), // CMD_REMOVE_ROAD_STOP
+	DEF_CMD(CmdBuildLongRoad,            CMD_NO_WATER | CMD_AUTO), // CMD_BUILD_LONG_ROAD
+	DEF_CMD(CmdRemoveLongRoad,            CMD_NO_TEST | CMD_AUTO), // CMD_REMOVE_LONG_ROAD; towns may disallow removing road bits (as they are connected) in test, but in exec they're removed and thus removing is allowed.
+	DEF_CMD(CmdBuildRoad,                CMD_NO_WATER | CMD_AUTO), // CMD_BUILD_ROAD
+	DEF_CMD(CmdBuildRoadDepot,           CMD_NO_WATER | CMD_AUTO), // CMD_BUILD_ROAD_DEPOT

-	{CmdBuildAirport,         CMD_NO_WATER | CMD_AUTO}, // CMD_BUILD_AIRPORT
-	{CmdBuildDock,                           CMD_AUTO}, // CMD_BUILD_DOCK
-	{CmdBuildShipDepot,                      CMD_AUTO}, // CMD_BUILD_SHIP_DEPOT
-	{CmdBuildBuoy,                           CMD_AUTO}, // CMD_BUILD_BUOY
-	{CmdPlantTree,                           CMD_AUTO}, // CMD_PLANT_TREE
-	{CmdBuildRailVehicle,                           0}, // CMD_BUILD_RAIL_VEHICLE
-	{CmdMoveRailVehicle,                            0}, // CMD_MOVE_RAIL_VEHICLE
+	DEF_CMD(CmdBuildAirport,             CMD_NO_WATER | CMD_AUTO), // CMD_BUILD_AIRPORT
+	DEF_CMD(CmdBuildDock,                               CMD_AUTO), // CMD_BUILD_DOCK
+	DEF_CMD(CmdBuildShipDepot,                          CMD_AUTO), // CMD_BUILD_SHIP_DEPOT
+	DEF_CMD(CmdBuildBuoy,                               CMD_AUTO), // CMD_BUILD_BUOY
+	DEF_CMD(CmdPlantTree,                               CMD_AUTO), // CMD_PLANT_TREE
+	DEF_CMD(CmdBuildRailVehicle,                               0), // CMD_BUILD_RAIL_VEHICLE
+	DEF_CMD(CmdMoveRailVehicle,                                0), // CMD_MOVE_RAIL_VEHICLE

-	{CmdSellRailWagon,                              0}, // CMD_SELL_RAIL_WAGON
-	{CmdSendTrainToDepot,                           0}, // CMD_SEND_TRAIN_TO_DEPOT
-	{CmdForceTrainProceed,                          0}, // CMD_FORCE_TRAIN_PROCEED
-	{CmdReverseTrainDirection,                      0}, // CMD_REVERSE_TRAIN_DIRECTION
+	DEF_CMD(CmdSellRailWagon,                                  0), // CMD_SELL_RAIL_WAGON
+	DEF_CMD(CmdSendTrainToDepot,                               0), // CMD_SEND_TRAIN_TO_DEPOT
+	DEF_CMD(CmdForceTrainProceed,                              0), // CMD_FORCE_TRAIN_PROCEED
+	DEF_CMD(CmdReverseTrainDirection,                          0), // CMD_REVERSE_TRAIN_DIRECTION

-	{CmdModifyOrder,                                0}, // CMD_MODIFY_ORDER
-	{CmdSkipToOrder,                                0}, // CMD_SKIP_TO_ORDER
-	{CmdDeleteOrder,                                0}, // CMD_DELETE_ORDER
-	{CmdInsertOrder,                                0}, // CMD_INSERT_ORDER
+	DEF_CMD(CmdModifyOrder,                                    0), // CMD_MODIFY_ORDER
+	DEF_CMD(CmdSkipToOrder,                                    0), // CMD_SKIP_TO_ORDER
+	DEF_CMD(CmdDeleteOrder,                                    0), // CMD_DELETE_ORDER
+	DEF_CMD(CmdInsertOrder,                                    0), // CMD_INSERT_ORDER

-	{CmdChangeServiceInt,                           0}, // CMD_CHANGE_SERVICE_INT
+	DEF_CMD(CmdChangeServiceInt,                               0), // CMD_CHANGE_SERVICE_INT

-	{CmdBuildIndustry,                              0}, // CMD_BUILD_INDUSTRY
-	{CmdBuildCompanyHQ,       CMD_NO_WATER | CMD_AUTO}, // CMD_BUILD_COMPANY_HQ
-	{CmdSetCompanyManagerFace,                      0}, // CMD_SET_COMPANY_MANAGER_FACE
-	{CmdSetCompanyColour,                           0}, // CMD_SET_COMPANY_COLOUR
+	DEF_CMD(CmdBuildIndustry,                                  0), // CMD_BUILD_INDUSTRY
+	DEF_CMD(CmdBuildCompanyHQ,           CMD_NO_WATER | CMD_AUTO), // CMD_BUILD_COMPANY_HQ
+	DEF_CMD(CmdSetCompanyManagerFace,                          0), // CMD_SET_COMPANY_MANAGER_FACE
+	DEF_CMD(CmdSetCompanyColour,                               0), // CMD_SET_COMPANY_COLOUR

-	{CmdIncreaseLoan,                               0}, // CMD_INCREASE_LOAN
-	{CmdDecreaseLoan,                               0}, // CMD_DECREASE_LOAN
+	DEF_CMD(CmdIncreaseLoan,                                   0), // CMD_INCREASE_LOAN
+	DEF_CMD(CmdDecreaseLoan,                                   0), // CMD_DECREASE_LOAN

-	{CmdWantEnginePreview,                          0}, // CMD_WANT_ENGINE_PREVIEW
+	DEF_CMD(CmdWantEnginePreview,                              0), // CMD_WANT_ENGINE_PREVIEW

-	{CmdRenameVehicle,                              0}, // CMD_RENAME_VEHICLE
-	{CmdRenameEngine,                               0}, // CMD_RENAME_ENGINE
+	DEF_CMD(CmdRenameVehicle,                                  0), // CMD_RENAME_VEHICLE
+	DEF_CMD(CmdRenameEngine,                                   0), // CMD_RENAME_ENGINE

-	{CmdRenameCompany,                              0}, // CMD_RENAME_COMPANY
-	{CmdRenamePresident,                            0}, // CMD_RENAME_PRESIDENT
+	DEF_CMD(CmdRenameCompany,                                  0), // CMD_RENAME_COMPANY
+	DEF_CMD(CmdRenamePresident,                                0), // CMD_RENAME_PRESIDENT

-	{CmdRenameStation,                              0}, // CMD_RENAME_STATION
+	DEF_CMD(CmdRenameStation,                                  0), // CMD_RENAME_STATION

-	{CmdSellAircraft,                               0}, // CMD_SELL_AIRCRAFT
+	DEF_CMD(CmdSellAircraft,                                   0), // CMD_SELL_AIRCRAFT

-	{CmdBuildAircraft,                              0}, // CMD_BUILD_AIRCRAFT
-	{CmdSendAircraftToHangar,                       0}, // CMD_SEND_AIRCRAFT_TO_HANGAR
-	{CmdRefitAircraft,                              0}, // CMD_REFIT_AIRCRAFT
+	DEF_CMD(CmdBuildAircraft,                                  0), // CMD_BUILD_AIRCRAFT
+	DEF_CMD(CmdSendAircraftToHangar,                           0), // CMD_SEND_AIRCRAFT_TO_HANGAR
+	DEF_CMD(CmdRefitAircraft,                                  0), // CMD_REFIT_AIRCRAFT

-	{CmdPlaceSign,                                  0}, // CMD_PLACE_SIGN
-	{CmdRenameSign,                                 0}, // CMD_RENAME_SIGN
+	DEF_CMD(CmdPlaceSign,                                      0), // CMD_PLACE_SIGN
+	DEF_CMD(CmdRenameSign,                                     0), // CMD_RENAME_SIGN

-	{CmdBuildRoadVeh,                               0}, // CMD_BUILD_ROAD_VEH
-	{CmdSellRoadVeh,                                0}, // CMD_SELL_ROAD_VEH
-	{CmdSendRoadVehToDepot,                         0}, // CMD_SEND_ROADVEH_TO_DEPOT
-	{CmdTurnRoadVeh,                                0}, // CMD_TURN_ROADVEH
-	{CmdRefitRoadVeh,                               0}, // CMD_REFIT_ROAD_VEH
+	DEF_CMD(CmdBuildRoadVeh,                                   0), // CMD_BUILD_ROAD_VEH
+	DEF_CMD(CmdSellRoadVeh,                                    0), // CMD_SELL_ROAD_VEH
+	DEF_CMD(CmdSendRoadVehToDepot,                             0), // CMD_SEND_ROADVEH_TO_DEPOT
+	DEF_CMD(CmdTurnRoadVeh,                                    0), // CMD_TURN_ROADVEH
+	DEF_CMD(CmdRefitRoadVeh,                                   0), // CMD_REFIT_ROAD_VEH

-	{CmdPause,                             CMD_SERVER}, // CMD_PAUSE
+	DEF_CMD(CmdPause,                                 CMD_SERVER), // CMD_PAUSE

-	{CmdBuyShareInCompany,                          0}, // CMD_BUY_SHARE_IN_COMPANY
-	{CmdSellShareInCompany,                         0}, // CMD_SELL_SHARE_IN_COMPANY
-	{CmdBuyCompany,                                 0}, // CMD_BUY_COMANY
+	DEF_CMD(CmdBuyShareInCompany,                              0), // CMD_BUY_SHARE_IN_COMPANY
+	DEF_CMD(CmdSellShareInCompany,                             0), // CMD_SELL_SHARE_IN_COMPANY
+	DEF_CMD(CmdBuyCompany,                                     0), // CMD_BUY_COMANY

-	{CmdFoundTown,                        CMD_NO_TEST}, // CMD_FOUND_TOWN; founding random town can fail only in exec run
-	{CmdRenameTown,                        CMD_SERVER}, // CMD_RENAME_TOWN
-	{CmdDoTownAction,                               0}, // CMD_DO_TOWN_ACTION
+	DEF_CMD(CmdFoundTown,                            CMD_NO_TEST), // CMD_FOUND_TOWN; founding random town can fail only in exec run
+	DEF_CMD(CmdRenameTown,                            CMD_SERVER), // CMD_RENAME_TOWN
+	DEF_CMD(CmdDoTownAction,                                   0), // CMD_DO_TOWN_ACTION

-	{CmdSellShip,                                   0}, // CMD_SELL_SHIP
-	{CmdBuildShip,                                  0}, // CMD_BUILD_SHIP
-	{CmdSendShipToDepot,                            0}, // CMD_SEND_SHIP_TO_DEPOT
-	{CmdRefitShip,                                  0}, // CMD_REFIT_SHIP
+	DEF_CMD(CmdSellShip,                                       0), // CMD_SELL_SHIP
+	DEF_CMD(CmdBuildShip,                                      0), // CMD_BUILD_SHIP
+	DEF_CMD(CmdSendShipToDepot,                                0), // CMD_SEND_SHIP_TO_DEPOT
+	DEF_CMD(CmdRefitShip,                                      0), // CMD_REFIT_SHIP

-	{CmdOrderRefit,                                 0}, // CMD_ORDER_REFIT
-	{CmdCloneOrder,                                 0}, // CMD_CLONE_ORDER
+	DEF_CMD(CmdOrderRefit,                                     0), // CMD_ORDER_REFIT
+	DEF_CMD(CmdCloneOrder,                                     0), // CMD_CLONE_ORDER

-	{CmdClearArea,                        CMD_NO_TEST}, // CMD_CLEAR_AREA; destroying multi-tile houses makes town rating differ between test and execution
+	DEF_CMD(CmdClearArea,                            CMD_NO_TEST), // CMD_CLEAR_AREA; destroying multi-tile houses makes town rating differ between test and execution

-	{CmdMoneyCheat,                       CMD_OFFLINE}, // CMD_MONEY_CHEAT
-	{CmdBuildCanal,                          CMD_AUTO}, // CMD_BUILD_CANAL
-	{CmdCompanyCtrl,                    CMD_SPECTATOR}, // CMD_COMPANY_CTRL
+	DEF_CMD(CmdMoneyCheat,                           CMD_OFFLINE), // CMD_MONEY_CHEAT
+	DEF_CMD(CmdBuildCanal,                              CMD_AUTO), // CMD_BUILD_CANAL
+	DEF_CMD(CmdCompanyCtrl,                        CMD_SPECTATOR), // CMD_COMPANY_CTRL

-	{CmdLevelLand, CMD_ALL_TILES | CMD_NO_TEST | CMD_AUTO}, // CMD_LEVEL_LAND; test run might clear tiles multiple times, in execution that only happens once
+	DEF_CMD(CmdLevelLand, CMD_ALL_TILES | CMD_NO_TEST | CMD_AUTO), // CMD_LEVEL_LAND; test run might clear tiles multiple times, in execution that only happens once

-	{CmdRefitRailVehicle,                           0}, // CMD_REFIT_RAIL_VEHICLE
-	{CmdRestoreOrderIndex,                          0}, // CMD_RESTORE_ORDER_INDEX
-	{CmdBuildLock,                           CMD_AUTO}, // CMD_BUILD_LOCK
+	DEF_CMD(CmdRefitRailVehicle,                               0), // CMD_REFIT_RAIL_VEHICLE
+	DEF_CMD(CmdRestoreOrderIndex,                              0), // CMD_RESTORE_ORDER_INDEX
+	DEF_CMD(CmdBuildLock,                               CMD_AUTO), // CMD_BUILD_LOCK

-	{CmdBuildSignalTrack,                    CMD_AUTO}, // CMD_BUILD_SIGNAL_TRACK
-	{CmdRemoveSignalTrack,                   CMD_AUTO}, // CMD_REMOVE_SIGNAL_TRACK
+	DEF_CMD(CmdBuildSignalTrack,                        CMD_AUTO), // CMD_BUILD_SIGNAL_TRACK
+	DEF_CMD(CmdRemoveSignalTrack,                       CMD_AUTO), // CMD_REMOVE_SIGNAL_TRACK

-	{CmdGiveMoney,                                  0}, // CMD_GIVE_MONEY
-	{CmdChangeSetting,                     CMD_SERVER}, // CMD_CHANGE_SETTING
-	{CmdChangeCompanySetting,                       0}, // CMD_CHANGE_COMPANY_SETTING
-	{CmdSetAutoReplace,                             0}, // CMD_SET_AUTOREPLACE
-	{CmdCloneVehicle,                     CMD_NO_TEST}, // CMD_CLONE_VEHICLE; NewGRF callbacks influence building and refitting making it impossible to correctly estimate the cost
-	{CmdStartStopVehicle,                           0}, // CMD_START_STOP_VEHICLE
-	{CmdMassStartStopVehicle,                       0}, // CMD_MASS_START_STOP
-	{CmdAutoreplaceVehicle,                         0}, // CMD_AUTOREPLACE_VEHICLE
-	{CmdDepotSellAllVehicles,                       0}, // CMD_DEPOT_SELL_ALL_VEHICLES
-	{CmdDepotMassAutoReplace,                       0}, // CMD_DEPOT_MASS_AUTOREPLACE
-	{CmdCreateGroup,                                0}, // CMD_CREATE_GROUP
-	{CmdDeleteGroup,                                0}, // CMD_DELETE_GROUP
-	{CmdRenameGroup,                                0}, // CMD_RENAME_GROUP
-	{CmdAddVehicleGroup,                            0}, // CMD_ADD_VEHICLE_GROUP
-	{CmdAddSharedVehicleGroup,                      0}, // CMD_ADD_SHARE_VEHICLE_GROUP
-	{CmdRemoveAllVehiclesGroup,                     0}, // CMD_REMOVE_ALL_VEHICLES_GROUP
-	{CmdSetGroupReplaceProtection,                  0}, // CMD_SET_GROUP_REPLACE_PROTECTION
-	{CmdMoveOrder,                                  0}, // CMD_MOVE_ORDER
-	{CmdChangeTimetable,                            0}, // CMD_CHANGE_TIMETABLE
-	{CmdSetVehicleOnTime,                           0}, // CMD_SET_VEHICLE_ON_TIME
-	{CmdAutofillTimetable,                          0}, // CMD_AUTOFILL_TIMETABLE
-	{CmdSetTimetableStart,                          0}, // CMD_SET_TIMETABLE_START
+	DEF_CMD(CmdGiveMoney,                                      0), // CMD_GIVE_MONEY
+	DEF_CMD(CmdChangeSetting,                         CMD_SERVER), // CMD_CHANGE_SETTING
+	DEF_CMD(CmdChangeCompanySetting,                           0), // CMD_CHANGE_COMPANY_SETTING
+	DEF_CMD(CmdSetAutoReplace,                                 0), // CMD_SET_AUTOREPLACE
+	DEF_CMD(CmdCloneVehicle,                         CMD_NO_TEST), // CMD_CLONE_VEHICLE; NewGRF callbacks influence building and refitting making it impossible to correctly estimate the cost
+	DEF_CMD(CmdStartStopVehicle,                               0), // CMD_START_STOP_VEHICLE
+	DEF_CMD(CmdMassStartStopVehicle,                           0), // CMD_MASS_START_STOP
+	DEF_CMD(CmdAutoreplaceVehicle,                             0), // CMD_AUTOREPLACE_VEHICLE
+	DEF_CMD(CmdDepotSellAllVehicles,                           0), // CMD_DEPOT_SELL_ALL_VEHICLES
+	DEF_CMD(CmdDepotMassAutoReplace,                           0), // CMD_DEPOT_MASS_AUTOREPLACE
+	DEF_CMD(CmdCreateGroup,                                    0), // CMD_CREATE_GROUP
+	DEF_CMD(CmdDeleteGroup,                                    0), // CMD_DELETE_GROUP
+	DEF_CMD(CmdRenameGroup,                                    0), // CMD_RENAME_GROUP
+	DEF_CMD(CmdAddVehicleGroup,                                0), // CMD_ADD_VEHICLE_GROUP
+	DEF_CMD(CmdAddSharedVehicleGroup,                          0), // CMD_ADD_SHARE_VEHICLE_GROUP
+	DEF_CMD(CmdRemoveAllVehiclesGroup,                         0), // CMD_REMOVE_ALL_VEHICLES_GROUP
+	DEF_CMD(CmdSetGroupReplaceProtection,                      0), // CMD_SET_GROUP_REPLACE_PROTECTION
+	DEF_CMD(CmdMoveOrder,                                      0), // CMD_MOVE_ORDER
+	DEF_CMD(CmdChangeTimetable,                                0), // CMD_CHANGE_TIMETABLE
+	DEF_CMD(CmdSetVehicleOnTime,                               0), // CMD_SET_VEHICLE_ON_TIME
+	DEF_CMD(CmdAutofillTimetable,                              0), // CMD_AUTOFILL_TIMETABLE
+	DEF_CMD(CmdSetTimetableStart,                              0), // CMD_SET_TIMETABLE_START
 };

 /*!
@@ -362,6 +364,20 @@ byte GetCommandFlags(uint32 cmd)
 	return _command_proc_table[cmd & CMD_ID_MASK].flags;
 }

+/*!
+ * This function mask the parameter with CMD_ID_MASK and returns
+ * the name which belongs to the given command.
+ *
+ * @param cmd The integer value of the command
+ * @return The name for this command
+ */
+const char *GetCommandName(uint32 cmd)
+{
+	assert(IsValidCommand(cmd));
+
+	return _command_proc_table[cmd & CMD_ID_MASK].name;
+}
+
 static int _docommand_recursive = 0;

 /**
@@ -640,7 +656,7 @@ CommandCost DoCommandPInternal(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd,
 		return_dcpi(CommandCost(), false);
 	}
 #endif /* ENABLE_NETWORK */
-	DEBUG(desync, 1, "cmd: %08x; %08x; %1x; %06x; %08x; %08x; %04x; %s\n", _date, _date_fract, (int)_current_company, tile, p1, p2, cmd & ~CMD_NETWORK_COMMAND, text);
+	DEBUG(desync, 1, "cmd: %08x; %02x; %02x; %06x; %08x; %08x; %08x; \"%s\" (%s)", _date, _date_fract, (int)_current_company, tile, p1, p2, cmd & ~CMD_NETWORK_COMMAND, text, GetCommandName(cmd));

 	/* Actually try and execute the command. If no cost-type is given
 	 * use the construction one */
@@ -662,6 +678,9 @@ CommandCost DoCommandPInternal(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd,
 	/* If we're needing more money and we haven't done
 	 * anything yet, ask for the money! */
 	if (_additional_cash_required != 0 && res2.GetCost() == 0) {
+		/* It could happen we removed rail, thus gained money, and deleted something else.
+		 * So make sure the signal buffer is empty even in this case */
+		UpdateSignalsInBuffer();
 		SetDParam(0, _additional_cash_required);
 		return_dcpi(CommandCost(STR_ERROR_NOT_ENOUGH_CASH_REQUIRES_CURRENCY), false);
 	}
--- a/src/command_func.h
+++ b/src/command_func.h
@@ -67,6 +67,10 @@ bool IsValidCommand(uint32 cmd);
 * Returns the flags from a given command.
 */
 byte GetCommandFlags(uint32 cmd);
+/**
+ * Returns the name of a given command.
+ */
+const char *GetCommandName(uint32 cmd);
 /**
 * Returns the current money available which can be used for a command.
 */
--- a/src/command_type.h
+++ b/src/command_type.h
@@ -382,8 +382,9 @@ typedef CommandCost CommandProc(TileIndex tile, DoCommandFlag flags, uint32 p1,
 * the #CMD_AUTO, #CMD_OFFLINE and #CMD_SERVER values.
 */
 struct Command {
-	CommandProc *proc;
-	byte flags;
+	CommandProc *proc; ///< The procedure to actually executing
+	const char *name;  ///< A human readable name for the procedure
+	byte flags;        ///< The (command) flags to that apply to this command
 };

 /**
--- a/src/company_cmd.cpp
+++ b/src/company_cmd.cpp
@@ -15,6 +15,7 @@
 #include "company_gui.h"
 #include "town.h"
 #include "news_func.h"
+#include "cmd_helper.h"
 #include "command_func.h"
 #include "network/network.h"
 #include "network/network_func.h"
@@ -78,6 +79,8 @@ void Company::PostDestructor(size_t index)
 	InvalidateWindowData(WC_GRAPH_LEGEND, 0, (int)index);
 	InvalidateWindowData(WC_PERFORMANCE_DETAIL, 0, (int)index);
 	InvalidateWindowData(WC_COMPANY_LEAGUE, 0, 0);
+	/* If the currently shown error message has this company in it, the close it. */
+	InvalidateWindowData(WC_ERRMSG, 0);
 }

 /**
@@ -589,14 +592,11 @@ static void HandleBankruptcyTakeover(Company *c)

 	SetBit(c->bankrupt_asked, best->index);

-	if (IsInteractiveCompany(best->index)) {
-		c->bankrupt_timeout = TAKE_OVER_TIMEOUT;
-		ShowBuyCompanyDialog(c->index);
-		return;
-	}
-
+	c->bankrupt_timeout = TAKE_OVER_TIMEOUT;
 	if (best->is_ai) {
 		AI::NewEvent(best->index, new AIEventCompanyAskMerger(c->index, ClampToI32(c->bankrupt_value)));
+	} else if (IsInteractiveCompany(best->index)) {
+		ShowBuyCompanyDialog(c->index);
 	}
 }

@@ -895,14 +895,11 @@ CommandCost CmdSetCompanyManagerFace(TileIndex tile, DoCommandFlag flags, uint32
 */
 CommandCost CmdSetCompanyColour(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
-	if (p2 >= 16) return CMD_ERROR; // max 16 colours
-
-	Colours colour = (Colours)p2;
-
-	LiveryScheme scheme = (LiveryScheme)GB(p1, 0, 8);
+	Colours colour = Extract<Colours, 0, 4>(p2);
+	LiveryScheme scheme = Extract<LiveryScheme, 0, 8>(p1);
 	byte state = GB(p1, 8, 2);

-	if (scheme >= LS_END || state >= 3) return CMD_ERROR;
+	if (scheme >= LS_END || state >= 3 || colour == INVALID_COLOUR) return CMD_ERROR;

 	Company *c = Company::Get(_current_company);

@@ -963,6 +960,13 @@ CommandCost CmdSetCompanyColour(TileIndex tile, DoCommandFlag flags, uint32 p1,
 		ResetVehicleColourMap();
 		MarkWholeScreenDirty();

+		/* All graph related to companies use the company colour. */
+		InvalidateWindowData(WC_INCOME_GRAPH, 0);
+		InvalidateWindowData(WC_OPERATING_PROFIT, 0);
+		InvalidateWindowData(WC_DELIVERED_CARGO, 0);
+		InvalidateWindowData(WC_PERFORMANCE_HISTORY, 0);
+		InvalidateWindowData(WC_COMPANY_VALUE, 0);
+
 		/* Company colour data is indirectly cached. */
 		Vehicle *v;
 		FOR_ALL_VEHICLES(v) {
--- a/src/console.cpp
+++ b/src/console.cpp
@@ -50,7 +50,7 @@ static void IConsoleWriteToLogFile(const char *string)
 	if (_iconsole_output_file != NULL) {
 		/* if there is an console output file ... also print it there */
 		const char *header = GetLogPrefix();
-		if (fwrite(header, strlen(header), 1, _iconsole_output_file) != 1 ||
+		if ((strlen(header) != 0 && fwrite(header, strlen(header), 1, _iconsole_output_file) != 1) ||
 				fwrite(string, strlen(string), 1, _iconsole_output_file) != 1 ||
 				fwrite("\n", 1, 1, _iconsole_output_file) != 1) {
 			fclose(_iconsole_output_file);
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -814,7 +814,7 @@ DEF_CONSOLE_CMD(ConNetworkConnect)
 {
 	if (argc == 0) {
 		IConsoleHelp("Connect to a remote OTTD server and join the game. Usage: 'connect <ip>'");
-		IConsoleHelp("IP can contain port and company: 'IP[[#Company]:Port]', eg: 'server.ottd.org#2:443'");
+		IConsoleHelp("IP can contain port and company: 'IP[:Port][#Company]', eg: 'server.ottd.org:443#2'");
 		IConsoleHelp("Company #255 is spectator all others are a certain company with Company 1 being #1");
 		return true;
 	}
--- a/src/core/enum_type.hpp
+++ b/src/core/enum_type.hpp
@@ -58,14 +58,16 @@ template <typename Tenum_t> struct EnumPropsT;
 *  @param Tbegin first valid value from the contiguous range (i.e. TRACK_BEGIN)
 *  @param Tend one past the last valid value from the contiguous range (i.e. TRACK_END)
 *  @param Tinvalid value used as invalid value marker (i.e. INVALID_TRACK)
+ *  @param Tnum_bits Number of bits for storing the enum in command parameters
 */
-template <typename Tenum_t, typename Tstorage_t, Tenum_t Tbegin, Tenum_t Tend, Tenum_t Tinvalid>
+template <typename Tenum_t, typename Tstorage_t, Tenum_t Tbegin, Tenum_t Tend, Tenum_t Tinvalid, uint Tnum_bits = 8 * sizeof(Tstorage_t)>
 struct MakeEnumPropsT {
 	typedef Tenum_t type;                     ///< enum type (i.e. Trackdir)
 	typedef Tstorage_t storage;               ///< storage type (i.e. byte)
 	static const Tenum_t begin = Tbegin;      ///< lowest valid value (i.e. TRACKDIR_BEGIN)
 	static const Tenum_t end = Tend;          ///< one after the last valid value (i.e. TRACKDIR_END)
 	static const Tenum_t invalid = Tinvalid;  ///< what value is used as invalid value (i.e. INVALID_TRACKDIR)
+	static const uint num_bits = Tnum_bits;   ///< Number of bits for storing the enum in command parameters
 };


--- a/src/core/random_func.cpp
+++ b/src/core/random_func.cpp
@@ -24,9 +24,9 @@ uint32 Randomizer::Next()
 	return this->state[1] = ROR(s, 3) - 1;
 }

-uint32 Randomizer::Next(uint16 max)
+uint32 Randomizer::Next(uint32 max)
 {
-	return GB(this->Next(), 0, 16) * max >> 16;
+	return ((uint64)this->Next() * (uint64)max) >> 32;
 }

 void Randomizer::SetSeed(uint32 seed)
@@ -55,8 +55,8 @@ uint32 DoRandom(int line, const char *file)
 	return _random.Next();
 }

-uint DoRandomRange(uint max, int line, const char *file)
+uint32 DoRandomRange(uint32 max, int line, const char *file)
 {
-	return GB(DoRandom(line, file), 0, 16) * max >> 16;
+	return ((uint64)DoRandom(line, file) * (uint64)max) >> 32;
 }
 #endif /* RANDOM_DEBUG */
--- a/src/core/random_func.hpp
+++ b/src/core/random_func.hpp
@@ -48,7 +48,7 @@ struct Randomizer {
 	 * @param max the maximum value of the returned random number
 	 * @return the random number
 	 */
-	uint32 Next(uint16 max);
+	uint32 Next(uint32 max);

 	/**
 	 * (Re)set the state of the random number generator.
@@ -92,14 +92,14 @@ void SetRandomSeed(uint32 seed);
 	#endif
 	uint32 DoRandom(int line, const char *file);
 	#define RandomRange(max) DoRandomRange(max, __LINE__, __FILE__)
-	uint DoRandomRange(uint max, int line, const char *file);
+	uint32 DoRandomRange(uint32 max, int line, const char *file);
 #else
 	static FORCEINLINE uint32 Random()
 	{
 		return _random.Next();
 	}

-	static FORCEINLINE uint32 RandomRange(uint16 max)
+	static FORCEINLINE uint32 RandomRange(uint32 max)
 	{
 		return _random.Next(max);
 	}
@@ -110,7 +110,7 @@ static FORCEINLINE uint32 InteractiveRandom()
 	return _interactive_random.Next();
 }

-static FORCEINLINE uint32 InteractiveRandomRange(uint16 max)
+static FORCEINLINE uint32 InteractiveRandomRange(uint32 max)
 {
 	return _interactive_random.Next(max);
 }
--- a/src/date.cpp
+++ b/src/date.cpp
@@ -218,12 +218,6 @@ static void OnNewYear()
 */
 static void OnNewMonth()
 {
-	if (_debug_desync_level > 2) {
-		char name[MAX_PATH];
-		snprintf(name, lengthof(name), "dmp_cmds_%08x_%08x.sav", _settings_game.game_creation.generation_seed, _date);
-		SaveOrLoad(name, SL_SAVE, AUTOSAVE_DIR);
-	}
-
 	if (_settings_client.gui.autosave != 0 && (_cur_month % _autosave_months[_settings_client.gui.autosave]) == 0) {
 		_do_autosave = true;
 		RedrawAutosave();
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -93,7 +93,7 @@ static void debug_print(const char *dbg, const char *buf)
 		static FILE *f = FioFOpenFile("commands-out.log", "wb", AUTOSAVE_DIR);
 		if (f == NULL) return;

-		fprintf(f, "%s%s", GetLogPrefix(), buf);
+		fprintf(f, "%s%s\n", GetLogPrefix(), buf);
 		fflush(f);
 	}
 }
--- a/src/direction_type.h
+++ b/src/direction_type.h
@@ -41,7 +41,7 @@ enum Direction {
 DECLARE_POSTFIX_INCREMENT(Direction);

 /** Define basic enum properties */
-template <> struct EnumPropsT<Direction> : MakeEnumPropsT<Direction, byte, DIR_BEGIN, DIR_END, INVALID_DIR> {};
+template <> struct EnumPropsT<Direction> : MakeEnumPropsT<Direction, byte, DIR_BEGIN, DIR_END, INVALID_DIR, 3> {};
 typedef TinyEnumT<Direction> DirectionByte; // typedefing-enumification of Direction


@@ -91,7 +91,7 @@ enum DiagDirection {
 DECLARE_POSTFIX_INCREMENT(DiagDirection);

 /** Define basic enum properties */
-template <> struct EnumPropsT<DiagDirection> : MakeEnumPropsT<DiagDirection, byte, DIAGDIR_BEGIN, DIAGDIR_END, INVALID_DIAGDIR> {};
+template <> struct EnumPropsT<DiagDirection> : MakeEnumPropsT<DiagDirection, byte, DIAGDIR_BEGIN, DIAGDIR_END, INVALID_DIAGDIR, 2> {};
 typedef TinyEnumT<DiagDirection> DiagDirectionByte; // typedefing-enumification of DiagDirection


@@ -130,5 +130,6 @@ enum Axis {
 	AXIS_END,            ///< Used for iterations
 	INVALID_AXIS = 0xFF, ///< Flag for an invalid Axis
 };
+template <> struct EnumPropsT<Axis> : MakeEnumPropsT<Axis, byte, AXIS_X, AXIS_END, INVALID_AXIS, 1> {};

 #endif /* DIRECTION_TYPE_H */
--- a/src/driver.h
+++ b/src/driver.h
@@ -28,12 +28,13 @@ public:

 	virtual ~Driver() { }

+	/** The type of driver */
 	enum Type {
-		DT_BEGIN = 0,
-		DT_SOUND = 0,
-		DT_MUSIC,
-		DT_VIDEO,
-		DT_END,
+		DT_BEGIN = 0, ///< Helper for iteration
+		DT_MUSIC = 0, ///< A music driver, needs to be before sound to properly shut down extmidi forked music players
+		DT_SOUND,     ///< A sound driver
+		DT_VIDEO,     ///< A video driver
+		DT_END,       ///< Helper for iteration
 	};

 	virtual const char *GetName() const = 0;
@@ -64,7 +65,7 @@ private:

 	static const char *GetDriverTypeName(Driver::Type type)
 	{
-		static const char * const driver_type_name[] = { "sound", "music", "video" };
+		static const char * const driver_type_name[] = { "music", "sound", "video" };
 		return driver_type_name[type];
 	}

--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -297,6 +297,11 @@ int UpdateCompanyRatingAndValue(Company *c, bool update)
 /*  use INVALID_OWNER as new_owner to delete the company. */
 void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
 {
+#ifdef ENABLE_NETWORK
+	/* In all cases, make spectators of clients connected to that company */
+	if (_networking) NetworkClientsToSpectators(old_owner);
+#endif /* ENABLE_NETWORK */
+
 	Town *t;
 	CompanyID old = _current_company;

@@ -471,21 +476,6 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
 	MarkWholeScreenDirty();
 }

-static void ChangeNetworkOwner(Owner current_owner, Owner new_owner)
-{
-#ifdef ENABLE_NETWORK
-	if (!_networking) return;
-
-	if (current_owner == _local_company) {
-		SetLocalCompany(new_owner);
-	}
-
-	if (!_network_server) return;
-
-	NetworkServerChangeOwner(current_owner, new_owner);
-#endif /* ENABLE_NETWORK */
-}
-
 static void CompanyCheckBankrupt(Company *c)
 {
 	/*  If the company has money again, it does not go bankrupt */
@@ -547,8 +537,6 @@ static void CompanyCheckBankrupt(Company *c)
 			SetDParamStr(2, cni->company_name);
 			AddCompanyNewsItem(STR_MESSAGE_NEWS_FORMAT, NS_COMPANY_BANKRUPT, cni);

-			/* Remove the company */
-			ChangeNetworkOwner(c->index, COMPANY_SPECTATOR);
 			ChangeOwnershipOfCompanyItems(c->index, INVALID_OWNER);

 			if (c->is_ai) AI::Stop(c->index);
@@ -667,6 +655,16 @@ void RecomputePrices()
 			price >>= -shift;
 		}

+		/* Make sure the price does not get reduced to zero.
+		 * Zero breaks quite a few commands that use a zero
+		 * cost to see whether something got changed or not
+		 * and based on that cause an error. When the price
+		 * is zero that fails even when things are done. */
+		if (price == 0) {
+			price = Clamp(_price_base_specs[i].start_price, -1, 1);
+			/* No base price should be zero, but be sure. */
+			assert(price != 0);
+		}
 		/* Store value */
 		_price[i] = price;
 	}
@@ -1449,8 +1447,6 @@ static void DoAcquireCompany(Company *c)
 	AddCompanyNewsItem(STR_MESSAGE_NEWS_FORMAT, NS_COMPANY_MERGER, cni);
 	AI::BroadcastNewEvent(new AIEventCompanyMerger(ci, _current_company));

-	/* original code does this a little bit differently */
-	ChangeNetworkOwner(ci, _current_company);
 	ChangeOwnershipOfCompanyItems(ci, _current_company);

 	if (c->bankrupt_value == 0) {
@@ -1492,12 +1488,12 @@ extern int GetAmountOwnedBy(const Company *c, Owner owner);
 CommandCost CmdBuyShareInCompany(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
 	CommandCost cost(EXPENSES_OTHER);
-
-	Company *c = Company::GetIfValid(p1);
+	CompanyID target_company = (CompanyID)p1;
+	Company *c = Company::GetIfValid(target_company);

 	/* Check if buying shares is allowed (protection against modified clients)
 	 * Cannot buy own shares */
-	if (c == NULL || !_settings_game.economy.allow_shares || _current_company == (CompanyID)p1) return CMD_ERROR;
+	if (c == NULL || !_settings_game.economy.allow_shares || _current_company == target_company) return CMD_ERROR;

 	/* Protect new companies from hostile takeovers */
 	if (_cur_year - c->inaugurated_year < 6) return_cmd_error(STR_ERROR_PROTECTED);
@@ -1523,7 +1519,7 @@ CommandCost CmdBuyShareInCompany(TileIndex tile, DoCommandFlag flags, uint32 p1,
 				break;
 			}
 		}
-		SetWindowDirty(WC_COMPANY, p1);
+		SetWindowDirty(WC_COMPANY, target_company);
 	}
 	return cost;
 }
@@ -1538,11 +1534,12 @@ CommandCost CmdBuyShareInCompany(TileIndex tile, DoCommandFlag flags, uint32 p1,
 */
 CommandCost CmdSellShareInCompany(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
-	Company *c = Company::GetIfValid(p1);
+	CompanyID target_company = (CompanyID)p1;
+	Company *c = Company::GetIfValid(target_company);

 	/* Check if selling shares is allowed (protection against modified clients)
 	 * Cannot sell own shares */
-	if (c == NULL || !_settings_game.economy.allow_shares || _current_company == (CompanyID)p1) return CMD_ERROR;
+	if (c == NULL || !_settings_game.economy.allow_shares || _current_company == target_company) return CMD_ERROR;

 	/* Those lines are here for network-protection (clients can be slow) */
 	if (GetAmountOwnedBy(c, _current_company) == 0) return CommandCost();
@@ -1555,7 +1552,7 @@ CommandCost CmdSellShareInCompany(TileIndex tile, DoCommandFlag flags, uint32 p1
 		OwnerByte *b = c->share_owners;
 		while (*b != _current_company) b++; // share owners is guaranteed to contain company
 		*b = COMPANY_SPECTATOR;
-		SetWindowDirty(WC_COMPANY, p1);
+		SetWindowDirty(WC_COMPANY, target_company);
 	}
 	return CommandCost(EXPENSES_OTHER, cost);
 }
@@ -1573,7 +1570,8 @@ CommandCost CmdSellShareInCompany(TileIndex tile, DoCommandFlag flags, uint32 p1
 */
 CommandCost CmdBuyCompany(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
-	Company *c = Company::GetIfValid(p1);
+	CompanyID target_company = (CompanyID)p1;
+	Company *c = Company::GetIfValid(target_company);
 	if (c == NULL) return CMD_ERROR;

 	/* Disable takeovers when not asked */
@@ -1583,7 +1581,7 @@ CommandCost CmdBuyCompany(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
 	if (!_networking && _local_company == c->index) return CMD_ERROR;

 	/* Do not allow companies to take over themselves */
-	if ((CompanyID)p1 == _current_company) return CMD_ERROR;
+	if (target_company == _current_company) return CMD_ERROR;

 	/* Get the cost here as the company is deleted in DoAcquireCompany. */
 	CommandCost cost(EXPENSES_OTHER, c->bankrupt_value);
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -184,12 +184,12 @@ uint Engine::GetDisplayDefaultCapacity(uint16 *mail_capacity) const
 			return GetEngineProperty(this->index, PROP_SHIP_CARGO_CAPACITY, this->u.ship.capacity);

 		case VEH_AIRCRAFT: {
-			uint capacity = this->u.air.passenger_capacity;
+			uint capacity = GetEngineProperty(this->index, PROP_AIRCRAFT_PASSENGER_CAPACITY, this->u.air.passenger_capacity);;
 			CargoID cargo = this->GetDefaultCargoType();
 			if (IsCargoInClass(cargo, CC_PASSENGERS)) {
-				if (mail_capacity != NULL) *mail_capacity = this->u.air.mail_capacity;
+				if (mail_capacity != NULL) *mail_capacity = GetEngineProperty(this->index, PROP_AIRCRAFT_MAIL_CAPACITY, this->u.air.mail_capacity);
 			} else {
-				capacity += this->u.air.mail_capacity;
+				capacity += GetEngineProperty(this->index, PROP_AIRCRAFT_MAIL_CAPACITY, this->u.air.mail_capacity);
 			}
 			switch (cargo) {
 				case CT_PASSENGERS:
--- a/src/fileio.cpp
+++ b/src/fileio.cpp
@@ -18,8 +18,11 @@
 #include "tar_type.h"
 #ifdef WIN32
 #include <windows.h>
+#elif defined(__HAIKU__)
+#include <Path.h>
+#include <storage/FindDirectory.h>
 #else
-#ifdef OPENBSD
+#if defined(OPENBSD) || defined(DOS)
 #include <unistd.h>
 #endif
 #include <pwd.h>
@@ -560,7 +563,11 @@ bool TarListAddFile(const char *filename)
 	if (it != _tar_list.end()) return false;

 	FILE *f = fopen(filename, "rb");
-	assert(f != NULL);
+	/* Although the file has been found there can be
+	 * a number of reasons we cannot open the file.
+	 * Most common case is when we simply have not
+	 * been given read access. */
+	if (f == NULL) return false;

 	const char *dupped_filename = strdup(filename);
 	_tar_list[filename].filename = dupped_filename;
@@ -740,6 +747,79 @@ bool TarListAddFile(const char *filename)
 	return true;
 }

+/**
+ * Extract the tar with the given filename in the directory
+ * where the tar resides.
+ * @param tar_filename the name of the tar to extract.
+ * @return false on failure.
+ */
+bool ExtractTar(const char *tar_filename)
+{
+	TarList::iterator it = _tar_list.find(tar_filename);
+	/* We don't know the file. */
+	if (it == _tar_list.end()) return false;
+
+	const char *dirname = (*it).second.dirname;
+
+	/* The file doesn't have a sub directory! */
+	if (dirname == NULL) return false;
+
+	char filename[MAX_PATH];
+	strecpy(filename, tar_filename, lastof(filename));
+	char *p = strrchr(filename, PATHSEPCHAR);
+	/* The file's path does not have a separator? */
+	if (p == NULL) return false;
+
+	p++;
+	strecpy(p, dirname, lastof(filename));
+	DEBUG(misc, 8, "Extracting %s to directory %s", tar_filename, filename);
+	FioCreateDirectory(filename);
+
+	for (TarFileList::iterator it2 = _tar_filelist.begin(); it2 != _tar_filelist.end(); it2++) {
+		if (strcmp((*it2).second.tar_filename, tar_filename) != 0) continue;
+
+		strecpy(p, (*it2).first.c_str(), lastof(filename));
+
+		DEBUG(misc, 9, "  extracting %s", filename);
+
+		/* First open the file in the .tar. */
+		size_t to_copy = 0;
+		FILE *in = FioFOpenFileTar(&(*it2).second, &to_copy);
+		if (in == NULL) {
+			DEBUG(misc, 6, "Extracting %s failed; could not open %s", filename, tar_filename);
+			return false;
+		}
+
+		/* Now open the 'output' file. */
+		FILE *out = fopen(filename, "wb");
+		if (out == NULL) {
+			DEBUG(misc, 6, "Extracting %s failed; could not open %s", filename, filename);
+			fclose(in);
+			return false;
+		}
+
+		/* Now read from the tar and write it into the file. */
+		char buffer[4096];
+		size_t read;
+		for (; to_copy != 0; to_copy -= read) {
+			read = fread(buffer, 1, min(to_copy, lengthof(buffer)), in);
+			if (read <= 0 || fwrite(buffer, 1, read, out) != read) break;
+		}
+
+		/* Close everything up. */
+		fclose(in);
+		fclose(out);
+
+		if (to_copy != 0) {
+			DEBUG(misc, 6, "Extracting %s failed; still %i bytes to copy", filename, (int)to_copy);
+			return false;
+		}
+	}
+
+	DEBUG(misc, 9, "  extraction successful");
+	return true;
+}
+
 static int ScanPathForTarFiles(const char *path, size_t basepath_length)
 {
 	extern bool FiosIsValidFile(const char *path, const struct dirent *ent, struct stat *sb);
@@ -848,6 +928,11 @@ void DetermineBasePaths(const char *exe)
 	char tmp[MAX_PATH];
 #if defined(__MORPHOS__) || defined(__AMIGA__) || defined(DOS) || defined(OS2) || !defined(WITH_PERSONAL_DIR)
 	_searchpaths[SP_PERSONAL_DIR] = NULL;
+#else
+#ifdef __HAIKU__
+	BPath path;
+	find_directory(B_USER_SETTINGS_DIRECTORY, &path);
+	const char *homedir = path.Path();
 #else
 	const char *homedir = getenv("HOME");

@@ -855,6 +940,7 @@ void DetermineBasePaths(const char *exe)
 		const struct passwd *pw = getpwuid(getuid());
 		homedir = (pw == NULL) ? "" : pw->pw_dir;
 	}
+#endif

 	snprintf(tmp, MAX_PATH, "%s" PATHSEP "%s", homedir, PERSONAL_DIR);
 	AppendPathSeparator(tmp, MAX_PATH);
--- a/src/fileio_func.h
+++ b/src/fileio_func.h
@@ -63,6 +63,7 @@ void *ReadFileToMem(const char *filename, size_t *lenp, size_t maxsize);
 bool FileExists(const char *filename);
 const char *FioTarFirstDir(const char *tarname);
 void FioTarAddLink(const char *src, const char *dest);
+bool ExtractTar(const char *tar_filename);

 extern char *_personal_dir; ///< custom directory for personal settings, saves, newgrf, etc.

--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -176,7 +176,7 @@ static void _GenerateWorld(void *)
 		ShowNewGRFError();

 		if (_network_dedicated) DEBUG(net, 0, "Map generated, starting game");
-		DEBUG(desync, 1, "new_map: %i\n", _settings_game.game_creation.generation_seed);
+		DEBUG(desync, 1, "new_map: %08x", _settings_game.game_creation.generation_seed);

 		if (_settings_client.gui.pause_on_newgame && _game_mode == GM_NORMAL) DoCommandP(0, PM_PAUSED_NORMAL, 1, CMD_PAUSE);
 		if (_debug_desync_level > 0) {
--- a/src/gfx_type.h
+++ b/src/gfx_type.h
@@ -196,6 +196,7 @@ enum Colours {
 	COLOUR_END,
 	INVALID_COLOUR = 0xFF,
 };
+template <> struct EnumPropsT<Colours> : MakeEnumPropsT<Colours, byte, COLOUR_DARK_BLUE, COLOUR_END, INVALID_COLOUR, 4> {};

 /** Colour of the strings, see _string_colourmap in table/palettes.h or docs/ottd-colourtext-palette.png */
 enum TextColour {
--- a/src/gfxinit.cpp
+++ b/src/gfxinit.cpp
@@ -205,7 +205,7 @@ void GfxLoadSprites()

 bool GraphicsSet::FillSetDetails(IniFile *ini, const char *path)
 {
-	bool ret = this->BaseSet<GraphicsSet, MAX_GFT, DATA_DIR>::FillSetDetails(ini, path);
+	bool ret = this->BaseSet<GraphicsSet, MAX_GFT, DATA_DIR>::FillSetDetails(ini, path, false);
 	if (ret) {
 		IniGroup *metadata = ini->GetGroup("metadata");
 		IniItem *item;
@@ -296,6 +296,7 @@ template <class Tbase_set>
 		if (c->GetNumMissing() != 0) continue;

 		if (best == NULL ||
+				(best->fallback && !c->fallback) ||
 				best->valid_files < c->valid_files ||
 				(best->valid_files == c->valid_files && (
 					(best->shortname == c->shortname && best->version < c->version) ||
--- a/src/graph_gui.cpp
+++ b/src/graph_gui.cpp
@@ -88,11 +88,11 @@ struct GraphLegendWindow : Window {
 		ToggleBit(_legend_excluded_companies, widget - GLW_FIRST_COMPANY);
 		this->ToggleWidgetLoweredState(widget);
 		this->SetDirty();
-		SetWindowDirty(WC_INCOME_GRAPH, 0);
-		SetWindowDirty(WC_OPERATING_PROFIT, 0);
-		SetWindowDirty(WC_DELIVERED_CARGO, 0);
-		SetWindowDirty(WC_PERFORMANCE_HISTORY, 0);
-		SetWindowDirty(WC_COMPANY_VALUE, 0);
+		InvalidateWindowData(WC_INCOME_GRAPH, 0);
+		InvalidateWindowData(WC_OPERATING_PROFIT, 0);
+		InvalidateWindowData(WC_DELIVERED_CARGO, 0);
+		InvalidateWindowData(WC_PERFORMANCE_HISTORY, 0);
+		InvalidateWindowData(WC_COMPANY_VALUE, 0);
 	}

 	virtual void OnInvalidateData(int data)
@@ -199,25 +199,33 @@ protected:
 	byte colours[GRAPH_MAX_DATASETS];
 	OverflowSafeInt64 cost[GRAPH_MAX_DATASETS][GRAPH_NUM_MONTHS]; ///< Stored costs for the last #GRAPH_NUM_MONTHS months

-	int64 GetHighestValue(int initial_highest_value) const
+	/**
+	 * Get the highest value of the graph's data. Excluded data is ignored to allow showing smaller values in
+	 * better detail when disabling higher ones.
+	 * @return Highest value of the graph (ignoring disabled data).
+	 */
+	int64 GetHighestValue() const
 	{
-		OverflowSafeInt64 highest_value = initial_highest_value;
+		OverflowSafeInt64 highest_value = 0;

 		for (int i = 0; i < this->num_dataset; i++) {
-			if (!HasBit(this->excluded_data, i)) {
-				for (int j = 0; j < this->num_on_x_axis; j++) {
-					OverflowSafeInt64 datapoint = this->cost[i][j];
+			if (HasBit(this->excluded_data, i)) continue;
+			for (int j = 0; j < this->num_on_x_axis; j++) {
+				OverflowSafeInt64 datapoint = this->cost[i][j];

-					if (datapoint != INVALID_DATAPOINT) {
-						/* For now, if the graph has negative values the scaling is
-						 * symmetrical about the x axis, so take the absolute value
-						 * of each data point. */
-						highest_value = max(highest_value, abs(datapoint));
-					}
+				if (datapoint != INVALID_DATAPOINT) {
+					/* For now, if the graph has negative values the scaling is
+					 * symmetrical about the x axis, so take the absolute value
+					 * of each data point. */
+					highest_value = max(highest_value, abs(datapoint));
 				}
 			}
 		}

+		/* Prevent showing the highest value too close to the graph upper limit. */
+		highest_value = (11 * highest_value) / 10;
+		/* Avoid using zero as the highest value. */
+		if (highest_value == 0) highest_value = GRAPH_NUM_LINES_Y - 1;
 		/* Round up highest_value so that it will divide cleanly into the number of
 		 * axis labels used. */
 		int round_val = highest_value % (GRAPH_NUM_LINES_Y - 1);
@@ -274,13 +282,7 @@ protected:
 		r.left   += 9;
 		r.right  -= 5;

-		/* Start of with a highest_value of twice the height of the graph in pixels.
-		 * It's a bit arbitrary, but it makes the cargo payment graph look a little
-		 * nicer, and prevents division by zero when calculating where the datapoint
-		 * should be drawn. */
-		highest_value = r.bottom - r.top + 1;
-		if (!this->has_negative_values) highest_value *= 2;
-		highest_value = GetHighestValue(highest_value);
+		highest_value = GetHighestValue();

 		/* Get width for Y labels */
 		int label_width = GetYLabelWidth(highest_value);
@@ -524,6 +526,11 @@ public:
 		this->UpdateStatistics(false);
 	}

+	virtual void OnInvalidateData(int data)
+	{
+		this->UpdateStatistics(true);
+	}
+
 	/**
 	 * Update the statistics.
 	 * @param initialize Initialize the data structure.
@@ -896,6 +903,11 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 		/* Override default OnTick */
 	}

+	virtual void OnInvalidateData(int data)
+	{
+		this->OnHundredthTick();
+	}
+
 	virtual void OnHundredthTick()
 	{
 		this->excluded_data = _legend_excluded_cargo;
--- a/src/group_cmd.cpp
+++ b/src/group_cmd.cpp
@@ -10,6 +10,7 @@
 /** @file group_cmd.cpp Handling of the engine groups */

 #include "stdafx.h"
+#include "cmd_helper.h"
 #include "command_func.h"
 #include "group.h"
 #include "train.h"
@@ -82,7 +83,7 @@ void InitializeGroup()
 */
 CommandCost CmdCreateGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
-	VehicleType vt = (VehicleType)p1;
+	VehicleType vt = Extract<VehicleType, 0, 3>(p1);
 	if (!IsCompanyBuildableVehicleType(vt)) return CMD_ERROR;

 	if (!Group::CanAllocateItem()) return CMD_ERROR;
@@ -258,13 +259,12 @@ CommandCost CmdAddVehicleGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, u
 */
 CommandCost CmdAddSharedVehicleGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
-	VehicleType type = (VehicleType)p2;
-	if (!Group::IsValidID(p1) || !IsCompanyBuildableVehicleType(type)) return CMD_ERROR;
+	VehicleType type = Extract<VehicleType, 0, 3>(p2);
+	GroupID id_g = p1;
+	if (!Group::IsValidID(id_g) || !IsCompanyBuildableVehicleType(type)) return CMD_ERROR;

 	if (flags & DC_EXEC) {
 		Vehicle *v;
-		VehicleType type = (VehicleType)p2;
-		GroupID id_g = p1;

 		/* Find the first front engine which belong to the group id_g
 		 * then add all shared vehicles of this front engine to the group id_g */
@@ -298,13 +298,13 @@ CommandCost CmdAddSharedVehicleGroup(TileIndex tile, DoCommandFlag flags, uint32
 */
 CommandCost CmdRemoveAllVehiclesGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
-	Group *g = Group::GetIfValid(p1);
-	VehicleType type = (VehicleType)p2;
+	GroupID old_g = p1;
+	Group *g = Group::GetIfValid(old_g);
+	VehicleType type = Extract<VehicleType, 0, 3>(p2);

 	if (g == NULL || g->owner != _current_company || !IsCompanyBuildableVehicleType(type)) return CMD_ERROR;

 	if (flags & DC_EXEC) {
-		GroupID old_g = p1;
 		Vehicle *v;

 		/* Find each Vehicle that belongs to the group old_g and add it to the default group */
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
rubidium	f3d56b97b1	(svn r19667) -Release: 1.0.1-RC1	2010-04-17 22:52:57 +00:00
rubidium	2dee7158d3	(svn r19666) [1.0] -Backport from trunk: many many string updates	2010-04-17 22:39:17 +00:00
rubidium	1f1ad73073	(svn r19665) [1.0] -Backport from trunk: - Fix: Crash of a dedicated server if the null blitter is overridden and (after a while) there is no company 0 on new year anymore [FS#3749] (r19664) - Fix: In rare cases, update of signals could be missed (r19663) - Fix: Various improvements of command handling, missing error messages (r19658, r19657, r19656, r19655, r19654, r19637, r19633, r19621, r19616, r19605, r19604) - Fix: Sorting industries by production was broken for NewGRF industries (r19538)	2010-04-17 22:27:49 +00:00
rubidium	9f14d652a9	(svn r19653) [1.0] -Backport from trunk: - Fix: RandomRange() is used for bigger ranges in many cases, so generally extent it to handle 32 bits (r19652) - Fix: When a company is sold, move connected clients to spectators [FS#3745] (r19651) - Fix: A client would not be properly moved when moved while joining, e.g. when entering a company's password. This caused the client to be in the wrong company (according to the rest of the clients) and the client being kicked on the first command [FS#3760] (r19648) - Fix: Trains loaded above the original IDs did not have a default railtypelabel assigned to them, causing them to be unavailable. Could cause desyncs if the multiplayer game was not started from a savegame [FS#3768] (r19647)	2010-04-17 12:00:59 +00:00
rubidium	4fada121bd	(svn r19646) [1.0] -Backport from trunk: - Change: Log the _date and _date_fract in the desync log for saved games (r19638) - Fix: Do not allow building cacti outside of the desert or rain forest trees outside of the rain forest area. This to prevent people from thinking planting rain forest trees makes the rain forest bigger and thus adds more place to build a lumber mill [FS#3728] (r19644, r19635, r19634) - Fix: Industry generation failed for large maps and lots of industry types (r19643) - Fix: Desync when taking over companies (r19636) - Fix: Chat message caused glitch when rejoining a network game [FS#3757] (r19629)	2010-04-16 22:02:33 +00:00
rubidium	7c3487501c	(svn r19624) [1.0] -Backport from trunk: - Fix: Possible invalid read when server moves client to spectators before he finishes joining [FS#3755] (r19613) - Fix: Improve joining behaviour; kicking clients when entering passwords that was just cleared, 'connection lost' for people failing the password (r19610, r19609, r19608, r19607, r19606)	2010-04-13 21:40:24 +00:00
rubidium	ba8422354b	(svn r19623) [1.0] -Backport from trunk: - Fix: Company related graphs were not updated correctly after changing the company colour [FS#3763] (r19615) - Fix: Crash when opening a savegame with a waypoint from around 0.4.0 [FS#3756] (r19612) - Fix: Presence of online content was not properly updated after download due to duplicate slashes in the path (r19600) - Fix: [NewGRF] Setting industry prop 0x24 to 0 caused empty station names (r19590)	2010-04-13 21:32:29 +00:00
rubidium	9ed75d3ab7	(svn r19622) [1.0] -Backport from trunk: - Fix: Desync when a command is received and in the queue while a client starts joining, i.e. save the game state. This can happen in two ways: with frame_freq > 1 a command received in a previous frame might not be executed yet or when a command is received in the same frame as the join but before the savegame is made. In both cases the joining client would not get all commands to get in-sync with the server (and the other clients) (r19620) - Fix: [desync debug] Minor fixes; "join" pause could cause a crash as some command data was not properly initialised, state was logged multiple times (r19619, r19617, r19602)	2010-04-13 19:30:51 +00:00
rubidium	83cca3a75a	(svn r19603) [1.0] -Backport from trunk: - Fix: Desync debugging; false positives in the cache validity checks and saving/loading the command stream (r19601, r19600, r19596, r19593, r19592, r19589, r19587, r19586)	2010-04-11 10:57:21 +00:00
rubidium	d197bcae1c	(svn r19585) [1.0] -Backport from trunk: - Feature: [NewGRF] Support for extended text code 0x9A 11, print qword (r19570) - Change: Sync Debian packaging updates from Debian, but keep building a single package (r19572) - Fix: Crash when pressing 'h' (non-stop) in the order window of a ship or aircraft [FS#3744] (r19584) - Fix: Graphs were not properly updated when going toggling keys (i.e. companies) (r19574) - Fix: The timetable button was not automatically raised [FS#3739] (r19571) - Fix: [NewGRF] Possible buffer underflow in NewGRF string code (r19569)	2010-04-08 15:40:46 +00:00
rubidium	bb74ec40ea	(svn r19567) [1.0] -Backport from trunk: - Feature: Give more detailed error message when trying to build a too long bridge (r19561) - Fix: [NewGRF] Do not return a random colour for unowned industries in var 45; TTDPatch does not seem to set the colour data in that case either and it could lead to desyncs (r19566) - Fix: Window::OnResize() was not always called while resizing a window causing incorrect windows [FS#3730] (r19563, r19558) - Fix: Bridge build error message should not show the same message twice (r19560, r19559) - Fix: Missed conversion to checking temporary data broke rail type setting upon changing traction type (r19557) - Fix: Incorrect speed limit reported for rail depots with original acceleration model (r19556)	2010-04-05 21:34:47 +00:00
rubidium	8840831852	(svn r19555) [1.0] -Backport from trunk: - Fix: Remove same_industry_close setting did not do what it said and caused NewGRF trouble (r19499)	2010-04-03 20:19:26 +00:00
rubidium	fcff99da75	(svn r19554) [1.0] -Backport from trunk: - Fix: Improperly scaled cargo payment graph when having lots of cargo (r19550, 19543) - Fix: [NewGRF] Properties set before property 08 (house, industry, industry tiles) should be ignored, not trigger the NewGRF to be disabled [FS#3725] (r19547) - Fix: Vehicle details window did not resize correctly after refitting a road vehicle to a longer variant [FS#3720] (r19533)	2010-04-03 20:09:19 +00:00
rubidium	a9163d0503	(svn r19552) [1.0] -Backport from trunk: - Fix: Prevent drawing industries disabled at the smallmap as land tiles when they are built on water (r19523) - Fix: Tunnels, bridges and roadstops are build with only one roadtype (r19506) - Fix: [NewGRF] During NewGRF loading, store rail type labels in temporary data and process after loading has finished. This avoids deactivated rail vehicles being reactivated if the climate property is set after the rail type property (r19502) - Fix: Keep number padding intact when cloning vehicle names [FS#3710] (r19498)	2010-04-03 19:57:23 +00:00
rubidium	3106bb110e	(svn r19551) [1.0] -Backport from trunk: - Feature: Add rail speed limit to land area information window (r19434) - Fix: [NewGRF] Bytes and words get sign-extended for temporary/persistent storage (r19497) - Fix: Stop reducing the size of the vehicle list after selecting a vehicle with a long description (r19480) - Fix: Implement custom sound effect for helicopter take-off [FS#3668] (r19364) - Update: Plural type of Slovak (r19452)	2010-04-03 19:48:01 +00:00
rubidium	6837650080	(svn r19529) [1.0] -Backport from trunk: - Fix: Network clients would crash while connecting to a server with AIs (r19526) - Fix: [NPF] Crash when finding a waypoint before finding the closest depot [FS#3703] (r19460)	2010-03-31 22:05:20 +00:00
rubidium	286575a6c3	(svn r19446) [1.0] -Backport from trunk: - Fix: Mark industry windows dirty more often [FS#3701] (r19443) - Update: Readme about openmsx and make it easier to find the pulseaudio-ubuntu-slowness bug in the readme/known-bugs (r19442) - Language updates	2010-03-17 22:21:03 +00:00
rubidium	9931557d89	(svn r19439) [1.0] -Backport from trunk: - Fix: Custom group names are misaligned with default ones when using rtl languages [FS#3700] (r19438) - Fix: With certain game settings one could clear tiles for free when building long roads (r19436) - Fix: When loading a savegame created with a house NewGRF without that NewGRF available all houses became tall office blocks (r19435) - Fix: Limit rail clearance earnings to 3/4s of rail build cost, to avoid money making loophole when rail build cost is less than rail removal earnings (r19433) - Fix: Crash when the error message 'owned by <town>' was shown [FS#3696] (r19432) - Feature: Append rail type speed limit (if set) to rail type selection list, and toolbar title (r19431)	2010-03-16 20:54:26 +00:00
rubidium	821fe5c3ba	(svn r19430) [1.0] -Backport from trunk: - Fix: [NoAI] When the title game contains an AIPL block the AI settings where overwritten by those from the title game (r19429) - Fix: Gracefully handle the case where we cannot open a .tar file (r19427) - Fix: [YAPP] A train on a bridge/tunnel was not always found when checking for trains on a reserved path (r19425) - Fix: [NoAI] The AI Debug window did not open if an AI or library fails to compile when loading a savegame [FS#3669] (r19395) - Change: Make the drive through and cargo list consistency checks only run when 'desync' debugging is enabled (r19403, r19398)	2010-03-15 22:52:39 +00:00
rubidium	c3daa9a9fe	(svn r19411) [1.0] -Backport from trunk: language updates	2010-03-13 18:47:58 +00:00
rubidium	7c127b2760	(svn r19393) [1.0] -Backport from trunk: - Fix: One could not level the whole map anymore at once (r19392) - Fix: Only show the 'No AIs available' error message when explicitly changing the number of AI opponents [FS3676] (r19389) - Fix: [NoAI] When reloading a savegame, an AI failing to compile could trigger (trying) to read the not yet loaded information of another AI via the AI Debug window and its "open with the most recently used AI" feature [FS#3666] (r19388) - Fix: Close all orders windows when switching companies [FS#3671] (r19387) - Fix: [IPv6] Netmask calculations were wrong if cidr >= 32 [FS#3684] (r19385) - Fix: Overbuilding bridges, rail stations did not properly update PBS reservation [FS#3680] (r19384, r19383)	2010-03-12 21:12:35 +00:00
rubidium	4aef9b3247	(svn r19376) [1.0] -Backport from trunk: - Feature: [NewGRF] Smallmap colours for railtypes (r19307) - Change: Update documentation for console command connect to use ip:port#company parameter format, in line with command line help (r19374) - Change: [NewGRF] Increase railtype cost range (r19306) - Fix: [NoAI] List valuator could cause invalid iterators [FS#3665] (r19367) - Fix: Close error messages about missing ownership when the company closes or is taken over [FS#3663] (r19358, r19357) [1.0] -Backport string updates from trunk	2010-03-08 22:19:39 +00:00
rubidium	d0583ff075	(svn r19312) [1.0] -Backport from trunk: - Feature: [YAPF] Consider the railtype imposed speed limit for pathfinding (r19301) - Change: Increase the default small font size for freetype fonts as 6 point fonts are usually unreadable [FS#3655] (r19308) - Change: [NewGRF] Railtype cost factor from byte to word value (r19306) - Fix: Disable sound when a sound error happens instead of crashing [FS#3652] (r19304)	2010-03-03 23:24:37 +00:00
rubidium	aba6a8a229	(svn r19310) [1.0] -Backport from trunk: language updates	2010-03-03 20:39:29 +00:00
rubidium	fa9867879f	(svn r19300) [1.0] -Backport from trunk: - Fix: [NewGRF] Return the TTD airport type in station var 0xF1 (r19299) - Fix: [NewGRF] Segfault when station vars 0xF2/0xF3 is accessed when there is no truck/bus stop (r19298) - Fix: [NoAI] Some methods of AIAbstractList left invalid iterators [FS#3566] (r19293) - Fix: [YAPP] If reversing at path signals was disabled, a train would not reverse when hitting the back of an one-way signal (r19286) [1.0] -Update: Intro game	2010-03-02 00:38:01 +00:00
rubidium	ccf52c64e9	(svn r19284) [1.0] -Backport from trunk: language updates	2010-02-27 21:05:13 +00:00
rubidium	6a8b04d01e	(svn r19278) [1.0] -Backport from trunk: - Feature: BaNaNaS support for music sets (r19262) - Fix: [NewGRF] Ensure prices cannot be set to zero. Zero prices break a lot of the internal logic to determine whether something has been done [FS#3646] (r19277) - Fix: 'Cannot build <industry> here... <industry> in the way' showed the to-be-built industry twice, instead of the to-be-built industry and the industry that's in the way [FS#3618] (r19265) - Fix: strgen segfaults when trying to lookup the command for a non-existing command (r19264)	2010-02-27 16:41:10 +00:00
rubidium	7ed9361ad9	(svn r19258) [1.0] -Backport from trunk: - Feature: [NewGRF] Add 2 bits of pseudo-random data for rail types, based on tile location (r19235) - Fix: Writing (console) output to a file failed on Windows if the date would not be logged [FS#3639] (r19252) - Fix: [NewGRF] Some GRF error messages did not free the previous error messages, creating a memory leak (r19251) - Fix: With RTL languages clicking a horizontal scrollbar that could not scroll could cause a crash [FS#3643] (r19250) - Fix: Start and end tiles were swapped in CMD_REMOVE_LONG_ROAD causing too much road to be removed [FS#3642] (r19249) - Fix: DOS 'port' did not compile anymore (r19248) - Fix: The -M command line option did not work (r19233)	2010-02-25 21:18:38 +00:00
rubidium	bfa5e7fef5	(svn r19223) [1.0] -Backport from trunk: - Feature: Add OpenMSX to the installer (r19220, r19219) - Feature: [NewGRF] Add CB36 support for aircraft properties 0F and 11 (r19218) - Feature: Scroll to current order destination when ctrl+clicking the start/stop bar (r19216, r19215) - Feature: Concept of fallback base sets, i.e. do not automatically load the NoMusic/NoSound sets when there is another set; make NoSound part of base installations (r19214, r19213, r19212, r19211, r19206) - Feature: Support for genders for cargos, industries, vehicles, stations (r19180, r19179, r19178, r19177)	2010-02-23 23:26:37 +00:00
rubidium	5b188a4933	(svn r19222) [1.0] -Backport from trunk: - Change: Improve error message with track building when signals are in the way (r19190, r19189) - Fix: GetDestination() is invalid for nearest-depot orders (r19210) - Fix: Compilation was broken for gcc 3.3 (r19207) - Fix: The vehicle info in the autoreplace gui was drawn even when the window was shaded [FS#3634] (r19187) - Fix: When selecting 'build many industries' in the scenario editor the 'build' button was not enabled [FS#3632] (r19176)	2010-02-23 23:18:41 +00:00
rubidium	eb8263ce50	(svn r19175) [1.0] -Backport from trunk: - Change: Do not print the absolute path to AI script files in the AI debug window, use the relative path from /ai/ instead (r19166) - Change: The Debian packaging; bring it in sync with the packaging used at Debian excluding package splitting (r19162) - Fix: Buoys are no Stations, only BaseStations (r19174) - Fix: Under some circumstances timidity (via extmidi) would not shut down properly causing all kinds of trouble (e.g. blocked audio output). Try harder to shut down timidity and first shut down the music so shut down order is the inverse of initialisation order (r19168) - Fix: Industry 0 could be choosen even if not available [FS#3631] (r19167) - Fix: Vehicle running costs should not be changed in a running game [FS#3629] (r19165)	2010-02-20 21:10:58 +00:00
rubidium	b87549229b	(svn r19156) [1.0] -Prepare: for 1.0.0-RC1	2010-02-17 23:00:36 +00:00
rubidium	02afc66664	(svn r19155) [1.0] -Backport from trunk: - Fix: Invisible depots draw the track, so also draw the overlays (r19154) - Fix: PBS reservation was drawn incorrectly for depots (r19153) - Change: Move home directory to a better place in Haiku [FS#3625] (r19151) - Fix: [v]seprintf should return the number of added characters excluding '\0' on truncation [FS#3627] (r19149, r19148)	2010-02-17 21:29:31 +00:00
rubidium	6c86fa768c	(svn r19144) [1.0] -Fix [FS#3569]: under certain circumstances one could crash a competitor's train	2010-02-16 00:09:43 +00:00
rubidium	9a4fd32e87	(svn r19142) [1.0] -Branch: the 1.0 series	2010-02-15 23:59:46 +00:00