Updated translations, updated settigns GUI

- Change: When train depots have a horizontal scrollbar, allow scrolling 1 tile beyond the longest train, so you can actually attach a wagon at the end (r27937)
- Fix: When moving wagons in the depot, the drag highlight did not exactly match the length of the dragged wagon chain (r27936)
- Fix: [Win32] Right mouse scrolling didn't work properly with the Windows 10 Fall Creators Update [FS#6629] (r27935)
- Fix: Forest, candyfloss forest and battery farm skipped the first animation frame [FS#6639] (r27932)
- Fix: Glyphs in range U+0020 to U+00FF may only be defined in orig_extra.grf, not in openttd.grf [FS#6620] (r27915)

.gitignore

@@ -7,6 +7,7 @@ bin/ai/*
 bin/baseset/*
 !bin/baseset/openttd.grf
 !bin/baseset/opntitle.dat
+!bin/baseset/orig_extra.grf
 !bin/baseset/orig_*.obg
 !bin/baseset/orig_*.obs
 !bin/baseset/no_sound.obs

.ottdrev

@@ -1 +1 @@
-1.4.4	27029	0	1.4.4
+1.7.2	27949	0	1.7.2

Doxyfile

@@ -195,7 +195,7 @@ EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           =
 INCLUDE_FILE_PATTERNS  =
-PREDEFINED             = ENABLE_NETWORK WITH_ZLIB WITH_LZO WITH_LZMA WITH_SDL WITH_PNG WITH_FONTCONFIG WITH_FREETYPE WITH_ICU UNICODE _UNICODE _GNU_SOURCE FINAL=
+PREDEFINED             = ENABLE_NETWORK WITH_ZLIB WITH_LZO WITH_LZMA WITH_SDL WITH_PNG WITH_FONTCONFIG WITH_FREETYPE WITH_ICU_SORT WITH_ICU_LAYOUT UNICODE _UNICODE _GNU_SOURCE FINAL=
 EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------

Makefile.bundle.in

@@ -84,7 +84,7 @@ 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 | LC_ALL=C $(SORT) |  $(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.filter.awk" >> "$(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)
@@ -172,6 +172,7 @@ install: bundle
 	$(Q)install -d "$(INSTALL_BINARY_DIR)"
 	$(Q)install -d "$(INSTALL_ICON_DIR)"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/ai"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/game"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/baseset"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/lang"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/scripts"
@@ -182,6 +183,7 @@ else
 endif
 	$(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/ai/"* "$(INSTALL_DATA_DIR)/ai"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/game/"* "$(INSTALL_DATA_DIR)/game"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/baseset/"* "$(INSTALL_DATA_DIR)/baseset"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/scripts/"* "$(INSTALL_DATA_DIR)/scripts"
 ifndef DO_NOT_INSTALL_DOCS

Makefile.grf.in

@@ -5,16 +5,13 @@
 # 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/>.
 #
-# Building requires GRFCodec and NFORenum. Older versions of GRFCodec are
+# Building requires GRFCodec.
-#  known to miscompile the graphics.
 #
-# Recent nightlies (including sources) of both can be found at:
+# Recent versions (including sources) can be found at:
 #  http://www.openttd.org/download-grfcodec
-#  http://www.openttd.org/download-nforenum
 #
-# The mercurial repository of both can be found at:
+# The mercurial repository can be found at:
 #  http://hg.openttdcoop.org/grfcodec
-#  http://hg.openttdcoop.org/nforenum
 #
 
 
@@ -47,22 +44,18 @@ 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 $(BIN_DIR)/orig_extra.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
 else
 all:
 endif
 
-# Make sure the sprites directory exists.
-$(OBJS_DIR)/sprites:
-	$(Q)-mkdir "$@"
-
 $(OBJS_DIR)/langfiles.tmp: $(LANG_DIR)/*.txt
 	$(E) '$(STAGE) Collecting baseset translations'
 	$(Q) cat $^ > $@
 
-$(BIN_DIR)/%.obg: $(BASESET_DIR)/%.obg $(BIN_DIR)/openttd.grf $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/translations.awk
+$(BIN_DIR)/%.obg: $(BASESET_DIR)/%.obg $(BIN_DIR)/orig_extra.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) sed 's/^ORIG_EXTRA.GRF    = *[0-9a-f]*$$/ORIG_EXTRA.GRF    = '`$(MD5SUM) $(BIN_DIR)/orig_extra.grf | sed 's@ .*@@'`'/' $< > $@.tmp
 	$(Q) awk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $@.tmp >$@
 	$(Q) rm $@.tmp
 
@@ -75,8 +68,9 @@ $(BIN_DIR)/%.obm: $(BASESET_DIR)/%.obm $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/
 	$(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 $(GRF_DIR)/assemble_nfo.awk
+$(BIN_DIR)/openttd.grf: $(PNG_FILES) $(NFO_FILES) $(GRF_DIR)/assemble_nfo.awk
 	$(E) '$(STAGE) Assembling openttd.nfo'
+	$(Q)-mkdir -p $(OBJS_DIR)/sprites
 	$(Q)-cp $(PNG_FILES) $(OBJS_DIR)/sprites 2> /dev/null
 	$(Q) awk -f $(GRF_DIR)/assemble_nfo.awk $(GRF_DIR)/openttd.nfo > $(OBJS_DIR)/sprites/openttd.nfo
 	$(Q) $(NFORENUM) -s $(OBJS_DIR)/sprites/openttd.nfo
@@ -84,6 +78,17 @@ $(BIN_DIR)/openttd.grf: $(PNG_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites $(GRF_DIR)
 	$(Q) $(GRFCODEC) -n -s -e -p1 $(OBJS_DIR)/openttd.grf
 	$(Q)cp $(OBJS_DIR)/openttd.grf $(BIN_DIR)/openttd.grf
 
+# The copy operation of PNG_FILES is duplicated from the target 'openttd.grf', thus those targets may not run in parallel.
+$(BIN_DIR)/orig_extra.grf: $(PNG_FILES) $(NFO_FILES) $(GRF_DIR)/assemble_nfo.awk | $(BIN_DIR)/openttd.grf
+	$(E) '$(STAGE) Assembling orig_extra.nfo'
+	$(Q)-mkdir -p $(OBJS_DIR)/sprites
+	$(Q)-cp $(PNG_FILES) $(OBJS_DIR)/sprites 2> /dev/null
+	$(Q) awk -f $(GRF_DIR)/assemble_nfo.awk $(GRF_DIR)/orig_extra.nfo > $(OBJS_DIR)/sprites/orig_extra.nfo
+	$(Q) $(NFORENUM) -s $(OBJS_DIR)/sprites/orig_extra.nfo
+	$(E) '$(STAGE) Compiling orig_extra.grf'
+	$(Q) $(GRFCODEC) -n -s -e -p1 $(OBJS_DIR)/orig_extra.grf
+	$(Q)cp $(OBJS_DIR)/orig_extra.grf $(BIN_DIR)/orig_extra.grf
+
 # Clean up temporary files.
 clean:
 	$(Q)rm -f *.bak *.grf

Makefile.in

@@ -152,7 +152,7 @@ mrproper:
 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 $(BIN_DIR)/baseset/orig_extra.grf $(BIN_DIR)/baseset/*.obg $(BIN_DIR)/baseset/*.obs $(BIN_DIR)/baseset/*.obm
 
 depend:
 	@for dir in $(SRC_DIRS); do \

Makefile.lang.in

@@ -43,23 +43,23 @@ RES := $(shell mkdir -p $(BIN_DIR)/lang )
 
 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
+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 $(SRC_DIR)/safeguards.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_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
+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 $(SRC_DIR)/safeguards.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
 
-string.o: $(SRC_DIR)/string.cpp endian_host.h
+string.o: $(SRC_DIR)/string.cpp endian_host.h $(SRC_DIR)/safeguards.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
 
-alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h
+alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h $(SRC_DIR)/safeguards.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
 
-getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h
+getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h $(SRC_DIR)/safeguards.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/misc/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
 

Makefile.setting.in

@@ -28,23 +28,23 @@ endif
 
 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
+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 $(SRC_DIR)/safeguards.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
 
-alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h
+alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h $(SRC_DIR)/safeguards.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
 
-getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h
+getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h $(SRC_DIR)/safeguards.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/misc/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
 
-string.o: $(SRC_DIR)/string.cpp endian_host.h
+string.o: $(SRC_DIR)/string.cpp endian_host.h $(SRC_DIR)/safeguards.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_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
+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 $(SRC_DIR)/safeguards.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
 

Makefile.src.in

@@ -210,7 +210,7 @@ endif
 	{                                   \
 		print $$0                         \
 	}                                   \
-	' < Makefile.dep.tmp | sed 's@  *@ @g;s@ $$@@' | $(SORT) > Makefile.dep
+	' < Makefile.dep.tmp | sed 's@  *@ @g;s@ $$@@' | LC_ALL=C $(SORT) > Makefile.dep
 
 	$(Q)rm -f Makefile.dep.tmp Makefile.dep.tmp.bak
 

android-extract-strings.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+mkdir -p ../translations/lang
+git diff 1.7/master -- src/lang/english.txt | tail -n +5 | grep '^[+]' | cut -b 2- | \
+grep -v "^STR_TABLET_CLOSE\b" | \
+grep -v "^STR_TABLET_SHIFT\b" | \
+grep -v "^STR_TABLET_CTRL\b" | \
+cat > ../translations/lang/english.txt
+
+for f in src/lang/*.txt; do
+	[ "$f" = src/lang/english.txt ] && continue
+	rm -f ../translations/lang/`basename $f`
+	cat ../translations/lang/english.txt | grep '^STR' | while read name text; do
+		grep "^$name\b" $f >> ../translations/lang/`basename $f`
+	done
+done

android-store-strings.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+for f in ../translations/lang/*.txt; do
+	[ "$f" = ../translations/lang/english.txt ] && continue
+	out=src/lang/`basename $f`
+	grep "^# Android strings" $out > /dev/null || [ -z "`tail -c 2 $out`" ] || echo >> $out
+	{ grep -v "^# Android strings" $out ; echo "# Android strings" ; } > $out.new
+	mv -f $out.new $out
+	cat $f | grep '^STR' | while read name text; do
+		{ grep -v "^$name\b" $out ; printf "%-64s%s\n" "$name" "$text" ; } > $out.new
+		mv -f $out.new $out
+	done
+done

bin/ai/compat_1.5.nut

@@ -6,3 +6,5 @@
  * 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.5 API compatibility in effect.");

bin/ai/compat_1.6.nut

@@ -0,0 +1,10 @@
+/* $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.6 API compatibility in effect.");

bin/ai/compat_1.7.nut

@@ -0,0 +1,8 @@
+/* $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/>.
+ */

bin/ai/regression/completeness.sh

@@ -2,12 +2,12 @@
 
 # $Id$
 
-if ! [ -f ai/regression/regression.nut ]; then
+if ! [ -f ai/regression/completeness.sh ]; then
 	echo "Make sure you are in the root of OpenTTD before starting this script."
 	exit 1
 fi
 
-cat ai/regression/regression.nut | tr ';' '\n' | awk '
+cat ai/regression/tst_*/main.nut | tr ';' '\n' | awk '
 /^function/ {
 	for (local in locals) {
 		delete locals[local]
@@ -61,7 +61,7 @@ cat ai/regression/regression.nut | tr ';' '\n' | awk '
 }
 ' | sed 's/	//g' | sort | uniq > tmp.in_regression
 
-grep 'DefSQ.*Method' ../src/ai/api/*.hpp.sq | grep -v 'AIError::' | grep -v 'AIAbstractList::Valuate' | grep -v '::GetClassName' | sed 's/^[^,]*, &//g;s/,[^,]*//g' | sort > tmp.in_api
+grep 'DefSQ.*Method' ../src/script/api/ai/*.hpp.sq | grep -v 'AIError::' | grep -v 'AIAbstractList::Valuate' | grep -v '::GetClassName' | sed 's/^[^,]*, &//g;s/,[^,]*//g' | sort > tmp.in_api
 
 diff -u tmp.in_regression tmp.in_api | grep -v '^+++' | grep '^+' | sed 's/^+//'
 

bin/ai/regression/regression_info.nut

@@ -4,9 +4,9 @@ class Regression extends AIInfo {
 	function GetAuthor()      { return "OpenTTD NoAI Developers Team"; }
 	function GetName()        { return "Regression"; }
 	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 GetDescription() { return "This runs regression-tests on some commands. On the same map the result should always be the same."; }
 	function GetVersion()     { return 1; }
-	function GetAPIVersion()  { return "1.5"; }
+	function GetAPIVersion()  { return "1.7"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
 }

bin/ai/regression/run.sh

@@ -2,14 +2,11 @@
 
 # $Id$
 
-if ! [ -f ai/regression/regression.nut ]; then
+if ! [ -f ai/regression/run.sh ]; then
 	echo "Make sure you are in the root of OpenTTD before starting this script."
 	exit 1
 fi
 
-cp ai/regression/regression.nut ai/regression/main.nut
-cp ai/regression/regression_info.nut ai/regression/info.nut
-
 if [ -f scripts/game_start.scr ]; then
 	mv scripts/game_start.scr scripts/game_start.scr.regression
 fi
@@ -22,27 +19,46 @@ fi
 if [ "$1" = "-g" ]; then
 	gdb="gdb --ex run --args "
 fi
-if [ -n "$gdb" ]; then
+
-	$gdb ./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav
+if [ -d "ai/regression/tst_$1" ]; then
+	tests="ai/regression/tst_$1"
+elif [ -d "ai/regression/tst_$2" ]; then
+	tests="ai/regression/tst_$2"
 else
-	./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav -d script=2 -d misc=9 2>&1 | awk '{ gsub("0x(\\(nil\\)|0+)(x0)?", "0x00000000", $0); gsub("^dbg: \\[script\\]", "", $0); gsub("^ ", "ERROR: ", $0); gsub("ERROR: \\[1\\] ", "", $0); gsub("\\[P\\] ", "", $0); print $0; }' | grep -v '^dbg: \[.*\]' > tmp.regression
+	tests=ai/regression/tst_*
 fi
 
 ret=0
-if [ -z "$gdb" ]; then
+for tst in $tests; do
-	res="`diff -ub ai/regression/regression.txt tmp.regression`"
+	echo -n "Running $tst... "
-	if [ -z "$res" ]; then
-		echo "Regression test passed!"
-	else
-		echo "Regression test failed! Difference:"
-		echo "$res"
-		ret=1
-	fi
-	echo ""
-	echo "Regression test done"
-fi
 
-rm -f ai/regression/main.nut ai/regression/info.nut
+	# Make sure that only one info.nut is present for each test run. Otherwise openttd gets confused.
+	cp ai/regression/regression_info.nut $tst/info.nut
+
+	sav=$tst/test.sav
+	if ! [ -f $sav ]; then
+		sav=ai/regression/empty.sav
+	fi
+
+	if [ -n "$gdb" ]; then
+		$gdb ./openttd -x -c ai/regression/regression.cfg $params -g $sav
+	else
+		./openttd -x -c ai/regression/regression.cfg $params -g $sav -d script=2 -d misc=9 2>&1 | awk '{ gsub("0x(\\(nil\\)|0+)(x0)?", "0x00000000", $0); gsub("^dbg: \\[script\\]", "", $0); gsub("^ ", "ERROR: ", $0); gsub("ERROR: \\[1\\] ", "", $0); gsub("\\[P\\] ", "", $0); print $0; }' | grep -v '^dbg: \[.*\]' > tmp.regression
+	fi
+
+	if [ -z "$gdb" ]; then
+		res="`diff -ub $tst/result.txt tmp.regression`"
+		if [ -z "$res" ]; then
+			echo "passed!"
+		else
+			echo "failed! Difference:"
+			echo "$res"
+			ret=1
+		fi
+	fi
+
+	rm $tst/info.nut
+done
 
 if [ -f scripts/game_start.scr.regression ]; then
 	mv scripts/game_start.scr.regression scripts/game_start.scr

bin/ai/regression/tst_regression/main.nut

@@ -972,48 +972,7 @@ function Regression::Order()
 	print("  SetStopLocation():     " + AIOrder.SetStopLocation(20, 0, AIOrder.STOPLOCATION_MIDDLE));
 	print("  GetStopLocation():     " + AIOrder.GetStopLocation(20, 0));
 
-	local list = AIStationList_Vehicle(12);
+	local list = AIVehicleList_Station(3);
-
-	print("");
-	print("--StationList_Vehicle--");
-	print("  Count():             " + list.Count());
-	list.Valuate(AIStation.GetLocation);
-	print("  Location ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.GetCargoWaiting, 0);
-	print("  CargoWaiting(0) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.GetCargoWaiting, 1);
-	print("  CargoWaiting(1) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.GetCargoRating, 1);
-	print("  CargoRating(1) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.GetDistanceManhattanToTile, 30000);
-	print("  DistanceManhattanToTile(30000) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.GetDistanceSquareToTile, 30000);
-	print("  DistanceSquareToTile(30000) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.IsWithinTownInfluence, 0);
-	print("  IsWithinTownInfluence(0) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-
-	list = AIVehicleList_Station(3);
 
 	print("");
 	print("--VehicleList_Station--");
@@ -1234,10 +1193,6 @@ function Regression::Station()
 	print("  GetLocation(1000):        " + AIStation.GetLocation(1000));
 	print("  GetStationID(33411):      " + AIStation.GetStationID(33411));
 	print("  GetStationID(34411):      " + AIStation.GetStationID(34411));
-	print("  GetCargoWaiting(0, 0):    " + AIStation.GetCargoWaiting(0, 0));
-	print("  GetCargoWaiting(1000, 0): " + AIStation.GetCargoWaiting(1000, 0));
-	print("  GetCargoWaiting(0, 1000): " + AIStation.GetCargoWaiting(0, 1000));
-
 	print("  GetStationID(33411):      " + AIStation.GetStationID(33411));
 	print("  HasRoadType(3, TRAM):     " + AIStation.HasRoadType(3, AIRoad.ROADTYPE_TRAM));
 	print("  HasRoadType(3, ROAD):     " + AIStation.HasRoadType(3, AIRoad.ROADTYPE_ROAD));
@@ -1254,25 +1209,42 @@ function Regression::Station()
 	print("  GetNearestTown():         " + AIStation.GetNearestTown(10000));
 	print("  GetNearestTown():         " + AIStation.GetNearestTown(3));
 
-	local list = AIStationList(AIStation.STATION_BUS_STOP + AIStation.STATION_TRUCK_STOP);
+	print("");
+	print("--CargoWaiting--");
+	for (local cargo = 0; cargo <= 1000; cargo += 1000) {
+		for (local station0 = 0; station0 <= 1000; station0 += 1000) {
+			print("  GetCargoWaiting(" + station0 + ", " + cargo + "): " +
+					AIStation.GetCargoWaiting(station0, cargo));
+			for (local station1 = 0; station1 <= 1000; station1 += 1000) {
+				print("  GetCargoWaitingFrom(" + station0 + ", " + station1 + ", " + cargo + "): " +
+						AIStation.GetCargoWaitingFrom(station0, station1, cargo));
+				print("  GetCargoWaitingVia(" + station0 + ", " + station1 + ", " + cargo + "): " +
+						AIStation.GetCargoWaitingFrom(station0, station1, cargo));
+				for (local station2 = 0; station2 <= 1000; station2 += 1000) {
+					print("  GetCargoWaitingFromVia(" + station0 + ", " + station1 + ", " + station2 + ", " + cargo + "): " +
+							AIStation.GetCargoWaitingFromVia(station0, station1, station2, cargo));
+				}
+			}
+		}
+	}
 
 	print("");
-	print("--StationList--");
+	print("--CargoPlanned--");
-	print("  Count():             " + list.Count());
+	for (local cargo = 0; cargo <= 1000; cargo += 1000) {
-	list.Valuate(AIStation.GetLocation);
+		for (local station0 = 0; station0 <= 1000; station0 += 1000) {
-	print("  Location ListDump:");
+			print("  GetCargoPlanned(" + station0 + ", " + cargo + "): " +
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+					AIStation.GetCargoPlanned(station0, cargo));
-		print("    " + i + " => " + list.GetValue(i));
+			for (local station1 = 0; station1 <= 1000; station1 += 1000) {
-	}
+				print("  GetCargoPlannedFrom(" + station0 + ", " + station1 + ", " + cargo + "): " +
-	list.Valuate(AIStation.GetCargoWaiting, 0);
+						AIStation.GetCargoPlannedFrom(station0, station1, cargo));
-	print("  CargoWaiting(0) ListDump:");
+				print("  GetCargoPlannedVia(" + station0 + ", " + station1 + ", " + cargo + "): " +
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+						AIStation.GetCargoPlannedFrom(station0, station1, cargo));
-		print("    " + i + " => " + list.GetValue(i));
+				for (local station2 = 0; station2 <= 1000; station2 += 1000) {
-	}
+					print("  GetCargoPlannedFromVia(" + station0 + ", " + station1 + ", " + station2 + ", " + cargo + "): " +
-	list.Valuate(AIStation.GetCargoWaiting, 1);
+							AIStation.GetCargoPlannedFromVia(station0, station1, station2, cargo));
-	print("  CargoWaiting(1) ListDump:");
+				}
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+			}
-		print("    " + i + " => " + list.GetValue(i));
+		}
 	}
 }
 

bin/ai/regression/tst_regression/result.txt

@@ -7487,9 +7487,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
   GetLocation(1000):        -1
   GetStationID(33411):      4
   GetStationID(34411):      65535
-  GetCargoWaiting(0, 0):    0
-  GetCargoWaiting(1000, 0): -1
-  GetCargoWaiting(0, 1000): -1
   GetStationID(33411):      4
   HasRoadType(3, TRAM):     false
   HasRoadType(3, ROAD):     false
@@ -7504,17 +7501,81 @@ ERROR: IsEnd() is invalid as Begin() is never called
   GetNearestTown():         65535
   GetNearestTown():         10
 
---StationList--
+--CargoWaiting--
-  Count():             2
+  GetCargoWaiting(0, 0): 0
-  Location ListDump:
+  GetCargoWaitingFrom(0, 0, 0): 0
-    5 => 33421
+  GetCargoWaitingVia(0, 0, 0): 0
-    4 => 33411
+  GetCargoWaitingFromVia(0, 0, 0, 0): 0
-  CargoWaiting(0) ListDump:
+  GetCargoWaitingFromVia(0, 0, 1000, 0): -1
-    5 => 0
+  GetCargoWaitingFrom(0, 1000, 0): -1
-    4 => 0
+  GetCargoWaitingVia(0, 1000, 0): -1
-  CargoWaiting(1) ListDump:
+  GetCargoWaitingFromVia(0, 1000, 0, 0): -1
-    5 => 0
+  GetCargoWaitingFromVia(0, 1000, 1000, 0): -1
-    4 => 0
+  GetCargoWaiting(1000, 0): -1
+  GetCargoWaitingFrom(1000, 0, 0): -1
+  GetCargoWaitingVia(1000, 0, 0): -1
+  GetCargoWaitingFromVia(1000, 0, 0, 0): -1
+  GetCargoWaitingFromVia(1000, 0, 1000, 0): -1
+  GetCargoWaitingFrom(1000, 1000, 0): -1
+  GetCargoWaitingVia(1000, 1000, 0): -1
+  GetCargoWaitingFromVia(1000, 1000, 0, 0): -1
+  GetCargoWaitingFromVia(1000, 1000, 1000, 0): -1
+  GetCargoWaiting(0, 1000): -1
+  GetCargoWaitingFrom(0, 0, 1000): -1
+  GetCargoWaitingVia(0, 0, 1000): -1
+  GetCargoWaitingFromVia(0, 0, 0, 1000): -1
+  GetCargoWaitingFromVia(0, 0, 1000, 1000): -1
+  GetCargoWaitingFrom(0, 1000, 1000): -1
+  GetCargoWaitingVia(0, 1000, 1000): -1
+  GetCargoWaitingFromVia(0, 1000, 0, 1000): -1
+  GetCargoWaitingFromVia(0, 1000, 1000, 1000): -1
+  GetCargoWaiting(1000, 1000): -1
+  GetCargoWaitingFrom(1000, 0, 1000): -1
+  GetCargoWaitingVia(1000, 0, 1000): -1
+  GetCargoWaitingFromVia(1000, 0, 0, 1000): -1
+  GetCargoWaitingFromVia(1000, 0, 1000, 1000): -1
+  GetCargoWaitingFrom(1000, 1000, 1000): -1
+  GetCargoWaitingVia(1000, 1000, 1000): -1
+  GetCargoWaitingFromVia(1000, 1000, 0, 1000): -1
+  GetCargoWaitingFromVia(1000, 1000, 1000, 1000): -1
+
+--CargoPlanned--
+  GetCargoPlanned(0, 0): 0
+  GetCargoPlannedFrom(0, 0, 0): 0
+  GetCargoPlannedVia(0, 0, 0): 0
+  GetCargoPlannedFromVia(0, 0, 0, 0): 0
+  GetCargoPlannedFromVia(0, 0, 1000, 0): -1
+  GetCargoPlannedFrom(0, 1000, 0): -1
+  GetCargoPlannedVia(0, 1000, 0): -1
+  GetCargoPlannedFromVia(0, 1000, 0, 0): -1
+  GetCargoPlannedFromVia(0, 1000, 1000, 0): -1
+  GetCargoPlanned(1000, 0): -1
+  GetCargoPlannedFrom(1000, 0, 0): -1
+  GetCargoPlannedVia(1000, 0, 0): -1
+  GetCargoPlannedFromVia(1000, 0, 0, 0): -1
+  GetCargoPlannedFromVia(1000, 0, 1000, 0): -1
+  GetCargoPlannedFrom(1000, 1000, 0): -1
+  GetCargoPlannedVia(1000, 1000, 0): -1
+  GetCargoPlannedFromVia(1000, 1000, 0, 0): -1
+  GetCargoPlannedFromVia(1000, 1000, 1000, 0): -1
+  GetCargoPlanned(0, 1000): -1
+  GetCargoPlannedFrom(0, 0, 1000): -1
+  GetCargoPlannedVia(0, 0, 1000): -1
+  GetCargoPlannedFromVia(0, 0, 0, 1000): -1
+  GetCargoPlannedFromVia(0, 0, 1000, 1000): -1
+  GetCargoPlannedFrom(0, 1000, 1000): -1
+  GetCargoPlannedVia(0, 1000, 1000): -1
+  GetCargoPlannedFromVia(0, 1000, 0, 1000): -1
+  GetCargoPlannedFromVia(0, 1000, 1000, 1000): -1
+  GetCargoPlanned(1000, 1000): -1
+  GetCargoPlannedFrom(1000, 0, 1000): -1
+  GetCargoPlannedVia(1000, 0, 1000): -1
+  GetCargoPlannedFromVia(1000, 0, 0, 1000): -1
+  GetCargoPlannedFromVia(1000, 0, 1000, 1000): -1
+  GetCargoPlannedFrom(1000, 1000, 1000): -1
+  GetCargoPlannedVia(1000, 1000, 1000): -1
+  GetCargoPlannedFromVia(1000, 1000, 0, 1000): -1
+  GetCargoPlannedFromVia(1000, 1000, 1000, 1000): -1
 
 --Tile--
   HasTreeOnTile():      false
@@ -9106,30 +9167,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
   SetStopLocation():     true
   GetStopLocation():     1
 
---StationList_Vehicle--
-  Count():             2
-  Location ListDump:
-    5 => 33421
-    4 => 33411
-  CargoWaiting(0) ListDump:
-    5 => 0
-    4 => 0
-  CargoWaiting(1) ListDump:
-    5 => 0
-    4 => 0
-  CargoRating(1) ListDump:
-    5 => -1
-    4 => -1
-  DistanceManhattanToTile(30000) ListDump:
-    5 => 106
-    4 => 96
-  DistanceSquareToTile(30000) ListDump:
-    5 => 8818
-    4 => 7058
-  IsWithinTownInfluence(0) ListDump:
-    5 => 0
-    4 => 0
-
 --VehicleList_Station--
   Count():             1
   Location ListDump:

bin/ai/regression/tst_stationlist/main.nut

@@ -0,0 +1,216 @@
+/* $Id$ */
+
+class Regression extends AIController {
+	function Start();
+};
+
+
+function Regression::StationList()
+{
+	local list = AIStationList(AIStation.STATION_BUS_STOP + AIStation.STATION_TRUCK_STOP);
+
+	print("");
+	print("--StationList--");
+	print("  Count():             " + list.Count());
+	list.Valuate(AIStation.GetLocation);
+	print("  Location ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+	list.Valuate(AIStation.GetCargoWaiting, 0);
+	print("  CargoWaiting(0) ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+	list.Valuate(AIStation.GetCargoWaiting, 1);
+	print("  CargoWaiting(1) ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+};
+
+function Regression::StationList_Cargo()
+{
+	print("");
+	print("--StationList_Cargo--");
+
+	for (local mode = AIStationList_Cargo.CM_WAITING; mode <= AIStationList_Cargo.CM_PLANNED; ++mode) {
+		print("  " + mode);
+		for (local selector = AIStationList_Cargo.CS_BY_FROM; selector <= AIStationList_Cargo.CS_FROM_BY_VIA ; ++selector) {
+			print("    " + selector);
+			local list = AIStationList_Cargo(mode, selector, 6, 0, 7);
+			for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+				print("      " + i + " => " + list.GetValue(i));
+			}
+		}
+	}
+};
+
+function Regression::StationList_CargoPlanned()
+{
+	print("");
+	print("--StationList_CargoPlanned--");
+
+	for (local selector = AIStationList_Cargo.CS_BY_FROM; selector <= AIStationList_Cargo.CS_FROM_BY_VIA; ++selector) {
+		print("    " + selector);
+		local list = AIStationList_CargoPlanned(selector, 6, 0, 7);
+		for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+			print("      " + i + " => " + list.GetValue(i));
+		}
+	}
+};
+
+function Regression::StationList_CargoPlannedByFrom()
+{
+	print("");
+	print("--StationList_CargoPlannedByFrom--");
+	local list = AIStationList_CargoPlannedByFrom(2, 0);
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("      " + i + " => " + list.GetValue(i));
+	}
+};
+
+function Regression::StationList_CargoPlannedByVia()
+{
+	print("");
+	print("--StationList_CargoPlannedByVia--");
+	local list = AIStationList_CargoPlannedByVia(2, 0);
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("      " + i + " => " + list.GetValue(i));
+	}
+};
+
+function Regression::StationList_CargoPlannedViaByFrom()
+{
+	print("");
+	print("--StationList_CargoPlannedViaByFrom--");
+	local list = AIStationList_CargoPlannedViaByFrom(6, 0, 7);
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("      " + i + " => " + list.GetValue(i));
+	}
+};
+
+function Regression::StationList_CargoPlannedFromByVia()
+{
+	print("");
+	print("--StationList_CargoPlannedFromByVia--");
+	local list = AIStationList_CargoPlannedFromByVia(6, 0, 7);
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("      " + i + " => " + list.GetValue(i));
+	}
+};
+
+function Regression::StationList_CargoWaiting()
+{
+	print("");
+	print("--StationList_CargoWaiting--");
+
+	for (local selector = AIStationList_Cargo.CS_BY_FROM; selector <= AIStationList_Cargo.CS_FROM_BY_VIA; ++selector) {
+		print("    " + selector);
+		local list = AIStationList_CargoWaiting(selector, 6, 0, 7);
+		for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+			print("      " + i + " => " + list.GetValue(i));
+		}
+	}
+};
+
+function Regression::StationList_CargoWaitingByFrom()
+{
+	print("");
+	print("--StationList_CargoWaitingByFrom--");
+	local list = AIStationList_CargoWaitingByFrom(2, 0);
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("      " + i + " => " + list.GetValue(i));
+	}
+};
+
+function Regression::StationList_CargoWaitingByVia()
+{
+	print("");
+	print("--StationList_CargoWaitingByVia--");
+	local list = AIStationList_CargoWaitingByVia(2, 0);
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("      " + i + " => " + list.GetValue(i));
+	}
+};
+
+function Regression::StationList_CargoWaitingViaByFrom()
+{
+	print("");
+	print("--StationList_CargoWaitingViaByFrom--");
+	local list = AIStationList_CargoWaitingViaByFrom(6, 0, 7);
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("      " + i + " => " + list.GetValue(i));
+	}
+};
+
+function Regression::StationList_CargoWaitingFromByVia()
+{
+	print("");
+	print("--StationList_CargoWaitingFromByVia--");
+	local list = AIStationList_CargoWaitingFromByVia(2, 0, 2);
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("      " + i + " => " + list.GetValue(i));
+	}
+};
+
+function Regression::StationList_Vehicle()
+{
+	local list = AIStationList_Vehicle(12);
+
+	print("");
+	print("--StationList_Vehicle--");
+	print("  Count():             " + list.Count());
+	list.Valuate(AIStation.GetLocation);
+	print("  Location ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+	list.Valuate(AIStation.GetCargoWaiting, 0);
+	print("  CargoWaiting(0) ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+	list.Valuate(AIStation.GetCargoWaiting, 1);
+	print("  CargoWaiting(1) ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+	list.Valuate(AIStation.GetCargoRating, 1);
+	print("  CargoRating(1) ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+	list.Valuate(AIStation.GetDistanceManhattanToTile, 30000);
+	print("  DistanceManhattanToTile(30000) ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+	list.Valuate(AIStation.GetDistanceSquareToTile, 30000);
+	print("  DistanceSquareToTile(30000) ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+	list.Valuate(AIStation.IsWithinTownInfluence, 0);
+	print("  IsWithinTownInfluence(0) ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+}
+
+function Regression::Start()
+{
+	StationList();
+	StationList_Cargo();
+	StationList_CargoPlanned();
+	StationList_CargoPlannedByFrom();
+	StationList_CargoPlannedByVia();
+	StationList_CargoPlannedViaByFrom();
+	StationList_CargoPlannedFromByVia();
+	StationList_CargoWaiting();
+	StationList_CargoWaitingByFrom();
+	StationList_CargoWaitingByVia();
+	StationList_CargoWaitingViaByFrom();
+	StationList_CargoWaitingFromByVia();
+	StationList_Vehicle();
+}

bin/ai/regression/tst_stationlist/result.txt

@@ -0,0 +1,127 @@
+
+--StationList--
+  Count():             5
+  Location ListDump:
+    6 => 42341
+    2 => 41831
+    7 => 41825
+    5 => 33421
+    4 => 33411
+  CargoWaiting(0) ListDump:
+    7 => 6
+    6 => 6
+    2 => 3
+    5 => 0
+    4 => 0
+  CargoWaiting(1) ListDump:
+    7 => 0
+    6 => 0
+    5 => 0
+    4 => 0
+    2 => 0
+
+--StationList_Cargo--
+  0
+    0
+      6 => 6
+    1
+      6 => 2
+    2
+      2 => 4
+      7 => 2
+    3
+  1
+    0
+      7 => 18
+      6 => 16
+      2 => 7
+    1
+      6 => 8
+      2 => 3
+    2
+      2 => 16
+      6 => 14
+      7 => 11
+    3
+      6 => 10
+      2 => 8
+
+--StationList_CargoPlanned--
+    0
+      7 => 18
+      6 => 16
+      2 => 7
+    1
+      6 => 8
+      2 => 3
+    2
+      2 => 16
+      6 => 14
+      7 => 11
+    3
+      6 => 10
+      2 => 8
+
+--StationList_CargoPlannedByFrom--
+      7 => 8
+      6 => 8
+      2 => 7
+
+--StationList_CargoPlannedByVia--
+      2 => 16
+      6 => 7
+
+--StationList_CargoPlannedViaByFrom--
+      6 => 8
+      2 => 3
+
+--StationList_CargoPlannedFromByVia--
+      6 => 10
+      2 => 8
+
+--StationList_CargoWaiting--
+    0
+      6 => 6
+    1
+      6 => 2
+    2
+      2 => 4
+      7 => 2
+    3
+
+--StationList_CargoWaitingByFrom--
+      2 => 3
+
+--StationList_CargoWaitingByVia--
+      6 => 3
+
+--StationList_CargoWaitingViaByFrom--
+      6 => 2
+
+--StationList_CargoWaitingFromByVia--
+      6 => 3
+
+--StationList_Vehicle--
+  Count():             2
+  Location ListDump:
+    5 => 33421
+    4 => 33411
+  CargoWaiting(0) ListDump:
+    5 => 0
+    4 => 0
+  CargoWaiting(1) ListDump:
+    5 => 0
+    4 => 0
+  CargoRating(1) ListDump:
+    5 => -1
+    4 => -1
+  DistanceManhattanToTile(30000) ListDump:
+    5 => 106
+    4 => 96
+  DistanceSquareToTile(30000) ListDump:
+    5 => 8818
+    4 => 7058
+  IsWithinTownInfluence(0) ListDump:
+    5 => 0
+    4 => 0
+ERROR: The script died unexpectedly.

bin/baseset/no_music.obm

@@ -12,7 +12,7 @@ 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.ca_ES = Una llista de música sense cap peça.
 description.cs_CZ = Prázná hudební sada.
 description.cy_GB = Pecyn cerddoriaeth heb unrhyw gerddoriaeth ynddo.
 description.da_DK = En musikpakke uden musik.
@@ -21,21 +21,27 @@ description.el_GR = Ένα πάκετο μουσικής χωρίς πραγμα
 description.en_AU = 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.es_MX = Paquete de música vacío
 description.et_EE = Muusikakogu ilma muusikata.
+description.eu_ES = Musika gabeko musika paketea.
 description.fi_FI = Musiikkipaketti, jossa ei ole musiikkia.
 description.fr_FR = Un pack de musiques sans musiques.
+description.ga_IE = Pacáiste ceoil gan aon cheol iarbhír ann.
 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.he_IL = אוסף מנגינות ללא מנגינות.
+description.hr_HR = Glazbeni paket bez ikakve glazbe.
 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.it_IT = Un pacchetto musicale non contenente alcuna musica.
 description.ja_JP = 空の音楽パック
 description.ko_KR = 실제 음악이 없는 음악 목록입니다.
+description.la_VA = Sarcina musicae sine ulla musica.
 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.ms_MY = Pek muzik tanpa muzik sebenar.
 description.nb_NO = En musikkpakke uten noe musikk.
 description.nl_NL = Een muziekset zonder muziek.
 description.nn_NO = Ei musikkpakke utan noko musikk.

bin/baseset/no_sound.obs

@@ -12,7 +12,7 @@ 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.ca_ES = Una llista de sons buida.
 description.cs_CZ = Prázdná sada zvuků.
 description.cy_GB = Pecyn sain heb unrhyw effeithiau sain ynddo.
 description.da_DK = En lydpakke uden lyde.
@@ -21,12 +21,15 @@ description.el_GR = Ένα πάκετο ήχων χώρις ήχους.
 description.en_AU = 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.es_MX = Paquete 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.fr_FR = Un pack de sons sans sons.
+description.ga_IE = Pacáiste fuaimeanna gan aon fhuaimeanna ann.
 description.gd_GB = Pacaid fhuaimean anns nach eil fuaim sam bith.
 description.gl_ES = Un conxunto de sons sen ningún son
+description.he_IL = אוסף צלילים ללא צלילים.
 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.
@@ -34,8 +37,10 @@ description.is_IS = Hljóðpakki án hljóðs.
 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.la_VA = Sarcina sonorum sine ullis sonis.
+description.lb_LU = E Soundpack ouni iergendee Sound.
 description.lt_LT = Garsų pakas be jokių garsų.
+description.lv_LV = Skaņu kopa bez skaņas.
 description.nb_NO = En lydpakke uten noen lyder.
 description.nl_NL = Een geluidset zonder geluid.
 description.nn_NO = Ei lydpakke utan nokon lydar.

bin/baseset/orig_dos.obg

@@ -13,7 +13,7 @@ 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.ca_ES = Gràfics originals del Transport Tycoon Deluxe pel 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.
@@ -22,11 +22,15 @@ description.el_GR = Αρχικά γραφικά από το Transport Tycoon Del
 description.en_AU = 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.es_MX = Gráficos originales de Transport Tycoon Deluxe para DOS.
 description.et_EE = Algse Transport Tycoon Deluxe DOSi versiooni graafika.
+description.eu_ES = Transport Tycoon Deluxe originaleko DOS edizioko grafikoak.
 description.fi_FI = Alkuperäiset Transport Tycoon Deluxen DOS-version grafiikat.
 description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version DOS).
+description.ga_IE = Grafaicí bunaidhTransport Tycoon Deluxe, eagrán 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.he_IL = גרפיקות Transport Tycoon Deluxe המקורי בגרסת 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.
@@ -34,8 +38,11 @@ description.is_IS = Upprunalega grafíkin úr Transport Tycoon Deluxe DOS útgá
 description.it_IT = Grafica originale di Transport Tycoon Deluxe, edizione DOS.
 description.ja_JP = Transport Tycoon Deluxe オリジナル版 グラフィック (DOS)
 description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 도스 에디션의 그래픽입니다.
+description.la_VA = Graphica ex editione originale Transport Tycoon Deluxe DOS.
 description.lb_LU = Original Transport Tycoon Deluxe DOS Editioun Grafik.
 description.lt_LT = Originali Transport Tycoon Deluxe DOS leidimo grafika.
+description.lv_LV = Oriģinālā Transport Tycoon Deluxe DOS izdevuma grafika.
+description.ms_MY = Grafik asal Transport Tycoon Deluxe DOS edition.
 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.
@@ -57,21 +64,21 @@ description.zh_CN = 运输大亨DOS豪华版原版图形包.
 description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版的圖形。
 
 [files]
-base         = TRG1.GRF
+base              = TRG1.GRF
-logos        = TRGI.GRF
+logos             = TRGI.GRF
-arctic       = TRGC.GRF
+arctic            = TRGC.GRF
-tropical     = TRGH.GRF
+tropical          = TRGH.GRF
-toyland      = TRGT.GRF
+toyland           = TRGT.GRF
-extra        = OPENTTD.GRF
+extra             = ORIG_EXTRA.GRF
 
 [md5s]
-TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
+TRG1.GRF          = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
+TRGI.GRF          = da6a6c9dcc451eec88d79211437b76a8
-TRGC.GRF     = ed446637e034104c5559b32c18afe78d
+TRGC.GRF          = ed446637e034104c5559b32c18afe78d
-TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
+TRGH.GRF          = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
+TRGT.GRF          = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF  = 75a93cea2ed455c2fd5dcbda39e53538
+ORIG_EXTRA.GRF    = 0b10a95c0adee710ecca9c3d676be4f3
 
 [origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+default           = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTD.GRF  = This file was part of your OpenTTD installation.
+ORIG_EXTRA.GRF    = This file was part of your OpenTTD installation.

bin/baseset/orig_dos.obs

@@ -12,7 +12,7 @@ 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.ca_ES = Sons originals del Transport Tycoon Deluxe pel 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.
@@ -21,11 +21,15 @@ description.el_GR = Αρχικοί ήχοι από το Transport Tycoon Deluxe
 description.en_AU = 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.es_MX = Sonidos originales de Transport Tycoon Deluxe para DOS.
 description.et_EE = Algse Transport Tycoon Deluxe DOSi versiooni helid.
+description.eu_ES = Transport Tycoon Deluxe originaleko DOS edizioko soinuak.
 description.fi_FI = Alkuperäiset Transport Tycoon Deluxen DOS-version äänet.
 description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version DOS).
+description.ga_IE = Fuaimeanna bunaidh Transport Tycoon Deluxe, eagrán 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.he_IL = צלילי Transport Tycoon Deluxe המקורי בגרסת DOS.
 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.id_ID = Efek suara orisinil Transport Tycoon Deluxe versi DOS.
@@ -33,6 +37,7 @@ description.is_IS = Upprunalega hljóðið úr Transport Tycoon Deluxe DOS útg
 description.it_IT = Suoni originali di Transport Tycoon Deluxe, edizione DOS.
 description.ja_JP = Transport Tycoon Deluxe オリジナル版 効果音 (DOS)
 description.ko_KR = 오리지널 트랜스포트 타이쿤 도스 에디션의 효과음입니다.
+description.la_VA = Soni ex editione originale Transport Tycoon Deluxe DOS.
 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.

bin/baseset/orig_dos_de.obg

@@ -13,7 +13,7 @@ description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS (German) uitgawe g
 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.ca_ES = Gràfics originals del Transport Tycoon Deluxe (alemany) pel DOS.
 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.
@@ -22,11 +22,14 @@ description.el_GR = Αρχικά γραφικά από το Transport Tycoon Del
 description.en_AU = 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.es_MX = Gráficos originales de Transport Tycoon Deluxe para DOS (en 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.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version DOS allemande).
+description.ga_IE = Grafaicí bunaidhTransport Tycoon Deluxe, eagrán DOS (Gearmánach).
 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.he_IL = גרפיקות Transport Tycoon Deluxe המקורי בגרסת 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).
@@ -34,8 +37,10 @@ description.is_IS = Upprunalega grafíkin úr Transport Tycoon Deluxe DOS (þýs
 description.it_IT = Grafica originale di Transport Tycoon Deluxe (tedesco), edizione DOS.
 description.ja_JP = Transport Tycoon Deluxe オリジナル版 グラフィック (DOS・ドイツ版)
 description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 도스 에디션(독일)의 그래픽입니다.
+description.la_VA = Graphica ex editione originale Transport Tycoon Deluxe DOS (Germanica).
 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.lv_LV = Oriģinālā Transport Tycoon Deluxe DOS (vācu) izdevuma 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).
@@ -57,21 +62,21 @@ description.zh_CN = 运输大亨DOS豪华德语版原版图形包.
 description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版 (德國版) 的圖形。
 
 [files]
-base         = TRG1.GRF
+base              = TRG1.GRF
-logos        = TRGI.GRF
+logos             = TRGI.GRF
-arctic       = TRGC.GRF
+arctic            = TRGC.GRF
-tropical     = TRGH.GRF
+tropical          = TRGH.GRF
-toyland      = TRGT.GRF
+toyland           = TRGT.GRF
-extra        = OPENTTD.GRF
+extra             = ORIG_EXTRA.GRF
 
 [md5s]
-TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
+TRG1.GRF          = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
+TRGI.GRF          = da6a6c9dcc451eec88d79211437b76a8
-TRGC.GRF     = ed446637e034104c5559b32c18afe78d
+TRGC.GRF          = ed446637e034104c5559b32c18afe78d
-TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
+TRGH.GRF          = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
+TRGT.GRF          = fcde1d7e8a74197d72a62695884b909e
-OPENTTD.GRF  = 75a93cea2ed455c2fd5dcbda39e53538
+ORIG_EXTRA.GRF    = 0b10a95c0adee710ecca9c3d676be4f3
 
 [origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+default           = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTD.GRF  = This file was part of your OpenTTD installation.
+ORIG_EXTRA.GRF    = This file was part of your OpenTTD installation.

bin/baseset/orig_win.obg

@@ -13,7 +13,7 @@ description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe grafie
 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.ca_ES = Gràfics originals del Transport Tycoon Deluxe pel 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.
@@ -22,11 +22,14 @@ description.el_GR = Αρχικά γραφικά από το Transport Tycoon Del
 description.en_AU = 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.es_MX = Gráficos originales de Transport Tycoon Deluxe para Windows.
 description.et_EE = Algse Transport Tycoon Deluxe Windowsi versiooni graafika.
 description.fi_FI = Alkuperäiset Transport Tycoon Deluxen Windows-version grafiikat.
 description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version Windows).
+description.ga_IE = Grafaicí bunaidhTransport Tycoon Deluxe, eagrán 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.he_IL = גרפיקות Transport Tycoon Deluxe המקורי בגרסת 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.
@@ -34,8 +37,11 @@ description.is_IS = Upprunalega grafíkin úr Transport Tycoon Deluxe Windows ú
 description.it_IT = Grafica originale di Transport Tycoon Deluxe, edizione Windows.
 description.ja_JP = Transport Tycoon Deluxe オリジナル版 グラフィック (Windows)
 description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 윈도 에디션의 그래픽입니다.
+description.la_VA = Graphica ex editione originale Transport Tycoon Deluxe Windows.
 description.lb_LU = Original Transport Tycoon Deluxe Windows Editioun Grafik.
 description.lt_LT = Originali Transport Tycoon Deluxe Windows leidimo grafika.
+description.lv_LV = Oriģinālā Transport Tycoon Deluxe Windows izdevuma grafika.
+description.ms_MY = Grafik asal Transport Tycoon Deluxe edisi Windows.
 description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for Windows.
 description.nl_NL = Originele graphics van de Transport Tycoon Deluxe Windows-versie.
 description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for Windows.
@@ -57,21 +63,21 @@ description.zh_CN = 运输大亨Windows豪华版原版图形包.
 description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的圖形。
 
 [files]
-base         = TRG1R.GRF
+base              = TRG1R.GRF
-logos        = TRGIR.GRF
+logos             = TRGIR.GRF
-arctic       = TRGCR.GRF
+arctic            = TRGCR.GRF
-tropical     = TRGHR.GRF
+tropical          = TRGHR.GRF
-toyland      = TRGTR.GRF
+toyland           = TRGTR.GRF
-extra        = OPENTTD.GRF
+extra             = ORIG_EXTRA.GRF
 
 [md5s]
-TRG1R.GRF    = b04ce593d8c5016e07473a743d7d3358
+TRG1R.GRF         = b04ce593d8c5016e07473a743d7d3358
-TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
+TRGIR.GRF         = 0c2484ff6be49fc63a83be6ab5c38f32
-TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
+TRGCR.GRF         = 3668f410c761a050b5e7095a2b14879b
-TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
+TRGHR.GRF         = 06bf2b7a31766f048baac2ebe43457b1
-TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
+TRGTR.GRF         = de53650517fe661ceaa3138c6edb0eb8
-OPENTTD.GRF  = 75a93cea2ed455c2fd5dcbda39e53538
+ORIG_EXTRA.GRF    = 0b10a95c0adee710ecca9c3d676be4f3
 
 [origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+default           = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTD.GRF  = This file was part of your OpenTTD installation.
+ORIG_EXTRA.GRF    = This file was part of your OpenTTD installation.

bin/baseset/orig_win.obm

@@ -12,7 +12,7 @@ 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.ca_ES = Música original del Transport Tycoon Deluxe pel 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.
@@ -21,21 +21,26 @@ description.el_GR = Αρχική μουσική από το Transport Tycoon Del
 description.en_AU = 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.es_MX = Música original de Transport Tycoon Deluxe para Windows.
 description.et_EE = Algse Transport Tycoon Deluxe Windowsi versiooni muusika.
 description.fi_FI = Alkuperäinen Transport Tycoon Deluxen Windows-version musiikki.
 description.fr_FR = Musiques originales de Transport Tycoon Deluxe (version Windows).
+description.ga_IE = Ceol bunaidh Transport Tycoon Deluxe, eagrán 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.he_IL = מנגינות Transport Tycoon Deluxe המקורי בגרסת Windows.
+description.hr_HR = Originalna glazba 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.la_VA = Musica ex editione originale Transport Tycoon Deluxe Windows.
+description.lb_LU = Original Transport Tycoon Deluxe Windows Editioun Musik.
 description.lt_LT = Originali Transport Tycoon Deluxe Windows leidimo muzika.
 description.lv_LV = Oriģinālā Transport Tycoon Deluxe Windows izdevuma mūzika.
+description.ms_MY = Muzik asal Transport Tycoon Deluxe edisi Windows.
 description.nb_NO = Original musikk fra Transport Tycoon Deluxe for Windows.
 description.nl_NL = Originele muziek van de Transport Tycoon Deluxe Windows-versie.
 description.nn_NO = Original musikk frå Transport Tycoon Deluxe for Windows.

bin/baseset/orig_win.obs

@@ -12,7 +12,7 @@ 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.ca_ES = Sons originals del Transport Tycoon Deluxe pel 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.
@@ -21,11 +21,15 @@ description.el_GR = Αρχικοί ήχοι από το Transport Tycoon Deluxe
 description.en_AU = 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.es_MX = Sonidos originales de Transport Tycoon Deluxe para Windows.
 description.et_EE = Algse Transport Tycoon Deluxe Windowsi versiooni helid.
+description.eu_ES = Transport Tycoon Deluxe originaleko Windows edizioko grafikoak.
 description.fi_FI = Alkuperäiset Transport Tycoon Deluxen Windows-version äänet.
 description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version Windows).
+description.ga_IE = Fuaimeanna bunaidh Transport Tycoon Deluxe, eagrán 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.he_IL = צלילי Transport Tycoon Deluxe המקורי בגרסת Windows.
 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.id_ID = Efek suara orisinil Transport Tycoon Deluxe versi Windows.
@@ -33,6 +37,7 @@ description.is_IS = Upprunalega hljóðið úr Transport Tycoon Deluxe Windows
 description.it_IT = Suoni originali di Transport Tycoon Deluxe, edizione Windows.
 description.ja_JP = Transport Tycoon Deluxe オリジナル版 効果音 (Windows)
 description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 윈도 에디션의 효과음입니다.
+description.la_VA = Soni ex editione originale Transport Tycoon Deluxe Windows.
 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.

bin/game/compat_1.2.nut

@@ -16,3 +16,10 @@ GSTown.SetGrowthRate <- function(town_id, days_between_town_growth)
 	if (days_between_town_growth == 0) days_between_town_growth = GSTown.TOWN_GROWTH_NORMAL;
 	return GSTown._SetGrowthRate(town_id, days_between_town_growth);
 }
+
+/* 1.5 adds a game element reference to the news. */
+GSNews._Create <- GSNews.Create;
+GSNews.Create <- function(type, text, company)
+{
+    return GSNews._Create(type, text, company, GSNews.NR_NONE, 0);
+}

bin/game/compat_1.3.nut

@@ -16,3 +16,10 @@ GSTown.SetGrowthRate <- function(town_id, days_between_town_growth)
 	if (days_between_town_growth == 0) days_between_town_growth = GSTown.TOWN_GROWTH_NORMAL;
 	return GSTown._SetGrowthRate(town_id, days_between_town_growth);
 }
+
+/* 1.5 adds a game element reference to the news. */
+GSNews._Create <- GSNews.Create;
+GSNews.Create <- function(type, text, company)
+{
+    return GSNews._Create(type, text, company, GSNews.NR_NONE, 0);
+}

bin/game/compat_1.4.nut

@@ -8,3 +8,10 @@
  */
 
 GSLog.Info("1.4 API compatibility in effect.");
+
+/* 1.5 adds a game element reference to the news. */
+GSNews._Create <- GSNews.Create;
+GSNews.Create <- function(type, text, company)
+{
+    return GSNews._Create(type, text, company, GSNews.NR_NONE, 0);
+}

bin/game/compat_1.5.nut

@@ -6,3 +6,5 @@
  * 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.5 API compatibility in effect.");

bin/game/compat_1.6.nut

@@ -0,0 +1,10 @@
+/* $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.6 API compatibility in effect.");

bin/game/compat_1.7.nut

@@ -0,0 +1,8 @@
+/* $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/>.
+ */

changelog.txt

@@ -1,3 +1,331 @@
+1.7.2 (2017-12-24)
+------------------------------------------------------------------------
+(None)
+
+
+1.7.2-RC1 (2017-12-11)
+------------------------------------------------------------------------
+- Change: When train depots have a horizontal scrollbar, allow scrolling 1 tile beyond the longest train, so you can actually attach a wagon at the end (r27937)
+- Fix: When moving wagons in the depot, the drag highlight did not exactly match the length of the dragged wagon chain (r27936)
+- Fix: [Win32] Right mouse scrolling didn't work properly with the Windows 10 Fall Creators Update [FS#6629] (r27935)
+- Fix: Forest, candyfloss forest and battery farm skipped the first animation frame [FS#6639] (r27932)
+- Fix: Glyphs in range U+0020 to U+00FF may only be defined in orig_extra.grf, not in openttd.grf [FS#6620] (r27915)
+- Fix: 'unban' console command was not handling IPv6 adresses properly (r27914, r27913)
+- Fix: Keep the 'link' between industry chain and smallmap windows whenever possible [FS#6585] (r27905)
+- Fix: When the last vehicle is removed from a shared orders group, hide the 'Stop sharing' button in the vehicle orders window [FS#6593] (r27904)
+- Fix: Tooltip of 'increase service interval' said 'decrease' [FS#6606] (r27895)
+- Fix: Console command parser passed invalid strings to the debug output, if command lines had many parameters [FS#6576] (r27884, r27883)
+
+
+1.7.1 (2017-06-13)
+------------------------------------------------------------------------
+(None)
+
+
+1.7.1-RC1 (2017-05-04)
+------------------------------------------------------------------------
+- Fix: Add missing game script event for ships arriving at a station [FS#6560] (r27859, r27858)
+- Fix: StringID truncation to 16 bits broke string remapping test [FS#6555] (r27851)
+- Fix: Infinite loop in pathfinder when checking safe waiting position from a waypoint [FS#5926] (r27846)
+- Fix: [YAPF] Consider depot as destination before reversing path and applying penalty (r27843)
+- Fix: Don't consider locks or ship depots as clear water when placing industries (r27841)
+- Fix: Small news window's fake caption was not sized to fit its text (r27838)
+- Fix: Black remap did nothing in 8bpp-simple blitter (r27837)
+- Fix: Misaligned resize icon due to widget bounds being inclusive (r27831)
+- Fix: Update viewport sign dimensions when changing GUI zoom level (r27827, r27819)
+- Fix: Vehicle viewport is not user scrollable so flag window as such (r27823)
+- Fix: Allow dropdown to be drawn above origin widget even with scrollbar (r27820)
+- Fix: 32bpp-anim blitters assumed that pitch and width of the screen were equal [FS#6545] (r27796)
+- Fix: Chat text background overflowed due to missing padding [FS#6526] (r27794)
+- Fix: Failed to load lzo compressed savegames sometimes [FS#6450] (r27793)
+- Fix: [Win32] Mark OpenTTD as DPI-aware to avoid OS window scaling that breaks mouse input [FS#6366] (r27791, r27790)
+- Fix: [NewGRF] Get vehicle load amount after executing new cargo trigger [FS#6536] (r27788)
+- Fix: AI configuration changed incorrect parameter when some parameters are hidden [FS#6479] (r27787, r27786)
+- Fix: Buoys not always drawn after being placed depending on zoom level [FS#6508] (r27785)
+- Fix: Allow rail conversion even if ship is on tile [FS#6505] (r27784)
+
+
+1.7.0 (2017-04-01)
+------------------------------------------------------------------------
+(None)
+
+
+1.7.0-RC1 (2017-03-11)
+------------------------------------------------------------------------
+- Feature: [NewGRF] Extend the DCxx range to D800-DFFF (r27769)
+- Feature: [NewGRF, script] Increase the maximum number of GameScript texts to 64k, and NewGRF texts to 512k (r27758)
+- Feature: [NewGRF] CB 37 results 0x0401 and 0x0800-0BFF for improved control of display of input cargos in the industry GUI (r27751)
+- Feature: Sprites missing in outdated basesets are now provided by openttd.grf (r27732, r27731, r27730)
+- Feature: [NewGRF] String command 9A 1E to print the name of a cargo type (r27707, r27706)
+- Feature: [Debug] Assign descriptive names to threads [FS#6471] (r27674, r27673, r27670)
+- Feature: [NewGRF] Allow composing vehicles from multiple sprites (r27668)
+- Change: Enable realistic train and road vehicle acceleration by default (r27760)
+- Change: Hide the drive-in stops from the tram station picker (r27734)
+- Change: Do not count static NewGRF when checking for the maximum number of NewGRFs in a game (r27729)
+- Change: Limit waypoint area by maximum station spread during dragging (r27710)
+- Change: [Build] Re-enable Wnarrowing for gcc 4.9+ [FS#6532] (r27709, r27703)
+- Change: List railtype of rail tiles explicitly in the tile info window (r27686)
+- Change: Re-arrange the autoreplace GUI for trains, and do not filter it by railtype by default (r27683)
+- Change: Various performance improvements to CargoDist and LinkGraphs (r27682, r27681, r27614, r27613, r27612, r27611)
+- Change: Improve randomisation of rough land appearance (r27657)
+- Change: [Build] Enable C++11 for clang 3.3 (r27654)
+- Fix: Insufficient thread synchronisation when switching blitters lead to crashes [FS#6510] (r27775)
+- Fix: Enabling palette animation for 32bpp blitters while paused skipped initialisation of the palette and resulted in black windows [FS#5889] (r27774)
+- Fix: Intro games other than the traditional nightly one would cause townname NewGRFs to not get activated in the game options [FS#5819] (r27772)
+- Fix: Some variables were not reset between loading old savegames, which made loading them fail [FS#6540] (r27770)
+- Fix: Removing secondary roadtypes from bridges was factor 2 too cheap [FS#6538] (r27746)
+- Fix: Extra viewports did not center on the selected tile [FS#6537] (r27743)
+- Fix: [Build] Building on newer OSX versions with newer SDKs [FS#6295, FS#6502] (r27727, r27675)
+- Fix: Improve error message when trying to build rail track over a depot  (r27726)
+- Fix: Rescanning NewGRF in-game could break the loaded NewGRF, if very many NewGRF were in use (r27721)
+- Fix: Text could overflow various GUI elements [FS#6527] (r27713)
+- Fix: Memory leak when reloading NewGRF (r27690, r27688, r27687)
+- Fix: When removing objects of bankrupt companies the tiles may revert to canal. In that case also check the ownership of the canal [FS#6511] (r27656)
+- Fix: Make the console file commands operate independent of the save/load GUI (r27645)
+- Fix: When dragging vehicles in group or depot GUI, draw the complete articulated vehicle (r27632)
+- Fix: When dragging multiple vehicles in the depot, make the destination gap as long as the chain instead of just considering the first vehicle (r27629)
+- Fix: [Build] Change the GCC version detection so that it works with two-digit and truncated versions [FS#6487] (r27623, r27616)
+- Fix: Do not hide filtered and highlighted industries by overlapping tiles in the zoomed-out smallmap (r27622, r27621, r27620)
+- Fix: [Script] Kill scripts, when a non-suspendable valuator call takes way too long [FS#6473] (r27594)
+
+
+1.6.1 (2016-07-01)
+------------------------------------------------------------------------
+- Fix: Compilation and optimisation issues with GCC6 (r27606, r27605, r27595)
+- Fix: Compilation with --disable-network [FS#6481] (r27602)
+- Fix: [NewGRF] shift-and-add-divide/modulo varadjusts use signed division/modulo (r27600)
+- Fix: Company 0 could accept engine previews before they were offered (r27598)
+
+
+1.6.1-RC1 (2016-06-01)
+------------------------------------------------------------------------
+- Feature: Mexican Spanish (r27564, r27553, r27552)
+- Change: Performance improvement for dedicated servers by skipping drawing calls earlier in the process [FS#6402] (r27579)
+- Fix: Automatic servicing of road vehicles compared path finder costs with tile distances, thus vehicles went to depots which were factor 100 too far away [FS#6410] (r27586)
+- Fix: Enforce a non-zero load amount for all vehicles, so that vehicles can process their cargo reservations [FS#6437] (r27585, r27584)
+- Fix: Do not decrease the column width of depot windows when vehicles with high unitnumbers leave [FS#6415] (r27583)
+- Fix: Button size computation in script configuration window [FS#6461] (r27581)
+- Fix: [NewGRF] Set date of last service on construction also for wagons and articulated parts [FS#6395] (r27580)
+- Fix: Vehicles could not be hidden from the purchase list when they were in exclusive preview [FS#6454] (r27578)
+- Fix: Dock and roadstop picker, client list and town authority window did not auto-resize according to their content when they were positioned at the bottom of the screen [FS#6386] (r27577)
+- Fix: Various incorrect but uncritical size computations in the content client [FS#6449] (r27576, r27570)
+- Fix: Memory leak when disabling palette animation [FS#6404] (r27575)
+- Fix: [NewGRF] The house id as returned by house variable 66 was incorrect when querying neighboured tiles [FS#6432] (r27574)
+- Fix: [Build] Compilation failure with gcc 6.1 due to headers included after safeguards.h [FS#6467] (r27573)
+- Fix: Convenience savegame bump to distinguish 1.6 savegames from 1.5 savegames [FS#6442] (r27572)
+- Fix: [Build] Force sorting to be locale independent, so files are always ordered the same and by that token better diff-able (r27562, r27558)
+- Fix: Typos in comments and string (r27561, r27560)
+- Fix: [Build] bashism that caused different CFLAGS with bash vs dash (r27557)
+- Fix: Use a more appropiate sound effect for convert-rail (r27547)
+- Fix: Remove SetFill from vehicle GUI buttons, so that the viewport is resized instead of them in case of long window titles (r27546)
+- Fix: [Script] Generation of API wrappers (r27545, r27544, r27543)
+- Fix: [Windows] ICU got disabled for Windows builds, breaking RTL support [FS#6427] (r27542)
+- Fix: [NewGRF] Station spritelayouts did not accept the var10 flag for the palette [FS#6435] (r27534)
+
+
+1.6.0 (2016-04-01)
+------------------------------------------------------------------------
+(None)
+
+
+1.6.0-RC1 (2016-03-01)
+------------------------------------------------------------------------
+- Feature: [NewGRF] Allow custom sound IDs in RV property 0x12, ship property 0x10 and aircraft property 0x12 (r27507)
+- Feature: When viewing online content of a particular type, hide content of other types unless they have been (auto)selected for download (r27469, r27468, r27444)
+- Feature: [NewGRF] Move sprite 8 positions in sprite aligner with ctrl+click [FS#6241] (r27451)
+- Feature: Lower the sell-vehicle and sell-chain buttons in the train depot GUI while dragging a vehicle over it [FS#6391] (r27450, r27446)
+- Feature: Make the object placement GUI an independent window (r27438, r27397, r27346)
+- Feature: [Build] Project files and compilation with MSVC2015 (r27385, r27382, r27381, r27380, r27379)
+- Feature: [NewGRF] Allow railtype NewGRF to define separate sprites for the fences on either track side [FS#6315] (r27354, r27343)
+- Feature: [NewGRF] Increase the maximum amount of industry types to 128 per NewGRF and 240 in total (r27279)
+- Feature: Make Ctrl+Remove-Roadstop also remove the road, just like for rail stations [FS#6252] (r27251)
+- Change: [NewGRF] Allow static NewGRF to enable the second rocky tile set (r27497)
+- Change: Round loading percentage in loading indicators and conditional orders towards 50%, so that 0% and 100% mean completely empty or full (r27426)
+- Change: [Build] Rework the configure system to make more use of pkg-config (r27377:r27366, r27361, r27360)
+- Change: Enable YAPF cache debugging with desync debug level 2 (r27332)
+- Change: [strgen] Default plural subparameter position for CARGO_xxx string control codes is subparameter 1 (r27295)
+- Change: [NewGRF] Translate industry variable A6 (r27267)
+- Change: Do not consider cargo that is already being loaded as waiting cargo wrt. the station rating [FS#6165] (r27256)
+- Change: Tune down terrain generation to reduce amount of long slopes (r27230)
+- Change: Generate more detailed curves at the coast (r27229)
+- Change: Slightly more water in the non-custom sea levels (r27228)
+- Change: Be more lenient about road stop removal when at least one stop could be removed [FS#6262] (r27225)
+- Fix: [Win32] Stdin/out/err need to be re-assigned differently if the runtime lib of MSVC2015 is used (r27481)
+- Fix: [Haiku] On Haiku use the appropriate system variable to obtain the include dir [FS#6401] (r27472)
+
+
+1.5.3 (2015-12-01)
+------------------------------------------------------------------------
+(None)
+
+
+1.5.3-RC1 (2015-11-01)
+------------------------------------------------------------------------
+- Fix: When selecting a refit cargo for orders, do not check whether the vehicle is in a depot or station, and do not ask whether the vehicle currently allows station-refitting. Also hide the refit cost for orders, it is not predictable (r27428)
+- Fix: Use the NewGRF railtype sorting order in the infrastructure window (r27427)
+- Fix: Crash when switching to or taking over companies, when an order window of a vehicle of the new company was opened. Now close those windows [FS#5842] (r27425)
+- Fix: Towns did not connect roads to existing roads, unless they had only a single roadbit. Otoh, towns also tried to connect to single roadbit tiles such as tunnels and depots, even though they were not connectable in the direction of interest [FS#6374] (r27424)
+- Fix: When towns expanded single-bit roadtiles using a grid-layout, they used the layout position of the neighbouring tile (r27423)
+- Fix: Aircraft picked the wrong airport entry point, if airports were rotated by 180 degree [FS#6341] (r27422)
+- Fix: Consider text and icon sizes when drawing the client list [FS#6265] (r27421)
+- Fix: GrowTownAtRoad sometimes returned false, even when a house was built [FS#6362] (r27420)
+- Fix: CmdSellRailWagon did not revert all actions properly when no orderlist could be allocated [FS#6369] (r27419)
+- Fix: Desync due to incorrect storage of segments with different railtype in the YAPF cache [FS#6329] [FS#6379] (r27418)
+- Fix: When a dedicated server was paused with no clients, the master server advertisement interval was slowed, causing deadvertisement of the server [FS#6368] (r27400)
+- Fix: [Makefile] Game script directory and compat*.nut were never installed on *nix (r27399)
+- Fix: There are two different availability conditions for fdatasync in the manpage. Use them both, since at least on some MinGW versions one is not enough (r27389)
+- Fix: win32 sound driver failed to report errors (r27383)
+- Fix: Clickareas in settings tree were misaligned when the filter warning was displayed, if the setting height was defined by the icons instead of the font [FS#6358] (r27366)
+- Fix: Center settings filter warning also vertically, and also in case of multiple lines (r27365)
+
+
+1.5.2 (2015-09-01)
+------------------------------------------------------------------------
+(None)
+
+
+1.5.2-RC1 (2015-08-01)
+------------------------------------------------------------------------
+- Change: Auto-complete partial roads when building level-crossings [FS#6283] (r27309)
+- Fix: Do not rerandomise the town name when only cost-estimating the founding [FS#6332] (r27341)
+- Fix: Make variety distribution not assume that sea level is at height 0.2 / 3 * TGPGetMaxHeight() [FS#6335] (r27331, r27330, r27329, r27328)
+- Fix: Remove corner-case optimisation for line drawing, which failed for dashed lines  (r27324)
+- Fix: Clipping of inclined lines did not account for the 'horizontal width' being bigger than the 'real width' (r27323, r27322)
+- Fix: Incorrect owner assignment when adding/removing road/tram to/from bridges [FS#6317] (r27313, r27312)
+- Fix: Mark infrastructure window dirty in more cases (r27311)
+- Fix: Prevent breaking of tram-reversal points by adding more road pieces [FS#6283] (r27308)
+- Fix: Error message window with manager face failed with GUI zoom [FS#6259] (r27307)
+- Fix: Account for road-bridges and drive-through-stops in CanFollowRoad [FS#6320] (r27306, r27305)
+- Fix: Password window layout with GUI zoom [FS#6321] (r27304, r27303)
+- Fix: Speed-only timetables got assigned times in stations [FS#6313] (r27302, r27301)
+- Fix: Enforce the company's default service intervals when purchasing another company [FS#6254] (r27282, r27281)
+- Fix: Cloning/autoreplace/autorenew did not copy custom service intervals (r27280)
+
+
+1.5.1 (2015-06-01)
+------------------------------------------------------------------------
+(None)
+
+
+1.5.1-RC1 (2015-05-08)
+------------------------------------------------------------------------
+- Fix: Do not consider road junctions with trivial dead ends as branch points during town growth [FS#6245] (r27260, r27259, r27244)
+- Fix: ScriptList::RemoveList failed to remove a list from itself [FS#6287] (r27258)
+- Fix: Combined button+dropdown widgets in order and autoreplace GUI had incorrect hitbox when using GUI zoom [FS#6270] (r27255)
+- Fix: When building a lock on DC_AUTO-removable water-based objects, the water class was always set to canal [FS#6264] (r27254)
+- Fix: When crossing tram tracks with railroads, cost of extra roads was not being counted [FS#6282] (r27253)
+- Fix: Invalid infrastructure counting when crossing tram tracks with railroads [FS#6281] (r27252)
+- Fix: Broken error message in configure [FS#6286] (r27250)
+- Fix: In some cases town growth failure was considered as success [FS#6240] (r27249, r27247)
+- Fix: Town labels on smallmap and zoomed-out viewports were not centered [FS#6257] (r27248)
+- Fix: Removing a rail waypoint used the remove-rail-station cost [FS#6251] (r27245)
+- Fix: Duplicate frees due to pool item classes not having copy constructors [FS#6285] (r27243)
+- Fix: Crash when no AIs were installed due to improper handling of non-ASCII characters by the string pointer lexer [FS#6272] (r27233)
+- Fix: Compilation on DragonflyBSD [FS#6274] (r27224, r27223)
+- Fix: Use the current maximum speed as limited by bridges, orders etc. for all vehicle types alike when considering increased smoke emissions of vehicles [FS#6278] (r27222)
+- Fix: Multi-value keys in the desktop entry shall end with a trailing separator (r27221)
+- Fix: Draw path reservation on the whole bridge, not only on the bridge heads (r27209)
+- Fix: Draw correct overlay sprites for path reservations on bridges and tunnels (r27208)
+
+
+1.5.0 (2015-04-01)
+------------------------------------------------------------------------
+- Fix: [NewGRF] Add Misc. GRF Feature Flag 6 to enable the second rocky tile set [FS#6260] (r27200)
+
+
+1.5.0-RC1 (2015-03-18)
+------------------------------------------------------------------------
+- Feature: [NewGRF] Display relative offset changes in the sprite aligner [FS#6236] (r27174)
+- Fix: Original road vehicle acceleration crashed for vehicles taking over [FS#6255] (r27190)
+- Fix: GCC 5 compilation (r27185, r27183)
+- Fix: Data race due to lazy initialisation of objects [FS#5969] (r27178)
+- Fix: Compilation with MinGW64 (r27176)
+- Fix: Use the regular clipping functions in the sprite aligner instead of some magic [FS#6237] (r27173)
+- Fix: Windows randomly drops SetCursorPos calls, breaking the RMB-scrolling [FS#6238] (r27172)
+
+
+1.5.0-beta2 (2015-02-24)
+------------------------------------------------------------------------
+- Feature: [NoGo] Game scripts can point to a location, station, industry, or town when publishing news (r27164)
+- Feature: Allow changing max heightlevel in scenario editor (r27151)
+- Feature: Make use of both rocky tile sets from the base graphics (r27117)
+- Change: Scale (non-custom) default window sizes according to GUI zoom (r27147)
+- Change: Make statusbar and chat-entry window use the same width as the toolbar (r27146)
+- Change: The chatbox-width setting now uses percent of screen width instead of pixels (r27144)
+- Change: [NewGRF] Interpret negative positions in industry layouts depending on GRF version (r27138)
+- Fix: [SDL, Windows] Right-mouse-button scrolling scrolled/jumped too far, when OpenTTD lagged during mouse event processing (r27167)
+- Fix: Toolbars were not invalidated when changing max-vehicles settings [FS#6204] (r27163)
+- Fix: Tile selection was drawn outside of map in some cases [FS#6208] (r27162)
+- Fix: Reimplement the viewport drawing algorithm [FS#6156] [FS#6206] (r27161)
+- Fix: Issues with smallmap and viewport coordinates and transformations (r27160, r27159, r27158)
+- Fix: Mark bridge middle tiles dirty when building/removing/changing bridges (r27157)
+- Fix: Rounding and unit-conversion inconsistencies in calls to MarkAllViewportsDirty (r27148)
+- Fix: Oilrig empty-tile checks were incorrect due to wrong TileIndexDiff->TileIndexDiffC conversion (r27137)
+- Fix: Misalignment in generate world window in case of small fonts (r27135)
+- Fix: Dragging of free wagons in depot failed with GUI zoom (r27133)
+- Fix: Reduce memory footprint of map array by shuffling its members [FS#6218] (r27132, r27126)
+- Fix: Dropdown- and tooltip-windows should not steal the focus (r27131)
+- Fix: [NewGRF] Action 7/9 condition 0A failed for present, but disabled, NewGRF (r27119)
+- Fix: Road vehicles could not reverse to be sent to depots when the following tile has the right type to run on, but could not be entered [FS#6183] (r27107)
+- Fix: Use the actual max speed of the vehicle in front when determining if a RV can overtake [FS#6176] (r27106)
+- Fix: grow_counter was not properly bounded by growth_rate, but by some other value used to calculate growth_rate [FS#6195] (r27105)
+- Fix: [Script] Support 64 bits integers in ScriptLists [FS#6194] (r27104)
+- Fix: [Script] Money values would end up wrong in strings when outside the bounds of a 32 bits integer [FS#6194] (r27102)
+
+
+1.5.0-beta1 (2014-12-24)
+------------------------------------------------------------------------
+- Feature: Support .txt.gz and -txt.xz changelog, readme and license files in basesets, NewGRFs, etc (r27035, r27034)
+- Feature: More height levels [FS#4126] (r27010)
+- Feature: Latin translation (r26993)
+- Feature: Add option to choose normal, double or quad-size interface (r26990)
+- Feature: [Script] Swap method for script lists (r26894)
+- Feature: [Script] ScriptStationList_Cargo for sorting cargo by from and via (r26893)
+- Feature: [Script] API for retrieving planned flow (r26892)
+- Feature: [CargoDist] Predict links for station-autorefitting vehicles (r26889)
+- Feature: Setting for limiting the height of bridges (r26882)
+- Feature: Make aircraft ascend/descend when they are too close to the ground or too far away (r26866)
+- Feature: Allow hiding of non-interesting engines in the GUI (r26805, r26804)
+- Feature: Vehicle sorting in autoreplace GUI [FS#1640] (r26800)
+- Feature: [NewGRF] Advanced visual effects with multiple effect sprites independent of spawning model (r26988, r26747)
+- Feature: Warn about missing industries after generating a map (r26729)
+- Feature: Upgrade currently active NewGRFs to newest installed version (r26613)
+- Feature: Save and load grfid and md5sum of NewGRFs in config file (r26611)
+- Feature: Select an editable preset name for saving (r26610)
+- Feature: Cancel cargo delivery from industries/houses to stations after about 21 months of not having picked up any of the cargo (r26582)
+- Feature: Give a warning when a plane's orders tell it to use a runway which is too short for it [FS#6009] (r26566)
+- Feature: [Script] Extended API for CargoDist (r26557)
+- Feature: Show measured order times in timetable GUI also when not timetabled (r26550)
+- Feature: Prompt for confirmation when deleting a vehicle group (r26455)
+- Feature: Hierarchical vehicle subgroups (r26450)
+- Feature: Allow more sound sleep for dedicated servers when there's nothing to do and nobody paying attention (r26449)
+- Feature: [NewGRF] Add vehicle modflag 1 (unloading in progress) (r26430)
+- Change: Improvements to the man page (r27091, r27012)
+- Change: Allow to set the granularity of the tooltip hover time in milliseconds instead of seconds. New default value is 250ms (r26815)
+- Change: Follow SI recommendation about spaces between numbers and units [FS#6086] (r26733)
+- Change: [CargoDist] Save locations instead of distances in link graphs to reduce size (r26646)
+- Change: [Squirrel] Make the internal integer for scripts always 64 bits, so scripts behave the same on 32 and 64 bit architectures and money can be represented properly (r26585, r26584)
+- Change: Reshuffle advanced settings tree (r26614, r26536)
+- Change: Add backend-independent config-file setting to disable 8bpp video modes, and disable 8bpp by default (r26522)
+- Fix: [OS/2] Compile again [FS#6186] (r27092)
+- Fix: Compilation with freetype2 version 2.5.4 and newer [FS#6185] (r27079)
+- Fix: Variable 47 used the carge translation table of the wrong GRF in case of callback 1D [FS#6182] (r27075)
+- Fix: Some lists did not use natural string sorting [FS#6172] (r27063)
+- Fix: Mercurial version detection failed if personal presets were configured (r27059)
+- Fix: [OSX] Don't require double-press from non-dead console hotkeys [FS#5812] (r27046)
+- Fix: Crash when having the vehicle list opened from a buoy or oil rig when the buoy/oil rig is removed (r27030)
+- Fix: Unit number was not always fully shown in depots [FS#6102] (r27014)
+- Fix: [CargoDist] Reserve cargo only after unloading finished or if the vehicle has the desired cargo already [FS#6110] (r26918)
+- Fix: [Squirrel] Loading a value saved as boolean caused it to be of type integer instead of boolean (r26785)
+- Fix: [Squirrel] Harden string handling (r26777)
+- Fix: [OSX] Implement more of the text editing API to prevent crashes and improve IME support [FS#5972] (r26758)
+- Fix: Incorrect saving of order backups [FS#6066] (r26700)
+- Fix: Ordering a vehicle to a competitor's rail waypoint displayed an error message. Ignore the click as is done for the other order types to competitor's stuff [FS#6059] (r26692)
+- Fix: [Script] Loading/parsing of info .nuts was done in the same VM, causing e.g. constants to break the loading of info of other scripts [FS#5973] (r26617)
+- Fix: [CargoDist] Improve estimation of link capacitites (r26549)
+- Remove: A bunch of archaic settings from the GUI (r26528, r26526, r26525)
+
+
 1.4.4 (2014-10-21)
 ------------------------------------------------------------------------
 (None)

config.lib

@@ -29,6 +29,7 @@ set_default() {
 	strip=""
 	lipo=""
 	awk="awk"
+	pkg_config="pkg-config"
 	os="DETECT"
 	endian="AUTO"
 	cpu_type="DETECT"
@@ -84,7 +85,8 @@ set_default() {
 	with_libtimidity="1"
 	with_freetype="1"
 	with_fontconfig="1"
-	with_icu="1"
+	with_icu_layout="1"
+	with_icu_sort="1"
 	static_icu="0"
 	with_psp_config="1"
 	with_threads="1"
@@ -105,6 +107,7 @@ set_default() {
 		strip
 		lipo
 		awk
+		pkg_config
 		os
 		endian
 		cpu_type
@@ -159,7 +162,8 @@ set_default() {
 		with_libtimidity
 		with_freetype
 		with_fontconfig
-		with_icu
+		with_icu_layout
+		with_icu_sort
 		static_icu
 		with_psp_config
 		with_threads
@@ -213,6 +217,8 @@ detect_params() {
 			--windres=*)                  windres="$optarg";;
 			--awk)                        prev_p="awk";;
 			--awk=*)                      awk="$optarg";;
+			--pkg-config)                 prev_p="pkg_config";;
+			--pkg-config=*)               pkg_config="$optarg";;
 			--strip)                      prev_p="strip";;
 			--strip=*)                    strip="$optarg";;
 			--lipo)                       prev_p="lipo";;
@@ -383,12 +389,18 @@ detect_params() {
 			--without-libfontconfig)      with_fontconfig="0";;
 			--with-libfontconfig=*)       with_fontconfig="$optarg";;
 
-			--with-icu)                   with_icu="2";;
+			--with-icu)                   with_icu_layout="2";with_icu_sort="2";;
-			--without-icu)                with_icu="0";;
+			--without-icu)                with_icu_layout="0";with_icu_sort="0";;
-			--with-icu=*)                 with_icu="$optarg";;
+			--with-icu=*)                 with_icu_layout="$optarg";with_icu_sort="$optarg";;
-			--with-libicu)                with_icu="2";;
+			--with-libicu)                with_icu_layout="2";with_icu_sort="2";;
-			--without-libicu)             with_icu="0";;
+			--without-libicu)             with_icu_layout="0";with_icu_sort="0";;
-			--with-libicu=*)              with_icu="$optarg";;
+			--with-libicu=*)              with_icu_layout="$optarg";with_icu_sort="$optarg";;
+			--with-icu-layout)            with_icu_layout="2";;
+			--without-icu-layout)         with_icu_layout="0";;
+			--with-icu-layout=*)          with_icu_layout="$optarg";;
+			--with-icu-sort)              with_icu_sort="2";;
+			--without-icu-sort)           with_icu_sort="0";;
+			--with-icu-sort=*)            with_icu_sort="$optarg";;
 			--static-icu)                 static_icu="1";;
 			--static-icu=*)               static_icu="$optarg";;
 			--static-libicu)              static_icu="1";;
@@ -526,10 +538,10 @@ check_params() {
 		log 1 " PREPROCESSOR is only available for OSX"
 		exit 1
 	fi
-	# OS only allows DETECT, UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, HAIKU, SUNOS, CYGWIN, MINGW, OS2, DOS, WINCE, and PSP
+	# OS only allows DETECT, UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, MORPHOS, BEOS, HAIKU, SUNOS, CYGWIN, MINGW, OS2, DOS, WINCE, and PSP
-	if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS|WINCE|PSP)$'`" ]; then
+	if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|DRAGONFLY|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS|WINCE|PSP)$'`" ]; then
 		log 1 "configure: error: invalid option --os=$os"
-		log 1 " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS|WINCE|PSP]"
+		log 1 " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|DRAGONFLY|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS|WINCE|PSP]"
 		exit 1
 	fi
 	# cpu_type can be either 32 or 64
@@ -787,7 +799,7 @@ check_params() {
 	pre_detect_with_zlib=$with_zlib
 	detect_zlib
 
-	if [ "$with_zlib" = "0" ] || [ -z "$zlib" ]; then
+	if [ "$with_zlib" = "0" ] || [ -z "$zlib-config" ]; then
 		log 1 "WARNING: zlib was not detected or disabled"
 		log 1 "WARNING: OpenTTD doesn't require zlib, but it does mean that many features"
 		log 1 "WARNING: (like loading most old savegames/scenarios, loading heightmaps,"
@@ -838,7 +850,8 @@ check_params() {
 	detect_png
 	detect_freetype
 	detect_fontconfig
-	detect_icu
+	detect_icu_layout
+	detect_icu_sort
 	detect_pspconfig
 	detect_libtimidity
 
@@ -862,7 +875,7 @@ check_params() {
 		endian="PREPROCESSOR"
 	fi
 
-	log 1 "checking endianess... $endian"
+	log 1 "checking endianness... $endian"
 
 	# Suppress language errors when there is a version defined, indicating a release
 	#  It just isn't pretty if any release produces warnings in the languages.
@@ -1037,7 +1050,7 @@ check_params() {
 		log 1 "checking revision... svn detection (tag)"
 	elif [ -e "$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
+	elif [ -d "$ROOT_DIR/.hg" ] && [ -n "`HGPLAIN= hg help 2>/dev/null`" ]; then
 		log 1 "checking revision... hg detection"
 	elif [ -f "$ROOT_DIR/.ottdrev" ]; then
 		log 1 "checking revision... source tarball"
@@ -1054,7 +1067,7 @@ check_params() {
 	fi
 
 	if [ "$doc_dir" = "1" ]; then
-		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
+		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "DRAGONFLY" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
 			doc_dir="share/doc/openttd"
 		else
 			doc_dir="$data_dir/docs"
@@ -1064,7 +1077,7 @@ check_params() {
 	fi
 
 	if [ "$icon_theme_dir" = "1" ]; then
-		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
+		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "DRAGONFLY" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
 			icon_theme_dir="share/icons/hicolor"
 		else
 			icon_theme_dir=""
@@ -1098,7 +1111,7 @@ check_params() {
 
 	if [ "$man_dir" = "1" ]; then
 		# add manpage on UNIX systems
-		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OSX" ]; then
+		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "DRAGONFLY" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OSX" ]; then
 			man_dir="share/man/man6"
 		else
 			man_dir=""
@@ -1109,7 +1122,7 @@ check_params() {
 
 	if [ "$menu_dir" = "1" ]; then
 		# add a freedesktop menu item only for some UNIX systems
-		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
+		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "DRAGONFLY" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
 			menu_dir="share/applications"
 		else
 			menu_dir=""
@@ -1272,7 +1285,7 @@ make_compiler_cflags() {
 
 		# -W alone doesn't enable all warnings enabled by -Wall; on the other hand,
 		# -Weverything enables too many useless warnings that can't be disabled (as of 3.0)
-		flags="$flags -Wall -W"
+		flags="$flags -Wall -W -Wextra"
 
 		# warning: unused parameter '...'
 		flags="$flags -Wno-unused-parameter"
@@ -1313,13 +1326,20 @@ make_compiler_cflags() {
 			flags="$flags -Wno-unused-variable"
 		fi
 
+		if [ "$cc_version" -ge "33" ]; then
+			# clang completed C++11 support in version 3.3
+			flags="$flags -std=c++11"
+		fi
+
 		# rdynamic is used to get useful stack traces from crash reports.
 		ldflags="$ldflags -rdynamic"
 	else
 		# Enable some things only for certain GCC versions
-		cc_version=`$1 -dumpversion | cut -c 1,3`
+		# cc_version = major_version * 100 + minor_version
+		# For example: "3.3" -> 303, "4.9.2" -> 409, "6" -> 600, "23.5" -> 2305
+		cc_version=`$1 -dumpversion | $awk -F . '{printf "%d%02d", $1, $2}'`
 
-		if [ $cc_version -lt 33 ]; then
+		if [ $cc_version -lt 303 ]; then
 			log 1 "configure: error: gcc older than 3.3 can't compile OpenTTD because of its poor template support"
 			exit 1
 		fi
@@ -1332,20 +1352,20 @@ make_compiler_cflags() {
 		if [ $enable_assert -eq 0 ]; then
 			# Do not warn about unused variables when building without asserts
 			flags="$flags -Wno-unused-variable"
-			if [ $cc_version -ge 46 ]; then
+			if [ $cc_version -ge 406 ]; then
 				# GCC 4.6 gives more warnings, disable them too
 				flags="$flags -Wno-unused-but-set-variable"
 				flags="$flags -Wno-unused-but-set-parameter"
 			fi
 		fi
 
-		if [ $cc_version -ge 34 ]; then
+		if [ $cc_version -ge 304 ]; then
 			# Warn when a variable is used to initialise itself:
 			# int a = a;
 			flags="$flags -Winit-self"
 		fi
 
-		if [ $cc_version -ge 40 ]; then
+		if [ $cc_version -ge 400 ]; then
 			# GCC 4.0+ complains about that we break strict-aliasing.
 			#  On most places we don't see how to fix it, and it doesn't
 			#  break anything. So disable strict-aliasing to make the
@@ -1356,7 +1376,7 @@ make_compiler_cflags() {
 			flags="$flags -Wcast-qual"
 		fi
 
-		if [ $cc_version -ge 42 ]; then
+		if [ $cc_version -ge 402 ]; then
 			# GCC 4.2+ automatically assumes that signed overflows do
 			# not occur in signed arithmetics, whereas we are not
 			# sure that they will not happen. It furthermore complains
@@ -1367,33 +1387,42 @@ make_compiler_cflags() {
 			flags="$flags -Wnon-virtual-dtor"
 		fi
 
-		if [ $cc_version -ge 43 ]; then
+		if [ $cc_version -ge 403 ] && [ $cc_version -lt 600 ]; then
 			# Use gnu++0x mode so static_assert() is available.
 			# Don't use c++0x, it breaks mingw (with gcc 4.4.0).
 			cxxflags="$cxxflags -std=gnu++0x"
 		fi
 
-		if [ $cc_version -eq 45 ]; then
+		if [ $cc_version -eq 405 ]; 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
+		if [ $cc_version -eq 407 ]; then
 			# Disable -Wnarrowing which gives many warnings, such as:
 			# warning: narrowing conversion of '...' from 'unsigned int' to 'int' inside { } [-Wnarrowing]
 			# They are valid according to the C++ standard, but useless.
 			cxxflags="$cxxflags -Wno-narrowing"
+		fi
+
+		if [ $cc_version -ge 407 ]; then
 			# Disable bogus 'attempt to free a non-heap object' warning
 			flags="$flags -Wno-free-nonheap-object"
 		fi
 
+		if [ $cc_version -ge 600 ]; then
+			# -flifetime-dse=2 (default since GCC 6) doesn't play
+			# well with our custom pool item allocator
+			cxxflags="$cxxflags -flifetime-dse=1 -std=gnu++14"
+		fi
+
 		if [ "$enable_lto" != "0" ]; then
 			# GCC 4.5 outputs '%{flto}', GCC 4.6 outputs '%{flto*}'
 			has_lto=`$1 -dumpspecs | grep '\%{flto'`
 			if [ -n "$has_lto" ]; then
 				# Use LTO only if we see LTO exists and is requested
-				if [ $cc_version -lt 46 ]; then
+				if [ $cc_version -lt 406 ]; then
 					flags="$flags -flto"
 				else
 					flags="$flags -flto=jobserver"
@@ -1477,7 +1506,7 @@ make_cflags_and_ldflags() {
 	fi
 
 	if [ $enable_debug -le 2 ]; then
-		cc_host_is_gcc=`basename "$cc_host" | grep "gcc" &>/dev/null`
+		cc_host_is_gcc=`basename "$cc_host" | grep "gcc" 2>/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.
@@ -1485,14 +1514,14 @@ make_cflags_and_ldflags() {
 			CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
 		fi
 
-		cc_build_is_gcc=`basename "$cc_build" | grep "gcc" &>/dev/null`
+		cc_build_is_gcc=`basename "$cc_build" | grep "gcc" 2>/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
+	if [ "$os" = "OSX" ] && [ $cc_version -eq 400 ]; 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.
 		CFLAGS="$CFLAGS -fno-expensive-optimizations"
@@ -1516,7 +1545,7 @@ make_cflags_and_ldflags() {
 			LDFLAGS="$LDFLAGS -mwin32"
 		fi
 		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
-			if [ $cc_version -lt 46 ]; then
+			if [ $cc_version -lt 406 ]; then
 				flags="$flags -mno-cygwin"
 				LDFLAGS="$LDFLAGS -mno-cygwin"
 			fi
@@ -1529,16 +1558,16 @@ make_cflags_and_ldflags() {
 
 			LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32 -limm32"
 
-			if [ $cc_version -ge 44 ]; then
+			if [ $cc_version -ge 404 ]; then
 				LDFLAGS_BUILD="$LDFLAGS_BUILD -static-libgcc -static-libstdc++"
 			fi
-			if [ $cc_version -ge 47 ]; then
+			if [ $cc_version -ge 407 ]; then
 				CFLAGS="$CFLAGS -mno-ms-bitfields"
 			fi
 		fi
 	fi
 
-	if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "FREEBSD" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "DOS" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then
+	if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "DOS" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then
 		LIBS="$LIBS -lpthread"
 	fi
 
@@ -1565,10 +1594,6 @@ make_cflags_and_ldflags() {
 		LIBS="$LIBS -pthread"
 	fi
 
-	if [ "$os" = "FREEBSD" ]; then
-		LIBS="$LIBS -lpthread"
-	fi
-
 	if [ "$os" = "OSX" ]; then
 		LDFLAGS="$LDFLAGS -framework Cocoa"
 
@@ -1586,23 +1611,6 @@ make_cflags_and_ldflags() {
 			CFLAGS="$OSX_SYSROOT $CFLAGS"
 			LDFLAGS="$OSX_LD_SYSROOT $LDFLAGS"
 		fi
-
-		if [ "$enable_universal" = "0" ] && [ $cc_version -gt 40 ]; then
-			# Only set the min version when not doing an universal build.
-			# Universal builds set the version elsewhere.
-			if [ "$cpu_type" = "64" ]; then
-				CFLAGS="$CFLAGS -mmacosx-version-min=10.5"
-			else
-				gcc_cpu=`$cc_host -dumpmachine`
-				if [ "`echo $gcc_cpu | cut -c 1-3`" = "ppc" -o "`echo $gcc_cpu | cut -c 1-7`" = "powerpc" ]; then
-					# PowerPC build can run on 10.3
-					CFLAGS="$CFLAGS -mmacosx-version-min=10.3"
-				else
-					# Intel is only available starting from 10.4
-					CFLAGS="$CFLAGS -mmacosx-version-min=10.4"
-				fi
-			fi
-		fi
 	fi
 
 	if [ "$os" = "BEOS" ] || [ "$os" = "HAIKU" ]; then
@@ -1610,7 +1618,7 @@ make_cflags_and_ldflags() {
 	fi
 
 	# Most targets act like UNIX, just with some additions
-	if [ "$os" = "BEOS" ] || [ "$os" = "HAIKU" ] || [ "$os" = "OSX" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OS2" ]; then
+	if [ "$os" = "BEOS" ] || [ "$os" = "HAIKU" ] || [ "$os" = "OSX" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "DRAGONFLY" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OS2" ]; then
 		CFLAGS="$CFLAGS -DUNIX"
 	fi
 	# And others like Windows
@@ -1657,12 +1665,13 @@ make_cflags_and_ldflags() {
 	fi
 
 	if [ "$with_zlib" != "0" ]; then
-		if [ "$enable_static" != "0" ] && [ "$os" != "OSX" ]; then
-			LIBS="$LIBS $zlib"
-		else
-			LIBS="$LIBS -lz"
-		fi
 		CFLAGS="$CFLAGS -DWITH_ZLIB"
+		CFLAGS="$CFLAGS `$zlib_config --cflags | tr '\n\r' '  '`"
+		if [ "$enable_static" != "0" ]; then
+			LIBS="$LIBS `$zlib_config --libs --static | tr '\n\r' '  '`"
+		else
+			LIBS="$LIBS `$zlib_config --libs | tr '\n\r' '  '`"
+		fi
 	fi
 
 	if [ -n "$lzma_config" ]; then
@@ -1708,13 +1717,7 @@ make_cflags_and_ldflags() {
 		CFLAGS="$CFLAGS `$png_config --cflags | tr '\n\r' '  '`"
 
 		if [ "$enable_static" != "0" ]; then
-			if [ "$os" = "OSX" ]; then
+			LIBS="$LIBS `$png_config --libs --static | tr '\n\r' '  '`"
-				# 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]*@@`"
-			else
-				LIBS="$LIBS `$png_config --libs --static | tr '\n\r' '  '`"
-			fi
 		else
 			LIBS="$LIBS `$png_config --libs | tr '\n\r' '  '`"
 		fi
@@ -1725,13 +1728,7 @@ make_cflags_and_ldflags() {
 		CFLAGS="$CFLAGS `$fontconfig_config --cflags | tr '\n\r' '  '`"
 
 		if [ "$enable_static" != "0" ]; then
-			if [ "$os" = "OSX" ]; then
+			LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' '  '`"
-				# 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 `$fontconfig_config --variable=prefix`/lib/libfontconfig.a `$fontconfig_config --libs --static | sed s@-lfontconfig@@`"
-			else
-				LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' '  '`"
-			fi
 		else
 			LIBS="$LIBS `$fontconfig_config --libs | tr '\n\r' '  '`"
 		fi
@@ -1742,26 +1739,31 @@ make_cflags_and_ldflags() {
 		CFLAGS="$CFLAGS `$freetype_config --cflags | tr '\n\r' '  '`"
 
 		if [ "$enable_static" != "0" ]; then
-			if [ "$os" = "OSX" ]; then
+			LIBS="$LIBS `$freetype_config --libs --static | tr '\n\r' '  '`"
-				LIBS="$LIBS `$freetype_config --prefix`/lib/libfreetype.a"
-			else
-				# Is it possible to do static with freetype, if so: how?
-				LIBS="$LIBS `$freetype_config --libs | tr '\n\r' '  '`"
-			fi
 		else
 			LIBS="$LIBS `$freetype_config --libs | tr '\n\r' '  '`"
 		fi
 	fi
 
-	if [ -n "$icu_config" ]; then
+	if [ -n "$icu_layout_config" ]; then
-		CFLAGS="$CFLAGS -DWITH_ICU"
+		CFLAGS="$CFLAGS -DWITH_ICU_LAYOUT"
-		CFLAGS="$CFLAGS `$icu_config --cppflags | tr '\n\r' '  '`"
+		CFLAGS="$CFLAGS `$icu_layout_config --cflags | tr '\n\r' '  '`"
 
-		# 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_layout_config --libs --static | 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_layout_config --libs | tr '\n\r' '  '`"
+		fi
+	fi
+
+	if [ -n "$icu_sort_config" ]; then
+		CFLAGS="$CFLAGS -DWITH_ICU_SORT"
+		CFLAGS="$CFLAGS `$icu_sort_config --cflags | tr '\n\r' '  '`"
+
+		if [ "$static_icu" != "0" ]; then
+			LIBS="$LIBS `$icu_sort_config --libs --static | tr '\n\r' '  ' | sed s/-licu/-lsicu/g`"
+		else
+			LIBS="$LIBS `$icu_sort_config --libs | tr '\n\r' '  '`"
 		fi
 	fi
 
@@ -1771,18 +1773,20 @@ make_cflags_and_ldflags() {
 		# GCC 4.0+ doesn't like the DirectX includes (gives tons of
 		#  warnings on it we won't be able to fix). For now just
 		#  suppress those warnings.
-		if [ $cc_version -ge 40 ]; then
+		if [ $cc_version -ge 400 ]; then
 			CFLAGS="$CFLAGS -Wno-non-virtual-dtor"
 		fi
 	fi
 
-	if [ -n "$libtimidity" ]; then
+	if [ -n "$libtimidity_config" ]; then
-		if [ "$enable_static" != "0" ]; then
-			LIBS="$LIBS $libtimidity"
-		else
-			LIBS="$LIBS -ltimidity"
-		fi
 		CFLAGS="$CFLAGS -DLIBTIMIDITY"
+		CFLAGS="$CFLAGS `$libtimidity_config --cflags | tr '\n\r' '  '`"
+
+		if [ "$enable_static" != "0" ]; then
+			LIBS="$LIBS `$libtimidity_config --libs --static | tr '\n\r' '  '`"
+		else
+			LIBS="$LIBS `$libtimidity_config --libs | tr '\n\r' '  '`"
+		fi
 	fi
 
 	if [ "$with_iconv" != "0" ]; then
@@ -1942,9 +1946,26 @@ check_compiler() {
 		log 2 "  exit code $ret"
 
 		if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then
-			log 1 "checking $1... $compiler not found"
+			if [ -z "$5" ]; then
-			log 1 "I couldn't detect any $6 binary for $3"
+				log 1 "checking $1... $compiler not found"
-			exit 1
+				log 1 "I couldn't detect any $6 binary for $3"
+				exit 1
+			else
+				compiler="$3-$5"
+			fi
+			machine=`eval $compiler $9 2>/dev/null`
+			ret=$?
+			eval "$2=\"$compiler\""
+
+			log 2 "executing $compiler $9"
+			log 2 "  returned $machine"
+			log 2 "  exit code $ret"
+
+			if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then
+				log 1 "checking $1... $compiler not found"
+				log 1 "I couldn't detect any $5 binary for $3"
+				exit 1
+			fi
 		fi
 
 		if [ "$machine" != "$3" ] && ( [ "$8" = "0" ] || [ "$8" = "1" ] ); then
@@ -2268,52 +2289,54 @@ detect_awk() {
 
 detect_os() {
 	if [ "$os" = "DETECT" ]; then
-		# Detect UNIX, OSX, FREEBSD, OPENBSD, NETBSD, HPUX, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, DOS, WINCE, and PSP
+		# Detect UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, HPUX, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, DOS, WINCE, and PSP
 
 		# Try first via dumpmachine, then via uname
 		os=`echo "$host" | tr '[A-Z]' '[a-z]' | $awk '
-					/linux/        { print "UNIX";    exit}
+					/linux/        { print "UNIX";      exit}
-					/darwin/       { print "OSX";     exit}
+					/darwin/       { print "OSX";       exit}
-					/freebsd/      { print "FREEBSD"; exit}
+					/freebsd/      { print "FREEBSD";   exit}
-					/openbsd/      { print "OPENBSD"; exit}
+					/dragonfly/    { print "DRAGONFLY"; exit}
-					/netbsd/       { print "NETBSD";  exit}
+					/openbsd/      { print "OPENBSD";   exit}
-					/hp-ux/        { print "HPUX";    exit}
+					/netbsd/       { print "NETBSD";    exit}
-					/morphos/      { print "MORPHOS"; exit}
+					/hp-ux/        { print "HPUX";      exit}
-					/beos/         { print "BEOS";    exit}
+					/morphos/      { print "MORPHOS";   exit}
-					/haiku/        { print "HAIKU";   exit}
+					/beos/         { print "BEOS";      exit}
-					/sunos/        { print "SUNOS";   exit}
+					/haiku/        { print "HAIKU";     exit}
-					/solaris/      { print "SUNOS";   exit}
+					/sunos/        { print "SUNOS";     exit}
-					/cygwin/       { print "CYGWIN";  exit}
+					/solaris/      { print "SUNOS";     exit}
-					/mingw/        { print "MINGW";   exit}
+					/cygwin/       { print "CYGWIN";    exit}
-					/os2/          { print "OS2";     exit}
+					/mingw/        { print "MINGW";     exit}
-					/dos/          { print "DOS";     exit}
+					/os2/          { print "OS2";       exit}
-					/wince/        { print "WINCE";   exit}
+					/dos/          { print "DOS";       exit}
-					/psp/          { print "PSP";     exit}
+					/wince/        { print "WINCE";     exit}
+					/psp/          { print "PSP";       exit}
 		'`
 
 		if [ -z "$os" ]; then
 			os=`LC_ALL=C uname | tr '[A-Z]' '[a-z]' | $awk '
-					/linux/        { print "UNIX";    exit}
+					/linux/        { print "UNIX";      exit}
-					/darwin/       { print "OSX";     exit}
+					/darwin/       { print "OSX";       exit}
-					/freebsd/      { print "FREEBSD"; exit}
+					/freebsd/      { print "FREEBSD";   exit}
-					/openbsd/      { print "OPENBSD"; exit}
+					/dragonfly/    { print "DRAGONFLY"; exit}
-					/netbsd/       { print "NETBSD";  exit}
+					/openbsd/      { print "OPENBSD";   exit}
-					/hp-ux/        { print "HPUX";    exit}
+					/netbsd/       { print "NETBSD";    exit}
-					/morphos/      { print "MORPHOS"; exit}
+					/hp-ux/        { print "HPUX";      exit}
-					/beos/         { print "BEOS";    exit}
+					/morphos/      { print "MORPHOS";   exit}
-					/haiku/        { print "HAIKU";   exit}
+					/beos/         { print "BEOS";      exit}
-					/sunos/        { print "SUNOS";   exit}
+					/haiku/        { print "HAIKU";     exit}
-					/cygwin/       { print "CYGWIN";  exit}
+					/sunos/        { print "SUNOS";     exit}
-					/mingw/        { print "MINGW";   exit}
+					/cygwin/       { print "CYGWIN";    exit}
-					/os\/2/        { print "OS2";     exit}
+					/mingw/        { print "MINGW";     exit}
-					/gnu/          { print "UNIX";    exit}
+					/os\/2/        { print "OS2";       exit}
+					/gnu/          { print "UNIX";      exit}
 			'`
 		fi
 
 		if [ -z "$os" ]; then
 			log 1 "detecting OS... none detected"
 			log 1 "I couldn't detect your OS. Please use --os=OS to force one"
-			log 1 "Allowed values are: UNIX, OSX, FREEBSD, OPENBSD, NETBSD, MORPHOS, HPUX, BEOS, HAIKU, SUNOS, CYGWIN, MINGW, OS2, DOS, WINCE, and PSP"
+			log 1 "Allowed values are: UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, MORPHOS, HPUX, BEOS, HAIKU, SUNOS, CYGWIN, MINGW, OS2, DOS, WINCE, and PSP"
 			exit 1
 		fi
 
@@ -2351,7 +2374,7 @@ detect_allegro() {
 		return 0
 	fi
 
-	# By default on OSX we don't use SDL. The rest is auto-detect
+	# By default on OSX we don't use Allegro. The rest is auto-detect
 	if [ "$with_allegro" = "1" ] && [ "$os" = "OSX" ] && [ "$with_cocoa" != "0" ]; then
 		log 1 "checking Allegro... OSX, skipping"
 
@@ -2359,33 +2382,7 @@ detect_allegro() {
 		return 0
 	fi
 
-	if [ "$with_allegro" = "1" ] || [ "$with_allegro" = "" ] || [ "$with_allegro" = "2" ]; then
+	detect_pkg_config "$with_allegro" "allegro" "allegro_config" "4.4"
-		allegro_config="allegro-config"
-	else
-		allegro_config="$with_allegro"
-	fi
-
-	version=`$allegro_config --version 2>/dev/null`
-	ret=$?
-	log 2 "executing $allegro_config --version"
-	log 2 "  returned $version"
-	log 2 "  exit code $ret"
-
-	if [ -z "$version" ] || [ "$ret" != "0" ]; then
-		log 1 "checking Allegro... not found"
-
-		# It was forced, so it should be found.
-		if [ "$with_allegro" != "1" ]; then
-			log 1 "configure: error: allegro-config couldn't be found"
-			log 1 "configure: error: you supplied '$with_allegro', but it seems invalid"
-			exit 1
-		fi
-
-		allegro_config=""
-		return 0
-	fi
-
-	log 1 "checking Allegro... found"
 }
 
 
@@ -2431,33 +2428,7 @@ detect_sdl() {
 		sleep 5
 	fi
 
-	if [ "$with_sdl" = "1" ] || [ "$with_sdl" = "" ] || [ "$with_sdl" = "2" ]; then
+	detect_pkg_config "$with_sdl" "sdl" "sdl_config" "1.2"
-		sdl_config="sdl-config"
-	else
-		sdl_config="$with_sdl"
-	fi
-
-	version=`$sdl_config --version 2>/dev/null`
-	ret=$?
-	log 2 "executing $sdl_config --version"
-	log 2 "  returned $version"
-	log 2 "  exit code $ret"
-
-	if [ -z "$version" ] || [ "$ret" != "0" ]; then
-		log 1 "checking SDL... not found"
-
-		# It was forced, so it should be found.
-		if [ "$with_sdl" != "1" ]; then
-			log 1 "configure: error: sdl-config couldn't be found"
-			log 1 "configure: error: you supplied '$with_sdl', but it seems invalid"
-			exit 1
-		fi
-
-		sdl_config=""
-		return 0
-	fi
-
-	log 1 "checking SDL... found"
 }
 
 detect_osx_sdk() {
@@ -2638,10 +2609,13 @@ detect_library() {
 			fi
 		fi
 		if [ -z "$res" ] && [ "$os" = "HAIKU" ]; then
-			eval "$2=`ls -1 /boot/common/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
+			if [ -z "$includeDir" ]; then
+				includeDir=`finddir B_SYSTEM_HEADERS_DIRECTORY`
+			fi
+			eval "$2=`ls -1 $includeDir/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
 			eval "res=\$$2"
 			if [ -z "$res" ]; then
-				log 2 "  trying /boot/common/include/$4$5... no"
+				log 2 "  trying $includeDir/$4$5... no"
 			fi
 		fi
 
@@ -2710,7 +2684,7 @@ detect_library() {
 }
 
 detect_zlib() {
-	detect_library "$with_zlib" "zlib" "libz.a" "" "zlib.h"
+	detect_pkg_config "$with_zlib" "zlib" "zlib_config" "1.2"
 }
 
 detect_lzo2() {
@@ -2718,7 +2692,7 @@ detect_lzo2() {
 }
 
 detect_libtimidity() {
-	detect_library "$with_libtimidity" "libtimidity" "libtimidity.a" "" "timidity.h"
+	detect_pkg_config "$with_libtimidity" "libtimidity" "libtimidity_config" "0.1" "1"
 }
 
 detect_pkg_config() {
@@ -2726,6 +2700,7 @@ detect_pkg_config() {
 	# $2 - package name ('liblzma')
 	# $3 - config name ('lzma_config', sets $lzma_config)
 	# $4 - minimum module version ('2.3')
+	# $5 - check for dedicated, 1 is "skif if dedicated"
 
 	# 0 means no, 1 is auto-detect, 2 is force
 	if [ "$1" = "0" ]; then
@@ -2735,10 +2710,17 @@ detect_pkg_config() {
 		return 0
 	fi
 
+	if [ "$5" = "1" ] && [ "$1" = "1" ] && [ "$enable_dedicated" != "0" ]; then
+		log 1 "checking $2... dedicated server, skipping"
+
+		eval "$3=\"\""
+		return 0
+	fi
+
 	log 2 "detecting $2"
 
 	if [ "$1" = "1" ] || [ "$1" = "" ] || [ "$1" = "2" ]; then
-		pkg_config_call="pkg-config $2"
+		pkg_config_call="$pkg_config $2"
 	else
 		pkg_config_call="$1"
 	fi
@@ -2760,7 +2742,7 @@ detect_pkg_config() {
 
 		# 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: $pkg_config $2 couldn't be found"
 			log 1 "configure: error: you supplied '$1', but it seems invalid"
 			exit 1
 		fi
@@ -2782,89 +2764,11 @@ detect_xdg_basedir() {
 }
 
 detect_png() {
-	# 0 means no, 1 is auto-detect, 2 is force
-	if [ "$with_png" = "0" ]; then
-		log 1 "checking libpng... disabled"
-
-		png_config=""
-		return 0
-	fi
-
-	if [ "$with_zlib" = "0" ] || [ -z "$zlib" ]; then
-		if [ "$with_png" != "1" ]; then
-			log 1 "checking libpng... no zlib"
-			log 1 "ERROR: libpng was forced, but zlib was not detected / disabled."
-			log 1 "ERROR: libpng depends on zlib."
-
-			exit 1
-		fi
-
-		log 1 "checking libpng... no zlib, skipping"
-
-		png_config=""
-		return 0
-	fi
-
 	detect_pkg_config "$with_png" "libpng" "png_config" "1.2"
 }
 
 detect_freetype() {
-	# 0 means no, 1 is auto-detect, 2 is force
+	detect_pkg_config "$with_freetype" "freetype2" "freetype_config" "2.2" "1"
-	if [ "$with_freetype" = "0" ]; then
-		log 1 "checking libfreetype... disabled"
-
-		freetype_config=""
-		return 0
-	fi
-	if [ "$with_freetype" = "1" ] && [ "$enable_dedicated" != "0" ]; then
-		log 1 "checking libfreetype... dedicated server, skipping"
-
-		freetype_config=""
-		return 0
-	fi
-
-	if [ "$with_zlib" = "0" ] || [ -z "$zlib" ]; then
-		if [ "$with_freetype" != "1" ]; then
-			log 1 "checking libfreetype... no zlib"
-			log 1 "ERROR: libfreetype was forced, but zlib was not detected / disabled."
-			log 1 "ERROR: libfreetype depends on zlib."
-
-			exit 1
-		fi
-
-		log 1 "checking libfreetype... no zlib, skipping"
-
-		freetype_config=""
-		return 0
-	fi
-
-	if [ "$with_freetype" = "1" ] || [ "$with_freetype" = "" ] || [ "$with_freetype" = "2" ]; then
-		freetype_config="freetype-config"
-	else
-		freetype_config="$with_freetype"
-	fi
-
-	version=`$freetype_config --version 2>/dev/null`
-	ret=$?
-	log 2 "executing freetype_config --version"
-	log 2 "  returned $version"
-	log 2 "  exit code $ret"
-
-	if [ -z "$version" ] || [ "$ret" != "0" ]; then
-		log 1 "checking libfreetype... not found"
-
-		# It was forced, so it should be found.
-		if [ "$with_freetype" != "1" ]; then
-			log 1 "configure: error: freetype-config couldn't be found"
-			log 1 "configure: error: you supplied '$with_freetype', but it seems invalid"
-			exit 1
-		fi
-
-		freetype_config=""
-		return 0
-	fi
-
-	log 1 "checking libfreetype... found"
 }
 
 detect_fontconfig() {
@@ -2875,19 +2779,6 @@ detect_fontconfig() {
 		fontconfig_config=""
 		return 0
 	fi
-	if [ "$with_fontconfig" = "1" ] && [ "$enable_dedicated" != "0" ]; then
-		log 1 "checking libfontconfig... dedicated server, skipping"
-
-		fontconfig_config=""
-		return 0
-	fi
-	if [ "$with_fontconfig" != "2" ] && [ -z "$freetype_config" ]; then
-		log 1 "checking libfontconfig... no freetype, skipping"
-
-		fontconfig_config=""
-		return 0
-	fi
-
 	if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
 		log 1 "checking libfontconfig... WIN32, skipping"
 		fontconfig_config=""
@@ -2900,57 +2791,15 @@ detect_fontconfig() {
 		return 0
 	fi
 
-	detect_pkg_config "$with_fontconfig" "fontconfig" "fontconfig_config" "2.3"
+	detect_pkg_config "$with_fontconfig" "fontconfig" "fontconfig_config" "2.3" "1"
 }
 
-detect_icu() {
+detect_icu_layout() {
-	# 0 means no, 1 is auto-detect, 2 is force
+	detect_pkg_config "$with_icu_layout" "icu-lx" "icu_layout_config" "4.8" "1"
-	if [ "$with_icu" = "0" ]; then
+}
-		log 1 "checking libicu... disabled"
 
-		icu_config=""
+detect_icu_sort() {
-		return 0
+	detect_pkg_config "$with_icu_sort" "icu-i18n" "icu_sort_config" "4.8" "1"
-	fi
-	if [ "$with_icu" = "1" ] && [ "$enable_dedicated" != "0" ]; then
-		log 1 "checking libicu... dedicated server, skipping"
-
-		icu_config=""
-		return 0
-	fi
-
-	if [ "$with_icu" = "1" ] || [ "$with_icu" = "" ] || [ "$with_icu" = "2" ]; then
-		icu_config="icu-config"
-	else
-		icu_config="$with_icu"
-	fi
-
-	version=`$icu_config --version 2>/dev/null`
-	ret=$?
-	check_version '3.6' "$version"
-	version_ok=$?
-	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
-			log 1 "checking libicu... needs at least version 3.6.0, icu NOT enabled"
-		else
-			log 1 "checking libicu... not found"
-		fi
-
-		# It was forced, so it should be found.
-		if [ "$with_icu" != "1" ]; then
-			log 1 "configure: error: icu-config couldn't be found"
-			log 1 "configure: error: you supplied '$with_icuconfig', but it seems invalid"
-			exit 1
-		fi
-
-		icu_config=""
-		return 0
-	fi
-
-	log 1 "checking libicu... found"
 }
 
 detect_pspconfig() {
@@ -3183,9 +3032,9 @@ detect_grfcodec() {
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 
-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "949" ]; then
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "985" ]; then
-		if [ -n "$version" ] && [ "$version" -lt "949" ]; then
+		if [ -n "$version" ] && [ "$version" -lt "985" ]; then
-			log 1 "checking grfcodec... needs at least version 6.0.2 (r949), disabled"
+			log 1 "checking grfcodec... needs at least version 6.0.5 (r985), disabled"
 		else
 			log 1 "checking grfcodec... not found"
 		fi
@@ -3225,9 +3074,9 @@ detect_nforenum() {
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 
-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "949" ]; then
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "985" ]; then
-		if [ -n "$version" ] && [ "$version" -lt "949" ]; then
+		if [ -n "$version" ] && [ "$version" -lt "985" ]; then
-			log 1 "checking nforenum... needs at least version 6.0.2 (r949), disabled"
+			log 1 "checking nforenum... needs at least version 6.0.5 (r985), disabled"
 		else
 			log 1 "checking nforenum... not found"
 		fi
@@ -3590,11 +3439,12 @@ showhelp() {
 	echo "  --windres=WINDRES              the windres to use [HOST-windres]"
 	echo "  --strip=STRIP                  the strip to use [HOST-strip]"
 	echo "  --awk=AWK                      the awk to use in configure [awk]"
+	echo "  --pkg-config=PKG-CONFIG        the pkg-config to use in configure [pkg-config]"
 	echo "  --lipo=LIPO                    the lipo to use (OSX ONLY) [HOST-lipo]"
 	echo "  --os=OS                        the OS we are compiling for [DETECT]"
-	echo "                                 DETECT/UNIX/OSX/FREEBSD/OPENBSD/NETBSD/"
+	echo "                                 DETECT/UNIX/OSX/FREEBSD/DRAGONFLY/OPENBSD/"
-	echo "                                 MORPHOS/HPUX/BEOS/SUNOS/CYGWIN/MINGW/OS2/"
+	echo "                                 NETBSD/MORPHOS/HPUX/BEOS/SUNOS/CYGWIN/"
-	echo "                                 DOS/WINCE/PSP/HAIKU"
+	echo "                                 MINGW/OS2/DOS/WINCE/PSP/HAIKU"
 	echo "  --endian=ENDIAN                set the endian of the HOST (AUTO/LE/BE)"
 	echo ""
 	echo "Paths:"
@@ -3664,23 +3514,30 @@ showhelp() {
 	echo "  --with-midi=midi               define which midi-player to use"
 	echo "  --with-midi-arg=arg            define which args to use for the"
 	echo "                                 midi-player"
-	echo "  --with-libtimidity             enables libtimidity support"
+	echo "  --with-libtimidity[=\"pkg-config libtimidity\"]"
-	echo "  --with-allegro[=allegro-config]"
+	echo "                                 enables libtimidity support"
+	echo "  --with-allegro[=\"pkg-config allegro\"]"
 	echo "                                 enables Allegro video driver support"
 	echo "  --with-cocoa                   enables COCOA video driver (OSX ONLY)"
-	echo "  --with-sdl[=sdl-config]        enables SDL video driver support"
+	echo "  --with-sdl[=\"pkg-config sdl\"]  enables SDL video driver support"
-	echo "  --with-zlib[=zlib.a]           enables zlib support"
+	echo "  --with-zlib[=\"pkg-config zlib\"]"
+	echo "                                 enables zlib support"
 	echo "  --with-liblzma[=\"pkg-config liblzma\"]"
 	echo "                                 enables liblzma support"
 	echo "  --with-liblzo2[=liblzo2.a]     enables liblzo2 support"
-	echo "  --with-png[=libpng-config]     enables libpng support"
+	echo "  --with-png[=\"pkg-config libpng\"]"
-	echo "  --with-freetype[=freetype-config]"
+	echo "                                 enables libpng support"
+	echo "  --with-freetype[=\"pkg-config freetype2\"]"
 	echo "                                 enables libfreetype support"
 	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 "  --with-icu                     enables icu components for layout and sorting"
+	echo "  --with-icu-layout[=\"pkg-config icu-lx\"]"
+	echo "                                 enables icu components for layouting (right-to-left support)"
+	echo "  --with-icu-sort[=\"pkg-config icu-i18n\"]"
+	echo "                                 enables icu components for locale specific string sorting"
 	echo "  --static-icu                   try to link statically (libsicu instead of"
 	echo "                                 libicu; can fail as the new name is guessed)"
 	echo "  --with-iconv[=iconv-path]      enables iconv support"

configure

@@ -127,7 +127,7 @@ AWKCOMMAND='
 		if ($0 == "WINCE"       && "'$os'" != "WINCE")             { next; }
 		if ($0 == "MSVC"        && "'$os'" != "MSVC")              { next; }
 		if ($0 == "DIRECTMUSIC" && "'$with_direct_music'" == "0")  { next; }
-		if ($0 == "LIBTIMIDITY" && "'$libtimidity'" == "" )        { next; }
+		if ($0 == "LIBTIMIDITY" && "'$libtimidity_config'" == "" ) { next; }
 		if ($0 == "HAVE_THREAD" && "'$with_threads'" == "0")       { next; }
 		if ($0 == "SSE"         && "'$with_sse'" != "1")           { next; }
 
@@ -149,7 +149,7 @@ AWKCOMMAND='
 
 # Read the source.list and process it
 # Please escape ALL " within ` because e.g. "" terminates the string in some sh implementations
-SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | $awk \"$AWKCOMMAND\" | $PIPE_SORT`"
+SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | $awk \"$AWKCOMMAND\" | LC_ALL=C $PIPE_SORT`"
 
 OBJS_C="`  echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.c$/   { gsub(\".c$\",   \".o\", $0); print $0; }'`"
 OBJS_CPP="`echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.cpp$/ { gsub(\".cpp$\", \".o\", $0); print $0; }'`"

docs/desync.txt

@@ -106,7 +106,7 @@ Table of contents
   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
+  all have occurred 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
@@ -194,6 +194,7 @@ Table of contents
    - 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'.
+     (DEBUG_FAILED_DUMP_COMMANDS is explained later)
    - 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'.
@@ -217,6 +218,11 @@ Table of contents
      the last dmp_cmds that reproduces the replay and the first one
      that fails.
 
+  If the replay does not succeed without mismatch, you can check the logs
+  whether there were failed commands. Then you may try to replay with
+  DEBUG_FAILED_DUMP_COMMANDS enabled. If the replay then fails, the
+  command test-run of the failed command modified the game state.
+
   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

docs/landscape.html

@@ -15,20 +15,60 @@
   For a graphical representation of the tile-layout have a look at
   <a href="landscape_grid.html">Landscape grid</a> page.
  </p>
- <p>Eight attributes (counting &quot;<span style="font-weight: bold;">type_height</span>&quot;) hold the informations about a tile.<BR>
+ <p>Nine attributes (counting &quot;<span style="font-weight: bold;">type</span>&quot; and
+  &quot;<span style="font-weight: bold;">height</span>&quot;) hold the informations about a tile.<BR>
   These attributes are referred to as
-  &quot;<span style="font-weight: bold;">type_height</span>",
+  &quot;<span style="font-weight: bold;">type</span>",
+  &quot;<span style="font-weight: bold;">height</span>",
   &quot;<span style="font-weight: bold;">m1</span>&quot;, &quot;<span style="font-weight: bold;">m2</span>&quot;,
   &quot;<span style="font-weight: bold;">m3</span>&quot;, &quot;<span style="font-weight: bold;">m4</span>&quot;,
   &quot;<span style="font-weight: bold;">m5</span>&quot;, &quot;<span style="font-weight: bold;">m6</span>&quot;
   and "<span style="font-weight: bold;">m7</span>".<br>
   The most important value is the class of a tile, stored in the upper 4 bits
-  of the <span style="font-weight: bold;">type_height</span> attribute. The lower 4 bits are used to encode the height and
+  of the <span style="font-weight: bold;">type</span> attribute.
-  slope data.
  </p>
 
  Frequently repeating patterns:
  <ul>
+  <li><span style="font-weight: bold;">type</span>
+   <ul>
+    <li>
+     <a name="type"></a>
+     Bits 7..4:
+     <table border="1" style="width: 30em;">
+      <tr bgcolor="#CCCCCC"><td colspan="2">The tile type.</td></tr>
+      <tr><td style="width: 5em;"><tt>00</tt></td><td>Ground</td></tr>
+      <tr><td><tt>01</tt></td><td>Railway tracks</td></tr>
+      <tr><td><tt>02</tt></td><td>Roads</td></tr>
+      <tr><td><tt>03</tt></td><td>Town building</td></tr>
+      <tr><td><tt>04</tt></td><td>Trees</td></tr>
+      <tr><td><tt>05</tt></td><td>Station tiles</td></tr>
+      <tr><td><tt>06</tt></td><td>Water</td></tr>
+      <tr><td><tt>07</tt></td><td>Void</td></tr>
+      <tr><td><tt>08</tt></td><td>Industries</td></tr>
+      <tr><td><tt>09</tt></td><td>Tunnel / bridge</td></tr>
+      <tr><td><tt>0A</tt></td><td>Objects</td></tr>
+     </table>
+    </li>
+     Bits 3..2:
+     <table border="1" style="width: 30em;">
+      <tr bgcolor="#CCCCCC"><td colspan="2">Presence and direction of bridge above.</td></tr>
+      <tr><td style="width: 5em;"><tt>00</tt></td><td>no bridge</td></tr>
+      <tr><td><tt>01</tt></td><td>Axis X (North-East)</td></tr>
+      <tr><td><tt>02</tt></td><td>Axis Y (South-West)</td></tr>
+     </table>
+    <li>
+     <a name="tropic_zone"></a>
+     Bits 1..0:
+     <table border="1" style="width: 30em;">
+      <tr bgcolor="#CCCCCC"><td colspan="2">Only meaningfull in tropic climate. It contains the definition of the available zones</td></tr>
+      <tr><td style="width: 5em;"><tt>00</tt></td><td>normal</td></tr>
+      <tr><td><tt>01</tt></td><td>desert</td></tr>
+      <tr><td><tt>02</tt></td><td>rain forest</td></tr>
+     </table>
+     In any other climate these 2 bits are theoretically free of use, however using them does not seem useful.
+    </li>
+   </ul>
   <li><span style="font-weight: bold;">m1</span>
    <ul>
     <li>
@@ -58,32 +98,6 @@
     </li>
    </ul>
   </li>
-  <li><span style="font-weight: bold;">m6</span>
-   <ul>
-    <li>
-     <a name="bridge_direction"></a>
-     Bits 7..6:
-     <table border="1" style="width: 30em;">
-      <tr bgcolor="#CCCCCC"><td colspan="2">Presence and direction of bridge above, for tiles that support this.</td></tr>
-      <tr><td style="width: 5em;"><tt>00</tt></td><td>no bridge</td></tr>
-      <tr><td><tt>01</tt></td><td>Axis X (North-East)</td></tr>
-      <tr><td><tt>02</tt></td><td>Axis Y (South-West)</td></tr>
-     </table>
-     Some tiles, such as houses do not support bridges over them and use these bits for other purposes.
-    </li>
-    <li>
-     <a name="tropic_zone"></a>
-     Bits 1..0:
-     <table border="1" style="width: 30em;">
-      <tr bgcolor="#CCCCCC"><td colspan="2">Only meaningfull in tropic climate. It contains the definition of the available zones</td></tr>
-      <tr><td style="width: 5em;"><tt>00</tt></td><td>normal</td></tr>
-      <tr><td><tt>01</tt></td><td>desert</td></tr>
-      <tr><td><tt>02</tt></td><td>rain forest</td></tr>
-     </table>
-     In any other climate these 2 bits are theoretically free of use, however using them does not seem useful.
-    </li>
-   </ul>
-  </li>
   <li><span style="font-weight: bold;">m7:</span><br>
    Animation frame/state. Used for houses, industries, objects and stations.
   </li>
@@ -196,9 +210,7 @@
        </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 4..2: type of hedge on NW border of the tile</li>
-     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
     </ul>
    </td>
   </tr>
@@ -510,8 +522,6 @@
        <li>m5 bit 4: pbs reservation state</li>
       </ul>
      </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>
     </ul>
    </td>
   </tr>
@@ -666,8 +676,6 @@
        <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
       </ul>
      </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>
     </ul>
    </td>
   </tr>
@@ -714,7 +722,6 @@
          <li>bits 7..2 : lift position (for houses type 04 and 05)</li>
         </ul>
        </li>
-       <li>bits 1..0 : tropic zone specifier</li>
       </ul>
      </li>
      <li>m7 :
@@ -836,7 +843,6 @@
        </tr>
       </table>
      </li>
-     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
     </ul>
    </td>
   </tr>
@@ -970,7 +976,6 @@
      <li>m6 bits 5..3: the station type (rail, airport, truck, bus, oilrig, dock, buoy, waypoint)</li>
      <li>m6 bit 2: pbs reservation state for railway stations/waypoints</li>
 
-     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
      <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road (road stops)</li>
      <li>m7 bits 7..6: present road types (road stops)</li>
      <li>m7: animation frame (railway stations/waypoints, airports)</li>
@@ -1083,8 +1088,6 @@
        </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>
     </ul>
    </td>
   </tr>
@@ -1102,7 +1105,7 @@
 
   <tr bgcolor="#CCCCCC">
    <td valign=top nowrap><strong><a name="Class8"><tt> 8</tt></a></strong></td>
-   <td><strong>Industry tile </strong></td>
+   <td><strong>Industries </strong></td>
   </tr>
   <tr>
    <td valign=top nowrap>&nbsp;</td>
@@ -1426,7 +1429,6 @@
      </li>
      <li>m6 bits 5..3: random triggers (NewGRF)</li>
      <li>m6 bit 2: bit 8 of type (see m5)</li>
-     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
      <li>m7: animation frame</li>
     </ul>
    </td>
@@ -1577,8 +1579,6 @@
        </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 bits 4..0: <a href="#OwnershipInfo">owner</a> of road</li>
      <li>m7 bit 5 set = on snow or desert</li>
      <li>m7 bits 7..6: present road types for road</li>
@@ -1599,8 +1599,6 @@
      <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>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>
     </ul>
    </td>

docs/landscape_grid.html

@@ -17,7 +17,7 @@
 </head>
 <body style="direction: ltr;">
 <h3 style="font-weight: bold;">Landscape</h3>
-<span style="font-weight: bold;"></span>Six attributes hold the information about a tile.
+<span style="font-weight: bold;"></span>Nine attributes hold the information about a tile.
 This can be seen in the <a href="landscape.html">Landscape</a> document. This page tries to give an overview of used and free bits of
 the array so you can quickly see what is used and what is not.
 <ul>
@@ -28,13 +28,14 @@ the array so you can quickly see what is used and what is not.
 </ul>
 <p>
 <ul>
-  <li><span style="font-weight: bold;">type_height</span> - 8 bits in size, stores tile height (lower 4 bits) and tile class (upper 4 bits)</li>
+  <li><span style="font-weight: bold;">type</span> - 8 bits in size, tile class (bits 4..7), bridge (bits 2..3) tropic zone (bits 0..1, only valid in tropic climate)</li>
+  <li><span style="font-weight: bold;">height</span> - 8 bits in size, stores tile height</li>
   <li><span style="font-weight: bold;">m1</span> - 8 bits in size, used to identify the owner of that tile (eg piece of rail, bridge, etc.)</li>
   <li><span style="font-weight: bold;">m2</span> - 16 bits in size, used to identify the index of the given tile (object) in the (object-)array</li>
   <li><span style="font-weight: bold;">m3</span> - 8 bits in size, is used for general storage</li>
   <li><span style="font-weight: bold;">m4</span> - 8 bits in size, is used for general storage</li>
   <li><span style="font-weight: bold;">m5</span> - 8 bits in size, is used for general storage</li>
-  <li><span style="font-weight: bold;">m6</span> - 8 bits in size, special meaning : lower 2 bits only valid in tropic climate, upper 2 bits for bridges</li>
+  <li><span style="font-weight: bold;">m6</span> - 8 bits in size, is used for general storage</li>
   <li><span style="font-weight: bold;">m7</span> - 8 bits in size, is used for general storage</li>
 </ul>
 
@@ -42,7 +43,8 @@ the array so you can quickly see what is used and what is not.
   <tbody>
     <tr>
       <th colspan=2>class</th>
-      <th>type_height (8)</th>
+      <th>type (8)</th>
+      <th>height (8)</th>
       <th>m1 (8)</th>
       <th>m2 (16)</th>
       <th>m3 (8)</th>
@@ -55,6 +57,7 @@ the array so you can quickly see what is used and what is not.
       <td colspan=2 class="caption">bits</td>
       <td class="bits">7654 3210</td>
       <td class="bits">7654 3210</td>
+      <td class="bits">7654 3210</td>
       <td class="bits">FEDC BA98 7654 3210</td>
       <td class="bits">7654 3210</td>
       <td class="bits">7654 3210</td>
@@ -66,69 +69,75 @@ the array so you can quickly see what is used and what is not.
       <td rowspan="2">0</td>
       <td class="caption">ground</td>
       <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">OOO</span><span class="option">~ ~~~~</span></td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
       <td class="bits">XXXX <span class="free">OOOO</span></td>
       <td class="bits">XXXX XX<span class="free">OO</span></td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XX<span class="free">O</span>X XXXX</td>
+      <td class="bits"><span class="free">OOO</span>X XX<span class="free">OO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">farmland</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">XX<span class="free">O</span>X XXXX</td>
+      <td class="bits"><span class="free">OOO</span>X XX<span class="free">OO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td rowspan=3>1</td>
       <td class="caption">rail</td>
       <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">OOO</span>X XXXX</td>
       <td class="bits"><span class="free">OOOO</span> XXXX <span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO</span> XXXX</td>
       <td class="bits"><span class="free">OOOO</span> XXXX</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">rail with signals</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO</span> XXXX XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">depot</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
       <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">OO OO</span>XX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td rowspan=3>2</td>
       <td class="caption">road</td>
       <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">OOO</span>X XXXX</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX X<span class="free">O</span>XX</td>
+      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
       <td class="bits">XXX<span class="free">O</span> XXXX</td>
     </tr>
     <tr>
@@ -136,10 +145,11 @@ the array so you can quickly see what is used and what is not.
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">-inherit-</td>
       <td class="bits">XXXX<span class="free"> OOO</span>X</td>
-      <td class="bits">XXXX X<span class="free">O</span>XX</td>
+      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
       <td class="bits">XXXX XXXX</td>
     </tr>
     <tr>
@@ -147,10 +157,11 @@ the array so you can quickly see what is used and what is not.
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
       <td class="bits">XXXX <span class="free">OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XXX<span class="free">O</span> XXXX</td>
     </tr>
     <tr>
@@ -158,35 +169,38 @@ the array so you can quickly see what is used and what is not.
       <td class="caption">house</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
       <td class="bits">XX<span class="free">O</span><span class="option">~ ~~</span>XX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXX<span class="abuse">X XXXX</span></td>
-      <td class="bits"><span class="abuse">XXXX XX</span>XX</td>
+      <td class="bits"><span class="abuse">XXXX XX</span><span class="free">OO</span></td>
       <td class="bits">XXXX <span class="abuse">XXXX</span></td>
     </tr>
     <tr>
       <td>4</td>
       <td class="caption">trees</td>
       <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">OOO</span><span class="option">~ ~~~~</span></td>
       <td class="bits"><span class="free">OOOO OOO</span>X XXXX XXXX</td>
       <td class="bits"><span class="option">~~</span>XX XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XX<span class="free">OO O</span>XXX</td>
-      <td class="bits"><span class="free">OOOO OO</span>XX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td rowspan=7>5</td>
       <td class="caption">rail station</td>
       <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">O</span>XXX XXXX</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OO</span>XX XXXX</td>
+      <td class="bits"><span class="free">OO</span>XX XX<span class="free">OO</span></td>
       <td class="bits">XXXX XXXX</td>
     </tr>
     <tr>
@@ -199,16 +213,18 @@ the array so you can quickly see what is used and what is not.
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
     </tr>
     <tr>
       <td class="caption">road stop</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
       <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 X<span class="free">OOO</span></td>
       <td class="bits">XX<span class="free">O</span>X XXXX</td>
     </tr>
     <tr>
@@ -216,10 +232,11 @@ the array so you can quickly see what is used and what is not.
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO 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 X<span class="free">OOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
@@ -227,10 +244,11 @@ the array so you can quickly see what is used and what is not.
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
       <td class="bits">XXXX <span class="free">OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XXXX XXXX</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 X<span class="free">OOO</span></td>
       <td class="bits">XXXX XXXX</td>
     </tr>
     <tr>
@@ -238,10 +256,11 @@ the array so you can quickly see what is used and what is not.
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="option">~~~~ ~~~~</span></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 X<span class="free">OOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
@@ -249,68 +268,74 @@ the array so you can quickly see what is used and what is not.
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="option">~~~~ ~~~~</span></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 X<span class="free">OOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td rowspan=3>6</td>
       <td class="caption">sea, shore</td>
       <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">O</span>XXX XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">X<span class="option">~~</span>X XXXX</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">canal, river</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">shipdepot</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">-inherit-</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td>8</td>
       <td class="caption">industry</td>
       <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
       <td class="bits">XXX<span class="free">O</span> <span class="abuse">XXXX</span></td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OO</span>XX XXXX</td>
+      <td class="bits"><span class="free">OO</span>XX XX<span class="free">OO</span></td>
       <td class="bits">XXXX XXXX</td>
     </tr>
     <tr>
       <td rowspan=2>9</td>
       <td class="caption">tunnel entrance</td>
       <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">OOO</span>X XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
       <td class="bits">XXXX XXXX</td>
       <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"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XXXX XXXX</td>
     </tr>
     <tr>
@@ -321,19 +346,21 @@ the array so you can quickly see what is used and what is not.
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">XXXX XXXX</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits"><span class="free">OO</span>XX XX<span class="free">OO</span></td>
       <td class="bits">-inherit-</td>
     </tr>
     <tr>
       <td rowspan=2>A</td>
       <td class="caption">objects</td>
       <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">O</span>XXX XXXX</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XXXX XXXX</td>
     </tr>
   </tbody>

docs/openttd.6

@@ -1,112 +1,152 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd May 31, 2011
+.Dd October 13, 2014
 .Dt OPENTTD 6
+.Os
 .Sh NAME
 .Nm openttd
-.Nd An open source clone of the Microprose game "Transport Tycoon Deluxe"
+.Nd open source clone of the Microprose game \(lqTransport Tycoon Deluxe\(rq
 .Sh SYNOPSIS
 .Nm
 .Op Fl efhx
 .Op Fl b Ar blitter
 .Op Fl c Ar config_file
-.Op Fl d Ar [level | cat=lvl[,...]]
+.Op Fl d Op Ar level | Ar cat Ns = Ns Ar lvl Ns Op , Ns Ar ...
-.Op Fl D Ar [host][:port]
+.Op Fl D Oo Ar host Oc Ns Op : Ns Ar port
-.Op Fl g Ar [savegame]
+.Op Fl g Op Ar savegame
 .Op Fl G Ar seed
 .Op Fl I Ar graphicsset
-.Op Fl l Ar host[:port]
+.Op Fl l Ar host Ns Op : Ns Ar port
 .Op Fl m Ar driver
 .Op Fl M Ar musicset
-.Op Fl n Ar host[:port][#player]
+.Op Fl n Ar host Ns Oo : Ns Ar port Oc Ns Op # Ns Ar player
 .Op Fl p Ar password
 .Op Fl P Ar password
 .Op Fl q Ar savegame
-.Op Fl r Ar widthxheight
+.Op Fl r Ar width Ns x Ns Ar height
 .Op Fl s Ar driver
 .Op Fl S Ar soundset
 .Op Fl t Ar year
 .Op Fl v Ar driver
 .Sh OPTIONS
-.Bl -tag -width ".Fl n Ar host[:port][#player]"
+.Bl -tag -width "-n host[:port][#player]"
 .It Fl b Ar blitter
-Set the blitter, see
+Select the blitter
+.Ar blitter ;
+see
 .Fl h
-for a full list
+for a full list.
 .It Fl c Ar config_file
-Use 'config_file' instead of 'openttd.cfg'
+Use
+.Ar config_file
+instead of
+.Pa openttd.cfg .
 .It Fl d Ar [level]
 Set debug verbosity for all categories to
-.Ar level
+.Ar level ,
-or 1 if omitted
+or 1 if omitted.
-.It Fl d Ar cat=level[,...]
+.It Fl d Ar cat Ns = Ns Ar lvl Ns Op , Ns Ar ...
-Set debug verbosity for a specific category
+Set debug verbosity to
-.It Fl D Ar [host][:port]
+.Ar lvl
-Start a dedicated server. Sets network debug level to 6. If you want to change this, use
+for a specific category
+.Ar cat .
+.It Fl D Oo Ar host Oc Ns Op : Ns Ar port
+Start a dedicated server.
+.Pp
+Network debug level will be set to 6.
+If you want to change this, set
 .Fl d
-after
+after setting
-.Fl D
+.Fl D .
-.It Fl G Ar seed
-Seed the pseudo random number generator
 .It Fl e
-Start in world editor mode
+Start in world editor mode.
 .It Fl f
 Fork into background (dedicated server only, see
-.Fl D )
+.Fl D ) .
-.It Fl g Ar [savegame]
+.It Fl g Op Ar savegame
 Load
 .Ar savegame
-at start or start a new game if omitted. The
+at start or start a new game if omitted.
 .Ar savegame
-must be either absolute or relative to the current path or one of the search paths.
+must be either an absolute path or one relative to the current path or one of
+the search paths.
+.It Fl G Ar seed
+Seed the pseudo random number generator with
+.Ar seed .
 .It Fl h
-Display a summary of all options and lists all the available AIs, blitters, sound, music and video drivers, graphics sets and sound sets.
+Display a summary of all options and list all the available AIs, blitters,
+sound, music and video drivers, graphics sets and sound sets.
 .It Fl I Ar graphicsset
-Set the graphics set, see
+Select the graphics set
+.Ar graphicsset ;
+see
 .Fl h
-for a full list
+for a full list.
-.It Fl l Ar host[:port]
+.It Fl l Ar host Ns Op : Ns Ar port
-Redirect DEBUG(), See
+Redirect
-.Fl D
+.Fn DEBUG
+output; see
+.Fl D .
 .It Fl m Ar driver
-Set the music driver, see
+Select the music driver
+.Ar driver ;
+see
 .Fl h
-for a full list
+for a full list.
 .It Fl M Ar musicset
-Set the music set, see
+Select the music set
+.Ar musicset ;
+see
 .Fl h
-for a full list
+for a full list.
-.It Fl n Ar host[:port][#player]
+.It Fl n Ar host Ns Oo : Ns Ar port Oc Ns Op # Ns Ar player
-Join a network game, optionally specify a port to connect to and player to play as
+Join a network game, optionally specifying a port to connect to and player to
+play as.
 .It Fl p Ar password
-Password used to join server. Only useful with
+Password used to join server.
-.Fl n
+Only useful with
+.Fl n .
 .It Fl P Ar password
-Password used to join company. Only useful with
+Password used to join company.
-.Fl n
+Only useful with
+.Fl n .
 .It Fl q Ar savegame
-Write some information about the savegame and exit
+Write some information about the specified savegame and exit.
-.It Fl r Ar widthxheight
+.It Fl r Ar width Ns x Ns Ar height
-Set the resolution
+Set the resolution to
+.Ar width
+\(mu
+.Ar height
+pixels.
 .It Fl s Ar driver
-Set the sound driver, see
+Select the sound driver
+.Ar driver ;
+see
 .Fl h
-for a full list
+for a full list.
 .It Fl S Ar soundset
-Set the sound set, see
+Select the sound set
+.Ar soundset ;
+see
 .Fl h
-for a full list
+for a full list.
 .It Fl t Ar year
-Set the starting year
+Set the starting year to
+.Ar year .
 .It Fl v Ar driver
-Set the video driver, see
+Select the video driver
+.Ar driver ;
+see
 .Fl h
-for a full list
+for a full list.
 .It Fl x
-Do not automatically save to config file on exit
+Do not automatically save to config file on exit.
 .El
 .Sh SEE ALSO
-http://wiki.openttd.org/, http://www.openttd.org
+.Lk https://wiki.openttd.org "Wiki"
+(includes community maintained manual),
+.Lk https://forum.openttd.org "Forum",
+.Lk https://www.openttd.org "News"
 .Sh HISTORY
 Transport Tycoon Deluxe was written by Chris Sawyer and published by Microprose.
 .Nm

findversion.sh

@@ -70,7 +70,11 @@ 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 [ -f "$ROOT_DIR/.ottdrev" ]; then
+	# We are an exported source bundle
+	cat $ROOT_DIR/.ottdrev
+	exit
+elif [ -d "$ROOT_DIR/.svn" ] || [ -d "$ROOT_DIR/../.svn" ]; then
 	# We are an svn checkout
 	if [ -n "`svnversion | grep 'M'`" ]; then
 		MODIFIED="2"
@@ -84,7 +88,7 @@ if [ -d "$ROOT_DIR/.svn" ] || [ -d "$ROOT_DIR/../.svn" ]; then
 	else
 		REV="r$REV_NR"
 	fi
-elif [ -d "$ROOT_DIR/.git" ]; then
+elif [ -e "$ROOT_DIR/.git" ]; then
 	# We are a git checkout
 	# Refresh the index to make sure file stat info is in sync, then look for modifications
 	git update-index --refresh >/dev/null
@@ -106,26 +110,22 @@ elif [ -d "$ROOT_DIR/.git" ]; then
 	fi
 elif [ -d "$ROOT_DIR/.hg" ]; then
 	# We are a hg checkout
-	if [ -n "`hg status | grep -v '^?'`" ]; then
+	if [ -n "`HGPLAIN= hg status | grep -v '^?'`" ]; then
 		MODIFIED="2"
 	fi
-	HASH=`LC_ALL=C hg id -i | cut -c1-12`
+	HASH=`LC_ALL=C HGPLAIN= hg id -i | cut -c1-12`
 	REV="h`echo $HASH | cut -c1-8`"
-	BRANCH="`hg branch | sed 's@^default$@@'`"
+	BRANCH="`HGPLAIN= hg branch | sed 's@^default$@@'`"
-	TAG="`hg id -t | grep -v 'tip$'`"
+	TAG="`HGPLAIN= hg id -t | grep -v 'tip$'`"
 	if [ -n "$TAG" ]; then
 		BRANCH=""
 		REV="$TAG"
 	fi
-	REV_NR=`LC_ALL=C hg log -f -k "(svn r" -l 1 --template "{desc|firstline}\n" | grep "^(svn r[0-9]*)" | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
+	REV_NR=`LC_ALL=C HGPLAIN= hg log -f -k "(svn r" -l 1 --template "{desc|firstline}\n" | grep "^(svn r[0-9]*)" | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
 	if [ -z "$REV_NR" ]; then
 		# No rev? Maybe it is a custom hgsubversion clone
-		REV_NR=`LC_ALL=C hg parent --template="{svnrev}"`
+		REV_NR=`LC_ALL=C HGPLAIN= hg parent --template="{svnrev}"`
 	fi
-elif [ -f "$ROOT_DIR/.ottdrev" ]; then
-	# We are an exported source bundle
-	cat $ROOT_DIR/.ottdrev
-	exit
 else
 	# We don't know
 	MODIFIED="1"

known-bugs.txt

@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2014-10-21
+Last updated:    2017-12-24
-Release version: 1.4.4
+Release version: 1.7.2
 ------------------------------------------------------------------------
 
 

media/baseset/orig_dos.obg

@@ -11,21 +11,21 @@ palette           = DOS
 !! description STR_BASEGRAPHICS_DOS_DESCRIPTION
 
 [files]
-base         = TRG1.GRF
+base              = TRG1.GRF
-logos        = TRGI.GRF
+logos             = TRGI.GRF
-arctic       = TRGC.GRF
+arctic            = TRGC.GRF
-tropical     = TRGH.GRF
+tropical          = TRGH.GRF
-toyland      = TRGT.GRF
+toyland           = TRGT.GRF
-extra        = OPENTTD.GRF
+extra             = ORIG_EXTRA.GRF
 
 [md5s]
-TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
+TRG1.GRF          = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
+TRGI.GRF          = da6a6c9dcc451eec88d79211437b76a8
-TRGC.GRF     = ed446637e034104c5559b32c18afe78d
+TRGC.GRF          = ed446637e034104c5559b32c18afe78d
-TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
+TRGH.GRF          = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
+TRGT.GRF          = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF  =
+ORIG_EXTRA.GRF    =
 
 [origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+default           = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTD.GRF  = This file was part of your OpenTTD installation.
+ORIG_EXTRA.GRF    = This file was part of your OpenTTD installation.

media/baseset/orig_dos_de.obg

@@ -11,21 +11,21 @@ palette           = DOS
 !! description STR_BASEGRAPHICS_DOS_DE_DESCRIPTION
 
 [files]
-base         = TRG1.GRF
+base              = TRG1.GRF
-logos        = TRGI.GRF
+logos             = TRGI.GRF
-arctic       = TRGC.GRF
+arctic            = TRGC.GRF
-tropical     = TRGH.GRF
+tropical          = TRGH.GRF
-toyland      = TRGT.GRF
+toyland           = TRGT.GRF
-extra        = OPENTTD.GRF
+extra             = ORIG_EXTRA.GRF
 
 [md5s]
-TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
+TRG1.GRF          = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
+TRGI.GRF          = da6a6c9dcc451eec88d79211437b76a8
-TRGC.GRF     = ed446637e034104c5559b32c18afe78d
+TRGC.GRF          = ed446637e034104c5559b32c18afe78d
-TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
+TRGH.GRF          = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
+TRGT.GRF          = fcde1d7e8a74197d72a62695884b909e
-OPENTTD.GRF  =
+ORIG_EXTRA.GRF    =
 
 [origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+default           = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTD.GRF  = This file was part of your OpenTTD installation.
+ORIG_EXTRA.GRF    = This file was part of your OpenTTD installation.

media/baseset/orig_win.obg

@@ -11,21 +11,21 @@ palette           = Windows
 !! description STR_BASEGRAPHICS_WIN_DESCRIPTION
 
 [files]
-base         = TRG1R.GRF
+base              = TRG1R.GRF
-logos        = TRGIR.GRF
+logos             = TRGIR.GRF
-arctic       = TRGCR.GRF
+arctic            = TRGCR.GRF
-tropical     = TRGHR.GRF
+tropical          = TRGHR.GRF
-toyland      = TRGTR.GRF
+toyland           = TRGTR.GRF
-extra        = OPENTTD.GRF
+extra             = ORIG_EXTRA.GRF
 
 [md5s]
-TRG1R.GRF    = b04ce593d8c5016e07473a743d7d3358
+TRG1R.GRF         = b04ce593d8c5016e07473a743d7d3358
-TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
+TRGIR.GRF         = 0c2484ff6be49fc63a83be6ab5c38f32
-TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
+TRGCR.GRF         = 3668f410c761a050b5e7095a2b14879b
-TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
+TRGHR.GRF         = 06bf2b7a31766f048baac2ebe43457b1
-TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
+TRGTR.GRF         = de53650517fe661ceaa3138c6edb0eb8
-OPENTTD.GRF  =
+ORIG_EXTRA.GRF    =
 
 [origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+default           = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTD.GRF  = This file was part of your OpenTTD installation.
+ORIG_EXTRA.GRF    = This file was part of your OpenTTD installation.

media/extra_grf/canals.nfo

@@ -6,7 +6,7 @@
 // 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/>.
 //
-   -1 * 0	 0C "Canal graphics by George / PaulC"
+   -1 * 0	 0C "Canal graphics by George"
    -1 * 3	 05 08 41
 // Canal slopes
    -1 sprites/canal_locks.png 8bpp  66    8  64  23 -31   0 normal
@@ -77,95 +77,3 @@
    -1 sprites/canals.png 8bpp 446   10  24  16 -11  -6 normal
 // Canal icon
    -1 sprites/canal_locks.png 8bpp  50  232  20  20   0   0 normal
-
-// Differentiation for the climates starts here
-
-// Canal edges (arctic snowy)
-   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png 8bpp  30   40  45  22 -11  -1 normal
-   -1 sprites/canals.png 8bpp  94   40  41  21  -8  10 normal
-   -1 sprites/canals.png 8bpp 142   40  42  21 -31  10 normal
-   -1 sprites/canals.png 8bpp 190   40  43  22 -31  -1 normal
-   -1 sprites/canals.png 8bpp 238   40  22  22  11   4 normal
-   -1 sprites/canals.png 8bpp 270   40  24  16 -11  15 normal
-   -1 sprites/canals.png 8bpp 302   40  23  23 -31   4 normal
-   -1 sprites/canals.png 8bpp 334   40  24  18 -11  -1 normal
-   -1 sprites/canals.png 8bpp 366   40  12  11  21  10 normal
-   -1 sprites/canals.png 8bpp 398   40  19  10  -8  21 normal
-   -1 sprites/canals.png 8bpp 430   40  11  10 -31  10 normal
-   -1 sprites/canals.png 8bpp 446   40  24  16 -11  -6 normal
-   -1 * 7        02 05 10 01 00 00 00
-
-// Canal edges (arctic normal)
-   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png 8bpp  30   70  45  22 -11  -1 normal
-   -1 sprites/canals.png 8bpp  94   70  41  21  -8  10 normal
-   -1 sprites/canals.png 8bpp 142   70  42  21 -31  10 normal
-   -1 sprites/canals.png 8bpp 190   70  43  22 -31  -1 normal
-   -1 sprites/canals.png 8bpp 238   70  22  22  11   4 normal
-   -1 sprites/canals.png 8bpp 270   70  24  16 -11  15 normal
-   -1 sprites/canals.png 8bpp 302   70  23  23 -31   4 normal
-   -1 sprites/canals.png 8bpp 334   70  24  18 -11  -1 normal
-   -1 sprites/canals.png 8bpp 366   70  12  11  21  10 normal
-   -1 sprites/canals.png 8bpp 398   70  19  10  -8  21 normal
-   -1 sprites/canals.png 8bpp 430   70  11  10 -31  10 normal
-   -1 sprites/canals.png 8bpp 446   70  24  16 -11  -6 normal
-   -1 * 7        02 05 11 01 00 00 00
-// Choose the right arctic canal edges
-   -1 * 14       02 05 12 81 81 00 FF 01 10 00 04 04 11 00
-   -1 * 6        07 83 01 \7! 01 01
-   -1 * 7        03 05 01 02 00 12 00
-
-// Canal edges (tropic desert)
-   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png 8bpp  30  100  45  22 -11  -1 normal
-   -1 sprites/canals.png 8bpp  94  100  41  21  -8  10 normal
-   -1 sprites/canals.png 8bpp 142  100  42  21 -31  10 normal
-   -1 sprites/canals.png 8bpp 190  100  43  22 -31  -1 normal
-   -1 sprites/canals.png 8bpp 238  100  22  22  11   4 normal
-   -1 sprites/canals.png 8bpp 270  100  24  16 -11  15 normal
-   -1 sprites/canals.png 8bpp 302  100  23  23 -31   4 normal
-   -1 sprites/canals.png 8bpp 334  100  24  18 -11  -1 normal
-   -1 sprites/canals.png 8bpp 366  100  12  11  21  10 normal
-   -1 sprites/canals.png 8bpp 398  100  19  10  -8  21 normal
-   -1 sprites/canals.png 8bpp 430  100  11  10 -31  10 normal
-   -1 sprites/canals.png 8bpp 446  100  24  16 -11  -6 normal
-   -1 * 7        02 05 13 01 00 00 00
-
-// Canal edges (tropic rainforest)
-   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png 8bpp  30  130  45  22 -11  -1 normal
-   -1 sprites/canals.png 8bpp  94  130  41  21  -8  10 normal
-   -1 sprites/canals.png 8bpp 142  130  42  21 -31  10 normal
-   -1 sprites/canals.png 8bpp 190  130  43  22 -31  -1 normal
-   -1 sprites/canals.png 8bpp 238  130  22  22  11   4 normal
-   -1 sprites/canals.png 8bpp 270  130  24  16 -11  15 normal
-   -1 sprites/canals.png 8bpp 302  130  23  23 -31   4 normal
-   -1 sprites/canals.png 8bpp 334  130  24  18 -11  -1 normal
-   -1 sprites/canals.png 8bpp 366  130  12  11  21  10 normal
-   -1 sprites/canals.png 8bpp 398  130  19  10  -8  21 normal
-   -1 sprites/canals.png 8bpp 430  130  11  10 -31  10 normal
-   -1 sprites/canals.png 8bpp 446  130  24  16 -11  -6 normal
-   -1 * 7        02 05 14 01 00 00 00
-// Choose the right tropic canal edges
-   -1 * 14       02 05 15 81 81 00 FF 01 13 00 01 01 14 00
-   -1 * 6        07 83 01 \7! 02 01
-   -1 * 7        03 05 01 02 00 15 00
-
-// Canal edges (toyland)
-   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png 8bpp  30  160  45  22 -11  -1 normal
-   -1 sprites/canals.png 8bpp  94  160  41  21  -8  10 normal
-   -1 sprites/canals.png 8bpp 142  160  42  21 -31  10 normal
-   -1 sprites/canals.png 8bpp 190  160  43  22 -31  -1 normal
-   -1 sprites/canals.png 8bpp 238  160  22  22  11   4 normal
-   -1 sprites/canals.png 8bpp 270  160  24  16 -11  15 normal
-   -1 sprites/canals.png 8bpp 302  160  23  23 -31   4 normal
-   -1 sprites/canals.png 8bpp 334  160  24  18 -11  -1 normal
-   -1 sprites/canals.png 8bpp 366  160  12  11  21  10 normal
-   -1 sprites/canals.png 8bpp 398  160  19  10  -8  21 normal
-   -1 sprites/canals.png 8bpp 430  160  11  10 -31  10 normal
-   -1 sprites/canals.png 8bpp 446  160  24  16 -11  -6 normal
-   -1 * 7        02 05 16 01 00 00 00
-   -1 * 6        07 83 01 \7! 03 01
-   -1 * 7        03 05 01 02 00 16 00

media/extra_grf/canals_extra.nfo

@@ -0,0 +1,101 @@
+//
+// $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/>.
+//
+   -1 * 0	 0C "Extra canal graphics by PaulC"
+
+// Differentiation for the climates starts here
+
+// Canal edges (arctic snowy)
+   -1 * 4        01 05 01 \b12
+   -1 sprites/canals.png 8bpp  30   40  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94   40  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142   40  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190   40  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238   40  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270   40  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302   40  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334   40  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366   40  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398   40  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430   40  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446   40  24  16 -11  -6 normal
+   -1 * 7        02 05 10 01 00 00 00
+
+// Canal edges (arctic normal)
+   -1 * 4        01 05 01 \b12
+   -1 sprites/canals.png 8bpp  30   70  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94   70  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142   70  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190   70  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238   70  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270   70  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302   70  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334   70  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366   70  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398   70  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430   70  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446   70  24  16 -11  -6 normal
+   -1 * 7        02 05 11 01 00 00 00
+// Choose the right arctic canal edges
+   -1 * 14       02 05 12 81 81 00 FF 01 10 00 04 04 11 00
+   -1 * 6        07 83 01 \7! 01 01
+   -1 * 7        03 05 01 02 00 12 00
+
+// Canal edges (tropic desert)
+   -1 * 4        01 05 01 \b12
+   -1 sprites/canals.png 8bpp  30  100  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94  100  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142  100  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190  100  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238  100  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270  100  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302  100  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334  100  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366  100  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398  100  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430  100  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446  100  24  16 -11  -6 normal
+   -1 * 7        02 05 13 01 00 00 00
+
+// Canal edges (tropic rainforest)
+   -1 * 4        01 05 01 \b12
+   -1 sprites/canals.png 8bpp  30  130  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94  130  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142  130  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190  130  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238  130  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270  130  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302  130  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334  130  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366  130  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398  130  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430  130  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446  130  24  16 -11  -6 normal
+   -1 * 7        02 05 14 01 00 00 00
+// Choose the right tropic canal edges
+   -1 * 14       02 05 15 81 81 00 FF 01 13 00 01 01 14 00
+   -1 * 6        07 83 01 \7! 02 01
+   -1 * 7        03 05 01 02 00 15 00
+
+// Canal edges (toyland)
+   -1 * 4        01 05 01 \b12
+   -1 sprites/canals.png 8bpp  30  160  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94  160  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142  160  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190  160  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238  160  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270  160  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302  160  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334  160  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366  160  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398  160  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430  160  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446  160  24  16 -11  -6 normal
+   -1 * 7        02 05 16 01 00 00 00
+   -1 * 6        07 83 01 \7! 03 01
+   -1 * 7        03 05 01 02 00 16 00

media/extra_grf/chars.nfo

@@ -8,245 +8,7 @@
 //
    -1 * 0	 0C "Font characters by PaulC, Bilbo and Jasper Vries"
 
-// Replace original characters
+// Note: Characters in range U+0020..U+00FF may only be defined in chars_orig_extra.nfo.
-
-   -1 * 5	 0A 01 02 41 00
-   -1 sprites/chars.png 8bpp  10   10   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  20   10   4  12   0  -1 normal
-   -1 * 5	 0A 01 02 86 00
-   -1 sprites/chars.png 8bpp  50   10   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  70   10   9  12   0  -1 normal
-   -1 * 5	 0A 01 01 8A 00
-   -1 sprites/chars.png 8bpp 120   10   6  12   0  -1 normal
-   -1 * 5	 0A 01 01 A0 00
-   -1 sprites/chars.png 8bpp 230   10  10  12   0  -1 normal
-   -1 * 5	 0A 01 04 A2 00
-   -1 sprites/chars.png 8bpp 260   10   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 290   10   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 320   10   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 350   10   8  12   0  -1 normal
-   -1 * 5	 0A 01 06 A7 00
-   -1 sprites/chars.png 8bpp 410   10   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 440   10  12  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 470   10   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 480   10   7  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 500   10   7  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 520   10   7  12   0  -1 normal
-   -1 * 5	 0A 01 03 AE 00
-   -1 sprites/chars.png 8bpp 560   10   4  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 570   10   4  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 580   10   5  12   0  -1 normal
-   -1 * 5	 0A 01 05 B3 00
-   -1 sprites/chars.png 8bpp 620   10   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 640   10   9  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 660   10   9  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 680   10   9  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 700   10   9  12   0  -1 normal
-   -1 * 5	 0A 01 03 BB 00
-   -1 sprites/chars.png 8bpp 770   10   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  10   70   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  30   70   8  12   0  -1 normal
-   -1 * 5	 0A 01 01 BF 00
-   -1 sprites/chars.png 8bpp  70   70   9  12   0  -1 normal
-   -1 * 5	 0A 01 05 C1 00
-   -1 sprites/chars.png 8bpp 450   70   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 110   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 120   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 130   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 140   70   6  12   0  -1 normal
-   -1 * 5	 0A 01 01 C7 00
-   -1 sprites/chars.png 8bpp 160   70   6  12   0  -1 normal
-   -1 * 5	 0A 01 03 CA 00
-   -1 sprites/chars.png 8bpp 200   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 210   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 220   70   6  12   0  -1 normal
-   -1 * 5	 0A 01 04 CE 00
-   -1 sprites/chars.png 8bpp 230   70   4  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 240   70   4  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 250   70   5  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 260   70   5  12   0  -1 normal
-   -1 * 5	 0A 01 05 D3 00
-   -1 sprites/chars.png 8bpp 290   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 310   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 320   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 330   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 340   70   6  12   0  -1 normal
-   -1 * 5	 0A 01 03 DB 00
-   -1 sprites/chars.png 8bpp 390   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 400   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 410   70   6  12   0  -1 normal
-   -1 * 5	 0A 01 02 DF 00
-   -1 sprites/chars.png 8bpp 420   70   7  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 430   70   6  12   0  -1 normal
-   -1 * 5	 0A 01 01 22 01
-   -1 sprites/chars.png 8bpp  20   30   2   7   0   0 normal
-   -1 * 5	 0A 01 01 7D 01
-   -1 sprites/chars.png 8bpp 220   30   4   7   0   0 normal
-   -1 * 5	 0A 01 02 80 01
-   -1 sprites/chars.png 8bpp 230   30   9   7   0   0 normal
-   -1 sprites/chars.png 8bpp 250   30   3   7   0   0 normal
-   -1 * 5	 0A 01 01 89 01
-   -1 sprites/chars.png 8bpp 470   30   3   7   0   0 normal
-   -1 * 5	 0A 01 01 9F 01
-   -1 sprites/chars.png 8bpp  70   90   3   7   0   0 normal
-   -1 * 5	 0A 01 01 A9 01
-   -1 sprites/chars.png 8bpp 190   90   3   7   0   0 normal
-   -1 * 5	 0A 01 02 BF 01
-   -1 sprites/chars.png 8bpp 420   90   3   7   0   0 normal
-   -1 sprites/chars.png 8bpp 430   90   3   7   0   0 normal
-   -1 * 5	 0A 01 01 02 02
-   -1 sprites/chars.png 8bpp  20   40   4  21   0  -2 normal
-   -1 * 5	 0A 01 01 41 02
-   -1 sprites/chars.png 8bpp  30   40  14  21   0  -2 normal
-   -1 * 5	 0A 01 06 46 02
-   -1 sprites/chars.png 8bpp  50   40  10  21   0  -2 normal
-   -1 sprites/chars.png 8bpp  70   40  14  21   0  -2 normal
-   -1 sprites/chars.png 8bpp  90   40   3  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 100   40  13  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 120   40   7  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 130   40  16  21   0  -2 normal
-   -1 * 5	 0A 01 01 50 02
-   -1 sprites/chars.png 8bpp 150   40  16  21   0  -2 normal
-   -1 * 5	 0A 01 04 52 02
-   -1 sprites/chars.png 8bpp 170   40   8  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 180   40   9  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 190   40   6  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 200   40   6  21   0  -2 normal
-   -1 * 5	 0A 01 01 5C 02
-   -1 sprites/chars.png 8bpp 210   40   7  21   0  -2 normal
-   -1 * 5	 0A 01 01 60 02
-   -1 sprites/chars.png 8bpp 230   40  16  21   0  -2 normal
-   -1 * 5	 0A 01 07 62 02
-   -1 sprites/chars.png 8bpp 260   40  20  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 290   40  20  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 320   40  20  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 350   40  20  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 380   40  20  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 410   40  20  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 440   40  24  21   0  -2 normal
-   -1 * 5	 0A 01 18 6A 02
-   -1 sprites/chars.png 8bpp 480   40  14  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 500   40  14  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 520   40  14  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 540   40  14  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 560   40   9  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 570   40   9  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 580   40   9  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 590   40   9  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 600   40  17  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 620   40  18  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 640   40  15  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 660   40  15  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 680   40  15  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 700   40  15  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 720   40  15  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 740   40   9  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 750   40  16  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 770   40  17  21   0  -2 normal
-   -1 sprites/chars.png 8bpp  10  100  17  21   0  -2 normal
-   -1 sprites/chars.png 8bpp  30  100  17  21   0  -2 normal
-   -1 sprites/chars.png 8bpp  50  100  17  21   0  -2 normal
-   -1 sprites/chars.png 8bpp  70  100  14  21   0  -2 normal
-   -1 sprites/chars.png 8bpp  90  100  14  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 450  100  14  21   0  -2 normal
-   -1 * 5	 0A 01 01 85 02
-   -1 sprites/chars.png 8bpp 140  100  12  21   0  -2 normal
-   -1 * 5	 0A 01 01 88 02
-   -1 sprites/chars.png 8bpp 170  100  19  21   0  -2 normal
-   -1 * 5	 0A 01 02 92 02
-   -1 sprites/chars.png 8bpp 270  100  11  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 290  100  15  21   0  -2 normal
-   -1 * 5	 0A 01 01 97 02
-   -1 sprites/chars.png 8bpp 340  100  11  21   0  -2 normal
-   -1 * 5	 0A 01 02 99 02
-   -1 sprites/chars.png 8bpp 360  100   9  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 370  100  11  21   0  -2 normal
-   -1 * 5	 0A 01 01 A0 02
-   -1 sprites/chars.png 8bpp 430  100  14  21   0  -2 normal
-
-// New characters, all fonts except monospaced
-
-// U+007B: Left Curly Bracket
-// U+007C: Vertical Line
-// U+007D: Right Curly Bracket
-// U+007E: Tilde
-   -1 * 14	 12 03 00 04 7B 00 01 04 7B 00 02 04 7B 00
-   -1 sprites/chars.png 8bpp  10  130   5  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  20  130   3  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  30  130   5  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  50  130   7  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  10  150   3   7   0   0 normal
-   -1 sprites/chars.png 8bpp  20  150   1   7   0   0 normal
-   -1 sprites/chars.png 8bpp  30  150   3   7   0   0 normal
-   -1 sprites/chars.png 8bpp  50  150   4   7   0   0 normal
-   -1 sprites/chars.png 8bpp  10  160   9  21   0  -2 normal
-   -1 sprites/chars.png 8bpp  20  160   3  21   0  -2 normal
-   -1 sprites/chars.png 8bpp  30  160   9  21   0  -2 normal
-   -1 sprites/chars.png 8bpp  50  160  10  21   0  -2 normal
-
-// U+007F: No-Break Space
-   -1 * 14	 12 03 00 01 7F 00 01 01 7F 00 02 01 7F 00
-   -1 sprites/chars.png 8bpp  70  130   2  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  70  150   1   7   0   0 normal
-   -1 sprites/chars.png 8bpp  70  160   5  21   0  -2 normal
-
-// U+00AA: Feminine Ordinal Indicator
-   -1 * 14	 12 03 00 01 AA 00 01 01 AA 00 02 01 AA 00
-   -1 sprites/chars.png 8bpp  80  130   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  80  150   3   7   0   0 normal
-   -1 sprites/chars.png 8bpp  80  160   7  21   0  -2 normal
-
-// U+00AC: Not Sign
-// U+00AD: Soft Hyphen
-   -1 * 14	 12 03 00 02 AC 00 01 02 AC 00 02 02 AC 00
-   -1 sprites/chars.png 8bpp  90  130   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 110  130   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  90  150   4   7   0   0 normal
-   -1 sprites/chars.png 8bpp 110  150   3   7   0   0 normal
-   -1 sprites/chars.png 8bpp  90  160  12  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 110  160   9  21   0  -2 normal
-
-// U+00AF: Macron
-   -1 * 14	 12 03 00 01 AF 00 01 01 AF 00 02 01 AF 00
-   -1 sprites/chars.png 8bpp 130  130   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 130  150   3   7   0   0 normal
-   -1 sprites/chars.png 8bpp 130  160  12  21   0  -2 normal
-
-// U+00B4: Acute Accent
-// U+00B5: Micro Sign
-// U+00B6: Pilcrow Sign
-// U+00B7: Middle Dot
-// U+00B8: Cedilla
-// U+00B9: Superscript One
-   -1 * 14	 12 03 00 06 B4 00 01 06 B4 00 02 06 B4 00
-   -1 sprites/chars.png 8bpp 150  130   4  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 160  130   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 180  130   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 200  130   3  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 210  130   4  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 220  130   5  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 150  150   2   7   0   0 normal
-   -1 sprites/chars.png 8bpp 160  150   3   7   0   0 normal
-   -1 sprites/chars.png 8bpp 180  150   6   7   0   0 normal
-   -1 sprites/chars.png 8bpp 200  150   1   7   0   0 normal
-   -1 sprites/chars.png 8bpp 210  150   2   7   0   0 normal
-   -1 sprites/chars.png 8bpp 220  150   2   7   0   0 normal
-   -1 sprites/chars.png 8bpp 150  160   4  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 160  160  15  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 180  160  13  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 200  160   3  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 210  160   5  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 220  160   6  21   0  -2 normal
-
-// U+00BC: Vulgar Fraction One Quarter
-// U+00BD: Vulgar Fraction One Half
-   -1 * 14	 12 03 00 02 BC 00 01 02 BC 00 02 02 BC 00
-   -1 sprites/chars.png 8bpp 230  130  10  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 250  130  10  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 230  150   9   7   0   0 normal
-   -1 sprites/chars.png 8bpp 250  150   9   7   0   0 normal
-   -1 sprites/chars.png 8bpp 230  160  16  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 250  160  16  21   0  -2 normal
 
 // New characters, all fonts
 

media/extra_grf/chars_orig_extra.nfo

@@ -0,0 +1,249 @@
+//
+// $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/>.
+//
+   -1 * 0	 0C "Font characters by PaulC, Bilbo and Jasper Vries"
+
+// Replace original characters
+
+   -1 * 5	 0A 01 02 41 00
+   -1 sprites/chars.png 8bpp  10   10   6  12   0  -1 normal
+   -1 sprites/chars.png 8bpp  20   10   4  12   0  -1 normal
+   -1 * 5	 0A 01 02 86 00
+   -1 sprites/chars.png 8bpp  50   10   8  12   0  -1 normal
+   -1 sprites/chars.png 8bpp  70   10   9  12   0  -1 normal
+   -1 * 5	 0A 01 01 8A 00
+   -1 sprites/chars.png 8bpp 120   10   6  12   0  -1 normal
+   -1 * 5	 0A 01 01 A0 00
+   -1 sprites/chars.png 8bpp 230   10  10  12   0  -1 normal
+   -1 * 5	 0A 01 04 A2 00
+   -1 sprites/chars.png 8bpp 260   10   8  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 290   10   8  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 320   10   8  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 350   10   8  12   0  -1 normal
+   -1 * 5	 0A 01 06 A7 00
+   -1 sprites/chars.png 8bpp 410   10   8  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 440   10  12  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 470   10   8  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 480   10   7  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 500   10   7  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 520   10   7  12   0  -1 normal
+   -1 * 5	 0A 01 03 AE 00
+   -1 sprites/chars.png 8bpp 560   10   4  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 570   10   4  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 580   10   5  12   0  -1 normal
+   -1 * 5	 0A 01 05 B3 00
+   -1 sprites/chars.png 8bpp 620   10   8  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 640   10   9  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 660   10   9  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 680   10   9  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 700   10   9  12   0  -1 normal
+   -1 * 5	 0A 01 03 BB 00
+   -1 sprites/chars.png 8bpp 770   10   8  12   0  -1 normal
+   -1 sprites/chars.png 8bpp  10   70   8  12   0  -1 normal
+   -1 sprites/chars.png 8bpp  30   70   8  12   0  -1 normal
+   -1 * 5	 0A 01 01 BF 00
+   -1 sprites/chars.png 8bpp  70   70   9  12   0  -1 normal
+   -1 * 5	 0A 01 05 C1 00
+   -1 sprites/chars.png 8bpp 450   70   8  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 110   70   6  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 120   70   6  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 130   70   6  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 140   70   6  12   0  -1 normal
+   -1 * 5	 0A 01 01 C7 00
+   -1 sprites/chars.png 8bpp 160   70   6  12   0  -1 normal
+   -1 * 5	 0A 01 03 CA 00
+   -1 sprites/chars.png 8bpp 200   70   6  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 210   70   6  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 220   70   6  12   0  -1 normal
+   -1 * 5	 0A 01 04 CE 00
+   -1 sprites/chars.png 8bpp 230   70   4  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 240   70   4  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 250   70   5  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 260   70   5  12   0  -1 normal
+   -1 * 5	 0A 01 05 D3 00
+   -1 sprites/chars.png 8bpp 290   70   6  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 310   70   6  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 320   70   6  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 330   70   6  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 340   70   6  12   0  -1 normal
+   -1 * 5	 0A 01 03 DB 00
+   -1 sprites/chars.png 8bpp 390   70   6  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 400   70   6  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 410   70   6  12   0  -1 normal
+   -1 * 5	 0A 01 02 DF 00
+   -1 sprites/chars.png 8bpp 420   70   7  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 430   70   6  12   0  -1 normal
+   -1 * 5	 0A 01 01 22 01
+   -1 sprites/chars.png 8bpp  20   30   2   7   0   0 normal
+   -1 * 5	 0A 01 01 7D 01
+   -1 sprites/chars.png 8bpp 220   30   4   7   0   0 normal
+   -1 * 5	 0A 01 02 80 01
+   -1 sprites/chars.png 8bpp 230   30   9   7   0   0 normal
+   -1 sprites/chars.png 8bpp 250   30   3   7   0   0 normal
+   -1 * 5	 0A 01 01 89 01
+   -1 sprites/chars.png 8bpp 470   30   3   7   0   0 normal
+   -1 * 5	 0A 01 01 9F 01
+   -1 sprites/chars.png 8bpp  70   90   3   7   0   0 normal
+   -1 * 5	 0A 01 01 A9 01
+   -1 sprites/chars.png 8bpp 190   90   3   7   0   0 normal
+   -1 * 5	 0A 01 02 BF 01
+   -1 sprites/chars.png 8bpp 420   90   3   7   0   0 normal
+   -1 sprites/chars.png 8bpp 430   90   3   7   0   0 normal
+   -1 * 5	 0A 01 01 02 02
+   -1 sprites/chars.png 8bpp  20   40   4  21   0  -2 normal
+   -1 * 5	 0A 01 01 41 02
+   -1 sprites/chars.png 8bpp  30   40  14  21   0  -2 normal
+   -1 * 5	 0A 01 06 46 02
+   -1 sprites/chars.png 8bpp  50   40  10  21   0  -2 normal
+   -1 sprites/chars.png 8bpp  70   40  14  21   0  -2 normal
+   -1 sprites/chars.png 8bpp  90   40   3  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 100   40  13  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 120   40   7  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 130   40  16  21   0  -2 normal
+   -1 * 5	 0A 01 01 50 02
+   -1 sprites/chars.png 8bpp 150   40  16  21   0  -2 normal
+   -1 * 5	 0A 01 04 52 02
+   -1 sprites/chars.png 8bpp 170   40   8  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 180   40   9  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 190   40   6  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 200   40   6  21   0  -2 normal
+   -1 * 5	 0A 01 01 5C 02
+   -1 sprites/chars.png 8bpp 210   40   7  21   0  -2 normal
+   -1 * 5	 0A 01 01 60 02
+   -1 sprites/chars.png 8bpp 230   40  16  21   0  -2 normal
+   -1 * 5	 0A 01 07 62 02
+   -1 sprites/chars.png 8bpp 260   40  20  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 290   40  20  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 320   40  20  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 350   40  20  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 380   40  20  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 410   40  20  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 440   40  24  21   0  -2 normal
+   -1 * 5	 0A 01 18 6A 02
+   -1 sprites/chars.png 8bpp 480   40  14  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 500   40  14  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 520   40  14  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 540   40  14  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 560   40   9  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 570   40   9  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 580   40   9  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 590   40   9  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 600   40  17  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 620   40  18  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 640   40  15  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 660   40  15  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 680   40  15  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 700   40  15  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 720   40  15  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 740   40   9  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 750   40  16  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 770   40  17  21   0  -2 normal
+   -1 sprites/chars.png 8bpp  10  100  17  21   0  -2 normal
+   -1 sprites/chars.png 8bpp  30  100  17  21   0  -2 normal
+   -1 sprites/chars.png 8bpp  50  100  17  21   0  -2 normal
+   -1 sprites/chars.png 8bpp  70  100  14  21   0  -2 normal
+   -1 sprites/chars.png 8bpp  90  100  14  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 450  100  14  21   0  -2 normal
+   -1 * 5	 0A 01 01 85 02
+   -1 sprites/chars.png 8bpp 140  100  12  21   0  -2 normal
+   -1 * 5	 0A 01 01 88 02
+   -1 sprites/chars.png 8bpp 170  100  19  21   0  -2 normal
+   -1 * 5	 0A 01 02 92 02
+   -1 sprites/chars.png 8bpp 270  100  11  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 290  100  15  21   0  -2 normal
+   -1 * 5	 0A 01 01 97 02
+   -1 sprites/chars.png 8bpp 340  100  11  21   0  -2 normal
+   -1 * 5	 0A 01 02 99 02
+   -1 sprites/chars.png 8bpp 360  100   9  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 370  100  11  21   0  -2 normal
+   -1 * 5	 0A 01 01 A0 02
+   -1 sprites/chars.png 8bpp 430  100  14  21   0  -2 normal
+
+// New characters, all fonts except monospaced
+
+// U+007B: Left Curly Bracket
+// U+007C: Vertical Line
+// U+007D: Right Curly Bracket
+// U+007E: Tilde
+   -1 * 14	 12 03 00 04 7B 00 01 04 7B 00 02 04 7B 00
+   -1 sprites/chars.png 8bpp  10  130   5  12   0  -1 normal
+   -1 sprites/chars.png 8bpp  20  130   3  12   0  -1 normal
+   -1 sprites/chars.png 8bpp  30  130   5  12   0  -1 normal
+   -1 sprites/chars.png 8bpp  50  130   7  12   0  -1 normal
+   -1 sprites/chars.png 8bpp  10  150   3   7   0   0 normal
+   -1 sprites/chars.png 8bpp  20  150   1   7   0   0 normal
+   -1 sprites/chars.png 8bpp  30  150   3   7   0   0 normal
+   -1 sprites/chars.png 8bpp  50  150   4   7   0   0 normal
+   -1 sprites/chars.png 8bpp  10  160   9  21   0  -2 normal
+   -1 sprites/chars.png 8bpp  20  160   3  21   0  -2 normal
+   -1 sprites/chars.png 8bpp  30  160   9  21   0  -2 normal
+   -1 sprites/chars.png 8bpp  50  160  10  21   0  -2 normal
+
+// U+007F: No-Break Space
+   -1 * 14	 12 03 00 01 7F 00 01 01 7F 00 02 01 7F 00
+   -1 sprites/chars.png 8bpp  70  130   2  12   0  -1 normal
+   -1 sprites/chars.png 8bpp  70  150   1   7   0   0 normal
+   -1 sprites/chars.png 8bpp  70  160   5  21   0  -2 normal
+
+// U+00AA: Feminine Ordinal Indicator
+   -1 * 14	 12 03 00 01 AA 00 01 01 AA 00 02 01 AA 00
+   -1 sprites/chars.png 8bpp  80  130   6  12   0  -1 normal
+   -1 sprites/chars.png 8bpp  80  150   3   7   0   0 normal
+   -1 sprites/chars.png 8bpp  80  160   7  21   0  -2 normal
+
+// U+00AC: Not Sign
+// U+00AD: Soft Hyphen
+   -1 * 14	 12 03 00 02 AC 00 01 02 AC 00 02 02 AC 00
+   -1 sprites/chars.png 8bpp  90  130   8  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 110  130   6  12   0  -1 normal
+   -1 sprites/chars.png 8bpp  90  150   4   7   0   0 normal
+   -1 sprites/chars.png 8bpp 110  150   3   7   0   0 normal
+   -1 sprites/chars.png 8bpp  90  160  12  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 110  160   9  21   0  -2 normal
+
+// U+00AF: Macron
+   -1 * 14	 12 03 00 01 AF 00 01 01 AF 00 02 01 AF 00
+   -1 sprites/chars.png 8bpp 130  130   6  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 130  150   3   7   0   0 normal
+   -1 sprites/chars.png 8bpp 130  160  12  21   0  -2 normal
+
+// U+00B4: Acute Accent
+// U+00B5: Micro Sign
+// U+00B6: Pilcrow Sign
+// U+00B7: Middle Dot
+// U+00B8: Cedilla
+// U+00B9: Superscript One
+   -1 * 14	 12 03 00 06 B4 00 01 06 B4 00 02 06 B4 00
+   -1 sprites/chars.png 8bpp 150  130   4  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 160  130   6  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 180  130   8  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 200  130   3  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 210  130   4  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 220  130   5  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 150  150   2   7   0   0 normal
+   -1 sprites/chars.png 8bpp 160  150   3   7   0   0 normal
+   -1 sprites/chars.png 8bpp 180  150   6   7   0   0 normal
+   -1 sprites/chars.png 8bpp 200  150   1   7   0   0 normal
+   -1 sprites/chars.png 8bpp 210  150   2   7   0   0 normal
+   -1 sprites/chars.png 8bpp 220  150   2   7   0   0 normal
+   -1 sprites/chars.png 8bpp 150  160   4  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 160  160  15  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 180  160  13  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 200  160   3  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 210  160   5  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 220  160   6  21   0  -2 normal
+
+// U+00BC: Vulgar Fraction One Quarter
+// U+00BD: Vulgar Fraction One Half
+   -1 * 14	 12 03 00 02 BC 00 01 02 BC 00 02 02 BC 00
+   -1 sprites/chars.png 8bpp 230  130  10  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 250  130  10  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 230  150   9   7   0   0 normal
+   -1 sprites/chars.png 8bpp 250  150   9   7   0   0 normal
+   -1 sprites/chars.png 8bpp 230  160  16  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 250  160  16  21   0  -2 normal

media/extra_grf/openttd.nfo

@@ -60,10 +60,11 @@
              00
 
 // GRF ID, must start with FF so it gets ignored
-   -1 * 0	 08 08 FF "OTT"
+//@@WARNING DISABLE 101
+   -1 * 0	 08 08 FF FF FF FE
 
 // Name of the GRF
-             "OpenTTD's base graphics " 00
+             "OpenTTD's default and fallback extra graphics" 00
 
 // Description of the GRF.
              "License: GNU General Public License version 2" 0D
@@ -86,7 +87,6 @@
 #include "canals.nfo"
 #include "oneway.nfo"
 #include "tramtracks.nfo"
-#include "shore.nfo"
 #include "sloped_tracks.nfo"
 #include "airports.nfo"
 #include "roadstops.nfo"
@@ -97,10 +97,5 @@
 #include "airport_preview.nfo"
 #include "chars.nfo"
 #include "mono.nfo"
-#include "fix_graphics.nfo"
-#include "rivers/rapids.nfo"
-#include "rivers/temperate.nfo"
-#include "rivers/arctic.nfo"
-#include "rivers/tropic.nfo"
-#include "rivers/toyland.nfo"
 #include "tunnel_portals.nfo"
+#include "palette.nfo"

media/extra_grf/orig_extra.nfo

@@ -0,0 +1,86 @@
+// Automatically generated by GRFCODEC. Do not modify!
+// (Info version 32)
+// Format: spritenum imagefile depth xpos ypos xsize ysize xrel yrel zoom flags
+//
+// $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/>.
+//
+// Sources for extra graphics to complement the original graphics.
+// Checks whether the correct version of OpenTTD is used before
+// allowing it to be used.
+//
+
+//
+// Number of sprites, it is wrong, but GRFcodec automagically gets it right.
+//
+    0 * 4	 00 00 00 00
+
+
+//
+// Check whether we are running OTTD or not.
+//
+   -1 * 0	 07 9D 04 \7= 01 00 00 00 01
+   -1 * 0	 0B 03 7F FF 80 " is not for TTDPatch. Use ttdpatch(w).grf." 00
+
+
+//
+// Check for OTTD's version number
+//
+
+// First step... Variable A1 might not exist. If that's the case it always
+// skips. As we do not want to skip out of the whole testing, we skip over
+// the real version check.
+   -1 * 0	 07 A1 04 \7= FF FF FF FF 02
+
+// Real version check.
+   -1 * 0	 07 A1 04 \7> \w20304 01 01 03
+
+// If the version check is supported, the string is translateable via OpenTTD
+// itself. Use it!.
+
+   -1 * 0	 0B 03 7F 06 "1.1 (or trunk r20304)" 00
+
+// Some OTTD versions before r11130 did support Action B, so use the English
+// phrase there
+   -1 * 0	 0B 03 7F FF "Requires OpenTTD version 1.1 (or trunk r20304) or better." 00
+
+// Final fallback. No Action B support, just skip to the end of the file.
+   -1 * 0	 07 A1 04 \7= FF FF FF FF 00
+
+// We are a DOS paletted NewGRF, so tell OpenTTD that. Then it can actually
+// do the right thing. Yay for that feature as that means no duplicate NewGRF!
+   -1 * 0	 14
+             "C" "INFO"
+                 "B" "PALS" \w1 "D"
+                 00
+             00
+
+// GRF ID, must start with FF so it gets ignored
+//@@WARNING DISABLE 101
+   -1 * 0	 08 08 FF "OTT"
+
+// Name of the GRF
+             "Original baseset extra graphics" 00
+
+// Description of the GRF.
+             "License: GNU General Public License version 2" 0D
+             "Andrew Parkhouse: rivers" 0D
+             "Addi and PaulC: original graphics fixes" 0D
+             "OpenTTD developers: other graphics" 00
+
+//
+// The real data of the GRF is acquired from several subfiles.
+//
+#include "chars_orig_extra.nfo"
+#include "shore.nfo"
+#include "fix_graphics.nfo"
+#include "canals_extra.nfo"
+#include "rivers/rapids.nfo"
+#include "rivers/temperate.nfo"
+#include "rivers/arctic.nfo"
+#include "rivers/tropic.nfo"
+#include "rivers/toyland.nfo"

media/extra_grf/palette.nfo

@@ -0,0 +1,20 @@
+//
+// $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/>.
+//
+
+   -1 * 0	 0C "All black palette"
+   -1 * 0 05 18 01
+   -1 * 0	 00 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+	 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+	 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+	 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+	 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+	 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+	 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+	 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+	 01

media/extra_grf/shore.nfo

@@ -47,7 +47,7 @@
    -1 sprites/shore.png 8bpp  82  200  64  32 -31  -1 normal
    -1 sprites/shore.png 8bpp 162  200  64  31 -31  -8 normal
    -1 * 6	 07 83 01 \7! 03 0C
-   -1 * 44	 0C "Missing shore tile graphics for the toyland climate"
+   -1 * 52	 0C "Missing shore tile graphics for the toyland climate"
    -1 * 3	 05 0D 0A
    -1 sprites/shore.png 8bpp 290  200  64  15 -31   0 normal
    -1 sprites/shore.png 8bpp 370  200  64  31 -31  -8 normal

media/openttd.desktop.in

@@ -9,4 +9,4 @@ 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
+Keywords=game;simulation;transport;tycoon;deluxe;economics;multiplayer;money;train;ship;bus;truck;aircraft;cargo;

os/debian/changelog

@@ -1,3 +1,123 @@
+openttd (1.7.2-0) unstable; urgency=low
+
+  * New upstream release 1.7.2
+
+ -- OpenTTD <info@openttd.org>  Sun, 24 Dec 2017 14:00:00 +0100
+
+openttd (1.7.2~RC1-0) unstable; urgency=low
+
+  * New upstream release 1.7.2-RC1
+
+ -- OpenTTD <info@openttd.org>  Mon, 11 Dec 2017 21:30:00 +0100
+
+openttd (1.7.1-0) unstable; urgency=low
+
+  * New upstream release 1.7.1
+
+ -- OpenTTD <info@openttd.org>  Tue, 13 Jun 2017 21:00:00 +0200
+
+openttd (1.7.1~RC1-0) unstable; urgency=low
+
+  * New upstream release 1.7.1-RC1
+
+ -- OpenTTD <info@openttd.org>  Thu, 04 Mai 2017 21:00:00 +0200
+
+openttd (1.7.0-0) unstable; urgency=low
+
+  * New upstream release 1.7.0
+
+ -- OpenTTD <info@openttd.org>  Sat, 01 Apr 2017 19:00:00 +0200
+
+openttd (1.7.0~RC1-0) unstable; urgency=low
+
+  * New upstream release 1.7.0-RC1
+
+ -- OpenTTD <info@openttd.org>  Sat, 11 Mar 2017 22:30:00 +0100
+
+openttd (1.6.1-0) unstable; urgency=low
+
+  * New upstream release 1.6.1
+
+ -- OpenTTD <info@openttd.org>  Fri, 01 Jul 2016 00:00:00 +0200
+
+openttd (1.6.1~RC1-0) unstable; urgency=low
+
+  * New upstream release 1.6.1-RC1
+
+ -- OpenTTD <info@openttd.org>  Wed, 01 Jun 2016 21:00:00 +0200
+
+openttd (1.6.0-0) unstable; urgency=low
+
+  * New upstream release 1.6.0
+
+ -- OpenTTD <info@openttd.org>  Fri, 01 Apr 2016 21:00:00 +0200
+
+openttd (1.6.0~RC1-0) unstable; urgency=low
+
+  * New upstream release 1.6.0-RC1
+
+ -- OpenTTD <info@openttd.org>  Tue, 01 Mar 2016 21:00:00 +0100
+
+openttd (1.5.3-0) unstable; urgency=low
+
+  * New upstream release 1.5.3
+
+ -- OpenTTD <info@openttd.org>  Tue, 01 Dec 2015 21:00:00 +0100
+
+openttd (1.5.3~RC1-0) unstable; urgency=low
+
+  * New upstream release 1.5.3-RC1
+
+ -- OpenTTD <info@openttd.org>  Sun, 01 Nov 2015 14:00:00 +0100
+
+openttd (1.5.2-0) unstable; urgency=low
+
+  * New upstream release 1.5.2
+
+ -- OpenTTD <info@openttd.org>  Tue, 01 Sep 2015 21:00:00 +0200
+
+openttd (1.5.2~RC1-0) unstable; urgency=low
+
+  * New upstream release 1.5.2-RC1
+
+ -- OpenTTD <info@openttd.org>  Sat, 01 Aug 2015 13:00:00 +0200
+
+openttd (1.5.1-0) unstable; urgency=low
+
+  * New upstream release 1.5.1
+
+ -- OpenTTD <info@openttd.org>  Mon, 01 Jun 2015 21:00:00 +0200
+
+openttd (1.5.1~RC1-0) unstable; urgency=low
+
+  * New upstream release 1.5.1-RC1
+
+ -- OpenTTD <info@openttd.org>  Fri, 08 May 2015 21:00:00 +0200
+
+openttd (1.5.0-0) unstable; urgency=low
+
+  * New upstream release 1.5.0
+
+ -- OpenTTD <info@openttd.org>  Wed, 01 Apr 2015 21:00:00 +0200
+
+openttd (1.5.0~RC1-0) unstable; urgency=low
+
+  * New upstream release 1.5.0-RC1
+
+ -- OpenTTD <info@openttd.org>  Wed, 18 Mar 2015 21:00:00 +0100
+
+openttd (1.5.0~beta2-0) unstable; urgency=low
+
+  * New upstream release 1.5.0-beta2
+
+ -- OpenTTD <info@openttd.org>  Tue, 24 Feb 2015 21:00:00 +0100
+
+openttd (1.5.0~beta1-0) unstable; urgency=low
+
+  * New upstream release 1.5.0-beta1
+
+ -- OpenTTD <info@openttd.org>  Wed, 24 Dec 2014 21:00:00 +0100
+
 openttd (1.4.4-0) unstable; urgency=low
 
   * New upstream release 1.4.4

os/debian/copyright

@@ -5,7 +5,7 @@ Source: http://www.openttd.org
 
 
 Files: *
-Copyright: © 2004-2012 Ludvig Strigeous and others.
+Copyright: © 2004-2017 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

os/os2/installer/make_installer.cmd

@@ -1,6 +1,6 @@
 @echo off
 
-set OPENTTD_VERSION=1.5.0
+set OPENTTD_VERSION=1.7.0
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
 set OPENGFX_VERSION=1.2.0

os/rpm/openttd.spec

@@ -2,7 +2,7 @@
 # spec file for package openttd
 #
 # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2007-2012 The OpenTTD developers
+# Copyright (c) 2007-2017 The OpenTTD developers
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,9 +17,9 @@
 #
 
 Name:           openttd
-Version:        1.5.beta1
+Version:        1.7.beta1
 Release:        0
-%define srcver  1.5.0-beta1
+%define srcver  1.7.0-beta1
 Summary:        An open source reimplementation of Chris Sawyer's Transport Tycoon Deluxe
 License:        GPL-2.0
 Group:          Amusements/Games/Strategy/Other

os/windows/installer/install.nsi

@@ -1,7 +1,7 @@
 # Version numbers to update
 !define APPV_MAJOR 1
-!define APPV_MINOR 4
+!define APPV_MINOR 7
-!define APPV_MAINT 4
+!define APPV_MAINT 2
 !define APPV_BUILD 1
 !define APPV_EXTRA ""
 
@@ -408,6 +408,7 @@ Section "Uninstall"
 	; Baseset files
 	Delete "$INSTDIR\baseset\opntitle.dat"
 	Delete "$INSTDIR\baseset\openttd.grf"
+	Delete "$INSTDIR\baseset\orig_extra.grf"
 	Delete "$INSTDIR\baseset\orig_win.obg"
 	Delete "$INSTDIR\baseset\orig_dos.obg"
 	Delete "$INSTDIR\baseset\orig_dos_de.obg"

projects/dpi_aware.manifest

@@ -0,0 +1,7 @@
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" >
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+      <dpiAware>True/PM</dpiAware>
+    </windowsSettings>
+  </application>
+</assembly>

projects/generate

@@ -22,6 +22,15 @@ then
 	exit 1
 fi
 
+# openttd_vs140.sln             is for MSVC 2015
+# openttd_vs140.vcxproj         is for MSVC 2015
+# openttd_vs140.vcxproj.filters is for MSVC 2015
+# langs_vs140.vcxproj           is for MSVC 2015
+# strgen_vs140.vcxproj          is for MSVC 2015
+# strgen_vs140.vcxproj.filters  is for MSVC 2015
+# generate_vs140.vcxproj        is for MSVC 2015
+# version_vs140.vcxproj         is for MSVC 2015
+
 # openttd_vs100.sln             is for MSVC 2010
 # openttd_vs100.vcxproj         is for MSVC 2010
 # openttd_vs100.vcxproj.filters is for MSVC 2010
@@ -77,7 +86,7 @@ safety_check() {
 	done
 }
 
-grep '\.h' "$ROOT_DIR/source.list" | grep -v '../objs/langs/table/strings.h\|../objs/settings/table/settings.h' | sed 's/	//' | sort > tmp.headers.source.list
+grep '\.h' "$ROOT_DIR/source.list" | grep -v '../objs/langs/table/strings.h\|../objs/settings/table/settings.h' | sed 's/	//g' | sort > tmp.headers.source.list
 find "$ROOT_DIR/src" \( -iname "*.h" -or -iname "*.hpp" \) -and -not -ipath "*/.svn/*" | sed "s~$ROOT_DIR/src/~~" | sort > tmp.headers.src
 if [ -n "`diff tmp.headers.source.list tmp.headers.src`" ]; then
 	echo "The following headers are missing in source.list and not in /src/ or vice versa."
@@ -306,11 +315,17 @@ generate "$openttd" "openttd_vs80.vcproj"
 generate "$openttd" "openttd_vs90.vcproj"
 generate "$openttdvcxproj" "openttd_vs100.vcxproj"
 generate "$openttdfiles" "openttd_vs100.vcxproj.filters" "$openttdfilters"
+generate "$openttdvcxproj" "openttd_vs140.vcxproj"
+generate "$openttdfiles" "openttd_vs140.vcxproj.filters" "$openttdfilters"
 generate "$lang" "langs_vs80.vcproj"
 generate "$lang" "langs_vs90.vcproj"
 generate "$langvcxproj" "langs_vs100.vcxproj"
 generate "$langfiles" "langs_vs100.vcxproj.filters"
+generate "$langvcxproj" "langs_vs140.vcxproj"
+generate "$langfiles" "langs_vs140.vcxproj.filters"
 generate "$settings" "settings_vs80.vcproj" "$settingscommand"
 generate "$settings" "settings_vs90.vcproj" "$settingscommand"
 generate "$settingsvcxproj" "settings_vs100.vcxproj" "$settingscommand"
 generate "$settingsfiles" "settings_vs100.vcxproj.filters"
+generate "$settingsvcxproj" "settings_vs140.vcxproj" "$settingscommand"
+generate "$settingsfiles" "settings_vs140.vcxproj.filters"

projects/generate.vbs

@@ -10,6 +10,15 @@ Option Explicit
 Dim FSO
 Set FSO = CreateObject("Scripting.FileSystemObject")
 
+' openttd_vs140.sln             is for MSVC 2015
+' openttd_vs140.vcxproj         is for MSVC 2015
+' openttd_vs140.vcxproj.filters is for MSVC 2015
+' langs_vs140.vcxproj           is for MSVC 2015
+' strgen_vs140.vcxproj          is for MSVC 2015
+' strgen_vs140.vcxproj.filters  is for MSVC 2015
+' generate_vs140.vcxproj        is for MSVC 2015
+' version_vs140.vcxproj         is for MSVC 2015
+
 ' openttd_vs100.sln             is for MSVC 2010
 ' openttd_vs100.vcxproj         is for MSVC 2010
 ' openttd_vs100.vcxproj.filters is for MSVC 2010
@@ -369,6 +378,8 @@ generate openttd, ROOT_DIR & "/projects/openttd_vs80.vcproj", Null
 generate openttd, ROOT_DIR & "/projects/openttd_vs90.vcproj", Null
 generate openttdvcxproj, ROOT_DIR & "/projects/openttd_vs100.vcxproj", Null
 generate openttdfiles, ROOT_DIR & "/projects/openttd_vs100.vcxproj.filters", openttdfilters
+generate openttdvcxproj, ROOT_DIR & "/projects/openttd_vs140.vcxproj", Null
+generate openttdfiles, ROOT_DIR & "/projects/openttd_vs140.vcxproj.filters", openttdfilters
 
 Dim lang, langvcxproj, langfiles
 lang = load_lang_data(ROOT_DIR & "/src/lang", langvcxproj, langfiles)
@@ -376,6 +387,8 @@ generate lang, ROOT_DIR & "/projects/langs_vs80.vcproj", Null
 generate lang, ROOT_DIR & "/projects/langs_vs90.vcproj", Null
 generate langvcxproj, ROOT_DIR & "/projects/langs_vs100.vcxproj", Null
 generate langfiles, ROOT_DIR & "/projects/langs_vs100.vcxproj.filters", Null
+generate langvcxproj, ROOT_DIR & "/projects/langs_vs140.vcxproj", Null
+generate langfiles, ROOT_DIR & "/projects/langs_vs140.vcxproj.filters", Null
 
 Dim settings, settingsvcxproj, settingscommand, settingsfiles
 settings = load_settings_data(ROOT_DIR & "/src/table", settingsvcxproj, settingscommand, settingsfiles)
@@ -383,3 +396,5 @@ generate settings, ROOT_DIR & "/projects/settings_vs80.vcproj", settingscommand
 generate settings, ROOT_DIR & "/projects/settings_vs90.vcproj", settingscommand
 generate settingsvcxproj, ROOT_DIR & "/projects/settings_vs100.vcxproj", settingscommand
 generate settingsfiles, ROOT_DIR & "/projects/settings_vs100.vcxproj.filters", Null
+generate settingsvcxproj, ROOT_DIR & "/projects/settings_vs140.vcxproj", settingscommand
+generate settingsfiles, ROOT_DIR & "/projects/settings_vs140.vcxproj.filters", Null

projects/generate_vs140.vcxproj

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>generate</ProjectName>
+    <ProjectGuid>{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}</ProjectGuid>
+    <RootNamespace>generate</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\source.list">
+      <FileType>Document</FileType>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Running %27generate.vbs%27 ...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript "$(ProjectDir)generate.vbs"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FullPath);%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)openttd_vs80.vcproj;$(SolutionDir)openttd_vs90.vcproj;$(SolutionDir)openttd_vs100.vcxproj;$(SolutionDir)openttd_vs100.vcxproj.filters;$(SolutionDir)langs_vs80.vcproj;$(SolutionDir)langs_vs90.vcproj;$(SolutionDir)langs_vs100.vcxproj;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

projects/langs_vs100.vcxproj

@@ -227,6 +227,12 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\korean.lng;%(Outputs)</Outputs>
     </CustomBuild>
+    <CustomBuild Include="..\src\lang\latin.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating latin 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\latin.lng;%(Outputs)</Outputs>
+    </CustomBuild>
     <CustomBuild Include="..\src\lang\latvian.txt">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating latvian language file</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
@@ -311,6 +317,12 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\slovenian.lng;%(Outputs)</Outputs>
     </CustomBuild>
+    <CustomBuild Include="..\src\lang\spanish_MX.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish_MX 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\spanish_MX.lng;%(Outputs)</Outputs>
+    </CustomBuild>
     <CustomBuild Include="..\src\lang\spanish.txt">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish language file</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>

projects/langs_vs100.vcxproj.filters

@@ -97,6 +97,9 @@
     <CustomBuild Include="..\src\lang\korean.txt">
       <Filter>Translations</Filter>
     </CustomBuild>
+    <CustomBuild Include="..\src\lang\latin.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
     <CustomBuild Include="..\src\lang\latvian.txt">
       <Filter>Translations</Filter>
     </CustomBuild>
@@ -139,6 +142,9 @@
     <CustomBuild Include="..\src\lang\slovenian.txt">
       <Filter>Translations</Filter>
     </CustomBuild>
+    <CustomBuild Include="..\src\lang\spanish_MX.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
     <CustomBuild Include="..\src\lang\spanish.txt">
       <Filter>Translations</Filter>
     </CustomBuild>

projects/langs_vs140.vcxproj

@@ -0,0 +1,390 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>langs</ProjectName>
+    <ProjectGuid>{0F066B23-18DF-4284-8265-F4A5E7E3B966}</ProjectGuid>
+    <RootNamespace>langs</RootNamespace>
+    <Keyword>MakeFileProj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\langs\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PreBuildEvent>
+      <Message>Generating strings.h</Message>
+      <Command>..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table</Command>
+    </PreBuildEvent>
+    <Midl>
+      <TypeLibraryName>./langs.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\src\lang\english.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating english 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\english.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\afrikaans.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating afrikaans 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\afrikaans.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\arabic_egypt.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating arabic_egypt 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\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>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\belarusian.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\brazilian_portuguese.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating brazilian_portuguese 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\brazilian_portuguese.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\bulgarian.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating bulgarian 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\bulgarian.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\catalan.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating catalan 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\catalan.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\croatian.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating croatian 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\croatian.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\czech.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating czech 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\czech.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\danish.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating danish 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\danish.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\dutch.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating dutch 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\dutch.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\english_AU.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating english_AU 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\english_AU.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\english_US.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating english_US 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\english_US.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\esperanto.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating esperanto 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\esperanto.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\estonian.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating estonian 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\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>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\finnish.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\french.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating french 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\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>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\galician.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\german.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating german 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\german.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\greek.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating greek 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\greek.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\hebrew.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating hebrew 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\hebrew.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\hungarian.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating hungarian 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\hungarian.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\icelandic.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating icelandic 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\icelandic.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\indonesian.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating indonesian 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\indonesian.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\irish.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating irish 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\irish.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\italian.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating italian 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\italian.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\japanese.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating japanese 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\japanese.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\korean.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating korean 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\korean.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\latin.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating latin 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\latin.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\latvian.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating latvian 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\latvian.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\lithuanian.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating lithuanian 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\lithuanian.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\luxembourgish.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating luxembourgish 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\luxembourgish.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\malay.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating malay 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\malay.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\norwegian_bokmal.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating norwegian_bokmal 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\norwegian_bokmal.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\norwegian_nynorsk.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating norwegian_nynorsk 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\norwegian_nynorsk.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\polish.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating polish 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\polish.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\portuguese.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating portuguese 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\portuguese.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\romanian.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating romanian 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\romanian.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\russian.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating russian 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\russian.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\serbian.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating serbian 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\serbian.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\simplified_chinese.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating simplified_chinese 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\simplified_chinese.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\slovak.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating slovak 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\slovak.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\slovenian.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating slovenian 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\slovenian.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\spanish_MX.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish_MX 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\spanish_MX.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\spanish.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish 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\spanish.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\swedish.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating swedish 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\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>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\traditional_chinese.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\turkish.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating turkish 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\turkish.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\ukrainian.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating ukrainian 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\ukrainian.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\vietnamese.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating vietnamese 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\vietnamese.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\welsh.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating welsh 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\welsh.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="strgen_vs100.vcxproj">
+      <Project>{a133a442-bd0a-4ade-b117-ad7545e4bdd1}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

projects/langs_vs140.vcxproj.filters

@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Translations">
+      <UniqueIdentifier>{2a164580-9033-4a01-974b-b21da507efda}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\src\lang\english.txt" />
+    <CustomBuild Include="..\src\lang\afrikaans.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <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>
+    <CustomBuild Include="..\src\lang\brazilian_portuguese.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\bulgarian.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\catalan.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\croatian.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\czech.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\danish.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\dutch.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\english_AU.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\english_US.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\esperanto.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <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>
+    <CustomBuild Include="..\src\lang\german.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\greek.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\hebrew.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\hungarian.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\icelandic.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\indonesian.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\irish.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\italian.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\japanese.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\korean.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\latin.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\latvian.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\lithuanian.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\luxembourgish.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\malay.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\norwegian_bokmal.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\norwegian_nynorsk.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\polish.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\portuguese.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\romanian.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\russian.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\serbian.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\simplified_chinese.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\slovak.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\slovenian.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\spanish_MX.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\spanish.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <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>
+    <CustomBuild Include="..\src\lang\turkish.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\ukrainian.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\vietnamese.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\src\lang\welsh.txt">
+      <Filter>Translations</Filter>
+    </CustomBuild>
+  </ItemGroup>
+</Project>

projects/langs_vs140.vcxproj.filters.in

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Translations">
+      <UniqueIdentifier>{2a164580-9033-4a01-974b-b21da507efda}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\src\lang\english.txt" />
+!!FILES!!
+  </ItemGroup>
+</Project>

projects/langs_vs140.vcxproj.in

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>langs</ProjectName>
+    <ProjectGuid>{0F066B23-18DF-4284-8265-F4A5E7E3B966}</ProjectGuid>
+    <RootNamespace>langs</RootNamespace>
+    <Keyword>MakeFileProj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\langs\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PreBuildEvent>
+      <Message>Generating strings.h</Message>
+      <Command>..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table</Command>
+    </PreBuildEvent>
+    <Midl>
+      <TypeLibraryName>./langs.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\src\lang\english.txt">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating english 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\english.lng;%(Outputs)</Outputs>
+    </CustomBuild>
+!!FILES!!
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="strgen_vs100.vcxproj">
+      <Project>{a133a442-bd0a-4ade-b117-ad7545e4bdd1}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

projects/langs_vs80.vcproj

@@ -513,6 +513,21 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\src\lang\latin.txt"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating latin 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\latin.lng"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\src\lang\latvian.txt"
 				>
@@ -723,6 +738,21 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\src\lang\spanish_MX.txt"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating spanish_MX 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\spanish_MX.lng"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\src\lang\spanish.txt"
 				>

projects/langs_vs90.vcproj

@@ -514,6 +514,21 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\src\lang\latin.txt"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating latin 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\latin.lng"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\src\lang\latvian.txt"
 				>
@@ -724,6 +739,21 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\src\lang\spanish_MX.txt"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating spanish_MX 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\spanish_MX.lng"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\src\lang\spanish.txt"
 				>

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";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -145,6 +145,9 @@
       <TargetMachine>MachineX86</TargetMachine>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>
+    <Manifest>
+      <AdditionalManifestFiles>dpi_aware.manifest</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
@@ -156,7 +159,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_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -188,6 +191,9 @@
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
+    <Manifest>
+      <AdditionalManifestFiles>dpi_aware.manifest</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
@@ -204,7 +210,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;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;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>
@@ -244,6 +250,9 @@
       <TargetMachine>MachineX64</TargetMachine>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>
+    <Manifest>
+      <AdditionalManifestFiles>dpi_aware.manifest</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
@@ -256,7 +265,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_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -289,6 +298,9 @@
       <StackCommitSize>1048576</StackCommitSize>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
+    <Manifest>
+      <AdditionalManifestFiles>dpi_aware.manifest</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\airport.cpp" />
@@ -311,6 +323,7 @@
     <ClCompile Include="..\src\debug.cpp" />
     <ClCompile Include="..\src\dedicated.cpp" />
     <ClCompile Include="..\src\depot.cpp" />
+    <ClCompile Include="..\src\disaster_vehicle.cpp" />
     <ClCompile Include="..\src\driver.cpp" />
     <ClCompile Include="..\src\economy.cpp" />
     <ClCompile Include="..\src\effectvehicle.cpp" />
@@ -437,6 +450,7 @@
     <ClInclude Include="..\src\depot_type.h" />
     <ClInclude Include="..\src\direction_func.h" />
     <ClInclude Include="..\src\direction_type.h" />
+    <ClInclude Include="..\src\disaster_vehicle.h" />
     <ClInclude Include="..\src\music\dmusic.h" />
     <ClInclude Include="..\src\driver.h" />
     <ClInclude Include="..\src\economy_base.h" />
@@ -568,6 +582,7 @@
     <ClInclude Include="..\src\road_type.h" />
     <ClInclude Include="..\src\roadstop_base.h" />
     <ClInclude Include="..\src\roadveh.h" />
+    <ClInclude Include="..\src\safeguards.h" />
     <ClInclude Include="..\src\screenshot.h" />
     <ClInclude Include="..\src\sdl.h" />
     <ClInclude Include="..\src\sound\sdl_s.h" />
@@ -805,7 +820,6 @@
     <ClCompile Include="..\src\clear_cmd.cpp" />
     <ClCompile Include="..\src\company_cmd.cpp" />
     <ClCompile Include="..\src\depot_cmd.cpp" />
-    <ClCompile Include="..\src\disaster_cmd.cpp" />
     <ClCompile Include="..\src\group_cmd.cpp" />
     <ClCompile Include="..\src\industry_cmd.cpp" />
     <ClCompile Include="..\src\misc_cmd.cpp" />
@@ -882,6 +896,7 @@
     <ClInclude Include="..\src\table\elrail_data.h" />
     <ClInclude Include="..\src\table\engines.h" />
     <ClInclude Include="..\src\table\genland.h" />
+    <ClInclude Include="..\src\table\heightmap_colours.h" />
     <ClInclude Include="..\src\table\industry_land.h" />
     <ClInclude Include="..\src\table\landscape_sprite.h" />
     <ClInclude Include="..\src\table\newgrf_debug_data.h" />
@@ -896,6 +911,7 @@
     <ClInclude Include="..\src\table\sprites.h" />
     <ClInclude Include="..\src\table\station_land.h" />
     <ClInclude Include="..\src\table\strgen_tables.h" />
+    <ClInclude Include="..\src\table\string_colours.h" />
     <ClInclude Include="..\src\..\objs\langs\table\strings.h" />
     <ClInclude Include="..\src\table\town_land.h" />
     <ClInclude Include="..\src\table\townname.h" />
@@ -952,6 +968,7 @@
     <ClInclude Include="..\src\3rdparty\squirrel\squirrel\sqstate.h" />
     <ClInclude Include="..\src\3rdparty\squirrel\include\sqstdaux.h" />
     <ClInclude Include="..\src\3rdparty\squirrel\include\sqstdmath.h" />
+    <ClInclude Include="..\src\3rdparty\squirrel\include\sqstdstring.h" />
     <ClInclude Include="..\src\3rdparty\squirrel\squirrel\sqstring.h" />
     <ClInclude Include="..\src\3rdparty\squirrel\squirrel\sqtable.h" />
     <ClInclude Include="..\src\3rdparty\squirrel\include\squirrel.h" />

projects/openttd_vs100.vcxproj.filters

@@ -162,6 +162,9 @@
     <ClCompile Include="..\src\depot.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\disaster_vehicle.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\driver.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -540,6 +543,9 @@
     <ClInclude Include="..\src\direction_type.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\disaster_vehicle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\music\dmusic.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -933,6 +939,9 @@
     <ClInclude Include="..\src\roadveh.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\safeguards.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\screenshot.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1644,9 +1653,6 @@
     <ClCompile Include="..\src\depot_cmd.cpp">
       <Filter>Command handlers</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\disaster_cmd.cpp">
-      <Filter>Command handlers</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\group_cmd.cpp">
       <Filter>Command handlers</Filter>
     </ClCompile>
@@ -1875,6 +1881,9 @@
     <ClInclude Include="..\src\table\genland.h">
       <Filter>Tables</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\table\heightmap_colours.h">
+      <Filter>Tables</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\table\industry_land.h">
       <Filter>Tables</Filter>
     </ClInclude>
@@ -1917,6 +1926,9 @@
     <ClInclude Include="..\src\table\strgen_tables.h">
       <Filter>Tables</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\table\string_colours.h">
+      <Filter>Tables</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\..\objs\langs\table\strings.h">
       <Filter>Tables</Filter>
     </ClInclude>
@@ -2085,6 +2097,9 @@
     <ClInclude Include="..\src\3rdparty\squirrel\include\sqstdmath.h">
       <Filter>Squirrel headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\3rdparty\squirrel\include\sqstdstring.h">
+      <Filter>Squirrel headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\3rdparty\squirrel\squirrel\sqstring.h">
       <Filter>Squirrel headers</Filter>
     </ClInclude>

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";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -145,6 +145,9 @@
       <TargetMachine>MachineX86</TargetMachine>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>
+    <Manifest>
+      <AdditionalManifestFiles>dpi_aware.manifest</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
@@ -156,7 +159,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_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -188,6 +191,9 @@
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
+    <Manifest>
+      <AdditionalManifestFiles>dpi_aware.manifest</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
@@ -204,7 +210,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;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;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>
@@ -244,6 +250,9 @@
       <TargetMachine>MachineX64</TargetMachine>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>
+    <Manifest>
+      <AdditionalManifestFiles>dpi_aware.manifest</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
@@ -256,7 +265,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_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -289,6 +298,9 @@
       <StackCommitSize>1048576</StackCommitSize>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
+    <Manifest>
+      <AdditionalManifestFiles>dpi_aware.manifest</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
 !!FILES!!

projects/openttd_vs140.sln

@@ -0,0 +1,94 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openttd", "openttd_vs140.vcxproj", "{668328A0-B40E-4CDB-BD72-D0064424414A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0817F629-589E-4A3B-B81A-8647BC571E35} = {0817F629-589E-4A3B-B81A-8647BC571E35}
+		{E9548DE9-F089-49B7-93A6-30BE2CC311C7} = {E9548DE9-F089-49B7-93A6-30BE2CC311C7}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen_vs140.vcxproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "langs", "langs_vs140.vcxproj", "{0F066B23-18DF-4284-8265-F4A5E7E3B966}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "version", "version_vs140.vcxproj", "{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate", "generate_vs140.vcxproj", "{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settings", "settings_vs140.vcxproj", "{0817F629-589E-4A3B-B81A-8647BC571E35}"
+	ProjectSection(ProjectDependencies) = postProject
+		{E9548DE9-F089-49B7-93A6-30BE2CC311C7} = {E9548DE9-F089-49B7-93A6-30BE2CC311C7}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settingsgen", "settingsgen_vs140.vcxproj", "{E9548DE9-F089-49B7-93A6-30BE2CC311C7}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|Win32.Build.0 = Debug|Win32
+		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|x64.ActiveCfg = Debug|x64
+		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|x64.Build.0 = Debug|x64
+		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|Win32.ActiveCfg = Release|Win32
+		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|Win32.Build.0 = Release|Win32
+		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|x64.ActiveCfg = Release|x64
+		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|x64.Build.0 = Release|x64
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.Build.0 = Debug|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.ActiveCfg = Debug|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.Build.0 = Debug|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.ActiveCfg = Debug|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.Build.0 = Debug|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|x64.ActiveCfg = Debug|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|x64.Build.0 = Debug|Win32
+		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Win32.Build.0 = Debug|Win32
+		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|x64.ActiveCfg = Debug|Win32
+		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|x64.Build.0 = Debug|Win32
+		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.ActiveCfg = Debug|Win32
+		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.Build.0 = Debug|Win32
+		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.ActiveCfg = Debug|Win32
+		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.Build.0 = Debug|Win32
+		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.Build.0 = Debug|Win32
+		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.ActiveCfg = Debug|Win32
+		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.Build.0 = Debug|Win32
+		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.ActiveCfg = Debug|Win32
+		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.Build.0 = Debug|Win32
+		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.ActiveCfg = Debug|Win32
+		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.Build.0 = Debug|Win32
+		{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Debug|x64.ActiveCfg = Debug|Win32
+		{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Release|Win32.ActiveCfg = Debug|Win32
+		{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Release|x64.ActiveCfg = Debug|Win32
+		{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|Win32.Build.0 = Debug|Win32
+		{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|x64.ActiveCfg = Debug|Win32
+		{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|x64.Build.0 = Debug|Win32
+		{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|Win32.ActiveCfg = Debug|Win32
+		{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|Win32.Build.0 = Debug|Win32
+		{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|x64.ActiveCfg = Debug|Win32
+		{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|x64.Build.0 = Debug|Win32
+		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|Win32.Build.0 = Debug|Win32
+		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|x64.ActiveCfg = Debug|Win32
+		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|x64.Build.0 = Debug|Win32
+		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|Win32.ActiveCfg = Debug|Win32
+		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|Win32.Build.0 = Debug|Win32
+		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|x64.ActiveCfg = Debug|Win32
+		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|x64.Build.0 = Debug|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
+		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
+	EndGlobalSection
+EndGlobal

projects/openttd_vs140.vcxproj.filters.in

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+!!FILTERS!!
+  </ItemGroup>
+  <ItemGroup>
+!!FILES!!
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\media\openttd.ico" />
+    <None Include="..\readme.txt" />
+  </ItemGroup>
+</Project>

projects/openttd_vs140.vcxproj.in

@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>openttd</ProjectName>
+    <ProjectGuid>{668328A0-B40E-4CDB-BD72-D0064424414A}</ProjectGuid>
+    <RootNamespace>openttd</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</OutDir>
+    <LocalDebuggerWorkingDirectory>$(ProjectDir)..\bin</LocalDebuggerWorkingDirectory>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/openttd.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/J /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <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_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <StructMemberAlignment>4Bytes</StructMemberAlignment>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderFile>
+      </PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <AssemblerOutput>All</AssemblerOutput>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>FastCall</CallingConvention>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <StackReserveSize>1048576</StackReserveSize>
+      <StackCommitSize>1048576</StackCommitSize>
+      <OptimizeReferences>true</OptimizeReferences>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
+    </Link>
+    <Manifest>
+      <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Debug/openttd.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/J /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <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_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>FastCall</CallingConvention>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <StackReserveSize>1048576</StackReserveSize>
+      <StackCommitSize>1048576</StackCommitSize>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
+    </Link>
+    <Manifest>
+      <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+      <TypeLibraryName>.\Release/openttd.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/J /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <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_SORT;WITH_ICU_LAYOUT;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>
+      <StructMemberAlignment>Default</StructMemberAlignment>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderFile>
+      </PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <AssemblerOutput>All</AssemblerOutput>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>FastCall</CallingConvention>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <StackReserveSize>1048576</StackReserveSize>
+      <StackCommitSize>1048576</StackCommitSize>
+      <OptimizeReferences>true</OptimizeReferences>
+      <TargetMachine>MachineX64</TargetMachine>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <MinimumRequiredVersion>5.02</MinimumRequiredVersion>
+    </Link>
+    <Manifest>
+      <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+      <TypeLibraryName>.\Debug/openttd.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/J /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <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_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderFile>
+      </PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>Cdecl</CallingConvention>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <StackReserveSize>1048576</StackReserveSize>
+      <StackCommitSize>1048576</StackCommitSize>
+      <TargetMachine>MachineX64</TargetMachine>
+      <MinimumRequiredVersion>5.02</MinimumRequiredVersion>
+    </Link>
+    <Manifest>
+      <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+!!FILES!!
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\media\openttd.ico" />
+    <None Include="..\readme.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="langs_vs100.vcxproj">
+      <Project>{0f066b23-18df-4284-8265-f4a5e7e3b966}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="strgen_vs100.vcxproj">
+      <Project>{a133a442-bd0a-4ade-b117-ad7545e4bdd1}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="version_vs100.vcxproj">
+      <Project>{1a2b3c5e-1c23-41a5-9c9b-acba2aa75fec}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

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=\"OpenTTD\";WITH_ASSERT"
+				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_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -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=\"OpenTTD\""
+				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_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -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=\"OpenTTD\";_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -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=\"OpenTTD\";_SQ64"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -514,6 +514,10 @@
 				RelativePath=".\..\src\depot.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\disaster_vehicle.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\driver.cpp"
 				>
@@ -1022,6 +1026,10 @@
 				RelativePath=".\..\src\direction_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\disaster_vehicle.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\music\dmusic.h"
 				>
@@ -1546,6 +1554,10 @@
 				RelativePath=".\..\src\roadveh.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\safeguards.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\screenshot.h"
 				>
@@ -2510,10 +2522,6 @@
 				RelativePath=".\..\src\depot_cmd.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\disaster_cmd.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\group_cmd.cpp"
 				>
@@ -2826,6 +2834,10 @@
 				RelativePath=".\..\src\table\genland.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\heightmap_colours.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\table\industry_land.h"
 				>
@@ -2882,6 +2894,10 @@
 				RelativePath=".\..\src\table\strgen_tables.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\string_colours.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\..\objs\langs\table\strings.h"
 				>
@@ -3122,6 +3138,10 @@
 				RelativePath=".\..\src\3rdparty\squirrel\include\sqstdmath.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\3rdparty\squirrel\include\sqstdstring.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\3rdparty\squirrel\squirrel\sqstring.h"
 				>

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=\"OpenTTD\";WITH_ASSERT"
+				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_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -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=\"OpenTTD\""
+				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_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -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=\"OpenTTD\";_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -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=\"OpenTTD\";_SQ64"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"

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=\"OpenTTD\";WITH_ASSERT"
+				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_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -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=\"OpenTTD\""
+				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_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -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=\"OpenTTD\";_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -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=\"OpenTTD\";_SQ64"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -511,6 +511,10 @@
 				RelativePath=".\..\src\depot.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\disaster_vehicle.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\driver.cpp"
 				>
@@ -1019,6 +1023,10 @@
 				RelativePath=".\..\src\direction_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\disaster_vehicle.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\music\dmusic.h"
 				>
@@ -1543,6 +1551,10 @@
 				RelativePath=".\..\src\roadveh.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\safeguards.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\screenshot.h"
 				>
@@ -2507,10 +2519,6 @@
 				RelativePath=".\..\src\depot_cmd.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\disaster_cmd.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\group_cmd.cpp"
 				>
@@ -2823,6 +2831,10 @@
 				RelativePath=".\..\src\table\genland.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\heightmap_colours.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\table\industry_land.h"
 				>
@@ -2879,6 +2891,10 @@
 				RelativePath=".\..\src\table\strgen_tables.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\string_colours.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\..\objs\langs\table\strings.h"
 				>
@@ -3119,6 +3135,10 @@
 				RelativePath=".\..\src\3rdparty\squirrel\include\sqstdmath.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\3rdparty\squirrel\include\sqstdstring.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\3rdparty\squirrel\squirrel\sqstring.h"
 				>

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=\"OpenTTD\";WITH_ASSERT"
+				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_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -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=\"OpenTTD\""
+				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_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -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=\"OpenTTD\";_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -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=\"OpenTTD\";_SQ64"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"

projects/settings_vs140.vcxproj

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>settings</ProjectName>
+    <ProjectGuid>{0817F629-589E-4A3B-B81A-8647BC571E35}</ProjectGuid>
+    <RootNamespace>settings</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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
+    </SettingsCommandLine>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</IntDir>
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SettingsCommandLine)</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SettingsCommandLine)</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">del ..\objs\settings\table\settings.h</NMakeCleanCommandLine>
+    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\settings.h</NMakeOutput>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="..\src\table\company_settings.ini" />
+    <None Include="..\src\table\currency_settings.ini" />
+    <None Include="..\src\table\gameopt_settings.ini" />
+    <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" />
+    <None Include="..\src\table\settings.h.preamble" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

projects/settings_vs140.vcxproj.filters

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="INI">
+      <UniqueIdentifier>{21deca6c-8df4-4f34-9dad-17d7781cd5a0}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\src\table\company_settings.ini">
+      <Filter>INI</Filter>
+    </None>
+    <None Include="..\src\table\currency_settings.ini">
+      <Filter>INI</Filter>
+    </None>
+    <None Include="..\src\table\gameopt_settings.ini">
+      <Filter>INI</Filter>
+    </None>
+    <None Include="..\src\table\misc_settings.ini">
+      <Filter>INI</Filter>
+    </None>
+    <None Include="..\src\table\settings.ini">
+      <Filter>INI</Filter>
+    </None>
+    <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" />
+    <None Include="..\src\table\settings.h.preamble" />
+  </ItemGroup>
+</Project>

projects/settings_vs140.vcxproj.filters.in

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="INI">
+      <UniqueIdentifier>{21deca6c-8df4-4f34-9dad-17d7781cd5a0}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+!!FILES!!
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\src\table\settings.h.postamble" />
+    <None Include="..\src\table\settings.h.preamble" />
+  </ItemGroup>
+</Project>

projects/settings_vs140.vcxproj.in

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>settings</ProjectName>
+    <ProjectGuid>{0817F629-589E-4A3B-B81A-8647BC571E35}</ProjectGuid>
+    <RootNamespace>settings</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <SettingsCommandLine>
+!!FILTERS!!
+    </SettingsCommandLine>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</IntDir>
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SettingsCommandLine)</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SettingsCommandLine)</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">del ..\objs\settings\table\settings.h</NMakeCleanCommandLine>
+    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\settings.h</NMakeOutput>
+  </PropertyGroup>
+  <ItemGroup>
+!!FILES!!
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\src\table\settings.h.postamble" />
+    <None Include="..\src\table\settings.h.preamble" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

projects/settingsgen_vs140.vcxproj

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>settingsgen</ProjectName>
+    <ProjectGuid>{E9548DE9-F089-49B7-93A6-30BE2CC311C7}</ProjectGuid>
+    <RootNamespace>settings</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">settings_gen</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+    <CustomBuildStep>
+      <Inputs>%(Inputs)</Inputs>
+    </CustomBuildStep>
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <PreprocessorDefinitions>SETTINGSGEN;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AssemblerOutput>All</AssemblerOutput>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)settings_gen.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <SubSystem>Console</SubSystem>
+      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
+    </Link>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\core\alloc_func.cpp" />
+    <ClCompile Include="..\src\misc\getoptdata.cpp" />
+    <ClCompile Include="..\src\ini_load.cpp" />
+    <ClCompile Include="..\src\settingsgen\settingsgen.cpp" />
+    <ClCompile Include="..\src\string.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\misc\getoptdata.h" />
+    <ClInclude Include="..\src\ini_type.h" />
+    <ClInclude Include="..\src\core\smallvec_type.hpp" />
+    <ClInclude Include="..\src\string_func.h" />
+    <ClInclude Include="..\src\strings_type.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

projects/settingsgen_vs140.vcxproj.filters

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{a4678737-b3b3-4be5-9db1-fa6ccd164c59}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\core\alloc_func.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\misc\getoptdata.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\ini_load.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\settingsgen\settingsgen.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\string.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\misc\getoptdata.h" />
+    <ClInclude Include="..\src\ini_type.h" />
+    <ClInclude Include="..\src\core\smallvec_type.hpp" />
+    <ClInclude Include="..\src\string_func.h" />
+    <ClInclude Include="..\src\strings_type.h" />
+  </ItemGroup>
+</Project>

projects/strgen_vs140.vcxproj

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>strgen</ProjectName>
+    <ProjectGuid>{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}</ProjectGuid>
+    <RootNamespace>strgen</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\strgen\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\strgen\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Debug/strgen.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>MinSpace</Optimization>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <PreprocessorDefinitions>STRGEN;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <AssemblerOutput>All</AssemblerOutput>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x041d</Culture>
+    </ResourceCompile>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)strgen.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\core\alloc_func.cpp" />
+    <ClCompile Include="..\src\strgen\strgen_base.cpp" />
+    <ClCompile Include="..\src\strgen\strgen.cpp" />
+    <ClCompile Include="..\src\string.cpp" />
+    <ClCompile Include="..\src\misc\getoptdata.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\core\alloc_func.hpp" />
+    <ClInclude Include="..\src\table\control_codes.h" />
+    <ClInclude Include="..\src\debug.h" />
+    <ClInclude Include="..\src\core\endian_func.hpp" />
+    <ClInclude Include="..\src\stdafx.h" />
+    <ClInclude Include="..\src\string_func.h" />
+    <ClInclude Include="..\src\misc\getoptdata.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

projects/strgen_vs140.vcxproj.filters

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{5894294c-d4dc-41f0-be31-e56cff4e0405}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\core\alloc_func.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\strgen\strgen_base.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\strgen\strgen.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\string.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\misc\getoptdata.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\core\alloc_func.hpp" />
+    <ClInclude Include="..\src\table\control_codes.h" />
+    <ClInclude Include="..\src\debug.h" />
+    <ClInclude Include="..\src\core\endian_func.hpp" />
+    <ClInclude Include="..\src\stdafx.h" />
+    <ClInclude Include="..\src\string_func.h" />
+    <ClInclude Include="..\src\misc\getoptdata.h" />
+  </ItemGroup>
+</Project>

projects/version_vs140.vcxproj

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>version</ProjectName>
+    <ProjectGuid>{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}</ProjectGuid>
+    <RootNamespace>version</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\version\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\version\</IntDir>
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript "$(ProjectDir)/determineversion.vbs"</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript "$(ProjectDir)/determineversion.vbs"</NMakeReBuildCommandLine>
+    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\rev.cpp</NMakeOutput>
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">del ..\src\rev.cpp</NMakeCleanCommandLine>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="..\src\os\windows\ottdres.rc.in" />
+    <None Include="..\src\rev.cpp.in" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>