(svn r24046) -Release: 1.2.0-RC3

(svn r24045) [1.2] -Update: some documentation
(svn r24044) [1.2] -Fix: forgot some languages
2025-08-13 17:49:10 +00:00 · 2012-03-18 17:13:32 +00:00 · 2012-03-18 17:08:27 +00:00 · 2012-03-18 17:04:22 +00:00 · 2012-03-18 17:00:47 +00:00 · 2012-03-18 16:47:16 +00:00
890 changed files with 58399 additions and 121758 deletions
--- a/4
+++ b/4
@@ -1,7 +1,3 @@
-This is the license which applies to OpenTTD with the exception of some
-3rd party modules. See readme.txt for details
-
-
                    GNU GENERAL PUBLIC LICENSE
                       Version 2, June 1991

--- a/4
+++ b/4
@@ -97,7 +97,7 @@ EXCLUDE_PATTERNS       = */3rdparty */.svn */script/api
 EXAMPLE_PATH           =
 EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             =./docs/
+IMAGE_PATH             =
 INPUT_FILTER           =
 FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
@@ -202,7 +202,7 @@ SKIP_FUNCTION_MACROS   = YES
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 TAGFILES               =
-GENERATE_TAGFILE       = objs/openttd.tag
+GENERATE_TAGFILE       = openttd.tag
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 PERL_PATH              = /usr/bin/perl
--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
@@ -10,9 +10,13 @@
 #

 # The revision is needed for the bundle name and creating an OSX application bundle.
+ifdef REVISION
+REV := $(REVISION)
+else
 # Detect the revision
 VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh")
 REV      := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
+endif

 # Make sure we have something in REV
 ifeq ($(REV),)
@@ -26,13 +30,11 @@ endif
 # An OSX application bundle needs the data files, lang files and openttd executable in a different location.
 ifdef OSXAPP
 AI_DIR      = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/ai
-GAME_DIR    = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/game
 BASESET_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/baseset
 LANG_DIR    = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
 TTD_DIR     = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
 else
 AI_DIR      = $(BUNDLE_DIR)/ai
-GAME_DIR    = $(BUNDLE_DIR)/game
 BASESET_DIR = $(BUNDLE_DIR)/baseset
 LANG_DIR    = $(BUNDLE_DIR)/lang
 TTD_DIR     = $(BUNDLE_DIR)
@@ -47,7 +49,6 @@ bundle: all
 	$(Q)mkdir -p "$(BUNDLE_DIR)/scripts"
 	$(Q)mkdir -p "$(TTD_DIR)"
 	$(Q)mkdir -p "$(AI_DIR)"
-	$(Q)mkdir -p "$(GAME_DIR)"
 	$(Q)mkdir -p "$(BASESET_DIR)"
 	$(Q)mkdir -p "$(LANG_DIR)"
 ifdef OSXAPP
@@ -62,7 +63,6 @@ ifeq ($(OS),UNIX)
 endif
 	$(Q)cp "$(BIN_DIR)/$(TTD)"                "$(TTD_DIR)/"
 	$(Q)cp "$(BIN_DIR)/ai/"compat_*.nut       "$(AI_DIR)/"
-	$(Q)cp "$(BIN_DIR)/game/"compat_*.nut     "$(GAME_DIR)/"
 	$(Q)cp "$(BIN_DIR)/baseset/"*.grf         "$(BASESET_DIR)/"
 	$(Q)cp "$(BIN_DIR)/baseset/"*.obg         "$(BASESET_DIR)/"
 	$(Q)cp "$(BIN_DIR)/baseset/"*.obs         "$(BASESET_DIR)/"
@@ -73,6 +73,7 @@ endif
 	$(Q)cp "$(ROOT_DIR)/COPYING"              "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/known-bugs.txt"       "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/docs/multiplayer.txt" "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/docs/32bpp.txt"       "$(BUNDLE_DIR)/docs/"
 	$(Q)cp "$(ROOT_DIR)/changelog.txt"        "$(BUNDLE_DIR)/"
 ifdef MAN_DIR
 	$(Q)mkdir -p "$(BUNDLE_DIR)/man/"
@@ -84,15 +85,15 @@ endif
 	$(Q)cp "$(BIN_DIR)/scripts/"*             "$(BUNDLE_DIR)/scripts/"
 ifdef MENU_DIR
 	$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
-	$(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | $(SORT) |  $(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.filter.awk" >> "$(BUNDLE_DIR)/media/openttd.desktop"
+	$(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | $(SORT) >> "$(BUNDLE_DIR)/media/openttd.desktop"
 	$(Q)sed s/=openttd/=$(BINARY_NAME)/g "$(BUNDLE_DIR)/media/openttd.desktop" > "$(ROOT_DIR)/media/openttd.desktop.install"
 endif
 ifeq ($(TTD), openttd.exe)
 	$(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/readme.txt" "$(BUNDLE_DIR)/COPYING" "$(BUNDLE_DIR)/changelog.txt" "$(BUNDLE_DIR)/known-bugs.txt"
 ifeq ($(OS), DOS)
-	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi/cwsdpmi.txt"   "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi.txt"   "$(BUNDLE_DIR)/docs/"
 ifndef STRIP
-	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi/cwsdpmi.exe"   "$(TTD_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi.exe"   "$(TTD_DIR)/"
 endif
 endif
 endif
--- a/Makefile.grf.in
+++ b/Makefile.grf.in
@@ -20,8 +20,6 @@

 ROOT_DIR = !!ROOT_DIR!!
 GRF_DIR  = $(ROOT_DIR)/media/extra_grf
-BASESET_DIR = $(ROOT_DIR)/media/baseset
-LANG_DIR = $(ROOT_DIR)/src/lang
 BIN_DIR  = !!BIN_DIR!!/baseset
 OBJS_DIR = !!GRF_OBJS_DIR!!
 OS       = !!OS!!
@@ -38,7 +36,6 @@ endif

 GRFCODEC := !!GRFCODEC!!
 NFORENUM := !!NFORENUM!!
-CC_BUILD := !!CC_BUILD!!
 MD5SUM   := $(shell [ "$(OS)" = "OSX" ] && echo "md5 -r" || echo "md5sum")

 # Some "should not be changed" settings.
@@ -47,7 +44,7 @@ PNG_FILES    := $(GRF_DIR)/*.png $(GRF_DIR)/rivers/*.png

 # Build the GRF.
 ifdef GRFCODEC
-all: $(BIN_DIR)/openttd.grf $(BIN_DIR)/orig_dos.obg $(BIN_DIR)/orig_dos_de.obg $(BIN_DIR)/orig_win.obg $(BIN_DIR)/orig_dos.obs $(BIN_DIR)/orig_win.obs $(BIN_DIR)/no_sound.obs $(BIN_DIR)/orig_win.obm $(BIN_DIR)/no_music.obm
+all: $(BIN_DIR)/openttd.grf
 else
 all:
 endif
@@ -56,33 +53,20 @@ endif
 $(OBJS_DIR)/sprites:
 	$(Q)-mkdir "$@"

-$(OBJS_DIR)/langfiles.tmp: $(LANG_DIR)/*.txt
-	$(E) '$(STAGE) Collecting baseset translations'
-	$(Q) cat $^ > $@
+# Generic
+$(BIN_DIR)/openttd.grf: $(OBJS_DIR)/openttd.grf
+	$(Q)cp $(OBJS_DIR)/openttd.grf $(BIN_DIR)/openttd.grf
+	$(E) '$(STAGE) Updating base graphics sets'
+	$(Q) for grf in $(BIN_DIR)/orig*.obg; do sed 's/^OPENTTD.GRF  = [0-9a-f]*$$/OPENTTD.GRF  = '`$(MD5SUM) $(BIN_DIR)/openttd.grf | sed 's@ .*@@'`'/' $$grf > $$grf.tmp && mv $$grf.tmp $$grf; done

-$(BIN_DIR)/%.obg: $(BASESET_DIR)/%.obg $(BIN_DIR)/openttd.grf $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/translations.awk
-	$(E) '$(STAGE) Updating $(notdir $@)'
-	$(Q) sed 's/^OPENTTD.GRF  = *[0-9a-f]*$$/OPENTTD.GRF  = '`$(MD5SUM) $(BIN_DIR)/openttd.grf | sed 's@ .*@@'`'/' $< > $@.tmp
-	$(Q) awk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $@.tmp >$@
-	$(Q) rm $@.tmp
-
-$(BIN_DIR)/%.obs: $(BASESET_DIR)/%.obs $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/translations.awk
-	$(E) '$(STAGE) Updating $(notdir $@)'
-	$(Q) awk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $< >$@
-
-$(BIN_DIR)/%.obm: $(BASESET_DIR)/%.obm $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/translations.awk
-	$(E) '$(STAGE) Updating $(notdir $@)'
-	$(Q) awk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $< >$@
-
-# Compile extra grf
-$(BIN_DIR)/openttd.grf: $(PNG_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites
+# Yeah, we'd like to use -i in the sed, but Mac OS X's sed and GNU sed just can't agree on the usage of -i. In any case either one of them fails.
+$(OBJS_DIR)/openttd.grf: $(PNG_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites
 	$(E) '$(STAGE) Assembling openttd.nfo'
 	$(Q)-cp $(PNG_FILES) $(OBJS_DIR)/sprites 2> /dev/null
-	$(Q) $(CC_BUILD) -nostdinc -I$(GRF_DIR) -C -E - < "$(GRF_DIR)/openttd.nfo" | sed -e '/^#/d' -e '/^$$/d' > $(OBJS_DIR)/sprites/openttd.nfo
+	$(Q) gcc -I$(GRF_DIR) -C -E - < "$(GRF_DIR)/openttd.nfo" | sed -e '/^#/d' -e '/^$$/d' > $(OBJS_DIR)/sprites/openttd.nfo
 	$(Q) $(NFORENUM) -s $(OBJS_DIR)/sprites/openttd.nfo
 	$(E) '$(STAGE) Compiling openttd.grf'
 	$(Q) $(GRFCODEC) -n -s -e -p1 $(OBJS_DIR)/openttd.grf
-	$(Q)cp $(OBJS_DIR)/openttd.grf $(BIN_DIR)/openttd.grf

 # Clean up temporary files.
 clean:
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,6 +41,7 @@ TTDS        = $(SRC_DIRS:%=%/$(TTD))
 OS          = !!OS!!
 OSXAPP      = !!OSXAPP!!
 LIPO        = !!LIPO!!
+REVISION    = !!REVISION!!
 AWK         = !!AWK!!
 SORT        = !!SORT!!
 DISTCC      = !!DISTCC!!
@@ -144,15 +145,17 @@ mrproper:
 # output of profiling
 	$(Q)rm -f $(BIN_DIR)/gmon.out
 # output of generating 'API' documentation
+	$(Q)rm -f $(ROOT_DIR)/openttd.tag
 	$(Q)rm -rf $(ROOT_DIR)/docs/source
+# output of generating AI API documentation
+	$(Q)rm -f $(SRC_DIR)/ai/api/openttd.tag
 	$(Q)rm -rf $(ROOT_DIR)/docs/aidocs
-	$(Q)rm -rf $(ROOT_DIR)/docs/gamedocs
 # directories created by OpenTTD on regression testing
 	$(Q)rm -rf $(BIN_DIR)/ai/regression/content_download $(BIN_DIR)/ai/regression/save $(BIN_DIR)/ai/regression/scenario
 distclean: mrproper

 maintainer-clean: distclean
-	$(Q)rm -f $(BIN_DIR)/baseset/openttd.grf $(BIN_DIR)/baseset/*.obg $(BIN_DIR)/baseset/*.obs $(BIN_DIR)/baseset/*.obm
+	$(Q)rm -f $(BIN_DIR)/baseset/openttd.grf

 depend:
 	@for dir in $(SRC_DIRS); do \
--- a/Makefile.lang.in
+++ b/Makefile.lang.in
@@ -14,7 +14,6 @@ LANGS_SRC     = $(shell ls $(LANG_DIR)/*.txt)
 LANGS         = $(LANGS_SRC:$(LANG_DIR)/%.txt=%.lng)
 CXX_BUILD     = !!CXX_BUILD!!
 CFLAGS_BUILD  = !!CFLAGS_BUILD!!
-CXXFLAGS_BUILD= !!CXXFLAGS_BUILD!!
 LDFLAGS_BUILD = !!LDFLAGS_BUILD!!
 STRGEN_FLAGS  = !!STRGEN_FLAGS!!
 STAGE         = !!STAGE!!
@@ -45,23 +44,23 @@ all: table/strings.h $(LANGS)

 strgen_base.o: $(SRC_DIR)/strgen/strgen_base.cpp $(SRC_DIR)/strgen/strgen.h endian_host.h $(SRC_DIR)/table/control_codes.h $(SRC_DIR)/table/strgen_tables.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<

 strgen.o: $(SRC_DIR)/strgen/strgen.cpp $(SRC_DIR)/strgen/strgen.h endian_host.h $(SRC_DIR)/table/control_codes.h $(SRC_DIR)/table/strgen_tables.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<

 string.o: $(SRC_DIR)/string.cpp endian_host.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<

 alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<

 getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/misc/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<

 lang/english.txt: $(LANG_DIR)/english.txt
 	$(Q)mkdir -p lang
@@ -69,7 +68,7 @@ lang/english.txt: $(LANG_DIR)/english.txt

 $(STRGEN): alloc_func.o string.o strgen_base.o strgen.o getoptdata.o
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $^ -o $@
+	$(Q)$(CXX_BUILD) $(LDFLAGS_BUILD) $^ -o $@

 table/strings.h: lang/english.txt $(STRGEN)
 	$(E) '$(STAGE) Generating $@'
@@ -88,7 +87,7 @@ endian_host.h: $(ENDIAN_CHECK)

 $(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $< -o $@
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $< -o $@

 depend:

--- a/Makefile.setting.in
+++ b/Makefile.setting.in
@@ -10,7 +10,6 @@ ENDIAN_CHECK     = !!ENDIAN_CHECK!!
 SRC_DIR          = !!SRC_DIR!!
 CXX_BUILD        = !!CXX_BUILD!!
 CFLAGS_BUILD     = !!CFLAGS_BUILD!!
-CXXFLAGS_BUILD   = !!CXXFLAGS_BUILD!!
 LDFLAGS_BUILD    = !!LDFLAGS_BUILD!!
 STAGE            = !!STAGE!!
 SETTING_OBJS_DIR = !!SETTING_OBJS_DIR!!
@@ -30,27 +29,27 @@ all: table/settings.h

 settingsgen.o: $(SRC_DIR)/settingsgen/settingsgen.cpp $(SRC_DIR)/string_func.h $(SRC_DIR)/strings_type.h $(SRC_DIR)/misc/getoptdata.h $(SRC_DIR)/ini_type.h $(SRC_DIR)/core/smallvec_type.hpp
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<

 alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<

 getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/misc/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<

 string.o: $(SRC_DIR)/string.cpp endian_host.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<

 ini_load.o: $(SRC_DIR)/ini_load.cpp $(SRC_DIR)/core/alloc_func.hpp $(SRC_DIR)/core/mem_func.hpp $(SRC_DIR)/ini_type.h $(SRC_DIR)/string_func.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<

 $(SETTINGSGEN): alloc_func.o string.o ini_load.o settingsgen.o getoptdata.o
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $^ -o $@
+	$(Q)$(CXX_BUILD) $(LDFLAGS_BUILD) $^ -o $@

 table/settings.h: $(SETTINGSGEN) $(SRC_DIR)/table/settings.h.preamble $(SRC_DIR)/table/settings.h.postamble $(SRC_DIR)/table/*.ini
 	$(E) '$(STAGE) Generating $@'
@@ -65,7 +64,7 @@ endian_host.h: $(ENDIAN_CHECK)

 $(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $< -o $@
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $< -o $@

 depend:

--- a/Makefile.src.in
+++ b/Makefile.src.in
@@ -229,22 +229,10 @@ $(OBJS_C): %.o: $(SRC_DIR)/%.c $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.c=%.c)'
 	$(Q)$(CC_HOST) $(CFLAGS) -c -o $@ $<

-$(filter-out %sse2.o, $(filter-out %ssse3.o, $(filter-out %sse4.o, $(OBJS_CPP)))): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
+$(OBJS_CPP): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -o $@ $<

-$(filter %sse2.o, $(OBJS_CPP)): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -msse2 -o $@ $<
-
-$(filter %ssse3.o, $(OBJS_CPP)): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -mssse3 -o $@ $<
-
-$(filter %sse4.o, $(OBJS_CPP)): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -msse4.1 -o $@ $<
-
 $(OBJS_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.mm=%.mm)'
 	$(Q)$(CC_HOST) $(CFLAGS) -c -o $@ $<
@@ -288,7 +276,7 @@ endian_target.h: $(ENDIAN_CHECK) $(CONFIG_CACHE_ENDIAN)

 $(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $< -o $@
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $< -o $@

 # Revision files

--- a/bin/ai/compat_1.2.nut
+++ b/bin/ai/compat_1.2.nut
@@ -6,5 +6,3 @@
 * OpenTTD 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. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 */
-
-AILog.Info("1.2 API compatability in effect.");
--- a/bin/ai/compat_1.3.nut
+++ b/bin/ai/compat_1.3.nut
@@ -1,10 +0,0 @@
-/* $Id$ */
-
-/*
- * This file is part of OpenTTD.
- * OpenTTD 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, version 2.
- * OpenTTD 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. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-AILog.Info("1.3 API compatability in effect.");
--- a/bin/ai/compat_1.4.nut
+++ b/bin/ai/compat_1.4.nut
@@ -1,8 +0,0 @@
-/* $Id: compat_1.3.nut 23969 2012-02-19 19:14:17Z rubidium $ */
-
-/*
- * This file is part of OpenTTD.
- * OpenTTD 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, version 2.
- * OpenTTD 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. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
--- a/bin/ai/regression/regression.txt
+++ b/bin/ai/regression/regression.txt
@@ -88,9 +88,9 @@
 abs( 21): 21

 --AIBase--
-  Rand():       -54346916
-  Rand():       -937374575
-  Rand():       823953997
+  Rand():       1259692483
+  Rand():       -1289244298
+  Rand():       -1572996668
  RandRange(0): 0
  RandRange(0): 0
  RandRange(0): 0
@@ -98,12 +98,12 @@
  RandRange(1): 0
  RandRange(1): 0
  RandRange(2): 1
+  RandRange(2): 0
  RandRange(2): 1
-  RandRange(2): 1
-  RandRange(1000000): 966676
-  RandRange(1000000): 289525
-  RandRange(1000000): 170283
-  Chance(1, 2): false
+  RandRange(1000000): 36500
+  RandRange(1000000): 300101
+  RandRange(1000000): 418369
+  Chance(1, 2): true
  Chance(1, 2): true
  Chance(1, 2): false

@@ -420,144 +420,144 @@
    1098 => 46116
    1099 => 46158
  Randomize ListDump:
-    1 => -200078348
-    2 => -29799264
-    1000 => 1630721656
-    1001 => 959306175
-    1002 => 1527421791
-    1003 => 1259692483
-    1004 => -1289244298
-    1005 => -1572996668
-    1006 => -2069479746
-    1007 => -1819131606
-    1008 => -1007163964
-    1009 => -1185394870
-    1010 => -1471365065
-    1011 => 364354366
-    1012 => -1478084253
-    1013 => 405281367
-    1014 => -11170062
-    1015 => 156767750
-    1016 => 1288924796
-    1017 => 1796884876
-    1018 => -1947073702
-    1019 => -1999614238
-    1020 => -231292809
-    1021 => 966621566
-    1022 => -606766557
-    1023 => -1138727825
-    1024 => -749544262
-    1025 => 2004771271
-    1026 => 686734186
-    1027 => 923274744
-    1028 => -1672035149
-    1029 => -1642064950
-    1030 => 1363389551
-    1031 => -559500928
-    1032 => 1656196991
-    1033 => 1655354425
-    1034 => -1027156689
-    1035 => 1952644328
-    1036 => 1217870217
-    1037 => 242274100
-    1038 => 201816080
-    1039 => 2127464758
-    1040 => 446043650
-    1041 => -319728455
-    1042 => 204701002
-    1043 => -571265398
-    1044 => -1422217131
-    1045 => -391208397
-    1046 => -1822628371
-    1047 => -1499755350
-    1048 => -1422137641
-    1049 => 1621693134
-    1051 => -1428728134
-    1052 => -147587573
-    1053 => 681719500
-    1054 => 1172011190
-    1055 => -1834344882
-    1056 => 1157634586
-    1057 => 1902133676
-    1058 => -1967780161
-    1059 => -1618025531
-    1060 => -810220453
-    1061 => 1582854921
-    1062 => -410004643
-    1063 => 1159917159
-    1064 => -1377804984
-    1065 => -738843914
-    1066 => -1578756103
-    1067 => -464090986
-    1068 => 1711504679
-    1069 => 545330655
-    1070 => 379462570
-    1071 => 514511099
-    1072 => -1813251176
-    1073 => 1424958266
-    1074 => -825255131
-    1075 => 539054595
-    1076 => -1764192010
-    1077 => -1243277769
-    1078 => 2017874281
-    1079 => -1972353607
-    1080 => 1879761467
-    1081 => 1638986560
-    1082 => -1832287507
-    1083 => -492411882
-    1084 => 658940812
-    1085 => -1044199400
-    1086 => 1586504918
-    1087 => -125492611
-    1088 => -1562883174
-    1089 => -1013778441
-    1090 => 1560228607
-    1091 => -550265689
-    1092 => 524767105
-    1093 => -713387661
-    1094 => 1425927738
-    1095 => 942653932
-    1096 => 1233220698
-    1097 => 1313602368
-    1098 => -140318584
-    1099 => 1199179892
+    1 => 966621566
+    2 => -606766557
+    1000 => -1138727825
+    1001 => -749544262
+    1002 => 2004771271
+    1003 => 686734186
+    1004 => 923274744
+    1005 => -1672035149
+    1006 => -1642064950
+    1007 => 1363389551
+    1008 => -559500928
+    1009 => 1656196991
+    1010 => 1655354425
+    1011 => -1027156689
+    1012 => 1952644328
+    1013 => 1217870217
+    1014 => 242274100
+    1015 => 201816080
+    1016 => 2127464758
+    1017 => 446043650
+    1018 => -319728455
+    1019 => 204701002
+    1020 => -571265398
+    1021 => -1422217131
+    1022 => -391208397
+    1023 => -1822628371
+    1024 => -1499755350
+    1025 => -1422137641
+    1026 => 1621693134
+    1027 => -1428728134
+    1028 => -147587573
+    1029 => 681719500
+    1030 => 1172011190
+    1031 => -1834344882
+    1032 => 1157634586
+    1033 => 1902133676
+    1034 => -1967780161
+    1035 => -1618025531
+    1036 => -810220453
+    1037 => 1582854921
+    1038 => -410004643
+    1039 => 1159917159
+    1040 => -1377804984
+    1041 => -738843914
+    1042 => -1578756103
+    1043 => -464090986
+    1044 => 1711504679
+    1045 => 545330655
+    1046 => 379462570
+    1047 => 514511099
+    1048 => -1813251176
+    1049 => 1424958266
+    1051 => -825255131
+    1052 => 539054595
+    1053 => -1764192010
+    1054 => -1243277769
+    1055 => 2017874281
+    1056 => -1972353607
+    1057 => 1879761467
+    1058 => 1638986560
+    1059 => -1832287507
+    1060 => -492411882
+    1061 => 658940812
+    1062 => -1044199400
+    1063 => 1586504918
+    1064 => -125492611
+    1065 => -1562883174
+    1066 => -1013778441
+    1067 => 1560228607
+    1068 => -550265689
+    1069 => 524767105
+    1070 => -713387661
+    1071 => 1425927738
+    1072 => 942653932
+    1073 => 1233220698
+    1074 => 1313602368
+    1075 => -140318584
+    1076 => 1199179892
+    1077 => 91450916
+    1078 => -1471626821
+    1079 => -552692855
+    1080 => -801295697
+    1081 => 1307607393
+    1082 => -2111765574
+    1083 => 1773729008
+    1084 => -81987003
+    1085 => -1090790034
+    1086 => -843700327
+    1087 => -1306436740
+    1088 => 735656985
+    1089 => -1933491876
+    1090 => 642759863
+    1091 => 255293949
+    1092 => -1052469001
+    1093 => -1043605053
+    1094 => -2080328201
+    1095 => -1825196581
+    1096 => -1789181164
+    1097 => -1636072563
+    1098 => -111321262
+    1099 => 1979741000
  KeepTop(10):
-    1 => -200078348
-    2 => -29799264
-    1000 => 1630721656
-    1001 => 959306175
-    1002 => 1527421791
-    1003 => 1259692483
-    1004 => -1289244298
-    1005 => -1572996668
-    1006 => -2069479746
-    1007 => -1819131606
+    1 => 966621566
+    2 => -606766557
+    1000 => -1138727825
+    1001 => -749544262
+    1002 => 2004771271
+    1003 => 686734186
+    1004 => 923274744
+    1005 => -1672035149
+    1006 => -1642064950
+    1007 => 1363389551
  KeepBottom(8):
-    1000 => 1630721656
-    1001 => 959306175
-    1002 => 1527421791
-    1003 => 1259692483
-    1004 => -1289244298
-    1005 => -1572996668
-    1006 => -2069479746
-    1007 => -1819131606
+    1000 => -1138727825
+    1001 => -749544262
+    1002 => 2004771271
+    1003 => 686734186
+    1004 => 923274744
+    1005 => -1672035149
+    1006 => -1642064950
+    1007 => 1363389551
  RemoveBottom(2):
-    1000 => 1630721656
-    1001 => 959306175
-    1002 => 1527421791
-    1003 => 1259692483
-    1004 => -1289244298
-    1005 => -1572996668
+    1000 => -1138727825
+    1001 => -749544262
+    1002 => 2004771271
+    1003 => 686734186
+    1004 => 923274744
+    1005 => -1672035149
  RemoveTop(2):
-    1002 => 1527421791
-    1003 => 1259692483
-    1004 => -1289244298
-    1005 => -1572996668
+    1002 => 2004771271
+    1003 => 686734186
+    1004 => 923274744
+    1005 => -1672035149
  RemoveList({1003, 1004}):
-    1002 => 1527421791
-    1005 => -1572996668
+    1002 => 2004771271
+    1005 => -1672035149
  KeepList({1003, 1004, 1005}):
-    1005 => -1572996668
+    1005 => -1672035149
  AddList({1005, 4000, 4001, 4002}):
    1005 => 1005
    4000 => 8000
@@ -588,7 +588,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
  SetName():            false
  GetLastErrorString(): ERR_NAME_IS_NOT_UNIQUE
  GetName():                         Regression
-  GetPresidentName():                E. McAlpine
+  GetPresidentName():                I. McAlpine
  SetPresidentName():                true
  GetPresidentName():                Regression AI
  GetBankBalance():                  100000
@@ -877,7 +877,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
    GetName():          Wooden rail bridge
    GetMaxSpeed():      32
    GetPrice():         450
-    GetMaxLength():     66
+    GetMaxLength():     102
    GetMinLength():     2
  Bridge 1
    IsValidBridge():    true
@@ -905,14 +905,14 @@ ERROR: IsEnd() is invalid as Begin() is never called
    GetName():          Steel suspension rail bridge
    GetMaxSpeed():      96
    GetPrice():         1042
-    GetMaxLength():     66
+    GetMaxLength():     102
    GetMinLength():     5
  Bridge 5
    IsValidBridge():    true
    GetName():          Steel suspension rail bridge
    GetMaxSpeed():      112
    GetPrice():         1081
-    GetMaxLength():     66
+    GetMaxLength():     102
    GetMinLength():     5
  Bridge 6
    IsValidBridge():    true
@@ -1012,9 +1012,9 @@ ERROR: IsEnd() is invalid as Begin() is never called
    1 => 630
    0 => 450
  MaxLength ListDump:
-    5 => 66
-    4 => 66
-    0 => 66
+    5 => 102
+    4 => 102
+    0 => 102
    3 => 12
    8 => 11
    7 => 10
@@ -5079,7 +5079,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
    GetPlaneType():     -1
  Engine 211
    IsValidEngine():    true
-    GetName():          Yate Cargo Ship
+    GetName():          Yate Cargo ship
    GetCargoType():     5
    CanRefitCargo():    true
    GetCapacity():      160
@@ -7384,7 +7384,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
    HasRoadType(Road):             true
    HasRoadType(Tram):             false
    GetNeighbourRoadCount():       2
-    RemoveRoad():                  false
+    RemoveRoad():                  true
    RemoveRoad():                  true
    RemoveRoad():                  false
    RemoveRoad():                  true
@@ -8951,7 +8951,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
  GetWagonEngineType(): 27
  GetWagonAge():        1
  GetWagonEngineType(): 27
-  GetWagonAge():        0
+  GetWagonAge():        1
  GetWagonEngineType(): 65535
  GetWagonAge():        -1
  --Errors--
@@ -9118,8 +9118,8 @@ ERROR: IsEnd() is invalid as Begin() is never called
    5 => 0
    4 => 0
  CargoRating(1) ListDump:
-    5 => -1
-    4 => -1
+    5 => 69
+    4 => 69
  DistanceManhattanToTile(30000) ListDump:
    5 => 106
    4 => 96
@@ -9148,6 +9148,9 @@ ERROR: IsEnd() is invalid as Begin() is never called
        GetDestinationType():  1
        GetDestinationIndex(): 7
        GetCargoType():        0
+  GetNextEvent:          instance
+    GetEventType:        6
+      Unknown Event
  IsEventWaiting:        false

 --Math--
--- a/bin/ai/regression/regression_info.nut
+++ b/bin/ai/regression/regression_info.nut
@@ -6,7 +6,7 @@ class Regression extends AIInfo {
 	function GetShortName()   { return "REGR"; }
 	function GetDescription() { return "This runs regression-tests on all commands. On the same map the result should always be the same."; }
 	function GetVersion()     { return 1; }
-	function GetAPIVersion()  { return "1.3"; }
+	function GetAPIVersion()  { return "1.2"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
 }
--- a/bin/baseset/no_music.obm
+++ b/bin/baseset/no_music.obm
@@ -10,50 +10,34 @@ fallback          = true
 description       = A music pack without actual music.
 description.af_ZA = 'n Musiek stel sonder enige musiek.
 description.ar_EG = مجموعة موسيقى بدون موسيقى
-description.be_BY = "Пусты" набор музычнага афармлення, які не зьмяшчае ніякай музыкі.
 description.bg_BG = Празен музикален пакет.
 description.ca_ES = Un joc de música sense cap música.
 description.cs_CZ = Prázná hudební sada.
-description.cy_GB = Pecyn cerddoriaeth heb unrhyw gerddoriaeth ynddo.
-description.da_DK = En musikpakke uden musik.
+description.da_DA = En musikpakke uden musik.
 description.de_DE = Ein Musikset ohne Musik.
 description.el_GR = Ένα πάκετο μουσικής χωρίς πραγματική μουσική.
-description.en_AU = A music pack without actual music.
+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_EE = Muusikakogu ilma muusikata.
+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.gd_GB = Pacaid ciùil anns nach eil fonn sam bith.
-description.gl_ES = Un conxunto de músicas sen ningunha música.
 description.hr_HR = Muzički paket bez ikakve muzike.
 description.hu_HU = Zenei alapcsomag zene nélkül.
-description.id_ID = Paket musik tanpa musik sungguhan.
-description.is_IS = Tónlistarpakki sem er í raun án tónlistar.
+description.id_ID = Paket musik tanpa berisi musik.
 description.it_IT = Un pacchetto musicale non contenente alcuna musica.
-description.ja_JP = 空の音楽パック
-description.ko_KR = 실제 음악이 없는 음악 목록입니다.
-description.lb_LU = E Musikpack ouni aktuell Musik.
-description.lt_LT = Muzikos pakas be muzikos.
-description.lv_LV = Mūzikas kopa bez mūzikas
 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_BR = Um pacote de músicas sem músicas.
 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_SI = Glasbeni paket z vključeno glasbo.
+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.ta_IN = இசை இல்லாத இசைத்தொகுப்பு.
-description.th_TH = ชุดเพลงประกอบแบบไม่มีเสียงเพลง
 description.tr_TR = Müzik içermeyen boş bir müzik paketi.
-description.uk_UA = Порожній набір музики.
-description.vi_VN = Gói âm nhạc này không có nhạc nào.
-description.zh_CN = 一个没有实际内容的音乐包.
 description.zh_TW = 不含任何音樂的音樂集。

 [files]
--- a/bin/baseset/no_sound.obs
+++ b/bin/baseset/no_sound.obs
@@ -10,50 +10,34 @@ fallback          = true
 description       = A sound pack without any sounds.
 description.af_ZA = 'n Klank stel sonder enige klanke.
 description.ar_EG = مجموعة صوت بدوت اصوات مضافة
-description.be_BY = "Пусты" набор гукавога афармленьня, які не зьмяшчае ніякіх гукаў.
 description.bg_BG = Празен звуков пакет.
 description.ca_ES = Un joc de sons sense cap so.
 description.cs_CZ = Prázdná sada zvuků.
-description.cy_GB = Pecyn sain heb unrhyw effeithiau sain ynddo.
-description.da_DK = En lydpakke uden lyde.
+description.da_DA = En lydpakke uden lyde.
 description.de_DE = Basissounds ohne Sound.
 description.el_GR = Ένα πάκετο ήχων χώρις ήχους.
-description.en_AU = A sound pack without any sounds.
+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_EE = Helikogu ilma helideta.
-description.eu_ES = Soinurik gabeko soinu pakete bat
-description.fi_FI = Äänipaketti, jossa ei ole ääniä.
+description.et_ET = Ilma häälteta helipakk.
+description.fi_FI = Äänipaketti ilman ääniä.
 description.fr_FR = Un pack de sons sans sons.
-description.gd_GB = Pacaid fhuaimean anns nach eil fuaim sam bith.
-description.gl_ES = Un conxunto de sons sen ningún son
 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 suara apapun.
-description.is_IS = Hljóðpakki án hljóðs.
+description.id_ID = Paket efek suara tanpa berisi suara.
 description.it_IT = Un pacchetto sonoro non contenente alcun suono.
-description.ja_JP = 空の効果音パック
-description.ko_KR = 아무런 효과음도 없는 효과음 팩입니다.
-description.lb_LU = En Soundpack mat all den Sounds.
-description.lt_LT = Garsų pakas be jokių garsų.
 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_BR = Um pacote de sons sem sons.
 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_SI = Zvočni paket brez zvoka.
+description.sl_SL = Zvočni paket brez zvoka.
 description.sr_RS = Prazan skup zvukova.
 description.sv_SE = Ett ljudpaket utan några ljud.
-description.ta_IN = ஒலிகள் இல்லாத ஒலி தொகுப்பு.
-description.th_TH = ชุดเสียงแบบไร้เสียง
 description.tr_TR = Ses içermeyen boş bir ses kümesi.
-description.uk_UA = Порожній набір звуків.
-description.vi_VN = Gói âm thanh này không có âm thanh nào.
-description.zh_CN = 一个空的音效包.
 description.zh_TW = 不含任何音效的音效集。

 [files]
--- a/bin/baseset/openttd.grf
+++ b/bin/baseset/openttd.grf
--- a/bin/baseset/opntitle.dat
+++ b/bin/baseset/opntitle.dat
--- a/bin/baseset/orig_dos.obg
+++ b/bin/baseset/orig_dos.obg
@@ -11,49 +11,34 @@ palette           = DOS
 description       = Original Transport Tycoon Deluxe DOS edition graphics.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS uitgawe grafieke.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الرسومية نسخة الدوس
-description.be_BY = Арыґінальная ґрафіка з Transport Tycoon Deluxe для DOS.
 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.cy_GB = Graffeg gwreiddiol fersiwn DOS o Transport Tycoon Deluxe.
-description.da_DK = Originalgrafik fra Transport Tycoon Deluxe DOS-version.
+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_AU = Original Transport Tycoon Deluxe DOS edition graphics.
+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_EE = Algse Transport Tycoon Deluxe DOSi versiooni graafika.
-description.fi_FI = Alkuperäiset Transport Tycoon Deluxen DOS-version grafiikat.
+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.gd_GB = Grafaigeachd aig an deasachadh DOS tùsail aig Transport Tycoon Deluxe.
-description.gl_ES = Graficos da edición orixinal de Transport Tycoon Deluxe para 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.is_IS = Upprunalega grafíkin úr Transport Tycoon Deluxe DOS útgáfunni.
 description.it_IT = Grafica originale di Transport Tycoon Deluxe, edizione DOS.
-description.ja_JP = Transport Tycoon Deluxe オリジナル版 グラフィック (DOS)
-description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 도스 에디션의 그래픽입니다.
-description.lb_LU = Original Transport Tycoon Deluxe DOS Editioun Grafik.
-description.lt_LT = Originali Transport Tycoon Deluxe DOS leidimo grafika.
 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_BR = Gráficos Originais do Transport Tycoon Deluxe, Edição 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_SI = Originalna grafika Transport Tycoon Deluxe za različico 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.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் DOS பதிப்பு அசைவூட்டங்கள்.
-description.th_TH = กราฟฟิกต้นตำหรับของ Transport Tycoon Deluxe DOS edition
-description.tr_TR = Özgün Transport Tycoon Deluxe DOS sürümü grafikleri.
-description.uk_UA = Оригінальна графіка з Transport Tycoon Deluxe DOS edition.
-description.vi_VN = Đồ họa gốc từ phiên bản Transport Tycoon Deluxe trên DOS
-description.zh_CN = 运输大亨DOS豪华版原版图形包.
+description.tr_TR = Orijinal Transport Tycoon Deluxe DOS sürümü grafikleri.
 description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版的圖形。

 [files]
@@ -70,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF  = 75a93cea2ed455c2fd5dcbda39e53538
+OPENTTD.GRF  = 51f9d2b8a29a079e83486db13509336c

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/bin/baseset/orig_dos.obs
+++ b/bin/baseset/orig_dos.obs
@@ -10,49 +10,34 @@ version           = 0
 description       = Original Transport Tycoon Deluxe DOS edition sounds.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS uitgawe klanke.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الصوتية نسخة الدوس
-description.be_BY = Арыґінальны набор гукавога афармленьня з гульні Transport Tycoon Deluxe для DOS.
 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.cy_GB = Effeithiau sain gwreiddiol fersiwn DOS o Transport Tycoon Deluxe.
-description.da_DK = Originallyd fra Transport Tycoon Deluxe DOS-version.
+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_AU = Original Transport Tycoon Deluxe DOS edition sounds.
+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_EE = Algse Transport Tycoon Deluxe DOSi versiooni helid.
-description.fi_FI = Alkuperäiset Transport Tycoon Deluxen DOS-version äänet.
-description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version DOS).
-description.gd_GB = Fuaimean aig an deasachadh DOS tùsail aig Transport Tycoon Deluxe.
-description.gl_ES = Sons da edición orixinal de Transport Tycoon Deluxe para 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.is_IS = Upprunalega hljóðið úr Transport Tycoon Deluxe DOS útgáfunni.
 description.it_IT = Suoni originali di Transport Tycoon Deluxe, edizione DOS.
-description.ja_JP = Transport Tycoon Deluxe オリジナル版 効果音 (DOS)
-description.ko_KR = 오리지널 트랜스포트 타이쿤 도스 에디션의 효과음입니다.
-description.lb_LU = Original Transport Tycoon Deluxe DOS Editioun Sound.
-description.lt_LT = Originalūs Transport Tycoon Deluxe DOS leidimo garsai.
 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_BR = Sons Originais do Transport Tycoon Deluxe, Edição 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_SI = Originalni zvoki Transport Tycoon Deluxe različice 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.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் DOS பதிப்பு ஒலிகள்.
-description.th_TH = เสียงต้นตำหรับของ Transport Tycoon Deluxe DOS edition
-description.tr_TR = Özgün Transport Tycoon Deluxe DOS sürümü sesleri.
-description.uk_UA = Оригінальний набір звуків з Transport Tycoon Deluxe DOS edition.
-description.vi_VN = Âm thanh gốc từ phiên bản Transport Tycoon Deluxe trên DOS
-description.zh_CN = 运输大亨DOS豪华版原版音效包.
+description.tr_TR = Orijinal Transport Tycoon Deluxe DOS sürümü sesleri.
 description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版的音效。

 [files]
--- a/bin/baseset/orig_dos_de.obg
+++ b/bin/baseset/orig_dos_de.obg
@@ -11,49 +11,34 @@ 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.be_BY = Арыґінальная ґрафіка зь нямецкай версіі Transport Tycoon Deluxe для DOS.
 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.cy_GB = Graffeg gwreiddiol fersiwn DOS (Almaenig) o Transport Tycoon Deluxe.
-description.da_DK = Originalgrafik fra Transport Tycoon Deluxe DOS (Tysk) version.
+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_AU = Original Transport Tycoon Deluxe DOS (German) edition graphics.
+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_EE = Algse Transport Tycoon Deluxe DOSi (Saksa) versiooni graafika.
-description.fi_FI = Alkuperäiset Saksassa julkaistun Transport Tycoon Deluxen DOS-version grafiikat.
+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.gd_GB = Grafaigeachd aig an deasachadh DOS (Gearmailteach) tùsail aig Transport Tycoon Deluxe.
-description.gl_ES = Graficos da edición orixinal (alemá) de Transport Tycoon Deluxe para DOS.
 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.is_IS = Upprunalega grafíkin úr Transport Tycoon Deluxe DOS (þýsku) útgáfunni.
 description.it_IT = Grafica originale di Transport Tycoon Deluxe (tedesco), edizione DOS.
-description.ja_JP = Transport Tycoon Deluxe オリジナル版 グラフィック (DOS・ドイツ版)
-description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 도스 에디션(독일)의 그래픽입니다.
-description.lb_LU = Original Transport Tycoon Deluxe DOS (Däitsch) Editioun Grafik.
-description.lt_LT = Originali Transport Tycoon Deluxe DOS (Vokiečių) leidimo grafika.
 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_BR = Gráficos Originais do Transport Tycoon Deluxe, Edição DOS alemã.
 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_SI = Originalna grafika Transport Tycoon Deluxe za nemško različico DOS.
+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.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் DOS (செருமன்) பதிப்பு அசைவூட்டங்கள்.
-description.th_TH = กราฟฟิกต้นตำหรับของ Transport Tycoon Deluxe DOS (German) edition
-description.tr_TR = Özgün Transport Tycoon Deluxe DOS (Almanca) sürümü grafikleri.
-description.uk_UA = Оригінальна графіка з Transport Tycoon Deluxe DOS edition (німецького).
-description.vi_VN = Đồ họa gốc từ phiên bản Transport Tycoon Deluxe trên DOS (tiếng Đức)
-description.zh_CN = 运输大亨DOS豪华德语版原版图形包.
+description.tr_TR = Orijinal Transport Tycoon Deluxe DOS (Almanca) sürümü grafikleri.
 description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版 (德國版) 的圖形。

 [files]
@@ -70,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTD.GRF  = 75a93cea2ed455c2fd5dcbda39e53538
+OPENTTD.GRF  = 51f9d2b8a29a079e83486db13509336c

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/bin/baseset/orig_win.obg
+++ b/bin/baseset/orig_win.obg
@@ -11,49 +11,34 @@ palette           = Windows
 description       = Original Transport Tycoon Deluxe Windows edition graphics.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe grafieke.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الرسومية نسخة وندوز
-description.be_BY = Арыґінальная ґрафіка з Transport Tycoon Deluxe для Windows.
 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.cy_GB = Graffeg gwreiddiol fersiwn Windows o Transport Tycoon Deluxe.
-description.da_DK = Originalgrafik fra Transport Tycoon Deluxe Windows-version.
+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_AU = Original Transport Tycoon Deluxe Windows edition graphics.
+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_EE = Algse Transport Tycoon Deluxe Windowsi versiooni graafika.
-description.fi_FI = Alkuperäiset Transport Tycoon Deluxen Windows-version grafiikat.
+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.gd_GB = Grafaigeachd aig an deasachadh Windows tùsail aig Transport Tycoon Deluxe.
-description.gl_ES = Graficos da edición orixinal de Transport Tycoon Deluxe para 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.is_IS = Upprunalega grafíkin úr Transport Tycoon Deluxe Windows útgáfunni.
 description.it_IT = Grafica originale di Transport Tycoon Deluxe, edizione Windows.
-description.ja_JP = Transport Tycoon Deluxe オリジナル版 グラフィック (Windows)
-description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 윈도 에디션의 그래픽입니다.
-description.lb_LU = Original Transport Tycoon Deluxe Windows Editioun Grafik.
-description.lt_LT = Originali Transport Tycoon Deluxe Windows leidimo grafika.
 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_BR = Gráficos Originais do Transport Tycoon, Edição 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_SI = Originalna grafika Transport Tycoon Deluxe za različico oken(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.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் விண்டோஸ் பதிப்பு அசைவூட்டங்கள்.
-description.th_TH = กราฟฟิกต้ำตำหรับของ Transport Tycoon Deluxe Windows edition
-description.tr_TR = Özgün Transport Tycoon Deluxe Windows sürümü grafikleri.
-description.uk_UA = Оригінальна графіка з Transport Tycoon Deluxe Windows edition.
-description.vi_VN = Đồ họa gốc từ phiên bản Transport Tycoon Deluxe trên Windows
-description.zh_CN = 运输大亨Windows豪华版原版图形包.
+description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü grafikleri.
 description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的圖形。

 [files]
@@ -70,7 +55,7 @@ TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
 TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
 TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
 TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTD.GRF  = 75a93cea2ed455c2fd5dcbda39e53538
+OPENTTD.GRF  = 51f9d2b8a29a079e83486db13509336c

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/bin/baseset/orig_win.obm
+++ b/bin/baseset/orig_win.obm
@@ -10,50 +10,34 @@ version           = 1
 description       = Original Transport Tycoon Deluxe Windows edition music.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe musiek.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الموسيقية نسخة وندوز
-description.be_BY = Арыґінальны набор музычнага афармленьня з гульні Transport Tycoon Deluxe для Windows.
 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.cy_GB = Cerddoriaeth gwreiddiol fersion Windows o Transport Tycoon Deluxe.
-description.da_DK = Originalmusik fra Transport Tycoon Deluxe Windows-version.
+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_AU = Original Transport Tycoon Deluxe Windows edition music.
+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_EE = Algse Transport Tycoon Deluxe Windowsi versiooni muusika.
-description.fi_FI = Alkuperäinen Transport Tycoon Deluxen Windows-version musiikki.
+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.gd_GB = Ceòl aig an deasachadh Windows tùsail aig Transport Tycoon Deluxe.
-description.gl_ES = Música da edición orixinal de Transport Tycoon Deluxe para 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.is_IS = Upprunalega tónlistin úr Transport Tycoon Deluxe Windows útgáfunni.
 description.it_IT = Musica originale di Transport Tycoon Deluxe, edizione Windows.
-description.ja_JP = Transport Tycoon Deluxe オリジナル版 音楽 (Windows)
-description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 윈도 에디션의 음악입니다.
-description.lb_LU = Original Transport Tycoon Deluxe Windows Editioun Music.
-description.lt_LT = Originali Transport Tycoon Deluxe Windows leidimo muzika.
-description.lv_LV = Oriģinālā Transport Tycoon Deluxe Windows izdevuma mūzika.
 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_BR = Música Original do Transport Tycoon Deluxe, Edição 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 для Windows.
+description.ru_RU = Оригинальный набор музыкального оформления из игры Transport Tycoon Deluxe.
 description.sk_SK = Pôvodná hudba z Transport Tycoon Deluxe (Windows).
-description.sl_SI = Originalna glasba Transport Tycoon Deluxe različice oken(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.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் விண்டோஸ் பதிப்பு இசை.
-description.th_TH = เพลงต้นตำหรับชอง Transport Tycoon Deluxe Windows edition
-description.tr_TR = Özgün Transport Tycoon Deluxe Windows sürümü müzikleri.
-description.uk_UA = Оригінальна музика з Transport Tycoon Deluxe Windows edition.
-description.vi_VN = Nhạc gốc từ phiên bản Transport Tycoon Deluxe trên Windows
-description.zh_CN = Transport Tycoon Deluxe（运输大亨Windows豪华版）的原版音乐包
+description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü müzikleri.
 description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的音樂。

 [files]
--- a/bin/baseset/orig_win.obs
+++ b/bin/baseset/orig_win.obs
@@ -10,49 +10,34 @@ version           = 0
 description       = Original Transport Tycoon Deluxe Windows edition sounds.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe klanke.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الصوتية نسخة وندوز
-description.be_BY = Арыґінальны набор гукавога афармленьня з гульні Transport Tycoon Deluxe для Windows.
 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.cy_GB = Effeithiau sain gwreiddiol fersiwn Windows o Transport Tycoon Deluxe.
-description.da_DK = Originallyd fra Transport Tycoon Deluxe Windows-version.
+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_AU = Original Transport Tycoon Deluxe Windows edition sounds.
+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_EE = Algse Transport Tycoon Deluxe Windowsi versiooni helid.
-description.fi_FI = Alkuperäiset Transport Tycoon Deluxen Windows-version äänet.
-description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version Windows).
-description.gd_GB = Fuaimean aig an deasachadh Windows tùsail aig Transport Tycoon Deluxe.
-description.gl_ES = Sons da edición orixinal de Transport Tycoon Deluxe para 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.is_IS = Upprunalega hljóðið úr Transport Tycoon Deluxe Windows útgáfunni.
 description.it_IT = Suoni originali di Transport Tycoon Deluxe, edizione Windows.
-description.ja_JP = Transport Tycoon Deluxe オリジナル版 効果音 (Windows)
-description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 윈도 에디션의 효과음입니다.
-description.lb_LU = Original Transport Tycoon Deluxe Windows Editioun Sound.
-description.lt_LT = Originalūs Transport Tycoon Deluxe Windows leidimo garsai.
 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_BR = Sons Originais do Transport Tycoon Deluxe, Edição 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_SI = Originalni zvoki Transport Tycoon Deluxe različice oken(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.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் விண்டோஸ் பதிப்பு ஒலிகள்.
-description.th_TH = เสียงต้นตำหรับของ Transport Tycoon Deluxe Windows edition
-description.tr_TR = Özgün Transport Tycoon Deluxe Windows sürümü sesleri.
-description.uk_UA = Оригінальний набір звуків з Transport Tycoon Deluxe Windows edition.
-description.vi_VN = Âm thanh gốc từ phiên bản Transport Tycoon Deluxe trên Windows
-description.zh_CN = Transport Tycoon Deluxe Windows (运输大亨Windows豪华版)的原版音效包.
+description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü sesleri.
 description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的音效。

 [files]
--- a/bin/game/compat_1.2.nut
+++ b/bin/game/compat_1.2.nut
@@ -1,18 +0,0 @@
-/* $Id$ */
-
-/*
- * This file is part of OpenTTD.
- * OpenTTD 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, version 2.
- * OpenTTD 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. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-GSLog.Info("1.2 API compatability in effect.");
-
-GSTown._SetGrowthRate <- GSTown.SetGrowthRate;
-GSTown.SetGrowthRate <- function(town_id, days_between_town_growth)
-{
-	/* Growth rate 0 caused resetting the custom growth rate. While this was undocumented, it was used nevertheless (ofc). */
-	if (days_between_town_growth == 0) days_between_town_growth = GSTown.TOWN_GROWTH_NORMAL;
-	return GSTown._SetGrowthRate(town_id, days_between_town_growth);
-}
--- a/bin/game/compat_1.3.nut
+++ b/bin/game/compat_1.3.nut
@@ -1,18 +0,0 @@
-/* $Id$ */
-
-/*
- * This file is part of OpenTTD.
- * OpenTTD 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, version 2.
- * OpenTTD 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. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-GSLog.Info("1.3 API compatability in effect.");
-
-GSTown._SetGrowthRate <- GSTown.SetGrowthRate;
-GSTown.SetGrowthRate <- function(town_id, days_between_town_growth)
-{
-	/* Growth rate 0 caused resetting the custom growth rate. While this was undocumented, it was used nevertheless (ofc). */
-	if (days_between_town_growth == 0) days_between_town_growth = GSTown.TOWN_GROWTH_NORMAL;
-	return GSTown._SetGrowthRate(town_id, days_between_town_growth);
-}
--- a/bin/game/compat_1.4.nut
+++ b/bin/game/compat_1.4.nut
@@ -1,8 +0,0 @@
-/* $Id: compat_1.3.nut 24469 2012-08-13 19:33:17Z yexo $ */
-
-/*
- * This file is part of OpenTTD.
- * OpenTTD 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, version 2.
- * OpenTTD 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. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
--- a/changelog.txt
+++ b/changelog.txt
--- a/config.lib
+++ b/config.lib
@@ -57,8 +57,8 @@ set_default() {
 	enable_translator="0"
 	enable_unicode="1"
 	enable_console="1";
-	enable_assert="0"
-	enable_strip="1"
+	enable_assert="1"
+	enable_strip="0"
 	enable_universal="0"
 	enable_osx_g5="0"
 	enable_cocoa_quartz="1"
@@ -72,7 +72,6 @@ set_default() {
 	with_zlib="1"
 	with_lzma="1"
 	with_lzo2="1"
-	with_xdg_basedir="1"
 	with_png="1"
 	enable_builtin_depend="1"
 	with_makedepend="0"
@@ -92,7 +91,6 @@ set_default() {
 	with_ccache="1"
 	with_nforenum="1"
 	with_grfcodec="1"
-	with_sse="1"

 	save_params_array="
 		build
@@ -147,7 +145,6 @@ set_default() {
 		with_zlib
 		with_lzma
 		with_lzo2
-		with_xdg_basedir
 		with_png
 		enable_builtin_depend
 		with_makedepend
@@ -167,8 +164,7 @@ set_default() {
 		with_ccache
 		with_grfcodec
 		with_nforenum
-		with_sse
-	CC CXX CFLAGS CXXFLAGS LDFLAGS CFLAGS_BUILD CXXFLAGS_BUILD LDFLAGS_BUILD"
+	CC CXX CFLAGS CXXFLAGS LDFLAGS"
 }

 detect_params() {
@@ -201,21 +197,21 @@ detect_params() {
 			--cpu-type)                   prev_p="cpu_type";;
 			--cpu-type=*)                 cpu_type="$optarg";;

-			--cc-build)                   prev_p="cc_build";;
+			--cc-build)                   prevp_p="cc_build";;
 			--cc-build=*)                 cc_build="$optarg";;
-			--cc-host)                    prev_p="cc_host";;
+			--cc-host)                    prevp_p="cc_host";;
 			--cc-host=*)                  cc_host="$optarg";;
-			--cxx-build)                  prev_p="cxx_build";;
+			--cxx-build)                  prevp_p="cxx_build";;
 			--cxx-build=*)                cxx_build="$optarg";;
-			--cxx-host)                   prev_p="cxx_host";;
+			--cxx-host)                   prevp_p="cxx_host";;
 			--cxx-host=*)                 cxx_host="$optarg";;
-			--windres)                    prev_p="windres";;
+			--windres)                    prevp_p="windres";;
 			--windres=*)                  windres="$optarg";;
-			--awk)                        prev_p="awk";;
+			--awk)                        prevp_p="awk";;
 			--awk=*)                      awk="$optarg";;
-			--strip)                      prev_p="strip";;
+			--strip)                      prevp_p="strip";;
 			--strip=*)                    strip="$optarg";;
-			--lipo)                       prev_p="lipo";;
+			--lipo)                       prevp_p="lipo";;
 			--lipo=*)                     lipo="$optarg";;

 			--endian)                     prev_p="endian";;
@@ -223,53 +219,52 @@ detect_params() {



-			# Alias --prefix with --prefix-dir, for compatibility with GNU autotools
-			--prefix-dir | --prefix)      prev_p="prefix_dir";;
-			--prefix-dir=* | --prefix=*)  prefix_dir="$optarg";;
+			--prefix-dir)                 prevp_p="prefix-dir";;
+			--prefix-dir=*)               prefix_dir="$optarg";;

-			--binary-dir)                 prev_p="binary_dir";;
+			--binary-dir)                 prevp_p="binary-dir";;
 			--binary-dir=*)               binary_dir="$optarg";;

-			--data-dir)                   prev_p="data_dir";;
+			--data-dir)                   prevp_p="data-dir";;
 			--data-dir=*)                 data_dir="$optarg";;

-			--doc-dir)                    prev_p="doc_dir";;
+			--doc-dir)                    prevp_p="doc-dir";;
 			--doc-dir=*)                  doc_dir="$optarg";;

-			--icon-dir)                   prev_p="icon_dir";;
+			--icon-dir)                   prevp_p="icon-dir";;
 			--icon-dir=*)                 icon_dir="$optarg";;

-			--icon-theme-dir)             prev_p="icon_theme_dir";;
+			--icon-theme-dir)             prevp_p="icon-theme-dir";;
 			--icon-theme-dir=*)           icon_theme_dir="$optarg";;
 			--without-icon-theme)         icon_theme_dir="";;

-			--menu-dir)                   prev_p="menu_dir";;
+			--menu-dir)                   prevp_p="menu_dir";;
 			--menu-dir=*)                 menu_dir="$optarg";;
 			--without-menu-entry)         menu_dir="";;

-			--menu-name)                  prev_p="menu_name";;
+			--menu-name)                  prevp_p="menu_name";;
 			--menu-name=*)                menu_name="$optarg";;

-			--binary-name)                prev_p="binary_name";;
+			--binary-name)                prevp_p="binary_name";;
 			--binary-name=*)              binary_name="$optarg";;

-			--man-dir)                    prev_p="man_dir";;
+			--man-dir)                    prevp_p="man_dir";;
 			--man-dir=*)                  man_dir="$optarg";;

-			--personal-dir)               prev_p="personal_dir";;
+			--personal-dir)               prevp_p="personal-dir";;
 			--personal-dir=*)             personal_dir="$optarg";;
 			--without-personal-dir)       personal_dir="";;

-			--shared-dir)                 prev_p="shared_dir";;
+			--shared-dir)                 prevp_p="shared-dir";;
 			--shared-dir=*)               shared_dir="$optarg";;
 			--without-shared-dir)         shared_dir="";;

-			--install-dir)                prev_p="install_dir";;
+			--install-dir)                prevp_p="install-dir";;
 			--install-dir=*)              install_dir="$optarg";;



-			--menu-group)                 prev_p="menu_group";;
+			--menu-group)                 prevp_p="menu_group";;
 			--menu-group=*)               menu_group="$optarg";;


@@ -351,13 +346,6 @@ detect_params() {
 			--without-liblzo2)            with_lzo2="0";;
 			--with-liblzo2=*)             with_lzo2="$optarg";;

-			--with-xdg-basedir)           with_xdg_basedir="2";;
-			--without-xdg-basedir)        with_xdg_basedir="0";;
-			--with-xdg-basedir=*)         with_xdg_basedir="$optarg";;
-			--with-libxdg-basedir)        with_xdg_basedir="2";;
-			--without-libxdg-basedir)     with_xdg_basedir="0";;
-			--with-libxdg-basedir=*)      with_xdg_basedir="$optarg";;
-
 			--with-png)                   with_png="2";;
 			--without-png)                with_png="0";;
 			--with-png=*)                 with_png="$optarg";;
@@ -449,18 +437,11 @@ detect_params() {
 			--with-threads)               with_threads="1";;
 			--with-threads=*)             with_threads="$optarg";;

-			--without-sse)                with_sse="0";;
-			--with-sse)                   with_sse="1";;
-			--with-sse=*)                 with_sse="$optarg";;
-
 			CC=* | --CC=*)                CC="$optarg";;
 			CXX=* | --CXX=*)              CXX="$optarg";;
 			CFLAGS=* | --CFLAGS=*)        CFLAGS="$optarg";;
 			CXXFLAGS=* | --CXXFLAGS=*)    CXXFLAGS="$optarg";;
 			LDFLAGS=* | --LDFLAGS=*)      LDFLAGS="$optarg";;
-			CFLAGS_BUILD=* | --CFLAGS_BUILD=* | --CFLAGS-BUILD=*)     CFLAGS_BUILD="$optarg";;
-			CXXFLAGS_BUILD=* | --CXXFLAGS_BUILD=* | --CXXFLAGS-BUILD=*) CXXFLAGS_BUILD="$optarg";;
-			LDFLAGS_BUILD=* | --LDFLAGS_BUILD=* | --LDFLAGS-BUILD=*)   LDFLAGS_BUILD="$optarg";;

 			--ignore-extra-parameters)    ignore_extra_parameters="1";;

@@ -593,7 +574,6 @@ check_params() {

 	check_makedepend
 	detect_cputype
-	detect_sse_capable_architecture

 	if [ "$enable_static" = "1" ]; then
 		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "DOS" ]; then
@@ -834,7 +814,6 @@ check_params() {
 		fi
 	fi

-	detect_xdg_basedir
 	detect_png
 	detect_freetype
 	detect_fontconfig
@@ -1029,12 +1008,6 @@ check_params() {

 	if [ -d "$ROOT_DIR/.svn" ] && [ -n "`svn help 2>/dev/null`" ]; then
 		log 1 "checking revision... svn detection"
-	elif [ -d "$ROOT_DIR/../.svn" ] && [ -n "`svn help 2>/dev/null`" ] && [ -n "`LC_ALL=C svn info $ROOT_DIR/.. | grep '^URL:.*tags$'`" ]; then
-		# subversion changed its behaviour; now not all folders have a .svn folder,
-		# but only the root folder. Since making tags requires a (sparse) checkout
-		# of the tags folder, the folder of the tag does not have a .svn folder
-		# anymore and this fails to detect the subversion repository checkout.
-		log 1 "checking revision... svn detection (tag)"
 	elif [ -d "$ROOT_DIR/.git" ] && [ -n "`git help 2>/dev/null`" ]; then
 		log 1 "checking revision... git detection"
 	elif [ -d "$ROOT_DIR/.hg" ] && [ -n "`hg help 2>/dev/null`" ]; then
@@ -1326,8 +1299,8 @@ make_compiler_cflags() {

 		flags="$flags -Wall -Wno-multichar -Wsign-compare -Wundef"
 		flags="$flags -Wwrite-strings -Wpointer-arith"
-		flags="$flags -W -Wno-unused-parameter -Wredundant-decls"
-		flags="$flags -Wformat=2 -Wformat-security"
+		flags="$flags -W -Wno-unused-parameter -Wformat=2"
+		flags="$flags -Wredundant-decls"

 		if [ $enable_assert -eq 0 ]; then
 			# Do not warn about unused variables when building without asserts
@@ -1373,12 +1346,6 @@ make_compiler_cflags() {
 			cxxflags="$cxxflags -std=gnu++0x"
 		fi

-		if [ $cc_version -eq 45 ]; then
-			# Prevent optimisation supposing enums are in a range specified by the standard
-			# For details, see http://gcc.gnu.org/PR43680
-			flags="$flags -fno-tree-vrp"
-		fi
-
 		if [ $cc_version -ge 47 ]; then
 			# Disable -Wnarrowing which gives many warnings, such as:
 			# warning: narrowing conversion of '...' from 'unsigned int' to 'int' inside { } [-Wnarrowing]
@@ -1419,11 +1386,11 @@ make_compiler_cflags() {

 make_cflags_and_ldflags() {
 	# General CFlags for BUILD
-	CFLAGS_BUILD="$CFLAGS_BUILD"
+	CFLAGS_BUILD=""
 	# Special CXXFlags for BUILD
-	CXXFLAGS_BUILD="$CXXFLAGS_BUILD"
+	CXXFLAGS_BUILD=""
 	# LDFLAGS for BUILD
-	LDFLAGS_BUILD="$LDFLAGS_BUILD"
+	LDFLAGS_BUILD=""
 	# FEATURES for BUILD (lto)
 	FEATURES_BUILD=""
 	# General CFlags for HOST
@@ -1457,6 +1424,12 @@ make_cflags_and_ldflags() {
 		# Each debug level reduces the optimization by a bit
 		if [ $enable_debug -ge 1 ]; then
 			CFLAGS="$CFLAGS -g -D_DEBUG"
+			if basename "$cc_host" | grep "gcc" &>/dev/null; then
+				# Define only when compiling with GCC, some
+				# GLIBC versions use GNU extensions in a way
+				# that breaks build with at least ICC
+				CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
+			fi
 			if [ "$os" = "PSP" ]; then
 				CFLAGS="$CFLAGS -G0"
 			fi
@@ -1471,22 +1444,6 @@ make_cflags_and_ldflags() {
 		fi
 	fi

-	if [ $enable_debug -le 2 ]; then
-		cc_host_is_gcc=`basename "$cc_host" | grep "gcc" &>/dev/null`
-		if [ -n "$cc_host_is_gcc" ]; then
-			# Define only when compiling with GCC. Some GLIBC versions use GNU
-			# extensions in a way that breaks build with at least ICC.
-			# This requires -O1 or more, so debug level 3 (-O0) is excluded.
-			CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
-		fi
-
-		cc_build_is_gcc=`basename "$cc_build" | grep "gcc" &>/dev/null`
-		if [ -n "$cc_build_is_gcc" ]; then
-			# Just add -O1 to the tools needed for building.
-			CFLAGS_BUILD="$CFLAGS_BUILD -D_FORTIFY_SOURCE=2 -O1"
-		fi
-	fi
-
 	if [ "$os" = "OSX" ] && [ $cc_version -eq 40 ]; then
 		# Apple's GCC 4.0 has a compiler bug for x86_64 with (higher) optimization,
 		# wrongly optimizing ^= in loops. This disables the failing optimisation.
@@ -1501,9 +1458,6 @@ make_cflags_and_ldflags() {
 	if [ "$with_threads" = "0" ]; then
 		CFLAGS="$CFLAGS -DNO_THREADS"
 	fi
-	if [ "$with_sse" = "1" ]; then
-		CFLAGS="$CFLAGS -DWITH_SSE"
-	fi

 	if [ "`echo $1 | cut -c 1-3`" != "icc" ]; then
 		if [ "$os" = "CYGWIN" ]; then
@@ -1511,25 +1465,19 @@ make_cflags_and_ldflags() {
 			LDFLAGS="$LDFLAGS -mwin32"
 		fi
 		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
-			if [ $cc_version -lt 46 ]; then
-				flags="$flags -mno-cygwin"
-				LDFLAGS="$LDFLAGS -mno-cygwin"
-			fi
+			flags="$flags -mno-cygwin"

 			if [ "$enable_console" != "0" ]; then
-				LDFLAGS="$LDFLAGS -Wl,--subsystem,console"
+				LDFLAGS="$LDFLAGS -mno-cygwin -Wl,--subsystem,console"
 			else
-				LDFLAGS="$LDFLAGS -Wl,--subsystem,windows"
+				LDFLAGS="$LDFLAGS -mno-cygwin -Wl,--subsystem,windows"
 			fi

-			LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32 -limm32"
+			LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32"

 			if [ $cc_version -ge 44 ]; then
 				LDFLAGS_BUILD="$LDFLAGS_BUILD -static-libgcc -static-libstdc++"
 			fi
-			if [ $cc_version -ge 47 ]; then
-				CFLAGS="$CFLAGS -mno-ms-bitfields"
-			fi
 		fi
 	fi

@@ -1582,7 +1530,7 @@ make_cflags_and_ldflags() {
 			LDFLAGS="$OSX_LD_SYSROOT $LDFLAGS"
 		fi

-		if [ "$enable_universal" = "0" ] && [ $cc_version -gt 40 ]; then
+		if [ "$enable_universal" = "0" ] && [ $cc_version -ge 40 ]; then
 			# Only set the min version when not doing an universal build.
 			# Universal builds set the version elsewhere.
 			if [ "$cpu_type" = "64" ]; then
@@ -1681,17 +1629,6 @@ make_cflags_and_ldflags() {
 		CFLAGS="$CFLAGS -DWITH_LZO"
 	fi

-	if [ -n "$xdg_basedir_config" ]; then
-		CFLAGS="$CFLAGS -DWITH_XDG_BASEDIR"
-		CFLAGS="$CFLAGS `$xdg_basedir_config --cflags | tr '\n\r' '  '`"
-
-		if [ "$enable_static" != "0" ]; then
-			LIBS="$LIBS `$xdg_basedir_config --libs --static | tr '\n\r' '  '`"
-		else
-			LIBS="$LIBS `$xdg_basedir_config --libs | tr '\n\r' '  '`"
-		fi
-	fi
-
 	# 64bit machines need -D_SQ64
 	if [ "$cpu_type" = "64" ] && [ "$enable_universal" = "0" ]; then
 		CFLAGS="$CFLAGS -D_SQ64"
@@ -1700,18 +1637,17 @@ make_cflags_and_ldflags() {

 	if [ -n "$png_config" ]; then
 		CFLAGS="$CFLAGS -DWITH_PNG"
-		CFLAGS="$CFLAGS `$png_config --cflags | tr '\n\r' '  '`"
+		CFLAGS="$CFLAGS `$png_config --cppflags --I_opts | tr '\n\r' '  '`"

+		# The extra flags are unneeded for latest libpng-config, but some versions are so broken...
 		if [ "$enable_static" != "0" ]; then
 			if [ "$os" = "OSX" ]; then
-				# fontconfig_config goes via pkg-config on all systems, which doesn't know --prefix
-				# Also, despite the reason we link to the .a file ourself (because we can't use -static), we do need to ask pkg-config about possible other deps
-				LIBS="$LIBS `$png_config --variable=prefix`/lib/libpng.a `$png_config --libs --static | sed s@-lpng[0-9]*@@`"
+				LIBS="$LIBS `$png_config --prefix`/lib/libpng.a"
 			else
-				LIBS="$LIBS `$png_config --libs --static | tr '\n\r' '  '`"
+				LIBS="$LIBS `$png_config --static --ldflags | tr '\n\r' '  '`"
 			fi
 		else
-			LIBS="$LIBS `$png_config --libs | tr '\n\r' '  '`"
+			LIBS="$LIBS `$png_config --ldflags | tr '\n\r' '  '`"
 		fi
 	fi

@@ -1754,9 +1690,9 @@ make_cflags_and_ldflags() {

 		# Some icu-configs have the 'feature' of not adding a space where others do add the space
 		if [ "$static_icu" != "0" ]; then
-			LIBS="$LIBS `$icu_config --ldflags-searchpath` `($icu_config --ldflags-libsonly; $icu_config --ldflags-layout) | tr '\n\r' '  ' | sed s/licu/lsicu/g`"
+			LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly | tr '\n\r' '  ' | sed s/licu/lsicu/g`"
 		else
-			LIBS="$LIBS `$icu_config --ldflags-searchpath` `($icu_config --ldflags-libsonly; $icu_config --ldflags-layout) | tr '\n\r' '  '`"
+			LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly | tr '\n\r' '  '`"
 		fi
 	fi

@@ -1790,7 +1726,7 @@ make_cflags_and_ldflags() {
 			fi
 		fi

-		if [ "$os" != "OSX" ] && [ "$have_non_const_iconv" != "no" ]; then
+		if [ "$have_non_const_iconv" != "no" ]; then
 			CFLAGS="$CFLAGS -DHAVE_NON_CONST_ICONV"
 		fi
 	fi
@@ -1835,7 +1771,6 @@ make_cflags_and_ldflags() {

 	if [ "$enable_assert" = "0" ]; then
 		CFLAGS="$CFLAGS -DNDEBUG"
-		CFLAGS_BUILD="$CFLAGS_BUILD -DNDEBUG"
 	fi

 	if [ "$enable_desync_debug" != "0" ]; then
@@ -1871,9 +1806,6 @@ make_cflags_and_ldflags() {
 		fi
 	fi

-	log 1 "using CFLAGS_BUILD... $CFLAGS_BUILD"
-	log 1 "using CXXFLAGS_BUILD... $CXXFLAGS_BUILD"
-	log 1 "using LDFLAGS_BUILD... $LDFLAGS_BUILD"
 	log 1 "using CFLAGS... $CFLAGS"
 	log 1 "using CXXFLAGS... $CXXFLAGS"
 	log 1 "using LDFLAGS... $LIBS $LDFLAGS"
@@ -2198,30 +2130,6 @@ check_makedepend() {
 	log 1 "checking makedepend... $makedepend"
 }

-check_version() {
-	# $1 - requested version (major.minor)
-	# $2 - version we got (major.minor)
-
-	if [ -z "$2" ]; then
-		return 0
-	fi
-
-	req_major=`echo $1 | cut -d. -f1`
-	got_major=`echo $2 | cut -d. -f1`
-	if [ $got_major -lt $req_major ]; then
-		return 0
-	elif [ $got_major -gt $req_major ]; then
-		return 1
-	fi
-
-	req_minor=`echo $1 | cut -d. -f2`
-	got_minor=`echo $2 | cut -d. -f2`
-	if [ $got_minor -lt $req_minor ]; then
-		return 0
-	fi
-	return 1
-}
-
 detect_awk() {
 	# Not all awks allow gsub(), so we test for that here! It is in fact all we need...

@@ -2716,64 +2624,42 @@ detect_libtimidity() {
 	detect_library "$with_libtimidity" "libtimidity" "libtimidity.a" "" "timidity.h"
 }

-detect_pkg_config() {
-	# $1 - config-param ($with_lzma value)
-	# $2 - package name ('liblzma')
-	# $3 - config name ('lzma_config', sets $lzma_config)
-	# $4 - minimum module version ('2.3')
-
+detect_lzma() {
 	# 0 means no, 1 is auto-detect, 2 is force
-	if [ "$1" = "0" ]; then
-		log 1 "checking $2... disabled"
+	if [ "$with_lzma" = "0" ]; then
+		log 1 "checking liblzma... disabled"

-		eval "$3=\"\""
+		lzma_config=""
 		return 0
 	fi

-	log 2 "detecting $2"
-
-	if [ "$1" = "1" ] || [ "$1" = "" ] || [ "$1" = "2" ]; then
-		pkg_config_call="pkg-config $2"
+	if [ "$with_lzma" = "1" ] || [ "$with_lzma" = "" ] || [ "$with_lzma" = "2" ]; then
+		lzma_config="pkg-config liblzma"
 	else
-		pkg_config_call="$1"
+		lzma_config="$with_lzma"
 	fi

-	version=`$pkg_config_call --modversion 2>/dev/null`
+	version=`$lzma_config --modversion 2>/dev/null`
 	ret=$?
-	check_version "$4" "$version"
-	version_ok=$?
-	log 2 "executing $pkg_config_call --modversion"
+	log 2 "executing $lzma_config --modversion"
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"

-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version_ok" != "1" ]; then
-		if [ -n "$version" ] && [ "$version_ok" != "1" ]; then
-			log 1 "checking $2... needs at least version $4, $2 NOT enabled"
-		else
-			log 1 "checking $2... not found"
-		fi
+	if [ -z "$version" ] || [ "$ret" != "0" ]; then
+		log 1 "checking liblzma... not found"

 		# It was forced, so it should be found.
-		if [ "$1" != "1" ]; then
-			log 1 "configure: error: pkg-config $2 couldn't be found"
-			log 1 "configure: error: you supplied '$1', but it seems invalid"
+		if [ "$with_lzma" != "1" ]; then
+			log 1 "configure: error: pkg-config liblzma couldn't be found"
+			log 1 "configure: error: you supplied '$with_lzma', but it seems invalid"
 			exit 1
 		fi

-		eval "$3=\"\""
+		lzma_config=""
 		return 0
 	fi

-	eval "$3=\"$pkg_config_call\""
-	log 1 "checking $2... found"
-}
-
-detect_lzma() {
-	detect_pkg_config "$with_lzma" "liblzma" "lzma_config" "5.0"
-}
-
-detect_xdg_basedir() {
-	detect_pkg_config "$with_xdg_basedir" "libxdg-basedir" "xdg_basedir_config" "1.2"
+	log 1 "checking liblzma... found"
 }

 detect_png() {
@@ -2800,7 +2686,33 @@ detect_png() {
 		return 0
 	fi

-	detect_pkg_config "$with_png" "libpng" "png_config" "1.2"
+	if [ "$with_png" = "1" ] || [ "$with_png" = "" ] || [ "$with_png" = "2" ]; then
+		png_config="libpng-config"
+	else
+		png_config="$with_png"
+	fi
+
+	version=`$png_config --version 2>/dev/null`
+	ret=$?
+	log 2 "executing $png_config --version"
+	log 2 "  returned $version"
+	log 2 "  exit code $ret"
+
+	if [ -z "$version" ] || [ "$ret" != "0" ]; then
+		log 1 "checking libpng... not found"
+
+		# It was forced, so it should be found.
+		if [ "$with_png" != "1" ]; then
+			log 1 "configure: error: libpng-config couldn't be found"
+			log 1 "configure: error: you supplied '$with_png', but it seems invalid"
+			exit 1
+		fi
+
+		png_config=""
+		return 0
+	fi
+
+	log 1 "checking libpng... found"
 }

 detect_freetype() {
@@ -2895,7 +2807,38 @@ detect_fontconfig() {
 		return 0
 	fi

-	detect_pkg_config "$with_fontconfig" "fontconfig" "fontconfig_config" "2.3"
+	if [ "$with_fontconfig" = "1" ] || [ "$with_fontconfig" = "" ] || [ "$with_fontconfig" = "2" ]; then
+		fontconfig_config="pkg-config fontconfig"
+	else
+		fontconfig_config="$with_fontconfig"
+	fi
+
+	version=`$fontconfig_config --modversion 2>/dev/null`
+	ret=$?
+	shortversion=`echo $version | cut -c 1,3`
+	log 2 "executing $fontconfig_config --modversion"
+	log 2 "  returned $version"
+	log 2 "  exit code $ret"
+
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$shortversion" -le "22" ]; then
+		if [ -n "$shortversion" ] && [ "$shortversion" -le "22" ]; then
+			log 1 "checking libfontconfig... needs at least version 2.3.0, fontconfig NOT enabled"
+		else
+			log 1 "checking libfontconfig... not found"
+		fi
+
+		# It was forced, so it should be found.
+		if [ "$with_fontconfig" != "1" ]; then
+			log 1 "configure: error: fontconfig-config couldn't be found"
+			log 1 "configure: error: you supplied '$with_fontconfig', but it seems invalid"
+			exit 1
+		fi
+
+		fontconfig_config=""
+		return 0
+	fi
+
+	log 1 "checking libfontconfig... found"
 }

 detect_icu() {
@@ -2921,14 +2864,13 @@ detect_icu() {

 	version=`$icu_config --version 2>/dev/null`
 	ret=$?
-	check_version '3.6' "$version"
-	version_ok=$?
+	shortversion=`echo $version | cut -c 1,3`
 	log 2 "executing $icu_config --version"
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"

-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version_ok" != "1" ]; then
-		if [ -n "$version" ] && [ "$version_ok" != "1" ]; then
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$shortversion" -lt "36" ]; then
+		if [ -n "$shortversion" ] && [ "$shortversion" -lt "36" ]; then
 			log 1 "checking libicu... needs at least version 3.6.0, icu NOT enabled"
 		else
 			log 1 "checking libicu... not found"
@@ -3178,9 +3120,9 @@ detect_grfcodec() {
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"

-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "949" ]; then
-		if [ -n "$version" ] && [ "$version" -lt "949" ]; then
-			log 1 "checking grfcodec... needs at least version 6.0.2 (r949), disabled"
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "913" ]; then
+		if [ -n "$version" ] && [ "$version" -lt "913" ]; then
+			log 1 "checking grfcodec... needs at least version 5.1.4 (r913), disabled"
 		else
 			log 1 "checking grfcodec... not found"
 		fi
@@ -3220,9 +3162,9 @@ detect_nforenum() {
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"

-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "949" ]; then
-		if [ -n "$version" ] && [ "$version" -lt "949" ]; then
-			log 1 "checking nforenum... needs at least version 6.0.2 (r949), disabled"
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "913" ]; then
+		if [ -n "$version" ] && [ "$version" -lt "913" ]; then
+			log 1 "checking nforenum... needs at least version 5.1.4 (r913), disabled"
 		else
 			log 1 "checking nforenum... not found"
 		fi
@@ -3261,40 +3203,6 @@ detect_cputype() {
 	rm -f tmp.64bit tmp.64bit.cpp
 }

-detect_sse_capable_architecture() {
-	# 0 means no, 1 is auto-detect, 2 is force
-	if [ "$with_sse" = "0" ]; then
-		log 1 "checking SSE... disabled"
-		return
-	fi
-
-	echo "#define _SQ64 1" > tmp.sse.cpp
-	echo "#include <xmmintrin.h>" >> tmp.sse.cpp
-	echo "#include <smmintrin.h>" >> tmp.sse.cpp
-	echo "#include <tmmintrin.h>" >> tmp.sse.cpp
-	echo "int main() { return 0; }" >> tmp.sse.cpp
-	execute="$cxx_host -msse4.1 $CFLAGS tmp.sse.cpp -o tmp.sse 2>&1"
-	sse="`eval $execute 2>/dev/null`"
-	ret=$?
-	log 2 "executing $execute"
-	log 2 "  returned $sse"
-	log 2 "  exit code $ret"
-	if [ "$ret" = "0" ]; then
-		log 1 "detecting SSE... found"
-	else
-		# It was forced, so it should be found.
-		if [ "$with_sse" != "1" ]; then
-			log 1 "configure: error: SSE couln't be found"
-			log 1 "configure: error: you force enabled SSE, but it seems unavailable"
-			exit 1
-		fi
-
-		log 1 "detecting SSE... not found"
-		with_sse="0"
-	fi
-	rm -f tmp.sse tmp.exe tmp.sse.cpp
-}
-
 make_sed() {
 	T_CFLAGS="$CFLAGS"
 	T_CXXFLAGS="$CXXFLAGS"
@@ -3472,7 +3380,7 @@ generate_settings() {
 }

 generate_grf() {
-	STAGE="[BASESET]"
+	STAGE="[GRF]"

 	make_sed

@@ -3522,7 +3430,7 @@ generate_src_osx() {
 				CFLAGS="-isysroot $osx_sdk_path $CFLAGS_orig"
 				LDFLAGS="-Wl,-syslibroot,$osx_sdk_path $LDFLAGS_orig"
 			fi
-			CFLAGS="$CFLAGS -D_SQ64 -DNO_QUICKTIME -UENABLE_COCOA_QUICKDRAW"
+			CFLAGS="$CFLAGS -D_SQ64 -DHAVE_NON_CONST_ICONV -DNO_QUICKTIME -UENABLE_COCOA_QUICKDRAW"
 			LIBS="`echo $LIBS | sed 's/-framework QuickTime//'`"
 		fi

@@ -3665,16 +3573,13 @@ showhelp() {
 	echo "  --with-cocoa                   enables COCOA video driver (OSX ONLY)"
 	echo "  --with-sdl[=sdl-config]        enables SDL video driver support"
 	echo "  --with-zlib[=zlib.a]           enables zlib support"
-	echo "  --with-liblzma[=\"pkg-config liblzma\"]"
-	echo "                                 enables liblzma support"
+	echo "  --with-liblzma[=liblzma.a]     enables liblzma support"
 	echo "  --with-liblzo2[=liblzo2.a]     enables liblzo2 support"
 	echo "  --with-png[=libpng-config]     enables libpng support"
 	echo "  --with-freetype[=freetype-config]"
 	echo "                                 enables libfreetype support"
-	echo "  --with-fontconfig[=\"pkg-config fontconfig\"]"
+	echo "  --with-fontconfig[=pkg-config fontconfig]"
 	echo "                                 enables fontconfig support"
-	echo "  --with-xdg-basedir[=\"pkg-config libxdg-basedir\"]"
-	echo "                                 enables XDG base directory support"
 	echo "  --with-icu[=icu-config]        enables icu (used for right-to-left support)"
 	echo "  --static-icu                   try to link statically (libsicu instead of"
 	echo "                                 libicu; can fail as the new name is guessed)"
@@ -3684,9 +3589,6 @@ showhelp() {
 	echo "  --with-makedepend[=makedepend] enables makedepend support"
 	echo "  --with-ccache                  enables ccache support"
 	echo "  --with-distcc                  enables distcc support"
-	echo "  --without-grfcodec             disable usage of grfcodec and re-generation of base sets"
-	echo "  --without-threads              disable threading support"
-	echo "  --without-sse                  disable SSE support (x86/x86_64 only)"
 	echo ""
 	echo "Some influential environment variables:"
 	echo "  CC                             C compiler command"
@@ -3697,9 +3599,6 @@ showhelp() {
 	echo "  LDFLAGS                        linker flags, e.g. -L<lib dir> if you"
 	echo "                                 have libraries in a nonstandard"
 	echo "                                 directory <lib dir>"
-	echo "  CFLAGS_BUILD                   C compiler flags for build time tool generation"
-	echo "  CXXFLAGS_BUILD                 C++ compiler flags for build time tool generation"
-	echo "  LDFLAGS_BUILD                  linker flags for build time tool generation"
 	echo ""
 	echo "Use these variables to override the choices made by 'configure' or to help"
 	echo "it to find libraries and programs with nonstandard names/locations."
--- a/1
+++ b/1
@@ -129,7 +129,6 @@ AWKCOMMAND='
 		if ($0 == "DIRECTMUSIC" && "'$with_direct_music'" == "0")  { next; }
 		if ($0 == "LIBTIMIDITY" && "'$libtimidity'" == "" )        { next; }
 		if ($0 == "HAVE_THREAD" && "'$with_threads'" == "0")       { next; }
-		if ($0 == "SSE"         && "'$with_sse'" != "1")           { next; }

 		skip += 1;

--- a/docs/32bpp.txt
+++ b/docs/32bpp.txt
@@ -0,0 +1,44 @@
+32bpp and OpenTTD
+Last updated:    2007-06-13
+------------------------------------------------------------------------
+
+
+Table of contents
+-----------------
+1.0) About
+2.0) The format
+
+
+1.0) About
+---- -----
+OpenTTD has 32bpp support. This means: OpenTTD still is 8bpp, but it has the
+posibility to override the graphics with 32bpp. This means that it isn't a
+replacement of grf or newgrf, but simply an addition. If you want to use 32bpp
+graphics of a newgrf, you do need the newgrf itself too (with 8bpp graphics).
+
+
+2.0) The format
+---- ----------
+32bpp images are stored in PNG. They should go in:
+  data/sprites/<grfname>/<SpriteID>.png
+
+For example, a grfname would be 'openttd' (without .grf, lowercase), and the
+SpriteID 3, to override the 3rd sprite in openttd.grf with a 32bpp version.
+
+The format of this PNG can be almost anything, but we advise to use RGBA
+format. Alpha-channel is fully supported.
+
+As the core of OpenTTD is 8bpp, and because you of course want company colours
+in your images, you will need to add a mask for every sprite that needs colour
+remapping. The name is simular as above, only you have to put a 'm' behind the
+SpriteID. This image should be a 8bpp palette image, where the palette is the
+OpenTTD palette. Upon load of the PNG, the mask is loaded too, and overrides
+the RGB (not the Alpha) of the original PNG image, and replacing it with a
+8bpp color remapped and converted to 32bpp.
+
+Another thing that OpenTTD needs in your png, is 2 tEXt chunks: x_offs and
+y_offs. This to define the x- and y-offset, of course. Use the tool we supply
+to add this information. Sadly enough most graphical editors trashes those
+chunks upon save, so you have to readd it every time you save your image.
+
+Your images should be the same as the grf, in size.
--- a/docs/admin_network.txt
+++ b/docs/admin_network.txt
@@ -150,8 +150,7 @@ Table of contents

  Note: No additional authentication is required for rcon commands.

-  The server will reply with one or more ADMIN_PACKET_SERVER_RCON packets.
-  Finally an ADMIN_PACKET_ADMIN_RCON_END packet will be sent. Applications
+  The server will reply with a ADMIN_PACKET_SERVER_RCON packet. Applications
  will not receive the answer twice if they have asked for the AdminUpdateType
  ADMIN_UPDATE_CONSOLE, as the result is not printed on the servers console
  (just like clients rcon commands).
@@ -161,13 +160,6 @@ Table of contents
  Chat from the server itself will only be sent to the admin network when it
  was not sent from the admin network.

-  Note that when content is queried or updated via rcon, the processing
-  happens asynchronously. But the ADMIN_PACKET_ADMIN_RCON_END packet is sent
-  already right after the content is requested as there's no immediate output.
-  Thus other packages and the output of content rcon command may be sent at
-  an arbitrary later time, mixing into the output of other console activity,
-  e.g. also of possible subsequent other rcon commands sent.
-

 5.0) Sending chat
 ---- ------------
--- a/docs/desync.txt
+++ b/docs/desync.txt
@@ -1,262 +0,0 @@
-Some explanations about Desyncs
-Last updated: 2014-02-23
------------------------------------------------------------------------
-
-
-Table of contents
-----------------
-1.0) Desync theory
- * 1.1) OpenTTD multiplayer architecture
- * 1.2) What is a Desync and how is it detected
- * 1.3) Typical causes of Desyncs
-2.0) What to do in case of a Desync
- * 2.1) Cache debugging
- * 2.2) Desync recording
-3.0) Evaluating the Desync records
- * 3.1) Replaying
- * 3.2) Evaluation the replay
- * 3.3) Comparing savegames
-
-
-1.1) OpenTTD multiplayer architecture
---- --------------------------------
-  OpenTTD has a huge gamestate, which changes all of the time.
-  The savegame contains the complete gamestate at a specific point
-  in time. But this state changes completely each tick: Vehicles move
-  and trees grow.
-
-  However, most of these changes in the gamestate are deterministic:
-  Without a player interfering a vehicle follows its orders always
-  in the same way, and trees always grow the same.
-
-  In OpenTTD multiplayer synchronisation works by creating a savegame
-  when clients join, and then transfering that savegame to the client,
-  so it has the complete gamestate at a fixed point in time.
-
-  Afterwards clients only receive 'commands', that is: Stuff which is
-  not predictable, like
-   - player actions
-   - AI actions
-   - GameScript actions
-   - Admin Port command
-   - rcon commands
-   - ...
-
-  These commands contain the information on how to execute the command,
-  and when to execute it. Time is measured in 'network frames'.
-  Mind that network frames to not match ingame time. Network frames
-  also run while the game is paused, to give a defined behaviour to
-  stuff that is executing while the game is paused.
-
-  The deterministic part of the gamestate is run by the clients on
-  their own. All they get from the server is the instruction to
-  run the gamestate up to a certain network time, which basically
-  says that there are no commands scheduled in that time.
-
-  When a client (which includes the server itself) wants to execute
-  a command (i.e. a non-predictable action), it does this by
-   - calling DoCommandP resp. DoCommandPInternal
-   - These functions first do a local test-run of the command to
-     check simple preconditions. (Just to give the client an
-     immediate response without bothering the server and waiting for
-     the response.) The test-run may not actually change the
-     gamestate, all changes must be discarded.
-   - If the local test-run succeeds the command is sent to the server.
-   - The server inserts the command into the command queue, which
-     assigns a network frame to the commands, i.e. when it shall be
-     executed on all clients.
-   - Enhanced with this specific timestamp, the command is send to all
-     clients, which execute the command simultaneously in the same
-     network frame in the same order.
-
-1.2) What is a Desync and how is it detected
---- ---------------------------------------
-  In the ideal case all clients have the same gamestate as the server
-  and run in sync. That is, vehicle movement is the same on all
-  clients, and commands are executed the same everywhere and
-  have the same results.
-
-  When a Desync happens, it means that the gamestates on the clients
-  (including the server) are no longer the same. Just imagine
-  that a vehicle picks the left line instead of the right line at
-  a junction on one client.
-
-  The important thing here is, that noone notices when a Desync
-  occurs. The desync client will continue to simulate the gamestate
-  and execute commands from the server. Once the gamestate differs
-  it will increasingly spiral out of control: If a vehicle picks a
-  different route, it will arrive at a different time at a station,
-  which will load different cargo, which causes other vehicles to
-  load other stuff, which causes industries to notice different
-  servicing, which causes industries to change production, ...
-  the client could run all day in a different universe.
-
-  To limit how long a Desync can remain unnoticed, the server
-  transfers some checksums every now and then for the gamestate.
-  Currently this checksum is the state of the random number
-  generator of the game logic. A lot of things in OpenTTD depend
-  on the RNG, and if the gamestate differs, it is likely that the
-  RNG is called at different times, and the state differs when
-  checked.
-
-  The clients compare this 'checksum' with the checksum of their
-  own gamestate at the specific network frame. If they differ,
-  the client disconnects with a Desync error.
-
-  The important thing here is: The detection of the Desync is
-  only an ultimate failure detection. It does not give any
-  indication on when the Desync happened. The Desync may after
-  all have occured long ago, and just did not affect the checksum
-  up to now. The checksum may have matched 10 times or more
-  since the Desync happend, and only now the Desync has spiraled
-  enough to finally affect the checksum. (There was once a desync
-  which was only noticed by the checksum after 20 game years.)
-
-1.3) Typical causes of Desyncs
---- -------------------------
-  Desyncs can be caused by the following scenarios:
-   - The savegame does not describe the complete gamestate.
-      - Some information which affects the progression of the
-        gamestate is not saved in the savegame.
-      - Some information which affects the progression of the
-        gamestate is not loaded from the savegame.
-        This includes the case that something is not completely
-        reset before loading the savegame, so data from the
-        previous game is carried over to the new one.
-   - The gamestate does not behave deterministic.
-      - Cache mismatch: The game logic depends on some cached
-        values, which are not invalidated properly. This is
-        the usual case for NewGRF-specific Desyncs.
-      - Undefined behaviour: The game logic performs multiple
-        things in an undefined order or with an undefined
-        result. E.g. when sorting something with a key while
-        some keys are equal. Or some computation that depends
-        on the CPU architecture (32/64 bit, little/big endian).
-   - The gamestate is modified when it shall not be modified.
-      - The test-run of a command alters the gamestate.
-      - The gamestate is altered by a player or script without
-        using commands.
-
-
-2.1) Cache debugging
---- ---------------
-  Desyncs which are caused by inproper cache validation can
-  often be found by enabling cache validation:
-   - Start OpenTTD with '-d desync=2'.
-   - This will enable validation of caches every tick.
-     That is, cached values are recomputed every tick and compared
-     to the cached value.
-   - Differences are logged to 'commands-out.log' in the autosave
-     folder.
-
-  Mind that this type of debugging can also be done in singleplayer.
-
-2.2) Desync recording
---- ----------------
-  If you have a server, which happens to encounter Desyncs often,
-  you can enable recording of the gamestate alterations. This
-  will later allow the replay the gamestate and locate the Desync
-  cause.
-
-  There are two levels of Desync recording, which are enabled
-  via '-d desync=2' resp. '-d desync=3'. Both will record all
-  commands to a file 'commands-out.log' in the autosave folder.
-
-  If you have the savegame from the start of the server, and
-  this command log you can replay the whole game. (see Section 3.1)
-
-  If you do not start the server from a savegame, there will
-  also be a savegame created just after a map has been generated.
-  The savegame will be named 'dmp_cmds_*.sav' and be put into
-  the autosave folder.
-
-  In addition to that '-d desync=3' also creates regular savegames
-  at defined spots in network time. (more defined than regular
-  autosaves). These will be created in the autosave folder
-  and will also be named 'dmp_cmds_*.sav'.
-
-  These saves allow comparing the gamestate with the original
-  gamestate during replaying, and thus greatly help debugging.
-  However, they also take a lot of disk space.
-
-
-3.1) Replaying
---- ---------
-  To replay a Desync recording, you need these files:
-   - The savegame from when the server was started, resp.
-     the automatically created savegame from when the map
-     was generated.
-   - The 'commands-out.log' file.
-   - Optionally the 'dmp_cmds_*.sav'.
-  Put these files into a safe spot. (Not your autosave folder!)
-
-  Next, prepare your OpenTTD for replaying:
-   - Get the same version of OpenTTD as the original server was running.
-   - Uncomment/enable the define 'DEBUG_DUMP_COMMANDS' in
-     'src/network/network_func.h'.
-   - Put the 'commands-out.log' into the root save folder, and rename
-      it to 'commands.log'.
-   - Run 'openttd -D -d desync=3 -g startsavegame.sav'.
-     This replays the server log and creates new 'commands-out.log'
-     and 'dmp_cmds_*.sav' in your autosave folder.
-
-3.2) Evaluation the replay
---- ---------------------
-  The replaying will also compare the checksums which are part of
-  the 'commands-out.log' with the replayed gamestate.
-  If they differ, it will trigger a 'NOT_REACHED'.
-
-  If the replay succeeds without mismatch, that is the replay reproduces
-  the original server state:
-   - Repeat the replay starting from incrementally later 'dmp_cmds_*.sav'
-     while truncating the 'commands.log' at the beginning appropriately.
-     The 'dmp_cmds_*.sav' can be your own ones from the first reply, or
-     the ones from the original server (if you have them).
-     (This simulates the view of joining clients during the game.)
-   - If one of those replays fails, you have located the Desync between
-     the last dmp_cmds that reproduces the replay and the first one
-     that fails.
-
-  If you have the original 'dmp_cmds_*.sav', you can also compare those
-  savegames with your own ones from the replay. You can also comment/disable
-  the 'NOT_REACHED' mentioned above, to get another 'dmp_cmds_*.sav' from
-  the replay after the mismatch has already been detected.
-  See Section 3.2 on how to compare savegames.
-  If the saves differ you have located the Desync between the last dmp_cmds
-  that match and the first one that does not. The difference of the saves
-  may point you in the direction of what causes it.
-
-  If the replay succeeds without mismatch, and you do not have any
-  'dmp_cmd_*.sav' from the original server, it is a lost case.
-  Enable creation of the 'dmp_cmd_*.sav' on the server, and wait for the
-  next Desync.
-
-  Finally, you can also compare the 'commands-out.log' from the original
-  server with the one from the replay. They will differ in stuff like
-  dates, and the original log will contain the chat, but otherwise they
-  should match.
-
-3.2) Comparing savegames
---- -------------------
-  The binary form of the savegames from the original server and from
-  your replay will always differ:
-   - The savegame contains paths to used NewGRF files.
-   - The gamelog will log your loading of the savegame.
-   - The savegame data of AIs and the Gamescript will differ.
-     Scripts are not run during the replay, only their recorded commands
-     are replayed. Their internal state will thus not change in the
-     replay and will differ.
-
-  To compare savegame more semantically, there exist some ugly hackish
-  tools at:
-     http://devs.openttd.org/~frosch/texts/zpipe.c
-     http://devs.openttd.org/~frosch/texts/printhunk.c
-
-  The first one decompresses OpenTTD savegames. The second one creates
-  a textual representation of an uncompressed savegame, by parsing hunks
-  and arrays and such. With both tools you need to be a bit careful
-  since they work on stdin and stdout, which may not deal well with
-  binary data.
-
-  If you have the textual representation of the savegames, you can
-  compare them with regular diff tools.
--- a/docs/landscape.html
+++ b/docs/landscape.html
@@ -640,7 +640,7 @@
      <ul>
       <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the depot</li>
       <li>m2: Depot index</li>
-       <li>m5 bits 1..0: exit towards:
+       <li>m5 bits 3..0: exit towards:
        <table>
         <tr>
          <td><tt>0</tt>&nbsp; </td>
@@ -1593,14 +1593,41 @@
   <td valign=top nowrap>&nbsp;</td>
   <td>
    <ul>
-     <li>m1 bits 6..5 : Water class (sea, canal, river or land)</li>
+     <li>m1 bits 6..5 : Water class (sea, canal, river or land)
     <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the object (for lighthouses and transmitters normally <tt>10</tt>)</li>
-     <li>m2: index into the array of objects, bits 0 to 15 (upper bits in m5)</li>
-     <li>m3: random bits</li>
-     <li>m5: index into the array of objects, bits 16 to 23 (lower bits in m2)</li>
+     <li>m2: index into the array of objects
+     <li>m3: random bits
+     <li>m5: tile type:
+      <table>
+       <tr>
+        <td nowrap valign=top><tt>00</tt>&nbsp; </td>
+        <td align=left>transmitter</td>
+       </tr>
+
+       <tr>
+        <td nowrap valign=top><tt>01</tt>&nbsp; </td>
+        <td align=left>lighthouse</td>
+       </tr>
+
+       <tr>
+        <td nowrap valign=top><tt>02</tt>&nbsp; </td>
+        <td align=left>company statue
+       </tr>
+
+       <tr>
+        <td nowrap valign=top><tt>03</tt>&nbsp; </td>
+        <td align=left>company-owned land</td>
+       </tr>
+
+       <tr>
+        <td nowrap valign=top><tt>04</tt><tt></tt>&nbsp; </td>
+        <td align=left>company headquarters</td>
+       </tr>
+      </table>
+     </li>
     <li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
-     <li>m7: animation counter</li>
+     <li>m7: animation counter
    </ul>
   </td>
  </tr>
--- a/docs/landscape_grid.html
+++ b/docs/landscape_grid.html
@@ -115,7 +115,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">XXXX XXXX XXXX XXXX</td>
      <td class="bits"><span class="free">OOOO</span> XXXX</td>
      <td class="bits"><span class="free">OOOO</span> XXXX</td>
-      <td class="bits">XX<span class="free">O</span>X <span class="free">OO</span>XX</td>
+      <td class="bits">XX<span class="free">O</span>X <span class="free">O</span>XXX</td>
      <td class="bits">XX<span class="free">OO OO</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
@@ -208,7 +208,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">XXXX <span class="free">OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="option">~~~~ ~</span>XXX</td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
+      <td class="bits"><span class="free">OO</span>XX XXXX</td>
      <td class="bits">XX<span class="free">O</span>X XXXX</td>
    </tr>
    <tr>
@@ -311,7 +311,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">X<span class="free">OO</span>X XXXX</td>
      <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX X<span class="free">O</span>XX</td>
    </tr>
    <tr>
      <td>bridge ramp</td>
--- a/docs/linkgraph.txt
+++ b/docs/linkgraph.txt
@@ -1,30 +0,0 @@
-Some clarifications about the link graph
----------------------------------------
-
-InitializeLinkGraphs joins all threads, so if the game is abandoned
-with some threads still running, they're joined as soon as the next game
-(possibly the title game) is started. See also InitializeGame.
-
-The MCF (multi-commodity flow) algorithm can be quite CPU-hungry as it's
-NP-hard and takes exponential time (though with a very small constant
-factor) in the number of nodes.
-This is why it is run in a separate thread where possible. However after
-some time the thread is joined and if it hasn't finished by then the game
-will hang. This problem gets worse if we are running on a platform without
-threads. However, as those are usually the ones with less CPU power I
-assume the contention for the CPU would make the game hard to play even
-with threads or even without cargodist (autosave ...). I might be wrong,
-but I won't put any work into this before someone shows me some problem.
-
-You can configure the link graph recalculation time. A link graph
-recalculation time of X days means that each link graph job has X days
-to run before it is joined. The downside is that the flow stats won't be
-updated before the job is finished and thus a high value means less
-updates and longer times until changes in capacities are accounted for.
-If you play a very large map with a complicated link graph you may want to
-raise the time setting to avoid lags. The same holds for systems with slow
-CPUs.
-
-Another option to avoid excessive lags is to reduce the accuracy of link
-graph calculations. Generally the accuracy is inversely correlated to the
-CPU requirements of the MCF algorithm.
--- a/findversion.sh
+++ b/findversion.sh
@@ -70,7 +70,7 @@ ROOT_DIR=`pwd`
 # Determine if we are using a modified version
 # Assume the dir is not modified
 MODIFIED="0"
-if [ -d "$ROOT_DIR/.svn" ] || [ -d "$ROOT_DIR/../.svn" ]; then
+if [ -d "$ROOT_DIR/.svn" ]; then
 	# We are an svn checkout
 	if [ -n "`svnversion | grep 'M'`" ]; then
 		MODIFIED="2"
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,13 +1,14 @@
 OpenTTD's known bugs
-Last updated:    2014-06-02
-Release version: 1.4.1
+Last updated:    2012-03-18
+Release version: 1.2.0-RC3
 ------------------------------------------------------------------------


 Table of contents
 -----------------
 1.0) About
-2.0) Known bugs
+2.0) Known bugs in this release
+ * 2.1) Known bugs that will not be solved


 1.0) About
@@ -16,13 +17,36 @@ All bugs listed below are marked as known. Please do not submit any bugs
 that are the same as these. If you do, do not act surprised, because
 we WILL flame you!!

-The current list of known bugs that we intend to fix can be found in our
-bug tracking system at: http://bugs.openttd.org
-Also check the closed bugs when searching for your bug in this system as
-we might have fixed the bug in the mean time.
+Of course if you have more knowledge about any of these bugs, have more
+specifics, we welcome you to report them. React to the given bug indicated
+by the number below on http://bugs.openttd.org.


-2.0) Known bugs
+2.0) Known bugs in this release
+---- --------------------------
+The following bugs are known to exist in this release and we intend to
+fix them. Some bugs are known but are not fixable or fixing them would
+cause further problems. Those bugs can be found in the "Known bugs that
+will not be solved" section.
+
+The bugs in this section all refer to a ticket in our bug tracking system
+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.
+
+Issues prefixed with [OSX] are required to be fixed before we consider
+officially supporting Mac OS X again. For now it remains unsupported and
+we only apply bug fixes provided by the community but we are unable to fix
+these bugs ourselves.
+
+- 4857	[OSX] No support for detecting mono space font
+- 4847	[OSX] No support for bootstrap downloading of base graphics
+- 4744  [OSX] Crash when switching to full screen with OS X Lion
+- 4689  [OSX] Crash when hiding window after coming from full screen
+- 4420  [OSX] OS' mouse pointer still shows
+- 2484  [OSX] Cannot enter CJK characters
+
+2.1) Known bugs that will not be solved
 ---- ----------------------------------
 This section lists all known bugs that we do not intend to fix and the
 reasons why we think that fixing them is infeasible. We might make some
@@ -33,13 +57,12 @@ No suitable AI can be found
 	If you have no AIs and an AI is started the so-called 'dummy' AI will
 	be loaded. This AI does nothing but writing a message on the AI debug
 	window and showing a red warning. There are basically two solutions
-	for this problem: Either you set the number of AI players to 0 so that
-	no AI is started. You find that setting at the top of the window in the
-	"AI / Game Scripts Settings" window.
-	The other solution is acquiring (downloading) some AI. The easiest way
-	to do this is via the "Check Online Content" button in the main (intro)
-	menu or directly in the "AI / Game Scripts Settings" dialogue via the
-	"Check Online Content" button.
+	for this problem: you must change the settings so no AI is started,
+	this is done in the difficulty settings window. The other solution is
+	acquiring (downloading) some AI. The easiest way to do this is via
+	the "Check Online Content" button in the main (intro) menu or via
+	"AI Settings" -> "Select AI" -> "Check Online Content" which is also
+	accessed via the main menu.

 After a while of playing, colours get corrupted
 	In Windows 7 the background slideshow corrupts the colour mapping of
@@ -404,52 +427,3 @@ Mouse cursor going missing with SDL [FS#4997]:
 	We cannot fix this problem as SDL simply does not provide the
 	required information in these corner cases. This is a bug in SDL
 	and as such there is little that we can do about it.
-
-Inconsistent catchment areas [FS#5661]:
-	Due to performance decisions the catchment area for cargo accepted
-	by a station for delivery to houses or industries differs from the
-	catchment area for cargo that is delivered to stations from houses
-	or industries.
-
-	Conceptually they work the same, but the effect in game differs.
-	They work by finding the closest destination "around" the source
-	which is within a certain distance. This distance depends on the
-	type of station, e.g. road stops have a smaller catchment area than
-	large airports. In both cases the bounding box, the smallest
-	rectangle that contains all tiles of something, is searched for the
-	target of the cargo, and then spiraling outwards finding the closest
-	tile of the target.
-
-	In the case of a station with two tiles spread far apart with a house
-	that is within the station's bounding box, it would be possible that
-	the spiraling search from the house does not reach one of the station
-	tiles before the search ends, i.e. all tiles within that distance
-	are searched. So the house does not deliver cargo to the station. On
-	the other hand, the station will deliver cargo because the house
-	falls within the bounding box, and thus search area.
-
-	It is possible to make these consistent, but then cargo from a house
-	to a station needs to search up to 32 tiles around itself, i.e. 64
-	by 64 tiles, to find all possible stations it could deliver to
-	instead of 10 by 10 tiles (40 times more tiles). Alternatively the
-	search from a station could be changed to use the actual tiles, but
-	that would require considering checking 10 by 10 tiles for each of
-	the tiles of a station, instead of just once.
-
-Trains might not stop at platforms that are currently being changed [FS#5553]:
-	If you add tiles to or remove tiles from a platform while a train is
-	approaching to stop at the same platform, that train can miss the place
-	where it's supposed to stop and pass the station without stopping. This
-	is caused by the fact that the train is considered to already have stopped
-	if it's beyond its assigned stopping location. We can't let the train stop
-	just anywhere in the station because then it would never leave the station
-	if you have the same station in the order list multiple times in a row or
-	if there is only one station in the order list (see FS#5684).
-
-Some houses and industries are not affected by transparency [FS#5817]:
-	Some of the default houses and industries (f.e. the iron ore mine) are
-	not affected by the transparency options. This is because the graphics do
-	not (completely) separate the ground from the building.
-	This is a bug of the original graphics, and unfortunately cannot be
-	fixed with OpenGFX for the sake of maintaining compatibility with the
-	original graphics.
--- a/media/baseset/no_music.obm
+++ b/media/baseset/no_music.obm
@@ -1,50 +0,0 @@
-; $Id$
-;
-; This represents more or less nothingness
-;
-[metadata]
-name              = NoMusic
-shortname         = NULL
-version           = 0
-fallback          = true
-!! description STR_BASEMUSIC_NONE_DESCRIPTION
-
-[files]
-theme =
-old_0 =
-old_1 =
-old_2 =
-old_3 =
-old_4 =
-old_5 =
-old_6 =
-old_7 =
-old_8 =
-old_9 =
-new_0 =
-new_1 =
-new_2 =
-new_3 =
-new_4 =
-new_5 =
-new_6 =
-new_7 =
-new_8 =
-new_9 =
-ezy_0 =
-ezy_1 =
-ezy_2 =
-ezy_3 =
-ezy_4 =
-ezy_5 =
-ezy_6 =
-ezy_7 =
-ezy_8 =
-ezy_9 =
-
-[md5s]
-
-[names]
-
-[origin]
-default      = This file was part of your OpenTTD installation.
--- a/media/baseset/no_sound.obs
+++ b/media/baseset/no_sound.obs
@@ -1,18 +0,0 @@
-; $Id$
-;
-; This represents more or less nothingness
-;
-[metadata]
-name              = NoSound
-shortname         = NULL
-version           = 2
-fallback          = true
-!! description STR_BASESOUNDS_NONE_DESCRIPTION
-
-[files]
-samples      =
-
-[md5s]
-
-[origin]
-default      = This file was part of your OpenTTD installation.
--- a/media/baseset/orig_dos.obg
+++ b/media/baseset/orig_dos.obg
@@ -1,31 +0,0 @@
-; $Id$
-;
-; This represents the original graphics as on the non-German Transport
-; Tycoon Deluxe DOS CD.
-;
-[metadata]
-name              = original_dos
-shortname         = TTDD
-version           = 1
-palette           = DOS
-!! description STR_BASEGRAPHICS_DOS_DESCRIPTION
-
-[files]
-base         = TRG1.GRF
-logos        = TRGI.GRF
-arctic       = TRGC.GRF
-tropical     = TRGH.GRF
-toyland      = TRGT.GRF
-extra        = OPENTTD.GRF
-
-[md5s]
-TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
-TRGC.GRF     = ed446637e034104c5559b32c18afe78d
-TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF  =
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTD.GRF  = This file was part of your OpenTTD installation.
--- a/media/baseset/orig_dos.obs
+++ b/media/baseset/orig_dos.obs
@@ -1,19 +0,0 @@
-; $Id$
-;
-; This represents the original sounds as on the Transport
-; Tycoon Deluxe DOS CD.
-;
-[metadata]
-name              = original_dos
-shortname         = TTDO
-version           = 0
-!! description STR_BASESOUNDS_DOS_DESCRIPTION
-
-[files]
-samples      = SAMPLE.CAT
-
-[md5s]
-SAMPLE.CAT   = 422ea3dd074d2859bb51639a6e0e85da
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/media/baseset/orig_dos_de.obg
+++ b/media/baseset/orig_dos_de.obg
@@ -1,31 +0,0 @@
-; $Id$
-;
-; This represents the original graphics as on the German Transport
-; Tycoon Deluxe DOS CD. It contains one broken sprite.
-;
-[metadata]
-name              = original_dos_de
-shortname         = TTDD
-version           = 0
-palette           = DOS
-!! description STR_BASEGRAPHICS_DOS_DE_DESCRIPTION
-
-[files]
-base         = TRG1.GRF
-logos        = TRGI.GRF
-arctic       = TRGC.GRF
-tropical     = TRGH.GRF
-toyland      = TRGT.GRF
-extra        = OPENTTD.GRF
-
-[md5s]
-TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
-TRGC.GRF     = ed446637e034104c5559b32c18afe78d
-TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTD.GRF  =
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTD.GRF  = This file was part of your OpenTTD installation.
--- a/media/baseset/orig_win.obg
+++ b/media/baseset/orig_win.obg
@@ -1,31 +0,0 @@
-; $Id$
-;
-; This represents the original graphics as on the Transport
-; Tycoon Deluxe for Windows CD.
-;
-[metadata]
-name              = original_windows
-shortname         = TTDW
-version           = 0
-palette           = Windows
-!! description STR_BASEGRAPHICS_WIN_DESCRIPTION
-
-[files]
-base         = TRG1R.GRF
-logos        = TRGIR.GRF
-arctic       = TRGCR.GRF
-tropical     = TRGHR.GRF
-toyland      = TRGTR.GRF
-extra        = OPENTTD.GRF
-
-[md5s]
-TRG1R.GRF    = b04ce593d8c5016e07473a743d7d3358
-TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
-TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
-TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
-TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTD.GRF  =
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTD.GRF  = This file was part of your OpenTTD installation.
--- a/media/baseset/orig_win.obm
+++ b/media/baseset/orig_win.obm
@@ -1,94 +0,0 @@
-; $Id$
-;
-; This represents the original music as on the Transport
-; Tycoon Deluxe for Windows CD.
-;
-[metadata]
-name              = original_windows
-shortname         = TTDW
-version           = 1
-!! description STR_BASEMUSIC_WIN_DESCRIPTION
-
-[files]
-theme = GM_TT00.GM
-old_0 = GM_TT02.GM
-old_1 = GM_TT06.GM
-old_2 = GM_TT03.GM
-old_3 = GM_TT12.GM
-old_4 = GM_TT08.GM
-old_5 = GM_TT13.GM
-old_6 = GM_TT14.GM
-old_7 = GM_TT10.GM
-old_8 =
-old_9 =
-new_0 = GM_TT04.GM
-new_1 = GM_TT01.GM
-new_2 = GM_TT05.GM
-new_3 = GM_TT15.GM
-new_4 = GM_TT11.GM
-new_5 = GM_TT16.GM
-new_6 = GM_TT09.GM
-new_7 =
-new_8 =
-new_9 =
-ezy_0 = GM_TT18.GM
-ezy_1 = GM_TT19.GM
-ezy_2 = GM_TT21.GM
-ezy_3 = GM_TT17.GM
-ezy_4 = GM_TT20.GM
-ezy_5 = GM_TT07.GM
-ezy_6 =
-ezy_7 =
-ezy_8 =
-ezy_9 =
-
-[md5s]
-GM_TT00.GM = 45cfec1b9d8c7a0ad45e755833cbf221
-GM_TT01.GM = ab14ed3392d848abd2a2e90a9d75d121
-GM_TT02.GM = dd4f696e4be5987ce738257b08b50171
-GM_TT03.GM = a1bfde23343df9e4063419bf29c166b8
-GM_TT04.GM = 4e6943aa0c455203d76c79389054747d
-GM_TT05.GM = cee281cb85a2e2343552d97640545a47
-GM_TT06.GM = 26d1de5efa8675f94065784e9d539e49
-GM_TT07.GM = 6f2691e17558f552ec4c565e4ab7139c
-GM_TT08.GM = a42bf2cb3340a822f1a69646fc7a487d
-GM_TT09.GM = eb35761a58a8df3c59ed8929cce13916
-GM_TT10.GM = 42fecd686720a785d20a78590c466a82
-GM_TT11.GM = 50ef1ef02e49d2112786dd45e69dc3ee
-GM_TT12.GM = 4ce707a0e0e72419f0681dd9bd95271b
-GM_TT13.GM = e765753be29d889ec818f38009103619
-GM_TT14.GM = 270e2d63bd32b95a4d007ce15a6ce45f
-GM_TT15.GM = 89e116a1c0c69f1845cc903a9bfbe460
-GM_TT16.GM = f824e2371b3bedfe61aad4b9c62dd6be
-GM_TT17.GM = 1b23eebb0796c1ab99cd97fa7082cf7b
-GM_TT18.GM = 15650de3bad645d0e88c4f5c7a2df92a
-GM_TT19.GM = 7aec079e15bd09588660b85545ac4dfc
-GM_TT20.GM = 1509097889dee617aa1e9a1738a5a930
-GM_TT21.GM = a8d0aaad02e1a762d8d54cf81da56bab
-
-[names]
-GM_TT00.GM = Tycoon DELUXE Theme
-GM_TT01.GM = Snarl Up
-GM_TT02.GM = Easy Driver
-GM_TT03.GM = Little Red Diesel
-GM_TT04.GM = City Groove
-GM_TT05.GM = Aliens Ate My Railway
-GM_TT06.GM = Stoke It
-GM_TT07.GM = Don't Walk!
-GM_TT08.GM = Sawyer's Tune
-GM_TT09.GM = Fell Apart On Me
-GM_TT10.GM = Can't Get There From Here
-GM_TT11.GM = Hard Drivin'
-GM_TT12.GM = Road Hog
-GM_TT13.GM = Hold That Train!
-GM_TT14.GM = Broomer's Oil Rag
-GM_TT15.GM = Goss Groove
-GM_TT16.GM = Small Town
-GM_TT17.GM = Cruise Control
-GM_TT18.GM = Stroll On
-GM_TT19.GM = Funk Central
-GM_TT20.GM = Jammit
-GM_TT21.GM = Movin' On
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/media/baseset/orig_win.obs
+++ b/media/baseset/orig_win.obs
@@ -1,19 +0,0 @@
-; $Id$
-;
-; This represents the original sounds as on the Transport
-; Tycoon Deluxe for Windows CD.
-;
-[metadata]
-name              = original_windows
-shortname         = TTDO
-version           = 0
-!! description STR_BASESOUNDS_WIN_DESCRIPTION
-
-[files]
-samples      = SAMPLE.CAT
-
-[md5s]
-SAMPLE.CAT   = 9212e81e72badd4bbe1eaeae66458e10
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/media/baseset/translations.awk
+++ b/media/baseset/translations.awk
@@ -1,69 +0,0 @@
-# $Id: openttd.desktop.translation.awk 24100 2012-04-08 14:29:31Z rubidium $
-
-# This file is part of OpenTTD.
-# OpenTTD 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, version 2.
-# OpenTTD 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. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-
-#
-# Awk script to extract translations for baseset descriptions
-# from lang files for insertion into .obg/obs/obm files.
-# If there is no translation, there is no output.
-#
-# The input file is scanned for the pattern
-#  !! <ini-key> <STR_id>
-#
-# The lang files (passed as variable 'langfiles') are scanned for <STR_id> and
-# the translations are added to the output file:
-#  <ini-key>.<iso-code> = <translation>
-#
-
-# Simple insertion sort since not all AWKs have a sort implementation
-function isort(A) {
-	n = 0
-	for (val in A) {
-		n++;
-	}
-
-	for (i = 2; i <= n; i++) {
-		j = i;
-		hold = A[j]
-		while (A[j - 1] > hold) {
-			j--;
-			A[j + 1] = A[j]
-		}
-		A[j] = hold
-	}
-
-	return n
-}
-
-/^!!/ {
-	ini_key = $2;
-	str_id = $3;
-
-	file = langfiles
-	while ((getline < file) > 0) {
-		if (match($0, "##isocode") > 0) {
-			lang = $2;
-		} else if (match($0, "^" str_id " *:") > 0) {
-			sub("^[^:]*:", "", $0)
-			i++;
-			if (lang == "en_GB") {
-				texts[i] = ini_key "       = "$0;
-			} else {
-				texts[i] = ini_key "." lang " = "$0;
-			}
-		}
-	}
-	close(file);
-
-	count = isort(texts);
-	for (i = 1; i <= count; i++) {
-		print texts[i]
-	}
-
-	next
-}
-
-{ print }
--- a/media/extra_grf/openttdgui.nfo
+++ b/media/extra_grf/openttdgui.nfo
@@ -7,7 +7,7 @@
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 //
   -1 * 0	 0C "OpenTTD GUI graphics"
-   -1 * 3	 05 15 \b 175 // OPENTTD_SPRITE_COUNT
+   -1 * 3	 05 15 A2
   -1 sprites/openttdgui.png 8bpp  66    8  64  31 -31   7 normal
   -1 sprites/openttdgui.png 8bpp 146    8  64  31 -31   7 normal
   -1 sprites/openttdgui.png 8bpp 226    8  64  31 -31   7 normal
@@ -170,16 +170,3 @@
   -1 sprites/openttdgui.png 8bpp 194  440  13  10   0  -2 normal
   -1 sprites/openttdgui.png 8bpp 215  440   9  10   0   0 normal
   -1 sprites/openttdgui.png 8bpp 232  440   8  10   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 248  440   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 264  440   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 280  440   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 296  440   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 312  440  14  10   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 328  440  14  10   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 348  440   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 362  440  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 388  440  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 414  440  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 440  440  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 466  440  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 490  440  20  20   0   0 normal
--- a/media/extra_grf/openttdgui.png
+++ b/media/extra_grf/openttdgui.png
--- a/media/openttd.desktop.filter.awk
+++ b/media/openttd.desktop.filter.awk
@@ -1,13 +0,0 @@
-# $Id: openttd.desktop.translation.awk 19884 2010-05-22 19:59:37Z rubidium $
-
-# This file is part of OpenTTD.
-# OpenTTD 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, version 2.
-# OpenTTD 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. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-
-#
-# Awk script to automatically remove duplicate Comment[i]= lines
-#
-
-BEGIN { FS = "="; last = "" }
-{ if (last != $1) { print $0 }; last = $1 }
--- a/media/openttd.desktop.in
+++ b/media/openttd.desktop.in
@@ -9,4 +9,3 @@ Exec=!!TTD!!
 Terminal=false
 Categories=!!MENU_GROUP!!
 Comment=A clone of Transport Tycoon Deluxe
-Keywords=game;simulation;transport;tycoon;deluxe;economics;multiplayer;money;train;ship;bus;truck;aircraft;cargo
--- a/media/openttd.desktop.translation.awk
+++ b/media/openttd.desktop.translation.awk
@@ -6,10 +6,10 @@
 # See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.

 #
-# Awk script to automatically generate a comment lines for
-# a translated desktop shortcut. If it does not exist there
+# Awk script to automatically generate a single comment line
+# for a translated desktop shortcut. If it does not exist there
 # is no output.
 #

 /##isocode/ { lang = $2; next }
-/STR_DESKTOP_SHORTCUT_COMMENT/ { sub("^[^:]*:", "", $0); print "Comment[" lang "]=" $0; sub("_.*", "", lang); print "Comment[" lang "]=" $0; next}
+/STR_DESKTOP_SHORTCUT_COMMENT/ { sub("^[^:]*:", "", $0); print "Comment[" lang "]=" $0; next}
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,416 +1,224 @@
-openttd (1.4.1-0) unstable; urgency=low
-
-  * New upstream release 1.4.1
-
- -- OpenTTD <info@openttd.org>  Mon, 02 Jun 2014 21:00:00 +0200
-
-openttd (1.4.1~RC2-0) unstable; urgency=low
-
-  * New upstream release 1.4.1-RC2
-
- -- OpenTTD <info@openttd.org>  Sun, 18 May 2014 21:00:00 +0200
-
-openttd (1.4.1~RC1-0) unstable; urgency=low
-
-  * New upstream release 1.4.1-RC1
-
- -- OpenTTD <info@openttd.org>  Sun, 04 May 2014 21:00:00 +0200
-
-openttd (1.4.0-0) unstable; urgency=low
-
-  * New upstream release 1.4.0
-
- -- OpenTTD <info@openttd.org>  Tue, 01 Apr 2014 21:00:00 +0200
-
-openttd (1.4.0~RC1-0) unstable; urgency=low
-
-  * New upstream release 1.4.0-RC1
-
- -- OpenTTD <info@openttd.org>  Tue, 17 Mar 2014 21:00:00 +0100
-
-openttd (1.4.0~beta5-0) unstable; urgency=low
-
-  * New upstream release 1.4.0-beta5
-
- -- OpenTTD <info@openttd.org>  Tue, 25 Feb 2014 10:15:00 +0100
-
-openttd (1.4.0~beta4-0) unstable; urgency=low
-
-  * New upstream release 1.4.0-beta4
-
- -- OpenTTD <info@openttd.org>  Thu, 06 Feb 2014 21:00:00 +0100
-
-openttd (1.4.0~beta3-0) unstable; urgency=low
-
-  * New upstream release 1.4.0-beta3
-
- -- OpenTTD <info@openttd.org>  Tue, 21 Jan 2014 21:00:00 +0100
-
-openttd (1.4.0~beta2-0) unstable; urgency=low
-
-  * New upstream release 1.4.0-beta2
-
- -- OpenTTD <info@openttd.org>  Tue, 07 Jan 2014 21:00:00 +0100
-
-openttd (1.4.0~beta1-0) unstable; urgency=low
-
-  * New upstream release 1.4.0-beta1
-
- -- OpenTTD <info@openttd.org>  Tue, 24 Dec 2013 00:00:00 +0100
-
-openttd (1.3.3-0) unstable; urgency=low
-
-  * New upstream release 1.3.3
-
- -- OpenTTD <info@openttd.org>  Fri, 29 Nov 2013 19:00:00 +0100
-
-openttd (1.3.3~RC2-0) unstable; urgency=low
-
-  * New upstream release 1.3.3-RC2
-
- -- OpenTTD <info@openttd.org>  Sun, 24 Nov 2013 19:00:00 +0100
-
-openttd (1.3.3~RC1-0) unstable; urgency=low
-
-  * New upstream release 1.3.3-RC1
-
- -- OpenTTD <info@openttd.org>  Sun, 17 Nov 2013 19:00:00 +0100
-
-openttd (1.3.2-0) unstable; urgency=low
-
-  * New upstream release 1.3.2
-
- -- OpenTTD <info@openttd.org>  Sat, 27 Jul 2013 18:00:00 +0200
-
-openttd (1.3.2~RC2-0) unstable; urgency=low
-
-  * New upstream release 1.3.2-RC2
-
- -- OpenTTD <info@openttd.org>  Sat, 13 Jul 2013 12:00:00 +0200
-
-openttd (1.3.2~RC1-0) unstable; urgency=low
-
-  * New upstream release 1.3.2-RC1
-
- -- OpenTTD <info@openttd.org>  Sun, 30 Jun 2013 12:00:00 +0200
-
-openttd (1.3.1-0) unstable; urgency=low
-
-  * New upstream release 1.3.1
-
- -- OpenTTD <info@openttd.org>  Sat, 01 Jun 2013 00:00:00 +0300
-
-openttd (1.3.1~RC1-0) unstable; urgency=low
-
-  * New upstream release 1.3.1-RC1
-
- -- OpenTTD <info@openttd.org>  Fri, 17 May 2013 22:00:00 +0200
-
-openttd (1.3.0-0) unstable; urgency=low
-
-  * New upstream release 1.3.0
-
- -- OpenTTD <info@openttd.org>  Mon, 01 Apr 2013 00:00:00 +0200
-
-openttd (1.3.0~RC3) unstable; urgency=low
-
-  * New upstream release 1.3.0-RC3
-
- -- OpenTTD <info@openttd.org>  Mon, 18 Mar 2013 00:00:00 +0100
-
-openttd (1.3.0~RC2) unstable; urgency=low
-
-  * New upstream release 1.3.0-RC2
-
- -- OpenTTD <info@openttd.org>  Tue, 05 Mar 2013 00:00:00 +0100
-
-openttd (1.3.0~RC1) unstable; urgency=low
-
-  * New upstream release 1.3.0-RC1
-
- -- OpenTTD <info@openttd.org>  Tue, 19 Feb 2013 00:00:00 +0100
-
-openttd (1.3.0~beta2) unstable; urgency=low
-
-  * New upstream release 1.3.0-beta2
-
- -- OpenTTD <info@openttd.org>  Thu, 07 Feb 2013 00:00:00 +0100
-
-openttd (1.3.0~beta1) unstable; urgency=low
-
-  * New upstream release 1.3.0-beta1
-
- -- OpenTTD <info@openttd.org>  Mon, 24 Dec 2012 00:00:00 +0100
-
-openttd (1.2.3) unstable; urgency=low
-
-  * New upstream release 1.2.3
-
- -- OpenTTD <info@openttd.org>  Thu, 01 Nov 2012 00:00:00 +0200
-
-openttd (1.2.3~RC1) unstable; urgency=low
-
-  * New upstream release 1.2.3-RC1
-
- -- OpenTTD <info@openttd.org>  Wed, 17 Oct 2012 00:00:00 +0200
-
-openttd (1.2.2) unstable; urgency=low
-
-  * New upstream release 1.2.2
-
- -- OpenTTD <info@openttd.org>  Thu, 16 Aug 2012 20:00:00 +0200
-
-openttd (1.2.2~RC1) unstable; urgency=low
-
-  * New upstream release 1.2.2-RC1
-
- -- OpenTTD <info@openttd.org>  Wed, 01 Aug 2012 00:00:00 +0200
-
-openttd (1.2.1) unstable; urgency=low
-
-  * New upstream release 1.2.1
-
- -- OpenTTD <info@openttd.org>  Fri, 01 Jun 2012 00:00:00 +0200
-
-openttd (1.2.1~RC1) unstable; urgency=low
-
-  * New upstream release 1.2.1-RC1
-
- -- OpenTTD <info@openttd.org>  Wed, 16 Apr 2012 22:00:00 +0200
-
-openttd (1.2.0) unstable; urgency=low
-
-  * New upstream release 1.2.0
-
- -- OpenTTD <info@openttd.org>  Sun, 15 Apr 2012 14:00:00 +0200
-
-openttd (1.2.0~RC4) unstable; urgency=low
-
-  * New upstream release 1.2.0-RC4
-
- -- OpenTTD <info@openttd.org>  Sun, 01 Apr 2012 00:00:00 +0200
-
 openttd (1.2.0~RC3) unstable; urgency=low

  * New upstream release 1.2.0-RC3

- -- OpenTTD <info@openttd.org>  Sun, 18 Mar 2012 18:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 18 Mar 2012 18:00:00 +0100

 openttd (1.2.0~RC2) unstable; urgency=low

  * New upstream release 1.2.0-RC2

- -- OpenTTD <info@openttd.org>  Sun, 04 Mar 2012 18:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 04 Mar 2012 18:00:00 +0100

 openttd (1.2.0~RC1) unstable; urgency=low

  * New upstream release 1.2.0-RC1

- -- OpenTTD <info@openttd.org>  Sun, 19 Feb 2012 23:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 19 Feb 2012 23:00:00 +0100

 openttd (1.2.0~beta4) unstable; urgency=low

  * New upstream release 1.2.0-beta4

- -- OpenTTD <info@openttd.org>  Sat, 04 Feb 2012 16:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 04 Feb 2012 16:00:00 +0100

 openttd (1.2.0~beta3) unstable; urgency=low

  * New upstream release 1.2.0-beta3

- -- OpenTTD <info@openttd.org>  Sat, 21 Jan 2012 16:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 21 Jan 2012 16:00:00 +0100

 openttd (1.2.0~beta2) unstable; urgency=low

  * New upstream release 1.2.0-beta2

- -- OpenTTD <info@openttd.org>  Sat, 07 Jan 2012 00:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 07 Jan 2012 00:00:00 +0100

 openttd (1.2.0~beta1) unstable; urgency=low

  * New upstream release 1.2.0-beta1

- -- OpenTTD <info@openttd.org>  Sat, 24 Dec 2011 00:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 24 Dec 2011 00:00:00 +0100

 openttd (1.1.4) unstable; urgency=low

  * New upstream release 1.1.4

- -- OpenTTD <info@openttd.org>  Mon, 05 Dec 2011 00:00:00 +0400
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 05 Dec 2011 00:00:00 +0400

 openttd (1.1.4-RC1) unstable; urgency=low

  * New upstream release 1.1.4-RC1

- -- OpenTTD <info@openttd.org>  Sun, 20 Nov 2011 17:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 20 Nov 2011 17:00:00 +0100

 openttd (1.1.3) unstable; urgency=low

  * New upstream release 1.1.3

- -- OpenTTD <info@openttd.org>  Thu, 15 Sep 2011 21:00:00 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 15 Sep 2011 21:00:00 +0200

 openttd (1.1.3-RC1) unstable; urgency=low

  * New upstream release 1.1.3-RC1

- -- OpenTTD <info@openttd.org>  Sun, 04 Sep 2011 17:00:00 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 04 Sep 2011 17:00:00 +0200

 openttd (1.1.2) unstable; urgency=low

  * New upstream release 1.1.2

- -- OpenTTD <info@openttd.org>  Sun, 14 Aug 2011 17:00:00 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 14 Aug 2011 17:00:00 +0200

 openttd (1.1.2~RC2) unstable; urgency=low

  * New upstream release 1.1.2-RC2

- -- OpenTTD <info@openttd.org>  Sat, 30 Jul 2011 21:00:00 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 30 Jul 2011 21:00:00 +0200

 openttd (1.1.2~RC1) unstable; urgency=low

  * New upstream release 1.1.2-RC1

- -- OpenTTD <info@openttd.org>  Sun, 24 Jul 2011 21:00:00 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 24 Jul 2011 21:00:00 +0200

 openttd (1.1.1) unstable; urgency=low

  * New upstream release 1.1.1

- -- OpenTTD <info@openttd.org>  Wed, 01 Jun 2011 00:00:00 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 01 Jun 2011 00:00:00 +0200

 openttd (1.1.1~RC1) unstable; urgency=low

  * New upstream release 1.1.1-RC1

- -- OpenTTD <info@openttd.org>  Sun, 15 May 2011 21:00:00 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 15 May 2011 21:00:00 +0200

 openttd (1.1.0) unstable; urgency=low

  * New upstream release 1.1.0

- -- OpenTTD <info@openttd.org>  Fri, 01 Apr 2011 00:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 01 Apr 2011 00:00:00 +0100

 openttd (1.1.0~RC3) unstable; urgency=low

  * New upstream release 1.1.0-RC3

- -- OpenTTD <info@openttd.org>  Fri, 18 Mar 2011 22:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 18 Mar 2011 22:00:00 +0100

 openttd (1.1.0~RC2) unstable; urgency=low

  * New upstream release 1.1.0-RC2

- -- OpenTTD <info@openttd.org>  Fri, 04 Mar 2011 22:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 04 Mar 2011 22:00:00 +0100

 openttd (1.1.0~RC1) unstable; urgency=low

  * New upstream release 1.1.0-RC1

- -- OpenTTD <info@openttd.org>  Fri, 18 Feb 2011 22:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 18 Feb 2011 22:00:00 +0100

 openttd (1.1.0~beta5) unstable; urgency=low

  * New upstream release 1.1.0-beta5

- -- OpenTTD <info@openttd.org>  Fri, 04 Feb 2011 22:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 04 Feb 2011 22:00:00 +0100

 openttd (1.1.0~beta4) unstable; urgency=low

  * New upstream release 1.1.0-beta4

- -- OpenTTD <info@openttd.org>  Fri, 21 Jan 2011 00:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 21 Jan 2011 00:00:00 +0100

 openttd (1.1.0~beta3) unstable; urgency=low

  * New upstream release 1.1.0-beta3

- -- OpenTTD <info@openttd.org>  Sun, 09 Jan 2011 18:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 09 Jan 2011 18:00:00 +0100

 openttd (1.1.0~beta2) unstable; urgency=low

  * New upstream release 1.1.0-beta2

- -- OpenTTD <info@openttd.org>  Fri, 31 Dec 2010 18:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 31 Dec 2010 18:00:00 +0100

 openttd (1.1.0~beta1) unstable; urgency=low

  * New upstream release 1.1.0-beta1

- -- OpenTTD <info@openttd.org>  Fri, 24 Dec 2010 00:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 24 Dec 2010 00:00:00 +0100

 openttd (1.0.5-0) unstable; urgency=low

  * New upstream release 1.0.5

- -- OpenTTD <info@openttd.org>  Sat, 20 Nov 2010 21:00:00 +0000
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 20 Nov 2010 21:00:00 +0000

 openttd (1.0.5~rc2-0) unstable; urgency=low

  * New upstream release 1.0.5~rc2

- -- OpenTTD <info@openttd.org>  Sun, 14 Nov 2010 15:00:00 +0000
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 14 Nov 2010 15:00:00 +0000

 openttd (1.0.5~rc1-0) unstable; urgency=low

  * New upstream release 1.0.5-RC1

- -- OpenTTD <info@openttd.org>  Sun, 31 Oct 2010 15:00:00 +0000
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 31 Oct 2010 15:00:00 +0000

 openttd (1.0.4-0) unstable; urgency=low

  * New upstream release 1.0.4

- -- OpenTTD <info@openttd.org>  Tue, 14 Sep 2010 20:00:00 +0000
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 14 Sep 2010 20:00:00 +0000

 openttd (1.0.4~rc1-0) unstable; urgency=low

  * New upstream release 1.0.4-RC1

- -- OpenTTD <info@openttd.org>  Mon, 30 Aug 2010 20:00:00 +0000
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 30 Aug 2010 20:00:00 +0000

 openttd (1.0.3-0) unstable; urgency=low

  * New upstream release 1.0.3

- -- OpenTTD <info@openttd.org>  Sun, 01 Aug 2010 00:00:00 +0000
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 01 Aug 2010 00:00:00 +0000

 openttd (1.0.3~rc1-0) unstable; urgency=low

  * New upstream release 1.0.3-RC1

- -- OpenTTD <info@openttd.org>  Sat, 05 Jul 2010 17:37:21 +0000
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 05 Jul 2010 17:37:21 +0000

 openttd (1.0.2-0) unstable; urgency=low

  * New upstream release 1.0.2

- -- OpenTTD <info@openttd.org>  Sat, 19 Jun 2010 18:36:21 +0000
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 19 Jun 2010 18:36:21 +0000

 openttd (1.0.2~rc1-0) unstable; urgency=low

  * New upstream release 1.0.2-RC1

- -- OpenTTD <info@openttd.org>  Sat, 05 Jun 2010 23:36:21 +0000
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 05 Jun 2010 23:36:21 +0000

 openttd (1.0.1-0) unstable; urgency=low

  * New upstream release 1.0.1

- -- OpenTTD <info@openttd.org>  Sat, 01 May 2010 00:00:00 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 01 May 2010 00:00:00 +0200

 openttd (1.0.1~rc2-0) unstable; urgency=low

  * New upstream release 1.0.1-RC2

- -- OpenTTD <info@openttd.org>  Wed, 21 Apr 2010 21:36:21 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 21 Apr 2010 21:36:21 +0200

 openttd (1.0.1~rc1-0) unstable; urgency=low

  * New upstream release 1.0.1-RC1

- -- OpenTTD <info@openttd.org>  Sat, 17 Apr 2010 23:36:21 +0000
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 17 Apr 2010 23:36:21 +0000

 openttd (1.0.0-1) unstable; urgency=low

--- a/os/debian/control
+++ b/os/debian/control
@@ -3,10 +3,11 @@ Section: games
 Priority: optional
 Maintainer: Matthijs Kooijman <matthijs@stdin.nl>
 Uploaders: Jordi Mallach <jordi@debian.org>
+DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev, libicu-dev, liblzma-dev, liblzo2-dev
 Standards-Version: 3.8.4
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/openttd.git
-Vcs-Git: git://anonscm.debian.org/collab-maint/openttd.git
+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
--- a/os/debian/copyright
+++ b/os/debian/copyright
@@ -1,106 +1,77 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: OpenTTD
-Upstream-Contact: info@openttd.org, #openttd on irc.oftc.net
-Source: http://www.openttd.org
+This package was debianized by Matthijs Kooijman <matthijs@stdin.nl>
+on Wed, 15 Sep 2004 00:24:01 +0200.

+Upstream author: Ludvig Strigeus (ludde) and many others.
+Upstream homepage: http://www.openttd.org

-Files: *
-Copyright: © 2004-2012 Ludvig Strigeous and others.
-License: GPL-2.0
- 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;
- .
- 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.
- .
- 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'.
+Copyright © 2004-2009 Ludvig Strigeous and others.

-Files: src/3rdparty/squirrel/*
-Copyright: © 2003-2009 Alberto Demichelis
-License: Zlib
+OpenTTD License:

-Files: src/3rdparty/md5/*
-Copyright: © 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
-License: Zlib
+	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;

+	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.

-License: Zlib
- 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.
+	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

-Files: os/dos/exe2coff/*
-Copyright: © 1998 DJ Delorie
-License: GPL-2.0 with additional restrictions
- This document is Copyright (C) DJ Delorie and may be distributed
- verbatim, but changing it is not allowed.
- .
- Source code copyright DJ Delorie is distributed under the terms of the
- GNU General Public Licence, with the following exceptions:
- .
- * Sources used to build crt0.o, gcrt0.o, libc.a, libdbg.a, and
-   libemu.a are distributed under the terms of the GNU Library General
-   Public License, rather than the GNU GPL.
- .
- * Any existing copyright or authorship information in any given source
-   file must remain intact.  If you modify a source file, a notice to that
-   effect must be added to the authorship information in the source file.
- .
- * Runtime binaries, as provided by DJ in DJGPP, may be distributed
-   without sources ONLY if the recipient is given sufficient information
-   to obtain a copy of djgpp themselves.  This primarily applies to
-   go32-v2.exe, emu387.dxe, and stubedit.exe.
- .
- * Runtime objects and libraries, as provided by DJ in DJGPP, when
-   linked into an application, may be distributed without sources ONLY
-   if the recipient is given sufficient information to obtain a copy of
-   djgpp themselves.  This primarily applies to crt0.o and libc.a.
- .
- On Debian systems, the complete text of the GNU General Public License
- version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-Comment:
- Given only the exe2coff.c file is distributed in the source distribution (and
- nothing in Debian binary distribution), it seems only the 2nd condition
- applies.
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.

-Files: os/dos/cwsdpmi/*
-Source: http://homer.rice.edu/~sandmann/cwsdpmi/index.html
-Copyright: © 1995-2000 Charles W Sandmann (sandmann@clio.rice.edu)
-License: Custom binary-only license
- This is release 5.  The files in this binary distribution may be redistributed
- under the GPL (with source) or without the source code provided:
- .
- * CWSDPMI.EXE or CWSDPR0.EXE are not modified in any way except via CWSPARAM.
- .
- * CWSDSTUB.EXE internal contents are not modified in any way except via
-   CWSPARAM or STUBEDIT.  It may have a COFF image plus data appended to it.
- .
- * Notice to users that they have the right to receive the source code and/or
-   binary updates for CWSDPMI.  Distributors should indicate a site for the
-   source in their documentation.
-Comment:
- Files are distributed as binary only, so the second option in the license
- ("without source code provided: ...") is applicable.
+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/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/rules
+++ b/os/debian/rules
@@ -4,7 +4,7 @@

 # Use debhelper default for all targets (but some are overridden below).
 %:
-	dh --parallel $@
+	dh $@

 DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -12,29 +12,21 @@ ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
 CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif

-# This prevents linking uselessly to libicudata and silences a warning
-# in the build process.
-DEB_LDFLAGS_MAINT_APPEND="-Wl,-as-needed"
-
-# Enable all hardening options (since openttd offers a network-listening
-# service that handles untrusted data).
-DEB_BUILD_MAINT_OPTIONS=hardening=+all
-
-# Load buildflags (this uses dpkg-buildflags). Note that we don't export
-# them, but instead pass them to ./configure explicitly.
-include /usr/share/dpkg/buildflags.mk
-
 # 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 --with-lzma --without-xdg-basedir --without-iconv --disable-strip CFLAGS="$(CFLAGS) $(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CFLAGS_BUILD="$(CFLAGS) $(CPPFLAGS)" CXXFLAGS_BUILD="$(CXXFLAGS) $(CPPFLAGS)" LDFLAGS_BUILD="$(LDFLAGS)"
+	./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 --with-lzma --without-iconv --disable-strip CFLAGS="$(CFLAGS) -g" LDFLAGS="$(LDFLAGS) -Wl,-as-needed"

 # Do some extra installation
 override_dh_auto_install:
 	$(MAKE) install DO_NOT_INSTALL_CHANGELOG=1 DO_NOT_INSTALL_LICENSE=1

+	# 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/
+
 # 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.
--- a/os/dos/exe2coff/copying
+++ b/os/dos/exe2coff/copying
--- a/os/dos/exe2coff/copying.dj
+++ b/os/dos/exe2coff/copying.dj
--- a/os/dos/exe2coff/copying.lib
+++ b/os/dos/exe2coff/copying.lib
--- a/os/dos/cwsdpmi/cwsdpmi.exe
+++ b/os/dos/cwsdpmi/cwsdpmi.exe
--- a/os/dos/cwsdpmi/cwsdpmi.txt
+++ b/os/dos/cwsdpmi/cwsdpmi.txt
--- a/os/dos/cwsdpmi/README.licensing
+++ b/os/dos/cwsdpmi/README.licensing
@@ -1,3 +0,0 @@
-The files in this directory are not licensed under the same terms as the
-rest of OpenTTD. Licensing details can be found in OpenTTD's readme.txt
-and in this directory or subdirectories as well.
--- a/os/dos/cwsdpmi/cwsdstub.exe
+++ b/os/dos/cwsdpmi/cwsdstub.exe
--- a/os/dos/exe2coff/exe2coff.c
+++ b/os/dos/exe2coff/exe2coff.c
--- a/os/dos/exe2coff/README.licensing
+++ b/os/dos/exe2coff/README.licensing
@@ -1,3 +0,0 @@
-The files in this directory are not licensed under the same terms as the
-rest of OpenTTD. Licensing details can be found in OpenTTD's readme.txt
-and in this directory or subdirectories as well.
--- a/os/dos/make_dos_binary_selfcontained.sh
+++ b/os/dos/make_dos_binary_selfcontained.sh
@@ -3,9 +3,9 @@
 # $Id$

 cd `dirname $0`
-cc -o exe2coff/exe2coff exe2coff/exe2coff.c || exit
+cc -o exe2coff exe2coff.c || exit
 cp $1 binary.exe || exit
-./exe2coff/exe2coff binary.exe || exit
-cat cwsdpmi/cwsdstub.exe binary > binary.exe || exit
+./exe2coff binary.exe || exit
+cat cwsdstub.exe binary > binary.exe || exit
 mv binary.exe $1
-rm binary exe2coff/exe2coff
+rm binary exe2coff
--- a/os/macosx/openttd.icns
+++ b/os/macosx/openttd.icns
--- a/os/os2/installer/make_installer.cmd
+++ b/os/os2/installer/make_installer.cmd
@@ -1,6 +1,6 @@
@echo off

-set OPENTTD_VERSION=1.4.0
+set OPENTTD_VERSION=1.2.0-RC3
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
 set OPENGFX_VERSION=1.2.0
--- a/os/rpm/openttd.spec
+++ b/os/rpm/openttd.spec
@@ -17,9 +17,9 @@
 #

 Name:           openttd
-Version:        1.3.beta2
+Version:        1.2.beta4
 Release:        0
-%define srcver  1.3.0-beta2
+%define srcver  1.2.0-beta4
 Summary:        An open source reimplementation of Chris Sawyer's Transport Tycoon Deluxe
 License:        GPL-2.0
 Group:          Amusements/Games/Strategy/Other
@@ -227,13 +227,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %dir %{_datadir}/%{name}/baseset
 %dir %{_datadir}/%{name}/scripts
 %dir %{_datadir}/%{name}/ai
-%dir %{_datadir}/%{name}/game
 %{_datadir}/doc/%{name}/*
 %{_datadir}/%{name}/lang/*
 %{_datadir}/%{name}/baseset/*
 %{_datadir}/%{name}/scripts/*
 %{_datadir}/%{name}/ai/*
-%{_datadir}/%{name}/game/*
 %doc %{_mandir}/man6/%{name}.6.*

 %files gui
--- 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 4
-!define APPV_MAINT 1
-!define APPV_BUILD 2
-!define APPV_EXTRA ""
+!define APPV_MINOR 2
+!define APPV_MAINT 0
+!define APPV_BUILD 6
+!define APPV_EXTRA "-RC3"

 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"  ; Define application version
@@ -124,10 +124,6 @@ Section "!OpenTTD" Section1
 	SetOutPath "$INSTDIR\ai\"
 	File ${PATH_ROOT}bin\ai\compat_*.nut

-	; Copy Game Script files
-	SetOutPath "$INSTDIR\game\"
-	File ${PATH_ROOT}bin\game\compat_*.nut
-
 	; Copy data files
 	SetOutPath "$INSTDIR\baseset\"
 	File ${PATH_ROOT}bin\baseset\*.grf
@@ -147,6 +143,9 @@ Section "!OpenTTD" Section1
 	File ${PATH_ROOT}docs\multiplayer.txt
 	Push "$INSTDIR\docs\multiplayer.txt"
 	Call unix2dos
+	File ${PATH_ROOT}docs\32bpp.txt
+	Push "$INSTDIR\docs\32bpp.txt"
+	Call unix2dos

 	; Copy the rest of the stuff
 	SetOutPath "$INSTDIR\"
@@ -218,6 +217,7 @@ Section "!OpenTTD" Section1
 	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Known-bugs.lnk" "$INSTDIR\known-bugs.txt"
 	CreateDirectory "$SMPROGRAMS\$SHORTCUTS\Docs"
 	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Docs\Multiplayer.lnk" "$INSTDIR\docs\multiplayer.txt"
+	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Docs\32bpp.lnk" "$INSTDIR\docs\32bpp.txt"
 	CreateDirectory "$SMPROGRAMS\$SHORTCUTS\Scripts"
 	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Scripts\Readme.lnk" "$INSTDIR\scripts\readme.txt"
 	!insertmacro MUI_STARTMENU_WRITE_END
@@ -402,9 +402,6 @@ Section "Uninstall"
 	; AI files
 	Delete "$INSTDIR\ai\compat_*.nut"

-	; Game Script files
-	Delete "$INSTDIR\game\compat_*.nut"
-
 	; Baseset files
 	Delete "$INSTDIR\baseset\opntitle.dat"
 	Delete "$INSTDIR\baseset\openttd.grf"
@@ -476,7 +473,6 @@ Section "Uninstall"
 	RMDir "$SMPROGRAMS\$SHORTCUTS\Docs\"
 	RMDir "$SMPROGRAMS\$SHORTCUTS"
 	RMDir "$INSTDIR\ai"
-	RMDir "$INSTDIR\game"
 	RMDir "$INSTDIR\data"
 	RMDir "$INSTDIR\baseset"
 	RMDir "$INSTDIR\gm"
@@ -545,22 +541,15 @@ FunctionEnd
 ;-------------------------------------------------------------------------------
 ; Determine windows version, returns "win9x" if Win9x/Me/2000/XP SP2- or "winnt" for the rest on the stack
 Function GetWindowsVersion
-	GetVersion::WindowsPlatformArchitecture
-	Pop $R0
-	IntCmp $R0 64 WinNT 0
 	ClearErrors
 	StrCpy $R0 "win9x"
 	${If} ${IsNT}
 		${If} ${IsWinXP}
 		${AndIf} ${AtLeastServicePack} 3
 		${OrIf} ${AtLeastWin2003}
-			GoTo WinNT
+			StrCpy $R0 "winnt"
 		${EndIf}
 	${EndIf}
-	GoTo Done
-WinNT:
-	StrCpy $R0 "winnt"
-Done:
 	Push $R0
 FunctionEnd

--- a/projects/determineversion.vbs
+++ b/projects/determineversion.vbs
@@ -177,9 +177,6 @@ Function DetermineSVNVersion()
 				' Make sure index is in sync with disk
 				Set oExec = WshShell.Exec("git update-index --refresh")
 				If Err.Number = 0 Then
-					' StdOut and StdErr share a 4kB buffer so prevent it from filling up as we don't care about the output
-					oExec.StdOut.Close
-					oExec.StdErr.Close
 					' Wait till the application is finished ...
 					Do While oExec.Status = 0
 						WScript.Sleep 10
--- a/projects/generate.vbs
+++ b/projects/generate.vbs
@@ -173,7 +173,6 @@ Function load_main_data(filename, ByRef vcxproj, ByRef filters, ByRef files)
 						line = "MSVC" Or _
 						line = "DIRECTMUSIC" Or _
 						line = "AI" Or _
-						line = "SSE" Or _
 						line = "HAVE_THREAD" _
 					) Then skip = skip + 1
 					deep = deep + 1
--- a/projects/langs_vs100.vcxproj
+++ b/projects/langs_vs100.vcxproj
@@ -59,12 +59,6 @@
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\arabic_egypt.lng;%(Outputs)</Outputs>
    </CustomBuild>
-    <CustomBuild Include="..\src\lang\basque.txt">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating basque language file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\basque.lng;%(Outputs)</Outputs>
-    </CustomBuild>
    <CustomBuild Include="..\src\lang\belarusian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating belarusian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
@@ -137,12 +131,6 @@
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\estonian.lng;%(Outputs)</Outputs>
    </CustomBuild>
-    <CustomBuild Include="..\src\lang\faroese.txt">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating faroese language file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\faroese.lng;%(Outputs)</Outputs>
-    </CustomBuild>
    <CustomBuild Include="..\src\lang\finnish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating finnish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
@@ -155,12 +143,6 @@
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\french.lng;%(Outputs)</Outputs>
    </CustomBuild>
-    <CustomBuild Include="..\src\lang\gaelic.txt">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating gaelic language file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\gaelic.lng;%(Outputs)</Outputs>
-    </CustomBuild>
    <CustomBuild Include="..\src\lang\galician.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating galician language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
@@ -323,18 +305,6 @@
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\swedish.lng;%(Outputs)</Outputs>
    </CustomBuild>
-    <CustomBuild Include="..\src\lang\tamil.txt">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating tamil language file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\tamil.lng;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\src\lang\thai.txt">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating thai language file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\thai.lng;%(Outputs)</Outputs>
-    </CustomBuild>
    <CustomBuild Include="..\src\lang\traditional_chinese.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating traditional_chinese language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
--- a/projects/langs_vs100.vcxproj.filters
+++ b/projects/langs_vs100.vcxproj.filters
@@ -13,9 +13,6 @@
    <CustomBuild Include="..\src\lang\arabic_egypt.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
-    <CustomBuild Include="..\src\lang\basque.txt">
-      <Filter>Translations</Filter>
-    </CustomBuild>
    <CustomBuild Include="..\src\lang\belarusian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
@@ -52,18 +49,12 @@
    <CustomBuild Include="..\src\lang\estonian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
-    <CustomBuild Include="..\src\lang\faroese.txt">
-      <Filter>Translations</Filter>
-    </CustomBuild>
    <CustomBuild Include="..\src\lang\finnish.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\french.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
-    <CustomBuild Include="..\src\lang\gaelic.txt">
-      <Filter>Translations</Filter>
-    </CustomBuild>
    <CustomBuild Include="..\src\lang\galician.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
@@ -145,12 +136,6 @@
    <CustomBuild Include="..\src\lang\swedish.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
-    <CustomBuild Include="..\src\lang\tamil.txt">
-      <Filter>Translations</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\src\lang\thai.txt">
-      <Filter>Translations</Filter>
-    </CustomBuild>
    <CustomBuild Include="..\src\lang\traditional_chinese.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
--- a/projects/langs_vs80.vcproj
+++ b/projects/langs_vs80.vcproj
@@ -93,21 +93,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\src\lang\basque.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating basque language file"
-						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\basque.lng"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\src\lang\belarusian.txt"
 				>
@@ -288,21 +273,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\src\lang\faroese.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating faroese language file"
-						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\faroese.lng"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\src\lang\finnish.txt"
 				>
@@ -333,21 +303,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\src\lang\gaelic.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gaelic language file"
-						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\gaelic.lng"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\src\lang\galician.txt"
 				>
@@ -753,36 +708,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\src\lang\tamil.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating tamil language file"
-						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\tamil.lng"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\lang\thai.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating thai language file"
-						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\thai.lng"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\src\lang\traditional_chinese.txt"
 				>
--- a/projects/langs_vs90.vcproj
+++ b/projects/langs_vs90.vcproj
@@ -94,21 +94,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\src\lang\basque.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating basque language file"
-						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\basque.lng"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\src\lang\belarusian.txt"
 				>
@@ -289,21 +274,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\src\lang\faroese.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating faroese language file"
-						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\faroese.lng"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\src\lang\finnish.txt"
 				>
@@ -334,21 +304,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\src\lang\gaelic.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gaelic language file"
-						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\gaelic.lng"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\src\lang\galician.txt"
 				>
@@ -754,36 +709,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\src\lang\tamil.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating tamil language file"
-						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\tamil.lng"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\lang\thai.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating thai language file"
-						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\thai.lng"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\src\lang\traditional_chinese.txt"
 				>
--- a/projects/openttd_vs100.vcxproj
+++ b/projects/openttd_vs100.vcxproj
@@ -102,7 +102,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -131,7 +131,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -156,7 +156,7 @@
      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>
@@ -176,7 +176,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -204,7 +204,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -233,7 +233,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -256,7 +256,7 @@
      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>
@@ -280,7 +280,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -296,15 +296,12 @@
    <ClCompile Include="..\src\articulated_vehicles.cpp" />
    <ClCompile Include="..\src\autoreplace.cpp" />
    <ClCompile Include="..\src\bmp.cpp" />
-    <ClCompile Include="..\src\cargoaction.cpp" />
-    <ClCompile Include="..\src\cargomonitor.cpp" />
    <ClCompile Include="..\src\cargopacket.cpp" />
    <ClCompile Include="..\src\cargotype.cpp" />
    <ClCompile Include="..\src\cheat.cpp" />
    <ClCompile Include="..\src\command.cpp" />
    <ClCompile Include="..\src\console.cpp" />
    <ClCompile Include="..\src\console_cmds.cpp" />
-    <ClCompile Include="..\src\cpu.cpp" />
    <ClCompile Include="..\src\crashlog.cpp" />
    <ClCompile Include="..\src\currency.cpp" />
    <ClCompile Include="..\src\date.cpp" />
@@ -319,13 +316,10 @@
    <ClCompile Include="..\src\fileio.cpp" />
    <ClCompile Include="..\src\fios.cpp" />
    <ClCompile Include="..\src\fontcache.cpp" />
-    <ClCompile Include="..\src\fontdetection.cpp" />
-    <ClCompile Include="..\src\base_consist.cpp" />
    <ClCompile Include="..\src\gamelog.cpp" />
    <ClCompile Include="..\src\genworld.cpp" />
    <ClCompile Include="..\src\gfx.cpp" />
    <ClCompile Include="..\src\gfxinit.cpp" />
-    <ClCompile Include="..\src\gfx_layout.cpp" />
    <ClCompile Include="..\src\goal.cpp" />
    <ClCompile Include="..\src\ground_vehicle.cpp" />
    <ClCompile Include="..\src\heightmap.cpp" />
@@ -334,13 +328,6 @@
    <ClCompile Include="..\src\ini.cpp" />
    <ClCompile Include="..\src\ini_load.cpp" />
    <ClCompile Include="..\src\landscape.cpp" />
-    <ClCompile Include="..\src\linkgraph\demands.cpp" />
-    <ClCompile Include="..\src\linkgraph\flowmapper.cpp" />
-    <ClCompile Include="..\src\linkgraph\linkgraph.cpp" />
-    <ClCompile Include="..\src\linkgraph\linkgraphjob.cpp" />
-    <ClCompile Include="..\src\linkgraph\linkgraphschedule.cpp" />
-    <ClCompile Include="..\src\linkgraph\mcf.cpp" />
-    <ClCompile Include="..\src\linkgraph\refresh.cpp" />
    <ClCompile Include="..\src\map.cpp" />
    <ClCompile Include="..\src\misc.cpp" />
    <ClCompile Include="..\src\mixer.cpp" />
@@ -355,6 +342,7 @@
    <ClCompile Include="..\src\network\network_udp.cpp" />
    <ClCompile Include="..\src\openttd.cpp" />
    <ClCompile Include="..\src\order_backup.cpp" />
+    <ClCompile Include="..\src\os_timer.cpp" />
    <ClCompile Include="..\src\pbs.cpp" />
    <ClCompile Include="..\src\progress.cpp" />
    <ClCompile Include="..\src\rail.cpp" />
@@ -372,11 +360,8 @@
    <ClCompile Include="..\src\station.cpp" />
    <ClCompile Include="..\src\strgen\strgen_base.cpp" />
    <ClCompile Include="..\src\string.cpp" />
-    <ClCompile Include="..\src\stringfilter.cpp" />
    <ClCompile Include="..\src\strings.cpp" />
-    <ClCompile Include="..\src\story.cpp" />
    <ClCompile Include="..\src\subsidy.cpp" />
-    <ClCompile Include="..\src\textbuf.cpp" />
    <ClCompile Include="..\src\texteff.cpp" />
    <ClCompile Include="..\src\tgp.cpp" />
    <ClCompile Include="..\src\tile_map.cpp" />
@@ -385,7 +370,6 @@
    <ClCompile Include="..\src\vehicle.cpp" />
    <ClCompile Include="..\src\vehiclelist.cpp" />
    <ClCompile Include="..\src\viewport.cpp" />
-    <ClCompile Include="..\src\viewport_sprite_sorter_sse4.cpp" />
    <ClCompile Include="..\src\waypoint.cpp" />
    <ClCompile Include="..\src\widget.cpp" />
    <ClCompile Include="..\src\window.cpp" />
@@ -404,8 +388,6 @@
    <ClInclude Include="..\src\bmp.h" />
    <ClInclude Include="..\src\bridge.h" />
    <ClInclude Include="..\src\cargo_type.h" />
-    <ClInclude Include="..\src\cargoaction.h" />
-    <ClInclude Include="..\src\cargomonitor.h" />
    <ClInclude Include="..\src\cargopacket.h" />
    <ClInclude Include="..\src\cargotype.h" />
    <ClInclude Include="..\src\cheat_func.h" />
@@ -423,7 +405,6 @@
    <ClInclude Include="..\src\console_gui.h" />
    <ClInclude Include="..\src\console_internal.h" />
    <ClInclude Include="..\src\console_type.h" />
-    <ClInclude Include="..\src\cpu.h" />
    <ClInclude Include="..\src\crashlog.h" />
    <ClInclude Include="..\src\currency.h" />
    <ClInclude Include="..\src\date_func.h" />
@@ -454,13 +435,10 @@
    <ClInclude Include="..\src\fileio_type.h" />
    <ClInclude Include="..\src\fios.h" />
    <ClInclude Include="..\src\fontcache.h" />
-    <ClInclude Include="..\src\fontdetection.h" />
-    <ClInclude Include="..\src\base_consist.h" />
    <ClInclude Include="..\src\gamelog.h" />
    <ClInclude Include="..\src\gamelog_internal.h" />
    <ClInclude Include="..\src\genworld.h" />
    <ClInclude Include="..\src\gfx_func.h" />
-    <ClInclude Include="..\src\gfx_layout.h" />
    <ClInclude Include="..\src\gfx_type.h" />
    <ClInclude Include="..\src\gfxinit.h" />
    <ClInclude Include="..\src\goal_base.h" />
@@ -483,18 +461,6 @@
    <ClInclude Include="..\src\landscape.h" />
    <ClInclude Include="..\src\landscape_type.h" />
    <ClInclude Include="..\src\language.h" />
-    <ClInclude Include="..\src\linkgraph\demands.h" />
-    <ClInclude Include="..\src\linkgraph\flowmapper.h" />
-    <ClInclude Include="..\src\linkgraph\init.h" />
-    <ClInclude Include="..\src\linkgraph\linkgraph.h" />
-    <ClInclude Include="..\src\linkgraph\linkgraph_base.h" />
-    <ClInclude Include="..\src\linkgraph\linkgraph_gui.h" />
-    <ClInclude Include="..\src\linkgraph\linkgraph_type.h" />
-    <ClInclude Include="..\src\linkgraph\linkgraphjob.h" />
-    <ClInclude Include="..\src\linkgraph\linkgraphjob_base.h" />
-    <ClInclude Include="..\src\linkgraph\linkgraphschedule.h" />
-    <ClInclude Include="..\src\linkgraph\mcf.h" />
-    <ClInclude Include="..\src\linkgraph\refresh.h" />
    <ClInclude Include="..\src\livery.h" />
    <ClInclude Include="..\src\map_func.h" />
    <ClInclude Include="..\src\map_type.h" />
@@ -573,7 +539,6 @@
    <ClInclude Include="..\src\sound\sdl_s.h" />
    <ClInclude Include="..\src\video\sdl_v.h" />
    <ClInclude Include="..\src\settings_func.h" />
-    <ClInclude Include="..\src\settings_gui.h" />
    <ClInclude Include="..\src\settings_internal.h" />
    <ClInclude Include="..\src\settings_type.h" />
    <ClInclude Include="..\src\ship.h" />
@@ -596,13 +561,9 @@
    <ClInclude Include="..\src\station_type.h" />
    <ClInclude Include="..\src\statusbar_gui.h" />
    <ClInclude Include="..\src\stdafx.h" />
-    <ClInclude Include="..\src\story_base.h" />
-    <ClInclude Include="..\src\story_type.h" />
    <ClInclude Include="..\src\strgen\strgen.h" />
-    <ClInclude Include="..\src\string_base.h" />
    <ClInclude Include="..\src\string_func.h" />
    <ClInclude Include="..\src\string_type.h" />
-    <ClInclude Include="..\src\stringfilter_type.h" />
    <ClInclude Include="..\src\strings_func.h" />
    <ClInclude Include="..\src\strings_type.h" />
    <ClInclude Include="..\src\subsidy_base.h" />
@@ -611,7 +572,6 @@
    <ClInclude Include="..\src\tar_type.h" />
    <ClInclude Include="..\src\terraform_gui.h" />
    <ClInclude Include="..\src\textbuf_gui.h" />
-    <ClInclude Include="..\src\textbuf_type.h" />
    <ClInclude Include="..\src\texteff.hpp" />
    <ClInclude Include="..\src\textfile_gui.h" />
    <ClInclude Include="..\src\textfile_type.h" />
@@ -642,7 +602,6 @@
    <ClInclude Include="..\src\vehicle_type.h" />
    <ClInclude Include="..\src\vehiclelist.h" />
    <ClInclude Include="..\src\viewport_func.h" />
-    <ClInclude Include="..\src\viewport_sprite_sorter.h" />
    <ClInclude Include="..\src\viewport_type.h" />
    <ClInclude Include="..\src\water.h" />
    <ClInclude Include="..\src\waypoint_base.h" />
@@ -672,7 +631,6 @@
    <ClCompile Include="..\src\core\math_func.cpp" />
    <ClInclude Include="..\src\core\math_func.hpp" />
    <ClInclude Include="..\src\core\mem_func.hpp" />
-    <ClInclude Include="..\src\core\multimap.hpp" />
    <ClInclude Include="..\src\core\overflowsafe_type.hpp" />
    <ClCompile Include="..\src\core\pool_func.cpp" />
    <ClInclude Include="..\src\core\pool_func.hpp" />
@@ -680,8 +638,6 @@
    <ClCompile Include="..\src\core\random_func.cpp" />
    <ClInclude Include="..\src\core\random_func.hpp" />
    <ClInclude Include="..\src\core\smallmap_type.hpp" />
-    <ClInclude Include="..\src\core\smallmatrix_type.hpp" />
-    <ClInclude Include="..\src\core\smallstack_type.hpp" />
    <ClInclude Include="..\src\core\smallvec_type.hpp" />
    <ClInclude Include="..\src\core\sort_func.hpp" />
    <ClInclude Include="..\src\core\string_compare_type.hpp" />
@@ -707,7 +663,6 @@
    <ClCompile Include="..\src\highscore_gui.cpp" />
    <ClCompile Include="..\src\industry_gui.cpp" />
    <ClCompile Include="..\src\intro_gui.cpp" />
-    <ClCompile Include="..\src\linkgraph\linkgraph_gui.cpp" />
    <ClCompile Include="..\src\main_gui.cpp" />
    <ClCompile Include="..\src\misc_gui.cpp" />
    <ClCompile Include="..\src\music_gui.cpp" />
@@ -729,7 +684,6 @@
    <ClCompile Include="..\src\smallmap_gui.cpp" />
    <ClCompile Include="..\src\station_gui.cpp" />
    <ClCompile Include="..\src\statusbar_gui.cpp" />
-    <ClCompile Include="..\src\story_gui.cpp" />
    <ClCompile Include="..\src\subsidy_gui.cpp" />
    <ClCompile Include="..\src\terraform_gui.cpp" />
    <ClCompile Include="..\src\textfile_gui.cpp" />
@@ -768,7 +722,6 @@
    <ClInclude Include="..\src\widgets\highscore_widget.h" />
    <ClInclude Include="..\src\widgets\industry_widget.h" />
    <ClInclude Include="..\src\widgets\intro_widget.h" />
-    <ClInclude Include="..\src\widgets\link_graph_legend_widget.h" />
    <ClInclude Include="..\src\widgets\main_widget.h" />
    <ClInclude Include="..\src\widgets\misc_widget.h" />
    <ClInclude Include="..\src\widgets\music_widget.h" />
@@ -788,7 +741,6 @@
    <ClInclude Include="..\src\widgets\smallmap_widget.h" />
    <ClInclude Include="..\src\widgets\station_widget.h" />
    <ClInclude Include="..\src\widgets\statusbar_widget.h" />
-    <ClInclude Include="..\src\widgets\story_widget.h" />
    <ClInclude Include="..\src\widgets\subsidy_widget.h" />
    <ClInclude Include="..\src\widgets\terraform_widget.h" />
    <ClInclude Include="..\src\widgets\timetable_widget.h" />
@@ -831,7 +783,6 @@
    <ClCompile Include="..\src\saveload\airport_sl.cpp" />
    <ClCompile Include="..\src\saveload\animated_tile_sl.cpp" />
    <ClCompile Include="..\src\saveload\autoreplace_sl.cpp" />
-    <ClCompile Include="..\src\saveload\cargomonitor_sl.cpp" />
    <ClCompile Include="..\src\saveload\cargopacket_sl.cpp" />
    <ClCompile Include="..\src\saveload\cheat_sl.cpp" />
    <ClCompile Include="..\src\saveload\company_sl.cpp" />
@@ -844,7 +795,6 @@
    <ClCompile Include="..\src\saveload\group_sl.cpp" />
    <ClCompile Include="..\src\saveload\industry_sl.cpp" />
    <ClCompile Include="..\src\saveload\labelmaps_sl.cpp" />
-    <ClCompile Include="..\src\saveload\linkgraph_sl.cpp" />
    <ClCompile Include="..\src\saveload\map_sl.cpp" />
    <ClCompile Include="..\src\saveload\misc_sl.cpp" />
    <ClCompile Include="..\src\saveload\newgrf_sl.cpp" />
@@ -862,7 +812,6 @@
    <ClCompile Include="..\src\saveload\station_sl.cpp" />
    <ClCompile Include="..\src\saveload\storage_sl.cpp" />
    <ClCompile Include="..\src\saveload\strings_sl.cpp" />
-    <ClCompile Include="..\src\saveload\story_sl.cpp" />
    <ClCompile Include="..\src\saveload\subsidy_sl.cpp" />
    <ClCompile Include="..\src\saveload\town_sl.cpp" />
    <ClCompile Include="..\src\saveload\vehicle_sl.cpp" />
@@ -998,7 +947,6 @@
    <ClInclude Include="..\src\script\api\script_bridgelist.hpp" />
    <ClInclude Include="..\src\script\api\script_cargo.hpp" />
    <ClInclude Include="..\src\script\api\script_cargolist.hpp" />
-    <ClInclude Include="..\src\script\api\script_cargomonitor.hpp" />
    <ClInclude Include="..\src\script\api\script_company.hpp" />
    <ClInclude Include="..\src\script\api\script_companymode.hpp" />
    <ClInclude Include="..\src\script\api\script_controller.hpp" />
@@ -1035,9 +983,6 @@
    <ClInclude Include="..\src\script\api\script_signlist.hpp" />
    <ClInclude Include="..\src\script\api\script_station.hpp" />
    <ClInclude Include="..\src\script\api\script_stationlist.hpp" />
-    <ClInclude Include="..\src\script\api\script_story_page.hpp" />
-    <ClInclude Include="..\src\script\api\script_storypagelist.hpp" />
-    <ClInclude Include="..\src\script\api\script_storypageelementlist.hpp" />
    <ClInclude Include="..\src\script\api\script_subsidy.hpp" />
    <ClInclude Include="..\src\script\api\script_subsidylist.hpp" />
    <ClInclude Include="..\src\script\api\script_testmode.hpp" />
@@ -1063,7 +1008,6 @@
    <ClCompile Include="..\src\script\api\script_bridgelist.cpp" />
    <ClCompile Include="..\src\script\api\script_cargo.cpp" />
    <ClCompile Include="..\src\script\api\script_cargolist.cpp" />
-    <ClCompile Include="..\src\script\api\script_cargomonitor.cpp" />
    <ClCompile Include="..\src\script\api\script_company.cpp" />
    <ClCompile Include="..\src\script\api\script_companymode.cpp" />
    <ClCompile Include="..\src\script\api\script_controller.cpp" />
@@ -1099,9 +1043,6 @@
    <ClCompile Include="..\src\script\api\script_signlist.cpp" />
    <ClCompile Include="..\src\script\api\script_station.cpp" />
    <ClCompile Include="..\src\script\api\script_stationlist.cpp" />
-    <ClCompile Include="..\src\script\api\script_story_page.cpp" />
-    <ClCompile Include="..\src\script\api\script_storypagelist.cpp" />
-    <ClCompile Include="..\src\script\api\script_storypageelementlist.cpp" />
    <ClCompile Include="..\src\script\api\script_subsidy.cpp" />
    <ClCompile Include="..\src\script\api\script_subsidylist.cpp" />
    <ClCompile Include="..\src\script\api\script_testmode.cpp" />
@@ -1119,22 +1060,12 @@
    <ClCompile Include="..\src\script\api\script_window.cpp" />
    <ClCompile Include="..\src\blitter\32bpp_anim.cpp" />
    <ClInclude Include="..\src\blitter\32bpp_anim.hpp" />
-    <ClCompile Include="..\src\blitter\32bpp_anim_sse4.cpp" />
-    <ClInclude Include="..\src\blitter\32bpp_anim_sse4.hpp" />
    <ClCompile Include="..\src\blitter\32bpp_base.cpp" />
    <ClInclude Include="..\src\blitter\32bpp_base.hpp" />
    <ClCompile Include="..\src\blitter\32bpp_optimized.cpp" />
    <ClInclude Include="..\src\blitter\32bpp_optimized.hpp" />
    <ClCompile Include="..\src\blitter\32bpp_simple.cpp" />
    <ClInclude Include="..\src\blitter\32bpp_simple.hpp" />
-    <ClInclude Include="..\src\blitter\32bpp_sse_func.hpp" />
-    <ClInclude Include="..\src\blitter\32bpp_sse_type.h" />
-    <ClCompile Include="..\src\blitter\32bpp_sse2.cpp" />
-    <ClInclude Include="..\src\blitter\32bpp_sse2.hpp" />
-    <ClCompile Include="..\src\blitter\32bpp_sse4.cpp" />
-    <ClInclude Include="..\src\blitter\32bpp_sse4.hpp" />
-    <ClCompile Include="..\src\blitter\32bpp_ssse3.cpp" />
-    <ClInclude Include="..\src\blitter\32bpp_ssse3.hpp" />
    <ClCompile Include="..\src\blitter\8bpp_base.cpp" />
    <ClInclude Include="..\src\blitter\8bpp_base.hpp" />
    <ClCompile Include="..\src\blitter\8bpp_optimized.cpp" />
@@ -1256,7 +1187,6 @@
    <ClCompile Include="..\src\pathfinder\yapf\yapf_rail.cpp" />
    <ClCompile Include="..\src\pathfinder\yapf\yapf_road.cpp" />
    <ClCompile Include="..\src\pathfinder\yapf\yapf_ship.cpp" />
-    <ClInclude Include="..\src\pathfinder\yapf\yapf_type.hpp" />
    <ClCompile Include="..\src\video\dedicated_v.cpp" />
    <ClCompile Include="..\src\video\null_v.cpp" />
    <ClCompile Include="..\src\video\sdl_v.cpp" />
--- a/projects/openttd_vs100.vcxproj.filters
+++ b/projects/openttd_vs100.vcxproj.filters
@@ -117,12 +117,6 @@
    <ClCompile Include="..\src\bmp.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\cargoaction.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\cargomonitor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="..\src\cargopacket.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -141,9 +135,6 @@
    <ClCompile Include="..\src\console_cmds.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\cpu.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="..\src\crashlog.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -186,12 +177,6 @@
    <ClCompile Include="..\src\fontcache.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\fontdetection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\base_consist.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="..\src\gamelog.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -204,9 +189,6 @@
    <ClCompile Include="..\src\gfxinit.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\gfx_layout.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="..\src\goal.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -231,27 +213,6 @@
    <ClCompile Include="..\src\landscape.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\linkgraph\demands.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\linkgraph\flowmapper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\linkgraph\linkgraph.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\linkgraph\linkgraphjob.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\linkgraph\linkgraphschedule.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\linkgraph\mcf.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\linkgraph\refresh.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="..\src\map.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -294,6 +255,9 @@
    <ClCompile Include="..\src\order_backup.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="..\src\os_timer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="..\src\pbs.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -345,21 +309,12 @@
    <ClCompile Include="..\src\string.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\stringfilter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="..\src\strings.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\story.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="..\src\subsidy.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\textbuf.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="..\src\texteff.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -384,9 +339,6 @@
    <ClCompile Include="..\src\viewport.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\viewport_sprite_sorter_sse4.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="..\src\waypoint.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -441,12 +393,6 @@
    <ClInclude Include="..\src\cargo_type.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\cargoaction.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\cargomonitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\cargopacket.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -498,9 +444,6 @@
    <ClInclude Include="..\src\console_type.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\cpu.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\crashlog.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -591,12 +534,6 @@
    <ClInclude Include="..\src\fontcache.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\fontdetection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\base_consist.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\gamelog.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -609,9 +546,6 @@
    <ClInclude Include="..\src\gfx_func.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\gfx_layout.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\gfx_type.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -678,42 +612,6 @@
    <ClInclude Include="..\src\language.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\demands.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\flowmapper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\init.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\linkgraph.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\linkgraph_base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\linkgraph_gui.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\linkgraph_type.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\linkgraphjob.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\linkgraphjob_base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\linkgraphschedule.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\mcf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\refresh.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\livery.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -948,9 +846,6 @@
    <ClInclude Include="..\src\settings_func.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\settings_gui.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\settings_internal.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -1017,27 +912,15 @@
    <ClInclude Include="..\src\stdafx.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\story_base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\story_type.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\strgen\strgen.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\string_base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\string_func.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\string_type.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\stringfilter_type.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\strings_func.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -1062,9 +945,6 @@
    <ClInclude Include="..\src\textbuf_gui.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\textbuf_type.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\texteff.hpp">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -1155,9 +1035,6 @@
    <ClInclude Include="..\src\viewport_func.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\viewport_sprite_sorter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\viewport_type.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -1245,9 +1122,6 @@
    <ClInclude Include="..\src\core\mem_func.hpp">
      <Filter>Core Source Code</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\core\multimap.hpp">
-      <Filter>Core Source Code</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\core\overflowsafe_type.hpp">
      <Filter>Core Source Code</Filter>
    </ClInclude>
@@ -1269,12 +1143,6 @@
    <ClInclude Include="..\src\core\smallmap_type.hpp">
      <Filter>Core Source Code</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\core\smallmatrix_type.hpp">
-      <Filter>Core Source Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\core\smallstack_type.hpp">
-      <Filter>Core Source Code</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\core\smallvec_type.hpp">
      <Filter>Core Source Code</Filter>
    </ClInclude>
@@ -1350,9 +1218,6 @@
    <ClCompile Include="..\src\intro_gui.cpp">
      <Filter>GUI Source Code</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\linkgraph\linkgraph_gui.cpp">
-      <Filter>GUI Source Code</Filter>
-    </ClCompile>
    <ClCompile Include="..\src\main_gui.cpp">
      <Filter>GUI Source Code</Filter>
    </ClCompile>
@@ -1416,9 +1281,6 @@
    <ClCompile Include="..\src\statusbar_gui.cpp">
      <Filter>GUI Source Code</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\story_gui.cpp">
-      <Filter>GUI Source Code</Filter>
-    </ClCompile>
    <ClCompile Include="..\src\subsidy_gui.cpp">
      <Filter>GUI Source Code</Filter>
    </ClCompile>
@@ -1533,9 +1395,6 @@
    <ClInclude Include="..\src\widgets\intro_widget.h">
      <Filter>Widgets</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\widgets\link_graph_legend_widget.h">
-      <Filter>Widgets</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\widgets\main_widget.h">
      <Filter>Widgets</Filter>
    </ClInclude>
@@ -1593,9 +1452,6 @@
    <ClInclude Include="..\src\widgets\statusbar_widget.h">
      <Filter>Widgets</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\widgets\story_widget.h">
-      <Filter>Widgets</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\widgets\subsidy_widget.h">
      <Filter>Widgets</Filter>
    </ClInclude>
@@ -1722,9 +1578,6 @@
    <ClCompile Include="..\src\saveload\autoreplace_sl.cpp">
      <Filter>Save/Load handlers</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\saveload\cargomonitor_sl.cpp">
-      <Filter>Save/Load handlers</Filter>
-    </ClCompile>
    <ClCompile Include="..\src\saveload\cargopacket_sl.cpp">
      <Filter>Save/Load handlers</Filter>
    </ClCompile>
@@ -1761,9 +1614,6 @@
    <ClCompile Include="..\src\saveload\labelmaps_sl.cpp">
      <Filter>Save/Load handlers</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\saveload\linkgraph_sl.cpp">
-      <Filter>Save/Load handlers</Filter>
-    </ClCompile>
    <ClCompile Include="..\src\saveload\map_sl.cpp">
      <Filter>Save/Load handlers</Filter>
    </ClCompile>
@@ -1815,9 +1665,6 @@
    <ClCompile Include="..\src\saveload\strings_sl.cpp">
      <Filter>Save/Load handlers</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\saveload\story_sl.cpp">
-      <Filter>Save/Load handlers</Filter>
-    </ClCompile>
    <ClCompile Include="..\src\saveload\subsidy_sl.cpp">
      <Filter>Save/Load handlers</Filter>
    </ClCompile>
@@ -2223,9 +2070,6 @@
    <ClInclude Include="..\src\script\api\script_cargolist.hpp">
      <Filter>Script API</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\script\api\script_cargomonitor.hpp">
-      <Filter>Script API</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\script\api\script_company.hpp">
      <Filter>Script API</Filter>
    </ClInclude>
@@ -2334,15 +2178,6 @@
    <ClInclude Include="..\src\script\api\script_stationlist.hpp">
      <Filter>Script API</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\script\api\script_story_page.hpp">
-      <Filter>Script API</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\script\api\script_storypagelist.hpp">
-      <Filter>Script API</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\script\api\script_storypageelementlist.hpp">
-      <Filter>Script API</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\script\api\script_subsidy.hpp">
      <Filter>Script API</Filter>
    </ClInclude>
@@ -2418,9 +2253,6 @@
    <ClCompile Include="..\src\script\api\script_cargolist.cpp">
      <Filter>Script API Implementation</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\script\api\script_cargomonitor.cpp">
-      <Filter>Script API Implementation</Filter>
-    </ClCompile>
    <ClCompile Include="..\src\script\api\script_company.cpp">
      <Filter>Script API Implementation</Filter>
    </ClCompile>
@@ -2526,15 +2358,6 @@
    <ClCompile Include="..\src\script\api\script_stationlist.cpp">
      <Filter>Script API Implementation</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\script\api\script_story_page.cpp">
-      <Filter>Script API Implementation</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\script\api\script_storypagelist.cpp">
-      <Filter>Script API Implementation</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\script\api\script_storypageelementlist.cpp">
-      <Filter>Script API Implementation</Filter>
-    </ClCompile>
    <ClCompile Include="..\src\script\api\script_subsidy.cpp">
      <Filter>Script API Implementation</Filter>
    </ClCompile>
@@ -2586,12 +2409,6 @@
    <ClInclude Include="..\src\blitter\32bpp_anim.hpp">
      <Filter>Blitters</Filter>
    </ClInclude>
-    <ClCompile Include="..\src\blitter\32bpp_anim_sse4.cpp">
-      <Filter>Blitters</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\blitter\32bpp_anim_sse4.hpp">
-      <Filter>Blitters</Filter>
-    </ClInclude>
    <ClCompile Include="..\src\blitter\32bpp_base.cpp">
      <Filter>Blitters</Filter>
    </ClCompile>
@@ -2610,30 +2427,6 @@
    <ClInclude Include="..\src\blitter\32bpp_simple.hpp">
      <Filter>Blitters</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\blitter\32bpp_sse_func.hpp">
-      <Filter>Blitters</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\blitter\32bpp_sse_type.h">
-      <Filter>Blitters</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\blitter\32bpp_sse2.cpp">
-      <Filter>Blitters</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\blitter\32bpp_sse2.hpp">
-      <Filter>Blitters</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\blitter\32bpp_sse4.cpp">
-      <Filter>Blitters</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\blitter\32bpp_sse4.hpp">
-      <Filter>Blitters</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\blitter\32bpp_ssse3.cpp">
-      <Filter>Blitters</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\blitter\32bpp_ssse3.hpp">
-      <Filter>Blitters</Filter>
-    </ClInclude>
    <ClCompile Include="..\src\blitter\8bpp_base.cpp">
      <Filter>Blitters</Filter>
    </ClCompile>
@@ -2997,9 +2790,6 @@
    <ClCompile Include="..\src\pathfinder\yapf\yapf_ship.cpp">
      <Filter>YAPF</Filter>
    </ClCompile>
-    <ClInclude Include="..\src\pathfinder\yapf\yapf_type.hpp">
-      <Filter>YAPF</Filter>
-    </ClInclude>
    <ClCompile Include="..\src\video\dedicated_v.cpp">
      <Filter>Video</Filter>
    </ClCompile>
--- a/projects/openttd_vs100.vcxproj.in
+++ b/projects/openttd_vs100.vcxproj.in
@@ -102,7 +102,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -131,7 +131,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -156,7 +156,7 @@
      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>
@@ -176,7 +176,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -204,7 +204,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -233,7 +233,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -256,7 +256,7 @@
      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>
@@ -280,7 +280,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -52,7 +52,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -87,7 +87,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -156,7 +156,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -184,7 +184,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -257,7 +257,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -292,7 +292,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -362,7 +362,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -392,7 +392,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -454,14 +454,6 @@
 				RelativePath=".\..\src\bmp.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\cargoaction.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\cargomonitor.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\cargopacket.cpp"
 				>
@@ -486,10 +478,6 @@
 				RelativePath=".\..\src\console_cmds.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\cpu.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\crashlog.cpp"
 				>
@@ -546,14 +534,6 @@
 				RelativePath=".\..\src\fontcache.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\fontdetection.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\base_consist.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\gamelog.cpp"
 				>
@@ -570,10 +550,6 @@
 				RelativePath=".\..\src\gfxinit.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\gfx_layout.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\goal.cpp"
 				>
@@ -606,34 +582,6 @@
 				RelativePath=".\..\src\landscape.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\demands.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\flowmapper.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraphjob.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraphschedule.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\mcf.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\refresh.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\map.cpp"
 				>
@@ -690,6 +638,10 @@
 				RelativePath=".\..\src\order_backup.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\os_timer.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\pbs.cpp"
 				>
@@ -758,26 +710,14 @@
 				RelativePath=".\..\src\string.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\stringfilter.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\strings.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\story.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\subsidy.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\textbuf.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\texteff.cpp"
 				>
@@ -810,10 +750,6 @@
 				RelativePath=".\..\src\viewport.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\viewport_sprite_sorter_sse4.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\waypoint.cpp"
 				>
@@ -890,14 +826,6 @@
 				RelativePath=".\..\src\cargo_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\cargoaction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\cargomonitor.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\cargopacket.h"
 				>
@@ -966,10 +894,6 @@
 				RelativePath=".\..\src\console_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\cpu.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\crashlog.h"
 				>
@@ -1090,14 +1014,6 @@
 				RelativePath=".\..\src\fontcache.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\fontdetection.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\base_consist.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\gamelog.h"
 				>
@@ -1114,10 +1030,6 @@
 				RelativePath=".\..\src\gfx_func.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\gfx_layout.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\gfx_type.h"
 				>
@@ -1206,54 +1118,6 @@
 				RelativePath=".\..\src\language.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\demands.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\flowmapper.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\init.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph_base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph_gui.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph_type.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraphjob.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraphjob_base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraphschedule.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\mcf.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\refresh.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\livery.h"
 				>
@@ -1566,10 +1430,6 @@
 				RelativePath=".\..\src\settings_func.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\settings_gui.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\settings_internal.h"
 				>
@@ -1658,22 +1518,10 @@
 				RelativePath=".\..\src\stdafx.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\story_base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\story_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\strgen\strgen.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\string_base.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\string_func.h"
 				>
@@ -1682,10 +1530,6 @@
 				RelativePath=".\..\src\string_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\stringfilter_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\strings_func.h"
 				>
@@ -1718,10 +1562,6 @@
 				RelativePath=".\..\src\textbuf_gui.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\textbuf_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\texteff.hpp"
 				>
@@ -1842,10 +1682,6 @@
 				RelativePath=".\..\src\viewport_func.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\viewport_sprite_sorter.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\viewport_type.h"
 				>
@@ -1966,10 +1802,6 @@
 				RelativePath=".\..\src\core\mem_func.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\core\multimap.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\core\overflowsafe_type.hpp"
 				>
@@ -1998,14 +1830,6 @@
 				RelativePath=".\..\src\core\smallmap_type.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\core\smallmatrix_type.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\core\smallstack_type.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\core\smallvec_type.hpp"
 				>
@@ -2110,10 +1934,6 @@
 				RelativePath=".\..\src\intro_gui.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\main_gui.cpp"
 				>
@@ -2198,10 +2018,6 @@
 				RelativePath=".\..\src\statusbar_gui.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\story_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\subsidy_gui.cpp"
 				>
@@ -2358,10 +2174,6 @@
 				RelativePath=".\..\src\widgets\intro_widget.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\widgets\link_graph_legend_widget.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\widgets\main_widget.h"
 				>
@@ -2438,10 +2250,6 @@
 				RelativePath=".\..\src\widgets\statusbar_widget.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\widgets\story_widget.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\widgets\subsidy_widget.h"
 				>
@@ -2618,10 +2426,6 @@
 				RelativePath=".\..\src\saveload\autoreplace_sl.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\saveload\cargomonitor_sl.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\saveload\cargopacket_sl.cpp"
 				>
@@ -2670,10 +2474,6 @@
 				RelativePath=".\..\src\saveload\labelmaps_sl.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\saveload\linkgraph_sl.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\saveload\map_sl.cpp"
 				>
@@ -2742,10 +2542,6 @@
 				RelativePath=".\..\src\saveload\strings_sl.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\saveload\story_sl.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\saveload\subsidy_sl.cpp"
 				>
@@ -3326,10 +3122,6 @@
 				RelativePath=".\..\src\script\api\script_cargolist.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_cargomonitor.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\script\api\script_company.hpp"
 				>
@@ -3474,18 +3266,6 @@
 				RelativePath=".\..\src\script\api\script_stationlist.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_story_page.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_storypagelist.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_storypageelementlist.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\script\api\script_subsidy.hpp"
 				>
@@ -3590,10 +3370,6 @@
 				RelativePath=".\..\src\script\api\script_cargolist.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_cargomonitor.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\script\api\script_company.cpp"
 				>
@@ -3734,18 +3510,6 @@
 				RelativePath=".\..\src\script\api\script_stationlist.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_story_page.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_storypagelist.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_storypageelementlist.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\script\api\script_subsidy.cpp"
 				>
@@ -3818,14 +3582,6 @@
 				RelativePath=".\..\src\blitter\32bpp_anim.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_anim_sse4.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_anim_sse4.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\blitter\32bpp_base.cpp"
 				>
@@ -3850,38 +3606,6 @@
 				RelativePath=".\..\src\blitter\32bpp_simple.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse_func.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse_type.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse2.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse2.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse4.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse4.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_ssse3.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_ssse3.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\blitter\8bpp_base.cpp"
 				>
@@ -4402,10 +4126,6 @@
 				RelativePath=".\..\src\pathfinder\yapf\yapf_ship.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_type.hpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Video"
--- a/projects/openttd_vs80.vcproj.in
+++ b/projects/openttd_vs80.vcproj.in
@@ -52,7 +52,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -87,7 +87,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -156,7 +156,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -184,7 +184,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -257,7 +257,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -292,7 +292,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -362,7 +362,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -392,7 +392,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -53,7 +53,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -88,7 +88,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -155,7 +155,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -183,7 +183,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -255,7 +255,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -290,7 +290,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -359,7 +359,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -389,7 +389,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -451,14 +451,6 @@
 				RelativePath=".\..\src\bmp.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\cargoaction.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\cargomonitor.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\cargopacket.cpp"
 				>
@@ -483,10 +475,6 @@
 				RelativePath=".\..\src\console_cmds.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\cpu.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\crashlog.cpp"
 				>
@@ -543,14 +531,6 @@
 				RelativePath=".\..\src\fontcache.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\fontdetection.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\base_consist.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\gamelog.cpp"
 				>
@@ -567,10 +547,6 @@
 				RelativePath=".\..\src\gfxinit.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\gfx_layout.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\goal.cpp"
 				>
@@ -603,34 +579,6 @@
 				RelativePath=".\..\src\landscape.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\demands.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\flowmapper.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraphjob.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraphschedule.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\mcf.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\refresh.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\map.cpp"
 				>
@@ -687,6 +635,10 @@
 				RelativePath=".\..\src\order_backup.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\os_timer.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\pbs.cpp"
 				>
@@ -755,26 +707,14 @@
 				RelativePath=".\..\src\string.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\stringfilter.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\strings.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\story.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\subsidy.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\textbuf.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\texteff.cpp"
 				>
@@ -807,10 +747,6 @@
 				RelativePath=".\..\src\viewport.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\viewport_sprite_sorter_sse4.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\waypoint.cpp"
 				>
@@ -887,14 +823,6 @@
 				RelativePath=".\..\src\cargo_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\cargoaction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\cargomonitor.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\cargopacket.h"
 				>
@@ -963,10 +891,6 @@
 				RelativePath=".\..\src\console_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\cpu.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\crashlog.h"
 				>
@@ -1087,14 +1011,6 @@
 				RelativePath=".\..\src\fontcache.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\fontdetection.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\base_consist.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\gamelog.h"
 				>
@@ -1111,10 +1027,6 @@
 				RelativePath=".\..\src\gfx_func.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\gfx_layout.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\gfx_type.h"
 				>
@@ -1203,54 +1115,6 @@
 				RelativePath=".\..\src\language.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\demands.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\flowmapper.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\init.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph_base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph_gui.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph_type.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraphjob.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraphjob_base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraphschedule.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\mcf.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\refresh.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\livery.h"
 				>
@@ -1563,10 +1427,6 @@
 				RelativePath=".\..\src\settings_func.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\settings_gui.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\settings_internal.h"
 				>
@@ -1655,22 +1515,10 @@
 				RelativePath=".\..\src\stdafx.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\story_base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\story_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\strgen\strgen.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\string_base.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\string_func.h"
 				>
@@ -1679,10 +1527,6 @@
 				RelativePath=".\..\src\string_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\stringfilter_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\strings_func.h"
 				>
@@ -1715,10 +1559,6 @@
 				RelativePath=".\..\src\textbuf_gui.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\textbuf_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\texteff.hpp"
 				>
@@ -1839,10 +1679,6 @@
 				RelativePath=".\..\src\viewport_func.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\viewport_sprite_sorter.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\viewport_type.h"
 				>
@@ -1963,10 +1799,6 @@
 				RelativePath=".\..\src\core\mem_func.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\core\multimap.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\core\overflowsafe_type.hpp"
 				>
@@ -1995,14 +1827,6 @@
 				RelativePath=".\..\src\core\smallmap_type.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\core\smallmatrix_type.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\core\smallstack_type.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\core\smallvec_type.hpp"
 				>
@@ -2107,10 +1931,6 @@
 				RelativePath=".\..\src\intro_gui.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\main_gui.cpp"
 				>
@@ -2195,10 +2015,6 @@
 				RelativePath=".\..\src\statusbar_gui.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\story_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\subsidy_gui.cpp"
 				>
@@ -2355,10 +2171,6 @@
 				RelativePath=".\..\src\widgets\intro_widget.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\widgets\link_graph_legend_widget.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\widgets\main_widget.h"
 				>
@@ -2435,10 +2247,6 @@
 				RelativePath=".\..\src\widgets\statusbar_widget.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\widgets\story_widget.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\widgets\subsidy_widget.h"
 				>
@@ -2615,10 +2423,6 @@
 				RelativePath=".\..\src\saveload\autoreplace_sl.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\saveload\cargomonitor_sl.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\saveload\cargopacket_sl.cpp"
 				>
@@ -2667,10 +2471,6 @@
 				RelativePath=".\..\src\saveload\labelmaps_sl.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\saveload\linkgraph_sl.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\saveload\map_sl.cpp"
 				>
@@ -2739,10 +2539,6 @@
 				RelativePath=".\..\src\saveload\strings_sl.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\saveload\story_sl.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\saveload\subsidy_sl.cpp"
 				>
@@ -3323,10 +3119,6 @@
 				RelativePath=".\..\src\script\api\script_cargolist.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_cargomonitor.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\script\api\script_company.hpp"
 				>
@@ -3471,18 +3263,6 @@
 				RelativePath=".\..\src\script\api\script_stationlist.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_story_page.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_storypagelist.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_storypageelementlist.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\script\api\script_subsidy.hpp"
 				>
@@ -3587,10 +3367,6 @@
 				RelativePath=".\..\src\script\api\script_cargolist.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_cargomonitor.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\script\api\script_company.cpp"
 				>
@@ -3731,18 +3507,6 @@
 				RelativePath=".\..\src\script\api\script_stationlist.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_story_page.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_storypagelist.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_storypageelementlist.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\script\api\script_subsidy.cpp"
 				>
@@ -3815,14 +3579,6 @@
 				RelativePath=".\..\src\blitter\32bpp_anim.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_anim_sse4.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_anim_sse4.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\blitter\32bpp_base.cpp"
 				>
@@ -3847,38 +3603,6 @@
 				RelativePath=".\..\src\blitter\32bpp_simple.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse_func.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse_type.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse2.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse2.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse4.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse4.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_ssse3.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_ssse3.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\blitter\8bpp_base.cpp"
 				>
@@ -4399,10 +4123,6 @@
 				RelativePath=".\..\src\pathfinder\yapf\yapf_ship.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_type.hpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Video"
--- a/projects/openttd_vs90.vcproj.in
+++ b/projects/openttd_vs90.vcproj.in
@@ -53,7 +53,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -88,7 +88,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -155,7 +155,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -183,7 +183,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -255,7 +255,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -290,7 +290,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -359,7 +359,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -389,7 +389,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
--- a/projects/settings_vs100.vcxproj
+++ b/projects/settings_vs100.vcxproj
@@ -23,7 +23,7 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros">
    <SettingsCommandLine>
-..\objs\settings\settings_gen.exe -o ..\objs\settings\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble ..\src\table\company_settings.ini ..\src\table\currency_settings.ini ..\src\table\gameopt_settings.ini ..\src\table\misc_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini ..\src\table\window_settings.ini
+..\objs\settings\settings_gen.exe -o ..\objs\settings\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble ..\src\table\company_settings.ini ..\src\table\currency_settings.ini ..\src\table\gameopt_settings.ini ..\src\table\misc_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini
    </SettingsCommandLine>
  </PropertyGroup>
  <PropertyGroup>
@@ -42,7 +42,6 @@
    <None Include="..\src\table\misc_settings.ini" />
    <None Include="..\src\table\settings.ini" />
    <None Include="..\src\table\win32_settings.ini" />
-    <None Include="..\src\table\window_settings.ini" />
  </ItemGroup>
  <ItemGroup>
    <None Include="..\src\table\settings.h.postamble" />
--- a/projects/settings_vs100.vcxproj.filters
+++ b/projects/settings_vs100.vcxproj.filters
@@ -24,9 +24,6 @@
    <None Include="..\src\table\win32_settings.ini">
      <Filter>INI</Filter>
    </None>
-    <None Include="..\src\table\window_settings.ini">
-      <Filter>INI</Filter>
-    </None>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\src\table\settings.h.postamble" />
--- a/projects/settings_vs80.vcproj
+++ b/projects/settings_vs80.vcproj
@@ -24,7 +24,7 @@
 				Name="VCPreBuildEventTool"
 				Description="Generating settings.h"
 				CommandLine="
-..\objs\settings\settings_gen.exe -o ..\objs\settings\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble ..\src\table\company_settings.ini ..\src\table\currency_settings.ini ..\src\table\gameopt_settings.ini ..\src\table\misc_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini ..\src\table\window_settings.ini
+..\objs\settings\settings_gen.exe -o ..\objs\settings\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble ..\src\table\company_settings.ini ..\src\table\currency_settings.ini ..\src\table\gameopt_settings.ini ..\src\table\misc_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini
 				"
 			/>
 			<Tool
@@ -68,10 +68,6 @@
 			RelativePath="..\src\table\win32_settings.ini"
 			>
 		</File>
-		<File
-			RelativePath="..\src\table\window_settings.ini"
-			>
-		</File>
 		</Filter>
 		<File
 			RelativePath="..\src\table\settings.h.postamble"
--- a/projects/settings_vs90.vcproj
+++ b/projects/settings_vs90.vcproj
@@ -25,7 +25,7 @@
 				Name="VCPreBuildEventTool"
 				Description="Generating settings.h"
 				CommandLine="
-..\objs\settings\settings_gen.exe -o ..\objs\settings\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble ..\src\table\company_settings.ini ..\src\table\currency_settings.ini ..\src\table\gameopt_settings.ini ..\src\table\misc_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini ..\src\table\window_settings.ini
+..\objs\settings\settings_gen.exe -o ..\objs\settings\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble ..\src\table\company_settings.ini ..\src\table\currency_settings.ini ..\src\table\gameopt_settings.ini ..\src\table\misc_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini
 				"
 			/>
 			<Tool
@@ -69,10 +69,6 @@
 			RelativePath="..\src\table\win32_settings.ini"
 			>
 		</File>
-		<File
-			RelativePath="..\src\table\window_settings.ini"
-			>
-		</File>
 		</Filter>
 		<File
 			RelativePath="..\src\table\settings.h.postamble"
--- a/readme.txt
+++ b/readme.txt
@@ -1,5 +1,6 @@
-Last updated:    2014-06-02
-Release version: 1.4.1
+OpenTTD readme
+Last updated:    2012-03-18
+Release version: 1.2.0-RC3
 ------------------------------------------------------------------------


@@ -21,12 +22,10 @@ Table of contents
 7.0) Compiling
 * 7.1) Required/optional libraries
 * 7.2) Supported compilers
- * 7.3) Compilation of base sets
 8.0) Translating
 * 8.1) Translation
 * 8.2) Previewing
 9.0) Troubleshooting
-10.0) Licensing
 X.X) Credits


@@ -36,9 +35,9 @@ OpenTTD is a transport simulation game based upon the popular game Transport
 Tycoon Deluxe, written by Chris Sawyer. It attempts to mimic the original
 game as closely as possible while extending it with new features.

-OpenTTD is licensed under the GNU General Public License version 2.0,
-but includes some 3rd party software under different licenses. See the
-section "Licensing" below for details.
+OpenTTD is licensed under the GNU General Public License version 2.0. For
+more information, see the file 'COPYING'.
+

 2.0) Contacting
 ---- ----------
@@ -81,10 +80,8 @@ After you have done all that you can report the bug. Please include the
 following information in your bug report:
 * OpenTTD version (PLEASE test the latest SVN/nightly build)
 * Bug details, including instructions how to reproduce it
- * Platform (Windows, Linux, FreeBSD, ...) and compiler (including version) if
+ * Platform (Win32, Linux, FreeBSD, ...) and compiler (including version) if
   you compiled OpenTTD yourself.
- * The processor architecture of your OS (32 bits Windows, 64 bits Windows,
-   Linux on an ARM, Mac OS X on a PowerPC, ...)
 * Attach a saved game *and* a screenshot if possible
 * If this bug only occurred recently please note the last version without
   the bug and the first version including the bug. That way we can fix it
@@ -148,9 +145,9 @@ will not be able to reproduce the desync and thus will be unable to fix it.

 3.0) Supported platforms
 ---- -------------------
-OpenTTD has been ported to several platforms and operating systems. It should
-not be very difficult to port it to a new platform. The currently working
-platforms are:
+OpenTTD has been ported to several platforms and operating systems. It shouldn't
+be very difficult to port it to a new platform. The currently working platforms
+are:

  BeOS                 - SDL or Allegro
  DOS                  - Allegro
@@ -171,7 +168,7 @@ be installed, or you have downloaded an installer, which will automatically
 extract OpenTTD in the given directory.

 OpenTTD looks in multiple locations to find the required data files (described
-in section 4.2). Installing any 3rd party files into a 'shared' location has
+in section 4.2). Installing any 3rd party files into a "shared" location has
 the advantage that you only need to do this step once, rather than copying the
 data files into all OpenTTD versions you have.
 Savegames, screenshots, etc are saved relative to the config file (openttd.cfg)
@@ -180,16 +177,15 @@ shared directories, savegames will reside in the save/ directory next to the
 openttd.cfg file there.
 If you want savegames and screenshots in the directory where the OpenTTD binary
 resides, simply have your config file in that location. But if you remove this
-config file, savegames will still be in this directory (see notes in
-section 4.2 'OpenTTD directories')
+config file, savegames will still be in this directory (see notes in section 4.2)

 OpenTTD comes without AIs, so if you want to play with AIs you have to download
-them. The easiest way is via the 'Check Online Content' button in the main menu.
+them. The easiest way is via the "Check Online Content" button in the main menu.
 You can select some AIs that you think are compatible with your playing style.
 Another way is manually downloading the AIs from the forum although then you
 need to make sure that you install all the required AI libraries too; they get
-automatically selected (and downloaded) if you get the AIs via the 'Check
-Online Content'. If you do not have an AI but have configured OpenTTD to start
+automatically selected (and downloaded) if you get the AIs via the "Check
+Online Content". If you do not have an AI but have configured OpenTTD to start
 an AI a message will be shown that the 'dummy' AI has been started.

 4.1) (Required) 3rd party files
@@ -202,7 +198,7 @@ For OpenTTD you need to acquire some third party data files. For this you have
 the choice of using the original Transport Tycoon Deluxe data files or a set
 of free data files.

-Do NOT copy files included with OpenTTD into 'shared' directories (explained in
+Do NOT copy files included with OpenTTD into "shared" directories (explained in
 the following sections) as sooner or later you will run into graphical glitches
 when using other versions of the game.

@@ -219,9 +215,9 @@ The Windows installer can optionally download and install these packages.
 4.1.2) Original Transport Tycoon Deluxe graphics and sound files
 ------ ---------------------------------------------------------
 If you want to play with the original Transport Tycoon Deluxe data files you
-have to copy the data files from the CD-ROM into the baseset/ directory. It
-does not matter whether you copy them from the DOS or Windows version of
-Transport Tycoon Deluxe. The Windows install can optionally copy these files.
+have to copy the data files from the CD-ROM into the data/ directory. It does
+not matter whether you copy them from the DOS or Windows version of Transport
+Tycoon Deluxe. The Windows install can optionally copy these files.
 You need to copy the following files:
 - sample.cat
 - trg1r.grf or TRG1.GRF
@@ -243,7 +239,7 @@ not work.
 If you want AIs use the in-game content downloader. If for some reason that is
 not possible or you want to use an AI that has not been uploaded to the content
 download system download the tar file and place it in the ai/ directory. If the
-AI needs libraries you will have to download those too and put them in the
+AI needs libraries you'll have to download those too and put them in the
 ai/library/ directory. All AIs and AI Libraries that have been uploaded to
 the content download system can be found at http://noai.openttd.org/downloads/
 The AIs and libraries can be found their in the form of .tar.gz packages.
@@ -251,39 +247,26 @@ OpenTTD can read inside tar files but it does not extract .tar.gz files by
 itself.
 To figure out which libraries you need for an AI you have to start the AI and
 wait for an error message to pop up. The error message will tell you
-'could not find library "lib-name"'. Download that library and try again.
-
-4.1.5) Game scripts
------ ------------
-If you want an extra challenge in OpenTTD you can download so-called game
-scripts via the in-game content downloader. These game scripts have varying
-functionality, though they can generally influence town growth, subsidies, add
-goals to reach or provide a different ranking system.
-If you download a game script manually you have to follow the same rules as for
-AIs, except that game scripts are placed in the game/ directory instead of the
-ai/ directory.
-
+"couldn't find library 'lib-name'". Download that library and try again.

 4.2) OpenTTD directories
 ---- -------------------
-OpenTTD uses its own directory to store its required 3rd party base set files
-(see section 4.1 'Required 3rd party files') and non-compulsory extension and
-configuration files. See below for their proper place within this OpenTTD main
-data directory.
+OpenTTD uses its own directory to store its required 3rd party base set files (see section
+4.1 "Required 3rd party files") and non-compulsory extension and configuration files. See
+below for their proper place within this OpenTTD main data directory.

-The main OpenTTD directories can be found in various locations, depending on
-your operating system:
+The main OpenTTD directories can be found in various locations, depending on your operating
+system:
 	1. The current working directory (from where you started OpenTTD)
 		For non-Windows operating systems OpenTTD will not scan for files in this
-		directory if it is your personal directory, i.e. '~/', or when it is the
-		root directory, i.e. '/'.
+		directory if it is your personal directory, i.e. "~/", or when it is the
+		root directory, i.e. "/".
 	2. Your personal directory
 		Windows: C:\My Documents\OpenTTD (95, 98, ME)
 		         C:\Documents and Settings\<username>\My Documents\OpenTTD (2000, XP)
 		         C:\Users\<username>\Documents\OpenTTD (Vista, 7)
 		Mac OSX: ~/Documents/OpenTTD
-		Linux:   $XDG_DATA_HOME/openttd which is usually ~/.local/share/openttd when
-		         built with XDG base directory support, otherwise ~/.openttd
+		Linux:   ~/.openttd
 	3. The shared directory
 		Windows: C:\Documents and Settings\All Users\Shared Documents\OpenTTD (2000, XP)
 		         C:\Users\Public\Documents\OpenTTD (Vista, 7)
@@ -295,13 +278,13 @@ your operating system:
 	5. The installation directory (Linux only)
 		Linux:   /usr/share/games/openttd
 	6. The application bundle (Mac OSX only)
-		It includes the OpenTTD files (grf+lng) and it will work as long as they
-		are not touched
+		It includes the OpenTTD files (grf+lng) and it will work as long as they aren't
+		touched

-Different types of data or extensions go into different subdirectories of the
-chosen main OpenTTD directory:
+Different types of data or extensions go into different subdirectories of the chosen main
+OpenTTD directory:
 	Config File:         (no subdirectory)
-	Screenshots:         screenshot
+	Screenshots:         (no subdirectory)
 	Base Graphics:       baseset                 (or a subdirectory thereof)
 	Sound Sets:          baseset                 (or a subdirectory thereof)
 	NewGRFs:             newgrf                  (or a subdirectory thereof)
@@ -315,27 +298,21 @@ chosen main OpenTTD directory:
 	Automatic Savegames: save/autosave
 	Scenarios:           scenario

-The (automatically created) directory content_download is for OpenTTD's internal
-use and no files should be added to it or its subdirectories manually.
+The (automatically created) directory content_download is for OpenTTD's internal use and
+no files should be added to it or its subdirectories manually.

 Notes:
-	- Linux in the previous list means .deb, but most paths should be similar for
-	  others.
+	- Linux in the previous list means .deb, but most paths should be similar for others.
 	- The previous search order is also used for NewGRFs and openttd.cfg.
-	- If openttd.cfg is not found, then it will be created using the 2, 4, 1, 3,
-	  5 order. When built with XDG base directory support, openttd.cfg will be
-	  created in $XDG_CONFIG_HOME/openttd which is usually ~/.config/openttd.
+	- If openttd.cfg is not found, then it will be created using the 2, 4, 1, 3, 5 order.
 	- Savegames will be relative to the config file only if there is no save/
 	  directory in paths with higher priority than the config file path, but
 	  autosaves and screenshots will always be relative to the config file.
-	  Unless the configuration file is in $XDG_CONFIG_HOME/openttd, then all
-	  other files will be saved under $XDG_DATA_HOME/openttd.

 The preferred setup:
-Place 3rd party files in shared directory (or in personal directory if you do
-not have write access on shared directory) and have your openttd.cfg config
-file in personal directory (where the game will then also place savegames and
-screenshots).
+Place 3rd party files in shared directory (or in personal directory if you don't
+have write access on shared directory) and have your openttd.cfg config file in
+personal directory (where the game will then also place savegames and screenshots).

 4.3) Portable installations (portable media)
 ---- ---------------------------------------
@@ -357,10 +334,12 @@ makes it easy to bundle files belonging to the same script, NewGRF or base
 set. Music sets are the only exception as they cannot be stored in a tar
 file due to being played by external applications.

-OpenTTD sees each tar archive as the 'root' of its search path. This means that
-having a file with the same path in two different tar files means that one
-cannot be opened, after all only one file will be found first. As such it is
-advisable to put an uniquely named folder in the root of the tar and put all the
+OpenTTD sees each tar archive as the 'root' of its search path. This means
+that having a file with the same path in two different tar files means that
+one cannot be opened, after all only one file will be found first. This is
+done to make it possible to have the large 32bpp zoomed graphics in a separate
+file to the (relatively small) unzoomed 8bpp NewGRF. As such it is advisable
+to put an uniquely named folder in the root of the tar and put all the
 content in that folder. For example, all downloaded content has a path that
 concatenates the name of the content and the version, which makes the path
 unique. For custom tar files it is advised to do this as well.
@@ -414,6 +393,7 @@ Information logged:
  original Transport Tycoon version
 * Running a modified OpenTTD build
 * Changing settings affecting NewGRF behaviour (non-network-safe settings)
+* Changing landscape (by cheat)
 * Triggering NewGRF bugs

 No personal information is stored.
@@ -425,7 +405,7 @@ OpenTTD in debug mode.
 6.0) Configuration file
 ---- ------------------
 The configuration file for OpenTTD (openttd.cfg) is in a simple Windows-like
-.INI format. It is mostly undocumented. Almost all settings can be changed
+.INI format. It's mostly undocumented. Almost all settings can be changed
 ingame by using the 'Advanced Settings' window.
 When you cannot find openttd.cfg you should look in the directories as
 described in section 4.2. If you do not have an openttd.cfg OpenTTD will
@@ -449,24 +429,24 @@ Windows:
  Please read the Makefile for more information.

 Solaris, FreeBSD, OpenBSD:
-  Use 'gmake', but do a './configure' before the first build.
+  Use "gmake", but do a "./configure" before the first build.

 Linux/Unix:
-  OpenTTD can be built with GNU 'make'. On non-GNU systems it is called 'gmake'.
-  However, for the first build one has to do a './configure' first.
+  OpenTTD can be built with GNU "make". On non-GNU systems it's called "gmake".
+  However, for the first build one has to do a "./configure" first.

 MacOS X:
-  Use 'make' or Xcode (which will then call make for you)
+  Use "make" or Xcode (which will then call make for you)
  This will give you a binary for your CPU type (PPC/Intel)
-  However, for the first build one has to do a './configure' first.
-  To make a universal binary type './configure --enabled-universal'
-  instead of './configure'.
+  However, for the first build one has to do a "./configure" first.
+  To make a universal binary type "./configure --enabled-universal"
+  instead of "./configure".

 BeOS:
-  Use 'make', but do a './configure' before the first build.
+  Use "make", but do a "./configure" before the first build.

 MorphOS:
-  Use 'make'. However, for the first build one has to do a './configure' first.
+  Use "make". However, for the first build one has to do a "./configure" first.
  Note that you need the MorphOS SDK, latest libnix updates (else C++ parts of
  OpenTTD will not build) and the powersdl.library SDK. Optionally libz,
  libpng and freetype2 developer files.
@@ -478,12 +458,12 @@ OS/2:
 DOS:
  A build environment with DJGPP is needed as well as libraries such as
  Allegro, zlib and libpng, which all can be downloaded from the DJGPP
-  website. Compilation is straight forward: use make, but do a './configure'
+  website. Compilation is straight forward: use make, but do a "./configure"
  before the first build. The build binary will need cwsdpmi.exe to be in
  the same directory as the openttd executable. cwsdpmi.exe can be found in
-  the os/dos/cwsdpmi subdirectory. If you compile with stripping turned on a
-  binary will be generated that does not need cwsdpmi.exe by adding the
-  cswdstub.exe to the created OpenTTD binary.
+  the os/dos subdirectory. If you compile with stripping turned on a binary
+  will be generated that does not need cwsdpmi.exe by adding the cswdstub.exe
+  to the created OpenTTD binary.

 7.1) Required/optional libraries
 ---- ---------------------------
@@ -505,15 +485,21 @@ open most older savegames or use the content downloading system.
 Without libSDL/liballegro on non-Windows and non-MacOS X machines you have
 no graphical user interface; you would be building a dedicated server.

+To recompile the extra graphics needed to play with the original Transport
+Tycoon Deluxe graphics you need GRFCodec (which includes NFORenum) as well.
+GRFCodec can be found at: http://www.openttd.org/download-grfcodec
+The compilation of these extra graphics does generally not happen, unless
+you remove the graphics file using "make maintainer-clean".
+
 7.2) Supported compilers
 ---- -------------------
 The following compilers are known to compile OpenTTD:
  - Microsoft Visual C++ (MSVC) 2005, 2008 and 2010.
    Version 2005 gives bogus warnings about scoping issues.
-  - GNU Compiler Collection (GCC) 3.3 - 4.4, 4.6 - 4.8.
+  - GNU Compiler Collection (GCC) 3.3 - 4.7.
    Versions 4.1 and earlier give bogus warnings about uninitialised variables.
-    Versions 4.4, 4.6 give bogus warnings about freeing non-heap objects.
-    Versions 4.6 and later give invalid warnings when lto is enabled.
+    Versions 4.4 - 4.6 give bogus warnings about freeing non-heap objects.
+    Versions 4.5 and later give invalid warnings when lto is enabled.
  - Intel C++ Compiler (ICC) 12.0.
  - Clang/LLVM 2.9 - 3.0
    Version 2.9 gives bogus warnings about code nonconformity.
@@ -522,8 +508,6 @@ The following compilers are known not to compile OpenTTD:
  - Microsoft Visual C++ (MSVC) 2003 and earlier.
  - GNU Compiler Collection (GCC) 3.2 and earlier.
    These old versions fail due to OpenTTD's template usage.
-  - GNU Compiler Collection (GCC) 4.5. It optimizes enums too aggressively.
-    See http://bugs.openttd.org/task/5513 and references therein.
  - Intel C++ Compiler (ICC) 11.1 and earlier.
    Version 10.0 and earlier fail a configure check and fail with recent system
        headers.
@@ -535,21 +519,6 @@ The following compilers are known not to compile OpenTTD:
 If any of these compilers can compile OpenTTD again, please let us know.
 Patches to support more compilers are welcome.

-7.3) Compilation of base sets
-----------------------------
-To recompile the extra graphics needed to play with the original Transport
-Tycoon Deluxe graphics you need GRFCodec (which includes NFORenum) as well.
-GRFCodec can be found at: http://www.openttd.org/download-grfcodec
-The compilation of these extra graphics does generally not happen, unless
-you remove the graphics file using 'make maintainer-clean'.
-
-Re-compilation of the base sets, thus also use of --maintainer-clean can
-leave the repository in a modified state as different grfcodec versions can
-cause binary differences in the resulting grf. Also translations might have
-been added for the base sets which are not yet included in the base set
-information files. Use the configure option --without-grfcodec to avoid
-modification of the base set files by the build process.
-

 8.0) Translating
 ---- -----------
@@ -568,7 +537,7 @@ someone else may have already started translating to the same language.

 8.1) Translation
 ---- -----------
-So, now that you have notified the development team about your intention to
+So, now that you've notified the development team about your intention to
 translate (You did, right? Of course you did.) you can pick up english.txt
 (found in the SVN repository under /src/lang) and translate.

@@ -587,9 +556,10 @@ Note: Do not alter the following parts of the file:
 8.2) Previewing
 ---- ----------
 In order to view the translation in the game, you need to compile your language
-file with the strgen utility. As this utility is tailored to a specific OpenTTD
-version, you need to compile it yourself. Just take the normal OpenTTD sources
-and build that. During the build process the strgen utility will be made.
+file with the strgen utility. You can download the precompiled strgen from:
+http://www.openttd.org/download-strgen
+To compile it yourself just take the normal OpenTTD sources and build that.
+During the build process the strgen utility will be made.

 strgen is a command-line utility. It takes the language filename as parameter.
 Example:
@@ -601,17 +571,17 @@ Any missing strings are replaced with the English strings. Note that it looks
 for english.txt in the lang subdirectory, which is where your language file
 should also be.

-That is all! You should now be able to select the language in the game options.
+That's all! You should now be able to select the language in the game options.


 9.0) Troubleshooting
 ---- ---------------
 To see all startup options available to you, start OpenTTD with the
-'./openttd -h' option. This might help you tweak some of the settings.
+"./openttd -h" option. This might help you tweak some of the settings.

 If the game is acting strange and you feel adventurous you can try the
-'-d [[<name>=]<level>]' flag, where the higher levels will give you more
-debugging output. The 'name' variable can help you to display only some type of
+"-d [[<name>]=[<level>]" flag, where the higher levels will give you more
+debugging output. The "name" variable can help you to display only some type of
 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.
@@ -634,42 +604,19 @@ and add a suitable font for the small, medium and / or large font, e.g.:
 	small_font = "Tahoma"
 	medium_font = "Tahoma"
 	large_font = "Tahoma"
-You should use a font name like 'Tahoma' or a path to the desired font.
+You should use a font name like "Tahoma" or a path to the desired font.

 Any NewGRF file used in a game is stored inside the savegame and will refuse
-to load if you do not have that NewGRF file available. A list of missing files
+to load if you don't have that NewGRF file available. A list of missing files
 can be viewed in the NewGRF window accessible from the file load dialogue window.

 You can try to obtain the missing files from that NewGRF dialogue or - if they
 are not available online - you can search manually through our forum's graphics
 development section (http://www.tt-forums.net/viewforum.php?f=66) or GrfCrawler
 (http://grfcrawler.tt-forums.net/). Put the NewGRF files in OpenTTD's newgrf folder
-(see section 4.2 'OpenTTD directories') and rescan the list of available NewGRFs.
+(see section 4.2 "OpenTTD directories") and rescan the list of available NewGRFs.
 Once you have all missing files, you are set to go.

-10.0) Licensing
----- ---------
-OpenTTD is licensed under the GNU General Public License version 2.0. For
-the complete license text, see the file 'COPYING'. This license applies
-to all files in this distribution, except as noted below.
-
-The squirrel implementation in src/3rdparty/squirrel is licensed under
-the Zlib license. See src/3rdparty/squirrel/COPYRIGHT for the complete
-license text.
-
-The md5 implementation in src/3rdparty/md5 is licensed under the Zlib
-license. See the comments in the source files in src/3rdparty/md5 for
-the complete license text.
-
-The exe2coff implementation in os/dos/exe2coff is available under the
-GPL, with a number of additional terms. See os/dos/exe2coff/copying and
-os/dos/exe2coff/copying.dj for the exact licensing terms.
-
-The CWSDPMI implementation in os/dos/cwsdpmi is distributed under a
-custom binary-only license that prohibits modification. The exact
-licensing terms can be found in os/dos/cwsdpmi/cwsdpmi.txt. The sources
-for these files can be downloaded at its author site, at:
-http://homer.rice.edu/~sandmann/cwsdpmi/csdpmi5s.zip

 X.X) Credits
 ---- -------
@@ -677,7 +624,6 @@ The OpenTTD team (in alphabetical order):
  Albert Hofkamp (Alberth)        - GUI expert
  Jean-François Claeys (Belugas)  - GUI, newindustries and more
  Matthijs Kooijman (blathijs)    - Pathfinder-guru, pool rework
-  Ulf Hermann (fonsinchen)        - Cargo Distribution
  Christoph Elsenhans (frosch)    - General coding
  Loïc Guilloux (glx)             - Windows Expert
  Michael Lutz (michi_cc)         - Path based signals
@@ -688,7 +634,6 @@ The OpenTTD team (in alphabetical order):
  Zdeněk Sojka (SmatZ)            - Bug finder and fixer
  José Soler (Terkhen)            - General coding
  Thijs Marinussen (Yexo)         - AI Framework
-  Leif Linse (Zuu)                - AI/Game Script

 Inactive Developers:
  Bjarni Corfitzen (Bjarni)       - MacOSX port, coder and vehicles
@@ -708,7 +653,7 @@ Retired Developers:

 Thanks to:
  Josef Drexler                   - For his great work on TTDPatch.
-  Marcin Grzegorczyk              - For his TTDPatch work and documentation of Transport Tycoon Deluxe internals and track foundations
+  Marcin Grzegorczyk              - For his TTDPatch work and documentation of Transport Tycoon Deluxe internals and graphics (signals and track foundations)
  Petr Baudiš (pasky)             - Many patches, newgrf support, etc.
  Simon Sasburg (HackyKid)        - For the many bugfixes he has blessed us with
  Stefan Meißner (sign_de)        - For his work on the console
@@ -722,7 +667,6 @@ Thanks to:
  George                          - Canal graphics
  Andrew Parkhouse (andythenorth) - River graphics
  David Dallaston (Pikka)         - Tram tracks
-  Fleashosio                      - Titlegame
  All Translators                 - For their support to make OpenTTD a truly international game
  Bug Reporters                   - Thanks for all bug reports
  Chris Sawyer                    - For an amazing game!
--- a/source.list
+++ b/source.list
@@ -4,15 +4,12 @@ animated_tile.cpp
 articulated_vehicles.cpp
 autoreplace.cpp
 bmp.cpp
-cargoaction.cpp
-cargomonitor.cpp
 cargopacket.cpp
 cargotype.cpp
 cheat.cpp
 command.cpp
 console.cpp
 console_cmds.cpp
-cpu.cpp
 crashlog.cpp
 currency.cpp
 date.cpp
@@ -27,13 +24,10 @@ engine.cpp
 fileio.cpp
 fios.cpp
 fontcache.cpp
-fontdetection.cpp
-base_consist.cpp
 gamelog.cpp
 genworld.cpp
 gfx.cpp
 gfxinit.cpp
-gfx_layout.cpp
 goal.cpp
 ground_vehicle.cpp
 heightmap.cpp
@@ -42,13 +36,6 @@ hotkeys.cpp
 ini.cpp
 ini_load.cpp
 landscape.cpp
-linkgraph/demands.cpp
-linkgraph/flowmapper.cpp
-linkgraph/linkgraph.cpp
-linkgraph/linkgraphjob.cpp
-linkgraph/linkgraphschedule.cpp
-linkgraph/mcf.cpp
-linkgraph/refresh.cpp
 map.cpp
 misc.cpp
 mixer.cpp
@@ -63,6 +50,7 @@ network/network_server.cpp
 network/network_udp.cpp
 openttd.cpp
 order_backup.cpp
+os_timer.cpp
 pbs.cpp
 progress.cpp
 rail.cpp
@@ -82,11 +70,8 @@ spritecache.cpp
 station.cpp
 strgen/strgen_base.cpp
 string.cpp
-stringfilter.cpp
 strings.cpp
-story.cpp
 subsidy.cpp
-textbuf.cpp
 texteff.cpp
 tgp.cpp
 tile_map.cpp
@@ -111,9 +96,6 @@ townname.cpp
 vehicle.cpp
 vehiclelist.cpp
 viewport.cpp
-#if SSE
-viewport_sprite_sorter_sse4.cpp
-#end
 waypoint.cpp
 widget.cpp
 window.cpp
@@ -139,8 +121,6 @@ base_station_base.h
 bmp.h
 bridge.h
 cargo_type.h
-cargoaction.h
-cargomonitor.h
 cargopacket.h
 cargotype.h
 cheat_func.h
@@ -158,7 +138,6 @@ console_func.h
 console_gui.h
 console_internal.h
 console_type.h
-cpu.h
 crashlog.h
 currency.h
 date_func.h
@@ -189,13 +168,10 @@ fileio_func.h
 fileio_type.h
 fios.h
 fontcache.h
-fontdetection.h
-base_consist.h
 gamelog.h
 gamelog_internal.h
 genworld.h
 gfx_func.h
-gfx_layout.h
 gfx_type.h
 gfxinit.h
 goal_base.h
@@ -218,18 +194,6 @@ ini_type.h
 landscape.h
 landscape_type.h
 language.h
-linkgraph/demands.h
-linkgraph/flowmapper.h
-linkgraph/init.h
-linkgraph/linkgraph.h
-linkgraph/linkgraph_base.h
-linkgraph/linkgraph_gui.h
-linkgraph/linkgraph_type.h
-linkgraph/linkgraphjob.h
-linkgraph/linkgraphjob_base.h
-linkgraph/linkgraphschedule.h
-linkgraph/mcf.h
-linkgraph/refresh.h
 livery.h
 map_func.h
 map_type.h
@@ -308,7 +272,6 @@ sdl.h
 sound/sdl_s.h
 video/sdl_v.h
 settings_func.h
-settings_gui.h
 settings_internal.h
 settings_type.h
 ship.h
@@ -331,13 +294,9 @@ station_gui.h
 station_type.h
 statusbar_gui.h
 stdafx.h
-story_base.h
-story_type.h
 strgen/strgen.h
-string_base.h
 string_func.h
 string_type.h
-stringfilter_type.h
 strings_func.h
 strings_type.h
 subsidy_base.h
@@ -346,7 +305,6 @@ subsidy_type.h
 tar_type.h
 terraform_gui.h
 textbuf_gui.h
-textbuf_type.h
 texteff.hpp
 textfile_gui.h
 textfile_type.h
@@ -377,7 +335,6 @@ vehicle_gui_base.h
 vehicle_type.h
 vehiclelist.h
 viewport_func.h
-viewport_sprite_sorter.h
 viewport_type.h
 water.h
 waypoint_base.h
@@ -424,7 +381,6 @@ core/geometry_type.hpp
 core/math_func.cpp
 core/math_func.hpp
 core/mem_func.hpp
-core/multimap.hpp
 core/overflowsafe_type.hpp
 core/pool_func.cpp
 core/pool_func.hpp
@@ -432,8 +388,6 @@ core/pool_type.hpp
 core/random_func.cpp
 core/random_func.hpp
 core/smallmap_type.hpp
-core/smallmatrix_type.hpp
-core/smallstack_type.hpp
 core/smallvec_type.hpp
 core/sort_func.hpp
 core/string_compare_type.hpp
@@ -461,7 +415,6 @@ group_gui.cpp
 highscore_gui.cpp
 industry_gui.cpp
 intro_gui.cpp
-linkgraph/linkgraph_gui.cpp
 main_gui.cpp
 misc_gui.cpp
 music_gui.cpp
@@ -483,7 +436,6 @@ signs_gui.cpp
 smallmap_gui.cpp
 station_gui.cpp
 statusbar_gui.cpp
-story_gui.cpp
 subsidy_gui.cpp
 terraform_gui.cpp
 textfile_gui.cpp
@@ -524,7 +476,6 @@ widgets/group_widget.h
 widgets/highscore_widget.h
 widgets/industry_widget.h
 widgets/intro_widget.h
-widgets/link_graph_legend_widget.h
 widgets/main_widget.h
 widgets/misc_widget.h
 widgets/music_widget.h
@@ -544,7 +495,6 @@ widgets/sign_widget.h
 widgets/smallmap_widget.h
 widgets/station_widget.h
 widgets/statusbar_widget.h
-widgets/story_widget.h
 widgets/subsidy_widget.h
 widgets/terraform_widget.h
 widgets/timetable_widget.h
@@ -591,7 +541,6 @@ saveload/ai_sl.cpp
 saveload/airport_sl.cpp
 saveload/animated_tile_sl.cpp
 saveload/autoreplace_sl.cpp
-saveload/cargomonitor_sl.cpp
 saveload/cargopacket_sl.cpp
 saveload/cheat_sl.cpp
 saveload/company_sl.cpp
@@ -604,7 +553,6 @@ saveload/goal_sl.cpp
 saveload/group_sl.cpp
 saveload/industry_sl.cpp
 saveload/labelmaps_sl.cpp
-saveload/linkgraph_sl.cpp
 saveload/map_sl.cpp
 saveload/misc_sl.cpp
 saveload/newgrf_sl.cpp
@@ -622,7 +570,6 @@ saveload/signs_sl.cpp
 saveload/station_sl.cpp
 saveload/storage_sl.cpp
 saveload/strings_sl.cpp
-saveload/story_sl.cpp
 saveload/subsidy_sl.cpp
 saveload/town_sl.cpp
 saveload/vehicle_sl.cpp
@@ -778,7 +725,6 @@ script/api/script_bridge.hpp
 script/api/script_bridgelist.hpp
 script/api/script_cargo.hpp
 script/api/script_cargolist.hpp
-script/api/script_cargomonitor.hpp
 script/api/script_company.hpp
 script/api/script_companymode.hpp
 script/api/script_controller.hpp
@@ -815,9 +761,6 @@ script/api/script_sign.hpp
 script/api/script_signlist.hpp
 script/api/script_station.hpp
 script/api/script_stationlist.hpp
-script/api/script_story_page.hpp
-script/api/script_storypagelist.hpp
-script/api/script_storypageelementlist.hpp
 script/api/script_subsidy.hpp
 script/api/script_subsidylist.hpp
 script/api/script_testmode.hpp
@@ -845,7 +788,6 @@ script/api/script_bridge.cpp
 script/api/script_bridgelist.cpp
 script/api/script_cargo.cpp
 script/api/script_cargolist.cpp
-script/api/script_cargomonitor.cpp
 script/api/script_company.cpp
 script/api/script_companymode.cpp
 script/api/script_controller.cpp
@@ -881,9 +823,6 @@ script/api/script_sign.cpp
 script/api/script_signlist.cpp
 script/api/script_station.cpp
 script/api/script_stationlist.cpp
-script/api/script_story_page.cpp
-script/api/script_storypagelist.cpp
-script/api/script_storypageelementlist.cpp
 script/api/script_subsidy.cpp
 script/api/script_subsidylist.cpp
 script/api/script_testmode.cpp
@@ -905,26 +844,12 @@ script/api/script_window.cpp
 #else
 blitter/32bpp_anim.cpp
 blitter/32bpp_anim.hpp
-#if SSE
-blitter/32bpp_anim_sse4.cpp
-blitter/32bpp_anim_sse4.hpp
-#end
 blitter/32bpp_base.cpp
 blitter/32bpp_base.hpp
 blitter/32bpp_optimized.cpp
 blitter/32bpp_optimized.hpp
 blitter/32bpp_simple.cpp
 blitter/32bpp_simple.hpp
-#if SSE
-blitter/32bpp_sse_func.hpp
-blitter/32bpp_sse_type.h
-blitter/32bpp_sse2.cpp
-blitter/32bpp_sse2.hpp
-blitter/32bpp_sse4.cpp
-blitter/32bpp_sse4.hpp
-blitter/32bpp_ssse3.cpp
-blitter/32bpp_ssse3.hpp
-#end
 blitter/8bpp_base.cpp
 blitter/8bpp_base.hpp
 blitter/8bpp_optimized.cpp
@@ -1065,7 +990,6 @@ pathfinder/yapf/yapf_node_ship.hpp
 pathfinder/yapf/yapf_rail.cpp
 pathfinder/yapf/yapf_road.cpp
 pathfinder/yapf/yapf_ship.cpp
-pathfinder/yapf/yapf_type.hpp

 # Video
 video/dedicated_v.cpp
--- a/src/3rdparty/README.licensing
+++ b/src/3rdparty/README.licensing
@@ -1,3 +0,0 @@
-The files in this directory are not licensed under the same terms as the
-rest of OpenTTD. Licensing details can be found in OpenTTD's readme.txt
-and in this directory or subdirectories as well.
--- a/src/3rdparty/squirrel/squirrel/sqbaselib.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqbaselib.cpp
@@ -210,22 +210,16 @@ static SQInteger base_suspend(HSQUIRRELVM v)
 static SQInteger base_array(HSQUIRRELVM v)
 {
 	SQArray *a;
-	SQInteger nInitialSize = tointeger(stack_get(v,2));
-	SQInteger ret = 1;
-	if (nInitialSize < 0) {
-		v->Raise_Error(_SC("can't create/resize array with/to size %d"), nInitialSize);
-		nInitialSize = 0;
-		ret = -1;
-	}
+	SQObject &size = stack_get(v,2);
 	if(sq_gettop(v) > 2) {
 		a = SQArray::Create(_ss(v),0);
-		a->Resize(nInitialSize,stack_get(v,3));
+		a->Resize(tointeger(size),stack_get(v,3));
 	}
 	else {
-		a = SQArray::Create(_ss(v),nInitialSize);
+		a = SQArray::Create(_ss(v),tointeger(size));
 	}
 	v->Push(a);
-	return ret;
+	return 1;
 }

 static SQInteger base_type(HSQUIRRELVM v)
--- a/src/3rdparty/squirrel/squirrel/sqcompiler.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqcompiler.cpp
@@ -917,7 +917,6 @@ public:
 		_last_stacksize = _fs->GetStackSize();
 		Statement();
 		CleanStack(stacksize);
-		_fs->AddLineInfos(_lex._currentline, _lineinfo, true);
 		Expect(TK_WHILE);
 		SQInteger continuetrg = _fs->GetCurrentPos();
 		Expect(_SC('(')); CommaExpr(); Expect(_SC(')'));
--- a/src/3rdparty/squirrel/squirrel/squtils.h
+++ b/src/3rdparty/squirrel/squirrel/squtils.h
@@ -37,13 +37,9 @@ public:
 	~sqvector()
 	{
 		if(_allocated) {
-		        /* Break freeing loops, if this vector (indirectly) links to itself. */
-		        size_t allocated_size = _allocated * sizeof(T);
-		        _allocated = 0;
-
 			for(SQUnsignedInteger i = 0; i < _size; i++)
 				_vals[i].~T();
-			SQ_FREE(_vals, allocated_size);
+			SQ_FREE(_vals, (_allocated * sizeof(T)));
 		}
 	}
 	void reserve(SQUnsignedInteger newsize) { _realloc(newsize); }
--- a/src/3rdparty/squirrel/squirrel/sqvm.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqvm.cpp
@@ -107,7 +107,6 @@ SQVM::SQVM(SQSharedState *ss)
 	_errorhandler = _null_;
 	_debughook = _null_;
 	_can_suspend = false;
-	_in_stackoverflow = false;
 	_ops_till_suspend = 0;
 	ci = NULL;
 	INIT_CHAIN();ADD_TO_CHAIN(&_ss(this)->_gc_chain,this);
@@ -1191,7 +1190,7 @@ bool SQVM::CallNative(SQNativeClosure *nclosure,SQInteger nargs,SQInteger stackb
 		throw;
 	}

-	_callsstacksize = cstksize;
+	assert(cstksize == _callsstacksize);

 	_nnativecalls--;
 	suspend = false;
--- a/src/3rdparty/squirrel/squirrel/sqvm.h
+++ b/src/3rdparty/squirrel/squirrel/sqvm.h
@@ -170,7 +170,6 @@ public:

 	SQBool _can_suspend;
 	SQInteger _ops_till_suspend;
-	SQBool _in_stackoverflow;

 	bool ShouldSuspend()
 	{
@@ -201,10 +200,8 @@ inline SQObjectPtr &stack_get(HSQUIRRELVM v,SQInteger idx){return ((idx>=0)?(v->

 #define PUSH_CALLINFO(v,nci){ \
 	if(v->_callsstacksize == v->_alloccallsstacksize) { \
-		if (v->_callsstacksize > 65535 && !v->_in_stackoverflow) {\
-			v->_in_stackoverflow = true; \
+		if (v->_callsstacksize > 65535) {\
 			v->Raise_Error(_SC("stack overflow"));\
-			v->CallErrorHandler(v->_lasterror);\
 			return false;\
 		}\
 		v->GrowCallStack(); \
--- a/src/ai/ai.hpp
+++ b/src/ai/ai.hpp
@@ -14,7 +14,6 @@

 #include "../script/api/script_event_types.hpp"
 #include "../core/string_compare_type.hpp"
-#include "ai_scanner.hpp"
 #include <map>

 /** A list that maps AI names to their AIInfo object. */
@@ -26,7 +25,7 @@ typedef std::map<const char *, class ScriptInfo *, StringCompare> ScriptInfoList
 class AI {
 public:
 	/**
-	 * The default months AIs start after each other.
+	 * The default months AIs start after eachother.
 	 */
 	enum StartNext {
 		START_NEXT_EASY   = DAYS_IN_YEAR * 2,
@@ -68,30 +67,13 @@ public:
 	static void Stop(CompanyID company);

 	/**
-	 * Suspend the AI and then pause execution of the script. The script
-	 * will not be resumed from its suspended state until the script has
-	 * been unpaused.
-	 * @param company The company for which the AI should be paused.
+	 * Suspend an AI for the reminder of the current tick. If the AI is
+	 * in a state when it cannot be suspended, it will continue to run
+	 * until it can be suspended.
+	 * @param company The company for which the AI should be suspended.
 	 * @pre Company::IsValidAiID(company)
 	 */
-	static void Pause(CompanyID company);
-
-	/**
-	 * Resume execution of the AI. This function will not actually execute
-	 * the script, but set a flag so that the script is executed my the usual
-	 * mechanism that executes the script.
-	 * @param company The company for which the AI should be unpaused.
-	 * @pre Company::IsValidAiID(company)
-	 */
-	static void Unpause(CompanyID company);
-
-	/**
-	 * Checks if the AI is paused.
-	 * @param company The company for which to check if the AI is paused.
-	 * @pre Company::IsValidAiID(company)
-	 * @return true if the AI is paused, otherwise false.
-	 */
-	static bool IsPaused(CompanyID company);
+	static void Suspend(CompanyID company);

 	/**
 	 * Kill any and all AIs we manage.
@@ -158,12 +140,6 @@ public:
 	 * found it is removed from the config.
 	 */
 	static void Rescan();
-
-	/** Gets the ScriptScanner instance that is used to find AIs */
-	static AIScannerInfo *GetScannerInfo();
-	/** Gets the ScriptScanner instance that is used to find AI Libraries */
-	static AIScannerLibrary *GetScannerLibrary();
-
 #if defined(ENABLE_NETWORK)
 	/** Wrapper function for AIScanner::HasAI */
 	static bool HasAI(const struct ContentInfo *ci, bool md5sum);
--- a/src/ai/ai_config.cpp
+++ b/src/ai/ai_config.cpp
@@ -28,8 +28,7 @@ ScriptConfigItem _start_date_config = {
 	AI::START_NEXT_DEVIATION,
 	30,
 	SCRIPTCONFIG_NONE,
-	NULL,
-	false
+	NULL
 };

 /* static */ AIConfig *AIConfig::GetConfig(CompanyID company, ScriptSettingSource source)
@@ -80,13 +79,13 @@ int AIConfig::GetSetting(const char *name) const
 {
 	if (this->info == NULL) {
 		SettingValueList::const_iterator it = this->settings.find(name);
-		if (it == this->settings.end()) {
+		if (it == this->settings.end() || GetGameSettings().difficulty.diff_level != 3) {
 			assert(strcmp("start_date", name) == 0);
-			switch (GetGameSettings().script.settings_profile) {
-				case SP_EASY:   return AI::START_NEXT_EASY;
-				case SP_MEDIUM: return AI::START_NEXT_MEDIUM;
-				case SP_HARD:   return AI::START_NEXT_HARD;
-				case SP_CUSTOM: return AI::START_NEXT_MEDIUM;
+			switch (GetGameSettings().difficulty.diff_level) {
+				case 0: return AI::START_NEXT_EASY;
+				case 1: return AI::START_NEXT_MEDIUM;
+				case 2: return AI::START_NEXT_HARD;
+				case 3: return AI::START_NEXT_MEDIUM;
 				default: NOT_REACHED();
 			}
 		}
--- a/src/ai/ai_core.cpp
+++ b/src/ai/ai_core.cpp
@@ -39,7 +39,7 @@
 	/* Clients shouldn't start AIs */
 	if (_networking && !_network_server) return;

-	AIConfig *config = AIConfig::GetConfig(company, AIConfig::SSS_FORCE_GAME);
+	AIConfig *config = AIConfig::GetConfig(company);
 	AIInfo *info = config->GetInfo();
 	if (info == NULL || (rerandomise_ai && config->IsRandom())) {
 		info = AI::scanner_info->SelectRandomAI();
@@ -47,7 +47,6 @@
 		/* Load default data and store the name in the settings */
 		config->Change(info->GetName(), -1, false, true);
 	}
-	config->AnchorUnchangeableSettings();

 	Backup<CompanyByte> cur_company(_current_company, company, FILE_LINE);
 	Company *c = Company::Get(company);
@@ -113,37 +112,16 @@
 	DeleteWindowById(WC_AI_SETTINGS, company);
 }

-/* static */ void AI::Pause(CompanyID company)
+/* static */ void AI::Suspend(CompanyID company)
 {
-	/* The reason why dedicated servers are forbidden to execute this
-	 * command is not because it is unsafe, but because there is no way
-	 * for the server owner to unpause the script again. */
-	if (_network_dedicated) return;
+	if (_networking && !_network_server) return;

 	Backup<CompanyByte> cur_company(_current_company, company, FILE_LINE);
-	Company::Get(company)->ai_instance->Pause();
+	Company::Get(company)->ai_instance->Suspend();

 	cur_company.Restore();
 }

-/* static */ void AI::Unpause(CompanyID company)
-{
-	Backup<CompanyByte> cur_company(_current_company, company, FILE_LINE);
-	Company::Get(company)->ai_instance->Unpause();
-
-	cur_company.Restore();
-}
-
-/* static */ bool AI::IsPaused(CompanyID company)
-{
-	Backup<CompanyByte> cur_company(_current_company, company, FILE_LINE);
-	bool paused = Company::Get(company)->ai_instance->IsPaused();
-
-	cur_company.Restore();
-
-	return paused;
-}
-
 /* static */ void AI::KillAll()
 {
 	/* It might happen there are no companies .. than we have nothing to loop */
@@ -198,7 +176,7 @@

 /* static */ void AI::ResetConfig()
 {
-	/* Check for both newgame as current game if we can reload the AIInfo inside
+	/* Check for both newgame as current game if we can reload the AIInfo insde
 	 *  the AIConfig. If not, remove the AI from the list (which will assign
 	 *  a random new AI on reload). */
 	for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) {
@@ -305,7 +283,7 @@
 {
 	/* Find the first company which doesn't exist yet */
 	for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) {
-		if (!Company::IsValidID(c)) return AIConfig::GetConfig(c, AIConfig::SSS_FORCE_GAME)->GetSetting("start_date");
+		if (!Company::IsValidID(c)) return AIConfig::GetConfig(c)->GetSetting("start_date");
 	}

 	/* Currently no AI can be started, check again in a year. */
@@ -374,14 +352,3 @@
 }

 #endif /* defined(ENABLE_NETWORK) */
-
-/* static */ AIScannerInfo *AI::GetScannerInfo()
-{
-	return AI::scanner_info;
-}
-
-/* static */ AIScannerLibrary *AI::GetScannerLibrary()
-{
-	return AI::scanner_library;
-}
-
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
--- a/src/ai/ai_gui.hpp
+++ b/src/ai/ai_gui.hpp
@@ -14,7 +14,7 @@

 #include "../company_type.h"

-Window* ShowAIDebugWindow(CompanyID show_company = INVALID_COMPANY);
+void ShowAIDebugWindow(CompanyID show_company = INVALID_COMPANY);
 void ShowAIConfigWindow();
 void ShowAIDebugWindowIfAIError();
 void InitializeAIGui();
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
rubidium	25e2e61dfe	(svn r24046) -Release: 1.2.0-RC3	2012-03-18 17:13:32 +00:00
rubidium	c70e680e5e	(svn r24045) [1.2] -Update: some documentation	2012-03-18 17:08:27 +00:00
rubidium	50fa7f679f	(svn r24044) [1.2] -Fix: forgot some languages	2012-03-18 17:04:22 +00:00
rubidium	8545ab9c22	(svn r24043) [1.2] -Backport from trunk: string updates	2012-03-18 17:00:47 +00:00
rubidium	9c36498695	(svn r24041) [1.2] -Backport from trunk: - Fix: After opening a text window with the monospaced font, all other text started glitching (r24038) - Feature: Allow display of baseset textfiles (r24037)	2012-03-18 16:47:16 +00:00
rubidium	d5e69ff1fa	(svn r24036) [1.2] -Change: the title game from the title game competition (sc79). Some changes have been made outside of the view to reduce the file size significantly (chop trees, flatten ground)	2012-03-17 11:49:26 +00:00
rubidium	908ff68459	(svn r24034) [1.2] -Backport from trunk: - Feature: Increase the station class limit from 32 to 256 (r24031) - Fix: [NoAI] reset 'is random' status of temporary variable during saveload as it is not always written to when loading an AI which means it wouldd be taking the 'is random' setting of another AI (r24033) - Fix: [NoAI] Make AIEngine::IsArticulated return true if the articulated callback flag is set, do not try to run the callback (r24029) - Fix: Pass cases down into the list of cargos [FS#5090] (r24024, r24023, r24022)	2012-03-17 11:20:43 +00:00
rubidium	b6d5e4d60c	(svn r24014) [1.2] -Prepare for 1.2.0-RC2	2012-03-04 17:16:37 +00:00
rubidium	d793f89ec3	(svn r24013) [1.2] -Backport language updates from trunk	2012-03-04 17:12:36 +00:00
rubidium	32aee004c6	(svn r24010) [1.2] -Fix: forgot to backport r23992	2012-03-04 17:01:23 +00:00
rubidium	5814764af9	(svn r24009) [1.2] -Backport from trunk: - Fix: [Script] AI used in names in API for GSOrder [FS#5088] (r24006)	2012-03-04 16:56:41 +00:00
rubidium	e19915d824	(svn r24007) [1.2] -Backport from trunk: - Fix: Improve rounding when converting display speeds to internal speeds [FS#5079] (r23995) - Fix: Also reset the font glyph cache when switching blitters (r23992, r23987) - Fix: [NewGRF] Also display the cargo subtype for vehicles which have no capacity, but a subtype [FS#5076] (r23991)	2012-03-04 16:43:35 +00:00
rubidium	9bcd02e389	(svn r24005) [1.2] -Backport from trunk: - Fix: Fix the order of lights on the helipad [FS#5082] (r23984)	2012-03-04 16:39:12 +00:00
rubidium	2ab087f31f	(svn r24004) [1.2] -Backport from trunk: - Fix: Zero the offsets of disabled zoomlevels, so they do not influence offset calculations (r23989) - Fix: Invalid reads when scaling an odd-sized sprite smaller (r23986) - Fix: Inconsistent quit/abandon/exit game/scenario/editor strings [FS#5074] (r23985) - Fix: Tarred heightmaps would not be found [FS#5083] (r23983)	2012-03-04 16:38:05 +00:00
rubidium	9d168228e7	(svn r24003) [1.2] -Backport from trunk: - Fix: Do not load a game during UpdateWindows as that might trigger changing the blitter which triggers re-entrant locking (r23980, r23977) - Fix: [SDL] Palette update was done too late making switching from 8bpp -> 32bpp look ugly (r23978) - Fix: Sprites of different zoom levels were not always padded correctly to a common size (r23976) - Fix: Also save the maximum travel speed for the current vehicle order (r23973)	2012-03-04 16:33:13 +00:00
rubidium	8f8be22bc9	(svn r23970) [1.2] -Prepare: 1.2.0-RC1	2012-02-19 19:53:20 +00:00
rubidium	ebb7d2084b	(svn r23968) [1.2] -Branch: there we go...	2012-02-19 19:07:09 +00:00