(svn r25603) -Release: 1.3.2-RC2

- Fix: [Admin] End-of-rcon data could not be determined reliably for any rcon command [FS#5643] (r25598, r25588, r25587)
- Fix: [Content] When the server closed the connection, the client would for eternity try to read a packet and never timeout making it impossible to reconnect [FS#5635] (r25597)
- Fix: [Script] Changing the script difficulty level in-game would also change the settings using the default even though they were not allowed to change in-game [FS#5644] (r25592)
- Fix: [Admin] Ensure that sent and received length of json strings are the same [FS#5646] (r25590, r25589)
- Fix: [Squirrel] Stack overflow did not show an error, due to the stack to throw the error already being full [FS#5320] (r25585)

.gitignore

@@ -7,7 +7,6 @@ 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

COPYING

@@ -1,7 +1,3 @@
-This is the license which applies to OpenTTD with the exception of some
-3rd party modules. See readme.txt for details
-
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 

Doxyfile

@@ -97,7 +97,7 @@ EXCLUDE_PATTERNS       = */3rdparty */.svn */script/api
 EXAMPLE_PATH           =
 EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             =./docs/
+IMAGE_PATH             =
 INPUT_FILTER           =
 FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
@@ -195,14 +195,14 @@ 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_SORT WITH_ICU_LAYOUT UNICODE _UNICODE _GNU_SOURCE FINAL=
+PREDEFINED             = ENABLE_NETWORK WITH_ZLIB WITH_LZO WITH_LZMA WITH_SDL WITH_PNG WITH_FONTCONFIG WITH_FREETYPE WITH_ICU UNICODE _UNICODE _GNU_SOURCE FINAL=
 EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 TAGFILES               =
-GENERATE_TAGFILE       = objs/openttd.tag
+GENERATE_TAGFILE       = openttd.tag
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 PERL_PATH              = /usr/bin/perl

Makefile.bundle.in

@@ -84,15 +84,15 @@ endif
 	$(Q)cp "$(BIN_DIR)/scripts/"*             "$(BUNDLE_DIR)/scripts/"
 ifdef MENU_DIR
 	$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
-	$(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | LC_ALL=C $(SORT) |  $(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.filter.awk" >> "$(BUNDLE_DIR)/media/openttd.desktop"
+	$(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | $(SORT) |  $(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)
 	$(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/readme.txt" "$(BUNDLE_DIR)/COPYING" "$(BUNDLE_DIR)/changelog.txt" "$(BUNDLE_DIR)/known-bugs.txt"
 ifeq ($(OS), DOS)
-	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi/cwsdpmi.txt"   "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi.txt"   "$(BUNDLE_DIR)/docs/"
 ifndef STRIP
-	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi/cwsdpmi.exe"   "$(TTD_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi.exe"   "$(TTD_DIR)/"
 endif
 endif
 endif
@@ -172,7 +172,6 @@ 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"
@@ -183,7 +182,6 @@ 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,13 +5,16 @@
 # 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.
+# Building requires GRFCodec and NFORenum. Older versions of GRFCodec are
+#  known to miscompile the graphics.
 #
-# Recent versions (including sources) can be found at:
+# Recent nightlies (including sources) of both can be found at:
 #  http://www.openttd.org/download-grfcodec
+#  http://www.openttd.org/download-nforenum
 #
-# The mercurial repository can be found at:
+# The mercurial repository of both can be found at:
 #  http://hg.openttdcoop.org/grfcodec
+#  http://hg.openttdcoop.org/nforenum
 #
 
 
@@ -44,18 +47,22 @@ PNG_FILES    := $(GRF_DIR)/*.png $(GRF_DIR)/rivers/*.png
 
 # Build the GRF.
 ifdef GRFCODEC
-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
+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
 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)/orig_extra.grf $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/translations.awk
+$(BIN_DIR)/%.obg: $(BASESET_DIR)/%.obg $(BIN_DIR)/openttd.grf $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/translations.awk
 	$(E) '$(STAGE) Updating $(notdir $@)'
-	$(Q) sed 's/^ORIG_EXTRA.GRF    = *[0-9a-f]*$$/ORIG_EXTRA.GRF    = '`$(MD5SUM) $(BIN_DIR)/orig_extra.grf | sed 's@ .*@@'`'/' $< > $@.tmp
+	$(Q) sed 's/^OPENTTD.GRF  = *[0-9a-f]*$$/OPENTTD.GRF  = '`$(MD5SUM) $(BIN_DIR)/openttd.grf | sed 's@ .*@@'`'/' $< > $@.tmp
 	$(Q) awk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $@.tmp >$@
 	$(Q) rm $@.tmp
 
@@ -68,27 +75,15 @@ $(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) $(GRF_DIR)/assemble_nfo.awk
+$(BIN_DIR)/openttd.grf: $(PNG_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites
 	$(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) $(CC_BUILD) -nostdinc -I$(GRF_DIR) -C -E - < "$(GRF_DIR)/openttd.nfo" | sed -e '/^#/d' -e '/^$$/d' > $(OBJS_DIR)/sprites/openttd.nfo
 	$(Q) $(NFORENUM) -s $(OBJS_DIR)/sprites/openttd.nfo
 	$(E) '$(STAGE) Compiling openttd.grf'
 	$(Q) $(GRFCODEC) -n -s -e -p1 $(OBJS_DIR)/openttd.grf
 	$(Q)cp $(OBJS_DIR)/openttd.grf $(BIN_DIR)/openttd.grf
 
-# 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

@@ -144,15 +144,17 @@ mrproper:
 # output of profiling
 	$(Q)rm -f $(BIN_DIR)/gmon.out
 # output of generating 'API' documentation
+	$(Q)rm -f $(ROOT_DIR)/openttd.tag
 	$(Q)rm -rf $(ROOT_DIR)/docs/source
+# output of generating AI API documentation
+	$(Q)rm -f $(SRC_DIR)/ai/api/openttd.tag
 	$(Q)rm -rf $(ROOT_DIR)/docs/aidocs
-	$(Q)rm -rf $(ROOT_DIR)/docs/gamedocs
 # directories created by OpenTTD on regression testing
 	$(Q)rm -rf $(BIN_DIR)/ai/regression/content_download $(BIN_DIR)/ai/regression/save $(BIN_DIR)/ai/regression/scenario
 distclean: mrproper
 
 maintainer-clean: distclean
-	$(Q)rm -f $(BIN_DIR)/baseset/openttd.grf $(BIN_DIR)/baseset/orig_extra.grf $(BIN_DIR)/baseset/*.obg $(BIN_DIR)/baseset/*.obs $(BIN_DIR)/baseset/*.obm
+	$(Q)rm -f $(BIN_DIR)/baseset/openttd.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 $(SRC_DIR)/safeguards.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
 	$(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 $(SRC_DIR)/safeguards.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
 	$(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 $(SRC_DIR)/safeguards.h
+string.o: $(SRC_DIR)/string.cpp endian_host.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
 
-alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h $(SRC_DIR)/safeguards.h
+alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
 
-getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h $(SRC_DIR)/safeguards.h
+getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/misc/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
 

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 $(SRC_DIR)/safeguards.h
+settingsgen.o: $(SRC_DIR)/settingsgen/settingsgen.cpp $(SRC_DIR)/string_func.h $(SRC_DIR)/strings_type.h $(SRC_DIR)/misc/getoptdata.h $(SRC_DIR)/ini_type.h $(SRC_DIR)/core/smallvec_type.hpp
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
 
-alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h $(SRC_DIR)/safeguards.h
+alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
 
-getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h $(SRC_DIR)/safeguards.h
+getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/misc/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
 
-string.o: $(SRC_DIR)/string.cpp endian_host.h $(SRC_DIR)/safeguards.h
+string.o: $(SRC_DIR)/string.cpp endian_host.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
 
-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
+ini_load.o: $(SRC_DIR)/ini_load.cpp $(SRC_DIR)/core/alloc_func.hpp $(SRC_DIR)/core/mem_func.hpp $(SRC_DIR)/ini_type.h $(SRC_DIR)/string_func.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
 

Makefile.src.in

@@ -210,7 +210,7 @@ endif
 	{                                   \
 		print $$0                         \
 	}                                   \
-	' < Makefile.dep.tmp | sed 's@  *@ @g;s@ $$@@' | LC_ALL=C $(SORT) > Makefile.dep
+	' < Makefile.dep.tmp | sed 's@  *@ @g;s@ $$@@' | $(SORT) > Makefile.dep
 
 	$(Q)rm -f Makefile.dep.tmp Makefile.dep.tmp.bak
 
@@ -229,22 +229,10 @@ $(OBJS_C): %.o: $(SRC_DIR)/%.c $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.c=%.c)'
 	$(Q)$(CC_HOST) $(CFLAGS) -c -o $@ $<
 
-$(filter-out %sse2.o, $(filter-out %ssse3.o, $(filter-out %sse4.o, $(OBJS_CPP)))): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
+$(OBJS_CPP): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -o $@ $<
 
-$(filter %sse2.o, $(OBJS_CPP)): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -msse2 -o $@ $<
-
-$(filter %ssse3.o, $(OBJS_CPP)): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -mssse3 -o $@ $<
-
-$(filter %sse4.o, $(OBJS_CPP)): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -msse4.1 -o $@ $<
-
 $(OBJS_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.mm=%.mm)'
 	$(Q)$(CC_HOST) $(CFLAGS) -c -o $@ $<

bin/ai/compat_0.7.nut

@@ -7,7 +7,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-AILog.Info("0.7 API compatibility in effect:");
+AILog.Info("0.7 API compatability in effect:");
 AILog.Info(" - AITown::GetLastMonthProduction's behaviour has slightly changed.");
 AILog.Info(" - AISubsidy::GetDestination returns STATION_INVALID for awarded subsidies.");
 AILog.Info(" - AISubsidy::GetSource returns STATION_INVALID for awarded subsidies.");

bin/ai/compat_1.0.nut

@@ -7,7 +7,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-AILog.Info("1.0 API compatibility in effect.");
+AILog.Info("1.0 API compatability in effect.");
 
 AIRoad._BuildRoadStation <- AIRoad.BuildRoadStation;
 AIRoad.BuildRoadStation <- function(tile, front, road_veh_type, station_id)

bin/ai/compat_1.1.nut

@@ -7,7 +7,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-AILog.Info("1.1 API compatibility in effect.");
+AILog.Info("1.1 API compatability in effect.");
 
 AICompany.GetCompanyValue <- function(company)
 {

bin/ai/compat_1.2.nut

@@ -7,4 +7,4 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-AILog.Info("1.2 API compatibility in effect.");
+AILog.Info("1.2 API compatability in effect.");

bin/ai/compat_1.3.nut

@@ -6,5 +6,3 @@
  * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
-
-AILog.Info("1.3 API compatibility in effect.");

bin/ai/compat_1.4.nut

@@ -1,10 +0,0 @@
-/* $Id$ */
-
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-AILog.Info("1.4 API compatibility in effect.");

bin/ai/compat_1.5.nut

@@ -1,10 +0,0 @@
-/* $Id$ */
-
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-AILog.Info("1.5 API compatibility in effect.");

bin/ai/compat_1.6.nut

@@ -1,10 +0,0 @@
-/* $Id$ */
-
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-AILog.Info("1.6 API compatibility in effect.");

bin/ai/compat_1.7.nut

@@ -1,8 +0,0 @@
-/* $Id$ */
-
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */

bin/ai/regression/completeness.sh

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

bin/ai/regression/regression.nut

@@ -972,7 +972,48 @@ function Regression::Order()
 	print("  SetStopLocation():     " + AIOrder.SetStopLocation(20, 0, AIOrder.STOPLOCATION_MIDDLE));
 	print("  GetStopLocation():     " + AIOrder.GetStopLocation(20, 0));
 
-	local list = AIVehicleList_Station(3);
+	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));
+	}
+
+	list = AIVehicleList_Station(3);
 
 	print("");
 	print("--VehicleList_Station--");
@@ -1193,6 +1234,10 @@ 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));
@@ -1209,42 +1254,25 @@ function Regression::Station()
 	print("  GetNearestTown():         " + AIStation.GetNearestTown(10000));
 	print("  GetNearestTown():         " + AIStation.GetNearestTown(3));
 
-	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));
-				}
-			}
-		}
-	}
+	local list = AIStationList(AIStation.STATION_BUS_STOP + AIStation.STATION_TRUCK_STOP);
 
 	print("");
-	print("--CargoPlanned--");
-	for (local cargo = 0; cargo <= 1000; cargo += 1000) {
-		for (local station0 = 0; station0 <= 1000; station0 += 1000) {
-			print("  GetCargoPlanned(" + station0 + ", " + cargo + "): " +
-					AIStation.GetCargoPlanned(station0, cargo));
-			for (local station1 = 0; station1 <= 1000; station1 += 1000) {
-				print("  GetCargoPlannedFrom(" + station0 + ", " + station1 + ", " + cargo + "): " +
-						AIStation.GetCargoPlannedFrom(station0, station1, cargo));
-				print("  GetCargoPlannedVia(" + station0 + ", " + station1 + ", " + cargo + "): " +
-						AIStation.GetCargoPlannedFrom(station0, station1, cargo));
-				for (local station2 = 0; station2 <= 1000; station2 += 1000) {
-					print("  GetCargoPlannedFromVia(" + station0 + ", " + station1 + ", " + station2 + ", " + cargo + "): " +
-							AIStation.GetCargoPlannedFromVia(station0, station1, station2, cargo));
-				}
-			}
-		}
+	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));
 	}
 }
 

bin/ai/regression/regression.txt

@@ -877,7 +877,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetName():          Wooden rail bridge
     GetMaxSpeed():      32
     GetPrice():         450
-    GetMaxLength():     66
+    GetMaxLength():     102
     GetMinLength():     2
   Bridge 1
     IsValidBridge():    true
@@ -905,14 +905,14 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetName():          Steel suspension rail bridge
     GetMaxSpeed():      96
     GetPrice():         1042
-    GetMaxLength():     66
+    GetMaxLength():     102
     GetMinLength():     5
   Bridge 5
     IsValidBridge():    true
     GetName():          Steel suspension rail bridge
     GetMaxSpeed():      112
     GetPrice():         1081
-    GetMaxLength():     66
+    GetMaxLength():     102
     GetMinLength():     5
   Bridge 6
     IsValidBridge():    true
@@ -1012,9 +1012,9 @@ ERROR: IsEnd() is invalid as Begin() is never called
     1 => 630
     0 => 450
   MaxLength ListDump:
-    5 => 66
-    4 => 66
-    0 => 66
+    5 => 102
+    4 => 102
+    0 => 102
     3 => 12
     8 => 11
     7 => 10
@@ -7487,6 +7487,9 @@ 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
@@ -7501,81 +7504,17 @@ ERROR: IsEnd() is invalid as Begin() is never called
   GetNearestTown():         65535
   GetNearestTown():         10
 
---CargoWaiting--
-  GetCargoWaiting(0, 0): 0
-  GetCargoWaitingFrom(0, 0, 0): 0
-  GetCargoWaitingVia(0, 0, 0): 0
-  GetCargoWaitingFromVia(0, 0, 0, 0): 0
-  GetCargoWaitingFromVia(0, 0, 1000, 0): -1
-  GetCargoWaitingFrom(0, 1000, 0): -1
-  GetCargoWaitingVia(0, 1000, 0): -1
-  GetCargoWaitingFromVia(0, 1000, 0, 0): -1
-  GetCargoWaitingFromVia(0, 1000, 1000, 0): -1
-  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
+--StationList--
+  Count():             2
+  Location ListDump:
+    5 => 33421
+    4 => 33411
+  CargoWaiting(0) ListDump:
+    5 => 0
+    4 => 0
+  CargoWaiting(1) ListDump:
+    5 => 0
+    4 => 0
 
 --Tile--
   HasTreeOnTile():      false
@@ -9167,6 +9106,30 @@ 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 => 69
+    4 => 69
+  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/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 some commands. On the same map the result should always be the same."; }
+	function GetDescription() { return "This runs regression-tests on all commands. On the same map the result should always be the same."; }
 	function GetVersion()     { return 1; }
-	function GetAPIVersion()  { return "1.7"; }
+	function GetAPIVersion()  { return "1.3"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
 }

bin/ai/regression/run.sh

@@ -2,11 +2,14 @@
 
 # $Id$
 
-if ! [ -f ai/regression/run.sh ]; then
+if ! [ -f ai/regression/regression.nut ]; 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
@@ -19,46 +22,27 @@ fi
 if [ "$1" = "-g" ]; then
 	gdb="gdb --ex run --args "
 fi
-
-if [ -d "ai/regression/tst_$1" ]; then
-	tests="ai/regression/tst_$1"
-elif [ -d "ai/regression/tst_$2" ]; then
-	tests="ai/regression/tst_$2"
+if [ -n "$gdb" ]; then
+	$gdb ./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav
 else
-	tests=ai/regression/tst_*
+	./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
 fi
 
 ret=0
-for tst in $tests; do
-	echo -n "Running $tst... "
-
-	# 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
+if [ -z "$gdb" ]; then
+	res="`diff -ub ai/regression/regression.txt tmp.regression`"
+	if [ -z "$res" ]; then
+		echo "Regression test passed!"
 	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
+		echo "Regression test failed! Difference:"
+		echo "$res"
+		ret=1
 	fi
+	echo ""
+	echo "Regression test done"
+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
+rm -f ai/regression/main.nut ai/regression/info.nut
 
 if [ -f scripts/game_start.scr.regression ]; then
 	mv scripts/game_start.scr.regression scripts/game_start.scr

bin/ai/regression/tst_stationlist/main.nut

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

@@ -1,127 +0,0 @@
-
---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

@@ -10,9 +10,9 @@ fallback          = true
 description       = A music pack without actual music.
 description.af_ZA = 'n Musiek stel sonder enige musiek.
 description.ar_EG = مجموعة موسيقى بدون موسيقى
-description.be_BY = "Пусты" набор музычнага афармлення, які не зьмяшчае ніякай музыкі.
+description.be_BY = "Пусты" набор музычнага афармлення, не змяшчаючы ніякай музыкі.
 description.bg_BG = Празен музикален пакет.
-description.ca_ES = Una llista de música sense cap peça.
+description.ca_ES = Un joc de música sense cap música.
 description.cs_CZ = Prázná hudební sada.
 description.cy_GB = Pecyn cerddoriaeth heb unrhyw gerddoriaeth ynddo.
 description.da_DK = En musikpakke uden musik.
@@ -21,32 +21,23 @@ 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.et_EE = Muusikakomplekt ilma igasuguse muusikata.
 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.he_IL = אוסף מנגינות ללא מנגינות.
-description.hr_HR = Glazbeni paket bez ikakve glazbe.
+description.hr_HR = Muzički paket bez ikakve muzike.
 description.hu_HU = Zenei alapcsomag zene nélkül.
 description.id_ID = Paket musik tanpa musik sungguhan.
 description.is_IS = Tónlistarpakki sem er í raun án tónlistar.
 description.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.
 description.pl_PL = Zestaw utworów muzycznych nie zawierający żadnej muzyki.
-description.pt_BR = Um pacote de músicas sem músicas.
 description.pt_PT = Um conjunto de música vazio.
 description.ro_RO = Un set de muzică fără muzică inclusă.
 description.ru_RU = "Пустой" набор музыкального оформления, не содержащий никакой музыки.
@@ -55,9 +46,8 @@ description.sl_SI = Glasbeni paket z vključeno glasbo.
 description.sr_RS = Prazan skup muzičkih numera.
 description.sv_SE = Ett musikpaket utan någon musik.
 description.ta_IN = இசை இல்லாத இசைத்தொகுப்பு.
-description.th_TH = ชุดเพลงประกอบแบบไม่มีเสียงเพลง
+description.th_TH = A music pack without actual music.
 description.tr_TR = Müzik içermeyen boş bir müzik paketi.
-description.uk_UA = Порожній набір музики.
 description.vi_VN = Gói âm nhạc này không có nhạc nào.
 description.zh_CN = 一个没有实际内容的音乐包.
 description.zh_TW = 不含任何音樂的音樂集。

bin/baseset/no_sound.obs

@@ -10,9 +10,9 @@ fallback          = true
 description       = A sound pack without any sounds.
 description.af_ZA = 'n Klank stel sonder enige klanke.
 description.ar_EG = مجموعة صوت بدوت اصوات مضافة
-description.be_BY = "Пусты" набор гукавога афармленьня, які не зьмяшчае ніякіх гукаў.
+description.be_BY = "Пусты" набор гукавога афармленьня, не змяшчаючы ніякіх гукаў.
 description.bg_BG = Празен звуков пакет.
-description.ca_ES = Una llista de sons buida.
+description.ca_ES = Un joc de sons sense cap so.
 description.cs_CZ = Prázdná sada zvuků.
 description.cy_GB = Pecyn sain heb unrhyw effeithiau sain ynddo.
 description.da_DK = En lydpakke uden lyde.
@@ -21,15 +21,11 @@ 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.et_EE = Ilma häälteta helipakk.
 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.
@@ -37,15 +33,11 @@ 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.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.
 description.pl_PL = Zestaw dźwięków nie zawierający żadnych dźwięków.
-description.pt_BR = Um pacote de sons sem sons.
 description.pt_PT = Um conjunto de sons vazio.
 description.ro_RO = Un set de sunete fără nici un sunet inclus.
 description.ru_RU = "Пустой" набор звукового оформления, не содержащий никаких звуков.
@@ -54,9 +46,8 @@ description.sl_SI = Zvočni paket brez zvoka.
 description.sr_RS = Prazan skup zvukova.
 description.sv_SE = Ett ljudpaket utan några ljud.
 description.ta_IN = ஒலிகள் இல்லாத ஒலி தொகுப்பு.
-description.th_TH = ชุดเสียงแบบไร้เสียง
+description.th_TH = A sound pack without any sounds.
 description.tr_TR = Ses içermeyen boş bir ses kümesi.
-description.uk_UA = Порожній набір звуків.
 description.vi_VN = Gói âm thanh này không có âm thanh nào.
 description.zh_CN = 一个空的音效包.
 description.zh_TW = 不含任何音效的音效集。

bin/baseset/orig_dos.obg

@@ -11,9 +11,9 @@ palette           = DOS
 description       = Original Transport Tycoon Deluxe DOS edition graphics.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS uitgawe grafieke.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الرسومية نسخة الدوس
-description.be_BY = Арыґінальная ґрафіка з Transport Tycoon Deluxe для DOS.
+description.be_BY = Арыгінальная графіка з Transport Tycoon Deluxe для DOS.
 description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за DOS.
-description.ca_ES = Gràfics originals del Transport Tycoon Deluxe pel DOS.
+description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a DOS.
 description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (verze pro DOS).
 description.cy_GB = Graffeg gwreiddiol fersiwn DOS o Transport Tycoon Deluxe.
 description.da_DK = Originalgrafik fra Transport Tycoon Deluxe DOS-version.
@@ -22,15 +22,11 @@ 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.
@@ -38,16 +34,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.
 description.pl_PL = Oryginalna edycja grafik dla Transport Tycoon Deluxe DOS.
-description.pt_BR = Gráficos Originais do Transport Tycoon Deluxe, Edição DOS.
 description.pt_PT = Gráficos originais da edição DOS de Transport Tycoon Deluxe.
 description.ro_RO = Setul grafic original al Transport Tycoon Deluxe pentru DOS.
 description.ru_RU = Оригинальная графика из Transport Tycoon Deluxe для DOS.
@@ -57,28 +48,27 @@ description.sr_RS = Originalni skup grafika Transport Tycoon Deluxe DOS izdanja.
 description.sv_SE = Originalgrafiken från Transport Tycoon Deluxe, DOS-utgåvan.
 description.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் DOS பதிப்பு அசைவூட்டங்கள்.
 description.th_TH = กราฟฟิกต้นตำหรับของ Transport Tycoon Deluxe DOS edition
-description.tr_TR = Özgün Transport Tycoon Deluxe DOS sürümü grafikleri.
-description.uk_UA = Оригінальна графіка з Transport Tycoon Deluxe DOS edition.
+description.tr_TR = Orijinal Transport Tycoon Deluxe DOS sürümü grafikleri.
 description.vi_VN = Đồ họa gốc từ phiên bản Transport Tycoon Deluxe trên DOS
 description.zh_CN = 运输大亨DOS豪华版原版图形包.
 description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版的圖形。
 
 [files]
-base              = TRG1.GRF
-logos             = TRGI.GRF
-arctic            = TRGC.GRF
-tropical          = TRGH.GRF
-toyland           = TRGT.GRF
-extra             = ORIG_EXTRA.GRF
+base         = TRG1.GRF
+logos        = TRGI.GRF
+arctic       = TRGC.GRF
+tropical     = TRGH.GRF
+toyland      = TRGT.GRF
+extra        = OPENTTD.GRF
 
 [md5s]
-TRG1.GRF          = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF          = da6a6c9dcc451eec88d79211437b76a8
-TRGC.GRF          = ed446637e034104c5559b32c18afe78d
-TRGH.GRF          = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGT.GRF          = e30e8a398ae86c03dc534a8ac7dfb3b6
-ORIG_EXTRA.GRF    = 0b10a95c0adee710ecca9c3d676be4f3
+TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
+TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
+TRGC.GRF     = ed446637e034104c5559b32c18afe78d
+TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
+TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
+OPENTTD.GRF  = c683a77e1a43aed7db29ef318b166dd9
 
 [origin]
-default           = You can find it on your Transport Tycoon Deluxe CD-ROM.
-ORIG_EXTRA.GRF    = This file was part of your OpenTTD installation.
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+OPENTTD.GRF  = This file was part of your OpenTTD installation.

bin/baseset/orig_dos.obs

@@ -10,9 +10,9 @@ version           = 0
 description       = Original Transport Tycoon Deluxe DOS edition sounds.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS uitgawe klanke.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الصوتية نسخة الدوس
-description.be_BY = Арыґінальны набор гукавога афармленьня з гульні Transport Tycoon Deluxe для DOS.
+description.be_BY = Арыгінальны набор гукавога афармленьня з гульні Transport Tycoon Deluxe для DOS.
 description.bg_BG = Оригинални звуци на Transport Tycoon Deluxe за DOS.
-description.ca_ES = Sons originals del Transport Tycoon Deluxe pel DOS.
+description.ca_ES = Sons originals de Transport Tycoon Deluxe per a DOS.
 description.cs_CZ = Původní sada zvuků Transport Tycoon Deluxe (verze pro DOS).
 description.cy_GB = Effeithiau sain gwreiddiol fersiwn DOS o Transport Tycoon Deluxe.
 description.da_DK = Originallyd fra Transport Tycoon Deluxe DOS-version.
@@ -21,15 +21,11 @@ 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.
@@ -37,14 +33,11 @@ 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.
 description.nl_NL = Originele geluiden van de Transport Tycoon Deluxe DOS-versie.
 description.nn_NO = Originale lydar frå Transport Tycoon Deluxe for DOS.
 description.pl_PL = Oryginalna edycja dźwięków dla Transport Tycoon Deluxe DOS.
-description.pt_BR = Sons Originais do Transport Tycoon Deluxe, Edição DOS.
 description.pt_PT = Sons originais da edição DOS de Transport Tycoon Deluxe.
 description.ro_RO = Setul de sunete original al Transport Tycoon Deluxe pentru DOS.
 description.ru_RU = Оригинальный набор звукового оформления из игры Transport Tycoon Deluxe для DOS.
@@ -54,8 +47,7 @@ description.sr_RS = Originalni skup zvukova Transport Tycoon Deluxe DOS izdanja.
 description.sv_SE = Originalljuden från Transport Tycoon Deluxe, DOS-utgåvan.
 description.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் DOS பதிப்பு ஒலிகள்.
 description.th_TH = เสียงต้นตำหรับของ Transport Tycoon Deluxe DOS edition
-description.tr_TR = Özgün Transport Tycoon Deluxe DOS sürümü sesleri.
-description.uk_UA = Оригінальний набір звуків з Transport Tycoon Deluxe DOS edition.
+description.tr_TR = Orijinal Transport Tycoon Deluxe DOS sürümü sesleri.
 description.vi_VN = Âm thanh gốc từ phiên bản Transport Tycoon Deluxe trên DOS
 description.zh_CN = 运输大亨DOS豪华版原版音效包.
 description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版的音效。

bin/baseset/orig_dos_de.obg

@@ -11,9 +11,9 @@ palette           = DOS
 description       = Original Transport Tycoon Deluxe DOS (German) edition graphics.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS (German) uitgawe grafieke.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الالمانية نسخة الدوس
-description.be_BY = Арыґінальная ґрафіка зь нямецкай версіі Transport Tycoon Deluxe для DOS.
+description.be_BY = Арыгінальная графіка з нямецкай версіі Transport Tycoon Deluxe для DOS.
 description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за DOS (немски) .
-description.ca_ES = Gràfics originals del Transport Tycoon Deluxe (alemany) pel DOS.
+description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a DOS (Alemany).
 description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (německá verze pro DOS).
 description.cy_GB = Graffeg gwreiddiol fersiwn DOS (Almaenig) o Transport Tycoon Deluxe.
 description.da_DK = Originalgrafik fra Transport Tycoon Deluxe DOS (Tysk) version.
@@ -22,14 +22,11 @@ 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).
@@ -37,15 +34,11 @@ 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).
 description.pl_PL = Oryginalna edycja grafik dla Transport Tycoon Deluxe DOS (German).
-description.pt_BR = Gráficos Originais do Transport Tycoon Deluxe, Edição DOS alemã.
 description.pt_PT = Gráficos originais da edição DOS (Alemã) de Transport Tycoon Deluxe.
 description.ro_RO = Setul grafic original al Transport Tycoon Deluxe pentru DOS (ediţia germană).
 description.ru_RU = Оригинальная графика из немецкой версии Transport Tycoon Deluxe для DOS.
@@ -55,28 +48,27 @@ description.sr_RS = Originalni skup grafika nemačkog Transport Tycoon Deluxe DO
 description.sv_SE = Originalgrafiken från Transport Tycoon Deluxe, DOS-utgåvan (tyska).
 description.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் DOS (செருமன்) பதிப்பு அசைவூட்டங்கள்.
 description.th_TH = กราฟฟิกต้นตำหรับของ Transport Tycoon Deluxe DOS (German) edition
-description.tr_TR = Özgün Transport Tycoon Deluxe DOS (Almanca) sürümü grafikleri.
-description.uk_UA = Оригінальна графіка з Transport Tycoon Deluxe DOS edition (німецького).
+description.tr_TR = Orijinal Transport Tycoon Deluxe DOS (Almanca) sürümü grafikleri.
 description.vi_VN = Đồ họa gốc từ phiên bản Transport Tycoon Deluxe trên DOS (tiếng Đức)
 description.zh_CN = 运输大亨DOS豪华德语版原版图形包.
 description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版 (德國版) 的圖形。
 
 [files]
-base              = TRG1.GRF
-logos             = TRGI.GRF
-arctic            = TRGC.GRF
-tropical          = TRGH.GRF
-toyland           = TRGT.GRF
-extra             = ORIG_EXTRA.GRF
+base         = TRG1.GRF
+logos        = TRGI.GRF
+arctic       = TRGC.GRF
+tropical     = TRGH.GRF
+toyland      = TRGT.GRF
+extra        = OPENTTD.GRF
 
 [md5s]
-TRG1.GRF          = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF          = da6a6c9dcc451eec88d79211437b76a8
-TRGC.GRF          = ed446637e034104c5559b32c18afe78d
-TRGH.GRF          = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGT.GRF          = fcde1d7e8a74197d72a62695884b909e
-ORIG_EXTRA.GRF    = 0b10a95c0adee710ecca9c3d676be4f3
+TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
+TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
+TRGC.GRF     = ed446637e034104c5559b32c18afe78d
+TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
+TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
+OPENTTD.GRF  = c683a77e1a43aed7db29ef318b166dd9
 
 [origin]
-default           = You can find it on your Transport Tycoon Deluxe CD-ROM.
-ORIG_EXTRA.GRF    = This file was part of your OpenTTD installation.
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+OPENTTD.GRF  = This file was part of your OpenTTD installation.

bin/baseset/orig_win.obg

@@ -11,9 +11,9 @@ palette           = Windows
 description       = Original Transport Tycoon Deluxe Windows edition graphics.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe grafieke.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الرسومية نسخة وندوز
-description.be_BY = Арыґінальная ґрафіка з Transport Tycoon Deluxe для Windows.
+description.be_BY = Арыгінальная графіка з Transport Tycoon Deluxe для Windows.
 description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за Windows.
-description.ca_ES = Gràfics originals del Transport Tycoon Deluxe pel Windows.
+description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a Windows.
 description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (verze pro Windows).
 description.cy_GB = Graffeg gwreiddiol fersiwn Windows o Transport Tycoon Deluxe.
 description.da_DK = Originalgrafik fra Transport Tycoon Deluxe Windows-version.
@@ -22,31 +22,23 @@ 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.
 description.is_IS = Upprunalega grafíkin úr Transport Tycoon Deluxe Windows útgáfunni.
 description.it_IT = Grafica originale di Transport Tycoon Deluxe, edizione Windows.
 description.ja_JP = Transport Tycoon Deluxe オリジナル版 グラフィック (Windows)
-description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 윈도 에디션의 그래픽입니다.
-description.la_VA = Graphica ex editione originale Transport Tycoon Deluxe Windows.
-description.lb_LU = Original Transport Tycoon Deluxe Windows Editioun Grafik.
+description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 윈도우 에디션의 그래픽입니다.
 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.
 description.pl_PL = Oryginalna edycja grafik dla Transport Tycoon Deluxe Windows.
-description.pt_BR = Gráficos Originais do Transport Tycoon, Edição Windows.
 description.pt_PT = Gráficos originais da edição Windows de Transport Tycoon Deluxe.
 description.ro_RO = Setul grafic original al Transport Tycoon Deluxe pentru Windows.
 description.ru_RU = Оригинальная графика из Transport Tycoon Deluxe для Windows.
@@ -56,28 +48,27 @@ description.sr_RS = Originalni skup grafika Transport Tycoon Deluxe Windows izda
 description.sv_SE = Originalgrafiken från Transport Tycoon Deluxe, Windows-utgåvan.
 description.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் விண்டோஸ் பதிப்பு அசைவூட்டங்கள்.
 description.th_TH = กราฟฟิกต้ำตำหรับของ Transport Tycoon Deluxe Windows edition
-description.tr_TR = Özgün Transport Tycoon Deluxe Windows sürümü grafikleri.
-description.uk_UA = Оригінальна графіка з Transport Tycoon Deluxe Windows edition.
+description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü grafikleri.
 description.vi_VN = Đồ họa gốc từ phiên bản Transport Tycoon Deluxe trên Windows
 description.zh_CN = 运输大亨Windows豪华版原版图形包.
 description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的圖形。
 
 [files]
-base              = TRG1R.GRF
-logos             = TRGIR.GRF
-arctic            = TRGCR.GRF
-tropical          = TRGHR.GRF
-toyland           = TRGTR.GRF
-extra             = ORIG_EXTRA.GRF
+base         = TRG1R.GRF
+logos        = TRGIR.GRF
+arctic       = TRGCR.GRF
+tropical     = TRGHR.GRF
+toyland      = TRGTR.GRF
+extra        = OPENTTD.GRF
 
 [md5s]
-TRG1R.GRF         = b04ce593d8c5016e07473a743d7d3358
-TRGIR.GRF         = 0c2484ff6be49fc63a83be6ab5c38f32
-TRGCR.GRF         = 3668f410c761a050b5e7095a2b14879b
-TRGHR.GRF         = 06bf2b7a31766f048baac2ebe43457b1
-TRGTR.GRF         = de53650517fe661ceaa3138c6edb0eb8
-ORIG_EXTRA.GRF    = 0b10a95c0adee710ecca9c3d676be4f3
+TRG1R.GRF    = b04ce593d8c5016e07473a743d7d3358
+TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
+TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
+TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
+TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
+OPENTTD.GRF  = c683a77e1a43aed7db29ef318b166dd9
 
 [origin]
-default           = You can find it on your Transport Tycoon Deluxe CD-ROM.
-ORIG_EXTRA.GRF    = This file was part of your OpenTTD installation.
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+OPENTTD.GRF  = This file was part of your OpenTTD installation.

bin/baseset/orig_win.obm

@@ -10,9 +10,9 @@ version           = 1
 description       = Original Transport Tycoon Deluxe Windows edition music.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe musiek.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الموسيقية نسخة وندوز
-description.be_BY = Арыґінальны набор музычнага афармленьня з гульні Transport Tycoon Deluxe для Windows.
+description.be_BY = Арыгінальны набор музычнага афармленьня з гульні Transport Tycoon Deluxe для Windows.
 description.bg_BG = Оригинална музика на Transport Tycoon Deluxe за Windows.
-description.ca_ES = Música original del Transport Tycoon Deluxe pel Windows.
+description.ca_ES = Música Original de Transport Tycoon Deluxe per a Windows.
 description.cs_CZ = Původní hudba Transport Tycoon Deluxe (verze pro Windows).
 description.cy_GB = Cerddoriaeth gwreiddiol fersion Windows o Transport Tycoon Deluxe.
 description.da_DK = Originalmusik fra Transport Tycoon Deluxe Windows-version.
@@ -21,31 +21,23 @@ 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.he_IL = מנגינות Transport Tycoon Deluxe המקורי בגרסת Windows.
-description.hr_HR = Originalna glazba za Transport Tycoon Deluxe Windows izdanje.
+description.hr_HR = Originalna muzika za Transport Tycoon Deluxe Windows izdanje.
 description.hu_HU = Az eredeti Transport Tycoon Deluxe Windows verziójának zenéje.
 description.id_ID = Musik pengiring orisinil Transport Tycoon Deluxe versi Windows.
 description.is_IS = Upprunalega tónlistin úr Transport Tycoon Deluxe Windows útgáfunni.
 description.it_IT = Musica originale di Transport Tycoon Deluxe, edizione Windows.
 description.ja_JP = Transport Tycoon Deluxe オリジナル版 音楽 (Windows)
-description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 윈도 에디션의 음악입니다.
-description.la_VA = Musica ex editione originale Transport Tycoon Deluxe Windows.
-description.lb_LU = Original Transport Tycoon Deluxe Windows Editioun Musik.
+description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 윈도우 에디션의 음악입니다.
 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.
 description.pl_PL = Oryginalna edycja utworów muzycznych w Transport Tycoon Deluxe Windows.
-description.pt_BR = Música Original do Transport Tycoon Deluxe, Edição Windows
 description.pt_PT = Música original da edição Windows de Transport Tycoon Deluxe.
 description.ro_RO = Setul de muzică original al Transport Tycoon Deluxe pentru Windows.
 description.ru_RU = Оригинальный набор музыкального оформления из игры Transport Tycoon Deluxe для Windows.
@@ -55,8 +47,7 @@ description.sr_RS = Originalni skup muzičkih numera Transport Tycoon Deluxe Win
 description.sv_SE = Originalmusiken från Transport Tycoon Deluxe, Windows-utgåvan.
 description.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் விண்டோஸ் பதிப்பு இசை.
 description.th_TH = เพลงต้นตำหรับชอง Transport Tycoon Deluxe Windows edition
-description.tr_TR = Özgün Transport Tycoon Deluxe Windows sürümü müzikleri.
-description.uk_UA = Оригінальна музика з Transport Tycoon Deluxe Windows edition.
+description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü müzikleri.
 description.vi_VN = Nhạc gốc từ phiên bản Transport Tycoon Deluxe trên Windows
 description.zh_CN = Transport Tycoon Deluxe（运输大亨Windows豪华版）的原版音乐包
 description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的音樂。

bin/baseset/orig_win.obs

@@ -10,9 +10,9 @@ version           = 0
 description       = Original Transport Tycoon Deluxe Windows edition sounds.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe klanke.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الصوتية نسخة وندوز
-description.be_BY = Арыґінальны набор гукавога афармленьня з гульні Transport Tycoon Deluxe для Windows.
+description.be_BY = Арыгінальны набор гукавога афармленьня з гульні Transport Tycoon Deluxe для Windows.
 description.bg_BG = Оригинални звуци на Transport Tycoon Deluxe за Windows.
-description.ca_ES = Sons originals del Transport Tycoon Deluxe pel Windows.
+description.ca_ES = Sons originals de Transport Tycoon Deluxe per a Windows.
 description.cs_CZ = Původní sada zvuků Transport Tycoon Deluxe (verze pro Windows).
 description.cy_GB = Effeithiau sain gwreiddiol fersiwn Windows o Transport Tycoon Deluxe.
 description.da_DK = Originallyd fra Transport Tycoon Deluxe Windows-version.
@@ -21,30 +21,23 @@ 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.
 description.is_IS = Upprunalega hljóðið úr Transport Tycoon Deluxe Windows útgáfunni.
 description.it_IT = Suoni originali di Transport Tycoon Deluxe, edizione Windows.
 description.ja_JP = Transport Tycoon Deluxe オリジナル版 効果音 (Windows)
-description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 윈도 에디션의 효과음입니다.
-description.la_VA = Soni ex editione originale Transport Tycoon Deluxe Windows.
-description.lb_LU = Original Transport Tycoon Deluxe Windows Editioun Sound.
+description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 윈도우 에디션의 효과음입니다.
 description.lt_LT = Originalūs Transport Tycoon Deluxe Windows leidimo garsai.
 description.nb_NO = Originale lyder fra Transport Tycoon Deluxe for Windows.
 description.nl_NL = Originele geluiden van de Transport Tycoon Deluxe Windows-versie.
 description.nn_NO = Originale lydar frå Transport Tycoon Deluxe for Windows.
 description.pl_PL = Oryginalna edycja dźwięków dla Transport Tycoon Deluxe Windows.
-description.pt_BR = Sons Originais do Transport Tycoon Deluxe, Edição Windows.
 description.pt_PT = Sons originais da edição Windows de Transport Tycoon Deluxe.
 description.ro_RO = Setul de sunete original al Transport Tycoon Deluxe pentru Windows.
 description.ru_RU = Оригинальный набор звукового оформления из игры Transport Tycoon Deluxe для Windows.
@@ -54,8 +47,7 @@ description.sr_RS = Originalni skup zvukova Transport Tycoon Deluxe Windows izda
 description.sv_SE = Originalljuden från Transport Tycoon Deluxe, Windows-utgåvan.
 description.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் விண்டோஸ் பதிப்பு ஒலிகள்.
 description.th_TH = เสียงต้นตำหรับของ Transport Tycoon Deluxe Windows edition
-description.tr_TR = Özgün Transport Tycoon Deluxe Windows sürümü sesleri.
-description.uk_UA = Оригінальний набір звуків з Transport Tycoon Deluxe Windows edition.
+description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü sesleri.
 description.vi_VN = Âm thanh gốc từ phiên bản Transport Tycoon Deluxe trên Windows
 description.zh_CN = Transport Tycoon Deluxe Windows (运输大亨Windows豪华版)的原版音效包.
 description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的音效。

bin/game/compat_1.2.nut

@@ -7,19 +7,4 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-GSLog.Info("1.2 API compatibility in effect.");
-
-GSTown._SetGrowthRate <- GSTown.SetGrowthRate;
-GSTown.SetGrowthRate <- function(town_id, days_between_town_growth)
-{
-	/* Growth rate 0 caused resetting the custom growth rate. While this was undocumented, it was used nevertheless (ofc). */
-	if (days_between_town_growth == 0) days_between_town_growth = GSTown.TOWN_GROWTH_NORMAL;
-	return GSTown._SetGrowthRate(town_id, days_between_town_growth);
-}
-
-/* 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);
-}
+GSLog.Info("1.2 API compatability in effect.");

bin/game/compat_1.3.nut

@@ -6,20 +6,3 @@
  * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
-
-GSLog.Info("1.3 API compatibility in effect.");
-
-GSTown._SetGrowthRate <- GSTown.SetGrowthRate;
-GSTown.SetGrowthRate <- function(town_id, days_between_town_growth)
-{
-	/* Growth rate 0 caused resetting the custom growth rate. While this was undocumented, it was used nevertheless (ofc). */
-	if (days_between_town_growth == 0) days_between_town_growth = GSTown.TOWN_GROWTH_NORMAL;
-	return GSTown._SetGrowthRate(town_id, days_between_town_growth);
-}
-
-/* 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

@@ -1,17 +0,0 @@
-/* $Id$ */
-
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-GSLog.Info("1.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

@@ -1,10 +0,0 @@
-/* $Id$ */
-
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-GSLog.Info("1.5 API compatibility in effect.");

bin/game/compat_1.6.nut

@@ -1,10 +0,0 @@
-/* $Id$ */
-
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-GSLog.Info("1.6 API compatibility in effect.");

bin/game/compat_1.7.nut

@@ -1,8 +0,0 @@
-/* $Id$ */
-
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */

configure

@@ -129,7 +129,6 @@ AWKCOMMAND='
 		if ($0 == "DIRECTMUSIC" && "'$with_direct_music'" == "0")  { next; }
 		if ($0 == "LIBTIMIDITY" && "'$libtimidity'" == "" )        { next; }
 		if ($0 == "HAVE_THREAD" && "'$with_threads'" == "0")       { next; }
-		if ($0 == "SSE"         && "'$with_sse'" != "1")           { next; }
 
 		skip += 1;
 
@@ -149,7 +148,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\" | LC_ALL=C $PIPE_SORT`"
+SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | $awk \"$AWKCOMMAND\" | $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

@@ -1,268 +0,0 @@
-Some explanations about Desyncs
-Last updated: 2014-02-23
-------------------------------------------------------------------------
-
-
-Table of contents
------------------
-1.0) Desync theory
- * 1.1) OpenTTD multiplayer architecture
- * 1.2) What is a Desync and how is it detected
- * 1.3) Typical causes of Desyncs
-2.0) What to do in case of a Desync
- * 2.1) Cache debugging
- * 2.2) Desync recording
-3.0) Evaluating the Desync records
- * 3.1) Replaying
- * 3.2) Evaluation the replay
- * 3.3) Comparing savegames
-
-
-1.1) OpenTTD multiplayer architecture
----- --------------------------------
-  OpenTTD has a huge gamestate, which changes all of the time.
-  The savegame contains the complete gamestate at a specific point
-  in time. But this state changes completely each tick: Vehicles move
-  and trees grow.
-
-  However, most of these changes in the gamestate are deterministic:
-  Without a player interfering a vehicle follows its orders always
-  in the same way, and trees always grow the same.
-
-  In OpenTTD multiplayer synchronisation works by creating a savegame
-  when clients join, and then transfering that savegame to the client,
-  so it has the complete gamestate at a fixed point in time.
-
-  Afterwards clients only receive 'commands', that is: Stuff which is
-  not predictable, like
-   - player actions
-   - AI actions
-   - GameScript actions
-   - Admin Port command
-   - rcon commands
-   - ...
-
-  These commands contain the information on how to execute the command,
-  and when to execute it. Time is measured in 'network frames'.
-  Mind that network frames to not match ingame time. Network frames
-  also run while the game is paused, to give a defined behaviour to
-  stuff that is executing while the game is paused.
-
-  The deterministic part of the gamestate is run by the clients on
-  their own. All they get from the server is the instruction to
-  run the gamestate up to a certain network time, which basically
-  says that there are no commands scheduled in that time.
-
-  When a client (which includes the server itself) wants to execute
-  a command (i.e. a non-predictable action), it does this by
-   - calling DoCommandP resp. DoCommandPInternal
-   - These functions first do a local test-run of the command to
-     check simple preconditions. (Just to give the client an
-     immediate response without bothering the server and waiting for
-     the response.) The test-run may not actually change the
-     gamestate, all changes must be discarded.
-   - If the local test-run succeeds the command is sent to the server.
-   - The server inserts the command into the command queue, which
-     assigns a network frame to the commands, i.e. when it shall be
-     executed on all clients.
-   - Enhanced with this specific timestamp, the command is send to all
-     clients, which execute the command simultaneously in the same
-     network frame in the same order.
-
-1.2) What is a Desync and how is it detected
----- ---------------------------------------
-  In the ideal case all clients have the same gamestate as the server
-  and run in sync. That is, vehicle movement is the same on all
-  clients, and commands are executed the same everywhere and
-  have the same results.
-
-  When a Desync happens, it means that the gamestates on the clients
-  (including the server) are no longer the same. Just imagine
-  that a vehicle picks the left line instead of the right line at
-  a junction on one client.
-
-  The important thing here is, that noone notices when a Desync
-  occurs. The desync client will continue to simulate the gamestate
-  and execute commands from the server. Once the gamestate differs
-  it will increasingly spiral out of control: If a vehicle picks a
-  different route, it will arrive at a different time at a station,
-  which will load different cargo, which causes other vehicles to
-  load other stuff, which causes industries to notice different
-  servicing, which causes industries to change production, ...
-  the client could run all day in a different universe.
-
-  To limit how long a Desync can remain unnoticed, the server
-  transfers some checksums every now and then for the gamestate.
-  Currently this checksum is the state of the random number
-  generator of the game logic. A lot of things in OpenTTD depend
-  on the RNG, and if the gamestate differs, it is likely that the
-  RNG is called at different times, and the state differs when
-  checked.
-
-  The clients compare this 'checksum' with the checksum of their
-  own gamestate at the specific network frame. If they differ,
-  the client disconnects with a Desync error.
-
-  The important thing here is: The detection of the Desync is
-  only an ultimate failure detection. It does not give any
-  indication on when the Desync happened. The Desync may after
-  all have 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
-  which was only noticed by the checksum after 20 game years.)
-
-1.3) Typical causes of Desyncs
----- -------------------------
-  Desyncs can be caused by the following scenarios:
-   - The savegame does not describe the complete gamestate.
-      - Some information which affects the progression of the
-        gamestate is not saved in the savegame.
-      - Some information which affects the progression of the
-        gamestate is not loaded from the savegame.
-        This includes the case that something is not completely
-        reset before loading the savegame, so data from the
-        previous game is carried over to the new one.
-   - The gamestate does not behave deterministic.
-      - Cache mismatch: The game logic depends on some cached
-        values, which are not invalidated properly. This is
-        the usual case for NewGRF-specific Desyncs.
-      - Undefined behaviour: The game logic performs multiple
-        things in an undefined order or with an undefined
-        result. E.g. when sorting something with a key while
-        some keys are equal. Or some computation that depends
-        on the CPU architecture (32/64 bit, little/big endian).
-   - The gamestate is modified when it shall not be modified.
-      - The test-run of a command alters the gamestate.
-      - The gamestate is altered by a player or script without
-        using commands.
-
-
-2.1) Cache debugging
----- ---------------
-  Desyncs which are caused by inproper cache validation can
-  often be found by enabling cache validation:
-   - Start OpenTTD with '-d desync=2'.
-   - This will enable validation of caches every tick.
-     That is, cached values are recomputed every tick and compared
-     to the cached value.
-   - Differences are logged to 'commands-out.log' in the autosave
-     folder.
-
-  Mind that this type of debugging can also be done in singleplayer.
-
-2.2) Desync recording
----- ----------------
-  If you have a server, which happens to encounter Desyncs often,
-  you can enable recording of the gamestate alterations. This
-  will later allow the replay the gamestate and locate the Desync
-  cause.
-
-  There are two levels of Desync recording, which are enabled
-  via '-d desync=2' resp. '-d desync=3'. Both will record all
-  commands to a file 'commands-out.log' in the autosave folder.
-
-  If you have the savegame from the start of the server, and
-  this command log you can replay the whole game. (see Section 3.1)
-
-  If you do not start the server from a savegame, there will
-  also be a savegame created just after a map has been generated.
-  The savegame will be named 'dmp_cmds_*.sav' and be put into
-  the autosave folder.
-
-  In addition to that '-d desync=3' also creates regular savegames
-  at defined spots in network time. (more defined than regular
-  autosaves). These will be created in the autosave folder
-  and will also be named 'dmp_cmds_*.sav'.
-
-  These saves allow comparing the gamestate with the original
-  gamestate during replaying, and thus greatly help debugging.
-  However, they also take a lot of disk space.
-
-
-3.1) Replaying
----- ---------
-  To replay a Desync recording, you need these files:
-   - The savegame from when the server was started, resp.
-     the automatically created savegame from when the map
-     was generated.
-   - The 'commands-out.log' file.
-   - Optionally the 'dmp_cmds_*.sav'.
-  Put these files into a safe spot. (Not your autosave folder!)
-
-  Next, prepare your OpenTTD for replaying:
-   - Get the same version of OpenTTD as the original server was running.
-   - Uncomment/enable the define 'DEBUG_DUMP_COMMANDS' in
-     'src/network/network_func.h'.
-     (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'.
-     This replays the server log and creates new 'commands-out.log'
-     and 'dmp_cmds_*.sav' in your autosave folder.
-
-3.2) Evaluation the replay
----- ---------------------
-  The replaying will also compare the checksums which are part of
-  the 'commands-out.log' with the replayed gamestate.
-  If they differ, it will trigger a 'NOT_REACHED'.
-
-  If the replay succeeds without mismatch, that is the replay reproduces
-  the original server state:
-   - Repeat the replay starting from incrementally later 'dmp_cmds_*.sav'
-     while truncating the 'commands.log' at the beginning appropriately.
-     The 'dmp_cmds_*.sav' can be your own ones from the first reply, or
-     the ones from the original server (if you have them).
-     (This simulates the view of joining clients during the game.)
-   - If one of those replays fails, you have located the Desync between
-     the last dmp_cmds that reproduces the replay and the first one
-     that fails.
-
-  If 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
-  the replay after the mismatch has already been detected.
-  See Section 3.2 on how to compare savegames.
-  If the saves differ you have located the Desync between the last dmp_cmds
-  that match and the first one that does not. The difference of the saves
-  may point you in the direction of what causes it.
-
-  If the replay succeeds without mismatch, and you do not have any
-  'dmp_cmd_*.sav' from the original server, it is a lost case.
-  Enable creation of the 'dmp_cmd_*.sav' on the server, and wait for the
-  next Desync.
-
-  Finally, you can also compare the 'commands-out.log' from the original
-  server with the one from the replay. They will differ in stuff like
-  dates, and the original log will contain the chat, but otherwise they
-  should match.
-
-3.2) Comparing savegames
----- -------------------
-  The binary form of the savegames from the original server and from
-  your replay will always differ:
-   - The savegame contains paths to used NewGRF files.
-   - The gamelog will log your loading of the savegame.
-   - The savegame data of AIs and the Gamescript will differ.
-     Scripts are not run during the replay, only their recorded commands
-     are replayed. Their internal state will thus not change in the
-     replay and will differ.
-
-  To compare savegame more semantically, there exist some ugly hackish
-  tools at:
-     http://devs.openttd.org/~frosch/texts/zpipe.c
-     http://devs.openttd.org/~frosch/texts/printhunk.c
-
-  The first one decompresses OpenTTD savegames. The second one creates
-  a textual representation of an uncompressed savegame, by parsing hunks
-  and arrays and such. With both tools you need to be a bit careful
-  since they work on stdin and stdout, which may not deal well with
-  binary data.
-
-  If you have the textual representation of the savegames, you can
-  compare them with regular diff tools.

docs/landscape.html

@@ -15,60 +15,20 @@
   For a graphical representation of the tile-layout have a look at
   <a href="landscape_grid.html">Landscape grid</a> page.
  </p>
- <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>
+ <p>Eight attributes (counting &quot;<span style="font-weight: bold;">type_height</span>&quot;) hold the informations about a tile.<BR>
   These attributes are referred to as
-  &quot;<span style="font-weight: bold;">type</span>",
-  &quot;<span style="font-weight: bold;">height</span>",
+  &quot;<span style="font-weight: bold;">type_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</span> attribute.
+  of the <span style="font-weight: bold;">type_height</span> attribute. The lower 4 bits are used to encode the height and
+  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>
@@ -98,6 +58,32 @@
     </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>
@@ -210,7 +196,9 @@
        </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>
@@ -522,6 +510,8 @@
        <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>
@@ -549,7 +539,6 @@
        </tr>
       </table>
      </li>
-     <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of road type 1 (tram); OWNER_NONE (<tt>10</tt>) is stored as OWNER_TOWN (<tt>0F</tt>)
      <li>m5 bits 7 clear: road or level-crossing
       <ul>
        <li>m6 bits 5..3:
@@ -584,6 +573,7 @@
          </tr>
         </table>
        </li>
+       <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of road type 1 (tram); OWNER_NONE (<tt>10</tt>) is stored as OWNER_TOWN (<tt>0F</tt>)
        <li>m5 bit 6 clear: road
         <ul>
          <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
@@ -650,7 +640,7 @@
       <ul>
        <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the depot</li>
        <li>m2: Depot index</li>
-       <li>m5 bits 1..0: exit towards:
+       <li>m5 bits 3..0: exit towards:
         <table>
          <tr>
           <td><tt>0</tt>&nbsp; </td>
@@ -673,9 +663,10 @@
          </tr>
         </table>
        </li>
-       <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>
@@ -722,6 +713,7 @@
          <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 :
@@ -843,6 +835,7 @@
        </tr>
       </table>
      </li>
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
     </ul>
    </td>
   </tr>
@@ -976,6 +969,7 @@
      <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>
@@ -1088,6 +1082,8 @@
        </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>
@@ -1105,7 +1101,7 @@
 
   <tr bgcolor="#CCCCCC">
    <td valign=top nowrap><strong><a name="Class8"><tt> 8</tt></a></strong></td>
-   <td><strong>Industries </strong></td>
+   <td><strong>Industry tile </strong></td>
   </tr>
   <tr>
    <td valign=top nowrap>&nbsp;</td>
@@ -1429,6 +1425,7 @@
      </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>
@@ -1579,6 +1576,8 @@
        </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>
@@ -1594,12 +1593,41 @@
    <td valign=top nowrap>&nbsp;</td>
    <td>
     <ul>
-     <li>m1 bits 6..5 : Water class (sea, canal, river or land)</li>
+     <li>m1 bits 6..5 : Water class (sea, canal, river or land)
      <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the object (for lighthouses and transmitters normally <tt>10</tt>)</li>
-     <li>m2: index into the array of objects, bits 0 to 15 (upper bits in m5)</li>
-     <li>m3: random bits</li>
-     <li>m5: index into the array of objects, bits 16 to 23 (lower bits in m2)</li>
-     <li>m7: animation counter</li>
+     <li>m2: index into the array of objects
+     <li>m3: random bits
+     <li>m5: tile type:
+      <table>
+       <tr>
+        <td nowrap valign=top><tt>00</tt>&nbsp; </td>
+        <td align=left>transmitter</td>
+       </tr>
+
+       <tr>
+        <td nowrap valign=top><tt>01</tt>&nbsp; </td>
+        <td align=left>lighthouse</td>
+       </tr>
+
+       <tr>
+        <td nowrap valign=top><tt>02</tt>&nbsp; </td>
+        <td align=left>company statue
+       </tr>
+
+       <tr>
+        <td nowrap valign=top><tt>03</tt>&nbsp; </td>
+        <td align=left>company-owned land</td>
+       </tr>
+
+       <tr>
+        <td nowrap valign=top><tt>04</tt><tt></tt>&nbsp; </td>
+        <td align=left>company headquarters</td>
+       </tr>
+      </table>
+     </li>
+     <li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
+     <li>m7: animation counter
     </ul>
    </td>
   </tr>

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>Nine attributes hold the information about a tile.
+<span style="font-weight: bold;"></span>Six 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,14 +28,13 @@ the array so you can quickly see what is used and what is not.
 </ul>
 <p>
 <ul>
-  <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;">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;">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, 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;">m7</span> - 8 bits in size, is used for general storage</li>
 </ul>
 
@@ -43,8 +42,7 @@ the array so you can quickly see what is used and what is not.
   <tbody>
     <tr>
       <th colspan=2>class</th>
-      <th>type (8)</th>
-      <th>height (8)</th>
+      <th>type_height (8)</th>
       <th>m1 (8)</th>
       <th>m2 (16)</th>
       <th>m3 (8)</th>
@@ -57,7 +55,6 @@ 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>
@@ -69,75 +66,69 @@ 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"><span class="free">OOO</span>X XX<span class="free">OO</span></td>
+      <td class="bits">XX<span class="free">O</span>X XXXX</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"><span class="free">OOO</span>X XX<span class="free">OO</span></td>
+      <td class="bits">XX<span class="free">O</span>X XXXX</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"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</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"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</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"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XX<span class="free">O</span>X <span class="free">O</span>XXX</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <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"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
+      <td class="bits">XXXX X<span class="free">O</span>XX</td>
       <td class="bits">XXX<span class="free">O</span> XXXX</td>
     </tr>
     <tr>
@@ -145,11 +136,10 @@ 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"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
+      <td class="bits">XXXX X<span class="free">O</span>XX</td>
       <td class="bits">XXXX XXXX</td>
     </tr>
     <tr>
@@ -157,50 +147,46 @@ 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"><span class="free">OOOO OOOO</span></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>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits">XXX<span class="free">O OOOO</span></td>
     </tr>
     <tr>
       <td>3</td>
       <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><span class="free">OO</span></td>
+      <td class="bits"><span class="abuse">XXXX XX</span>XX</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 OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OO</span>XX</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 XX<span class="free">OO</span></td>
+      <td class="bits"><span class="free">OO</span>XX XXXX</td>
       <td class="bits">XXXX XXXX</td>
     </tr>
     <tr>
@@ -213,18 +199,16 @@ 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">OOO</span></td>
+      <td class="bits"><span class="free">OO</span>XX XXXX</td>
       <td class="bits">XX<span class="free">O</span>X XXXX</td>
     </tr>
     <tr>
@@ -232,11 +216,10 @@ 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">OOO</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">OOOO OOOO</span></td>
     </tr>
     <tr>
@@ -244,11 +227,10 @@ 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">OOO</span></td>
+      <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
       <td class="bits">XXXX XXXX</td>
     </tr>
     <tr>
@@ -256,11 +238,10 @@ 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">OOO</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">OOOO OOOO</span></td>
     </tr>
     <tr>
@@ -268,75 +249,69 @@ 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">OOO</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">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"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</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"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</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"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</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 XX<span class="free">OO</span></td>
+      <td class="bits"><span class="free">OO</span>XX XXXX</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"><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">XXXX X<span class="free">O</span>XX</td>
     </tr>
     <tr>
       <td>bridge ramp</td>
@@ -346,21 +321,19 @@ 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">OO</span>XX XX<span class="free">OO</span></td>
+      <td class="bits">XXXX XXXX</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"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits">XXXX XXXX</td>
     </tr>
   </tbody>

docs/linkgraph.txt

@@ -1,30 +0,0 @@
-Some clarifications about the link graph
-----------------------------------------
-
-InitializeLinkGraphs joins all threads, so if the game is abandoned
-with some threads still running, they're joined as soon as the next game
-(possibly the title game) is started. See also InitializeGame.
-
-The MCF (multi-commodity flow) algorithm can be quite CPU-hungry as it's
-NP-hard and takes exponential time (though with a very small constant
-factor) in the number of nodes.
-This is why it is run in a separate thread where possible. However after
-some time the thread is joined and if it hasn't finished by then the game
-will hang. This problem gets worse if we are running on a platform without
-threads. However, as those are usually the ones with less CPU power I
-assume the contention for the CPU would make the game hard to play even
-with threads or even without cargodist (autosave ...). I might be wrong,
-but I won't put any work into this before someone shows me some problem.
-
-You can configure the link graph recalculation time. A link graph
-recalculation time of X days means that each link graph job has X days
-to run before it is joined. The downside is that the flow stats won't be
-updated before the job is finished and thus a high value means less
-updates and longer times until changes in capacities are accounted for.
-If you play a very large map with a complicated link graph you may want to
-raise the time setting to avoid lags. The same holds for systems with slow
-CPUs.
-
-Another option to avoid excessive lags is to reduce the accuracy of link
-graph calculations. Generally the accuracy is inversely correlated to the
-CPU requirements of the MCF algorithm.

docs/openttd.6

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

findversion.sh

@@ -106,21 +106,21 @@ elif [ -d "$ROOT_DIR/.git" ]; then
 	fi
 elif [ -d "$ROOT_DIR/.hg" ]; then
 	# We are a hg checkout
-	if [ -n "`HGPLAIN= hg status | grep -v '^?'`" ]; then
+	if [ -n "`hg status | grep -v '^?'`" ]; then
 		MODIFIED="2"
 	fi
-	HASH=`LC_ALL=C HGPLAIN= hg id -i | cut -c1-12`
+	HASH=`LC_ALL=C hg id -i | cut -c1-12`
 	REV="h`echo $HASH | cut -c1-8`"
-	BRANCH="`HGPLAIN= hg branch | sed 's@^default$@@'`"
-	TAG="`HGPLAIN= hg id -t | grep -v 'tip$'`"
+	BRANCH="`hg branch | sed 's@^default$@@'`"
+	TAG="`hg id -t | grep -v 'tip$'`"
 	if [ -n "$TAG" ]; then
 		BRANCH=""
 		REV="$TAG"
 	fi
-	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@"`
+	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@"`
 	if [ -z "$REV_NR" ]; then
 		# No rev? Maybe it is a custom hgsubversion clone
-		REV_NR=`LC_ALL=C HGPLAIN= hg parent --template="{svnrev}"`
+		REV_NR=`LC_ALL=C hg parent --template="{svnrev}"`
 	fi
 elif [ -f "$ROOT_DIR/.ottdrev" ]; then
 	# We are an exported source bundle

known-bugs.txt

@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2017-12-11
-Release version: 1.7.2-RC1
+Last updated:    2013-07-14
+Release version: 1.3.2-RC2
 ------------------------------------------------------------------------
 
 
@@ -33,13 +33,12 @@ No suitable AI can be found
 	If you have no AIs and an AI is started the so-called 'dummy' AI will
 	be loaded. This AI does nothing but writing a message on the AI debug
 	window and showing a red warning. There are basically two solutions
-	for this problem: Either you set the number of AI players to 0 so that
-	no AI is started. You find that setting at the top of the window in the
-	"AI / Game Scripts Settings" window.
-	The other solution is acquiring (downloading) some AI. The easiest way
-	to do this is via the "Check Online Content" button in the main (intro)
-	menu or directly in the "AI / Game Scripts Settings" dialogue via the
-	"Check Online Content" button.
+	for this problem: you must change the settings so no AI is started,
+	this is done in the difficulty settings window. The other solution is
+	acquiring (downloading) some AI. The easiest way to do this is via
+	the "Check Online Content" button in the main (intro) menu or via
+	"AI Settings" -> "Select AI" -> "Check Online Content" which is also
+	accessed via the main menu.
 
 After a while of playing, colours get corrupted
 	In Windows 7 the background slideshow corrupts the colour mapping of
@@ -404,52 +403,3 @@ Mouse cursor going missing with SDL [FS#4997]:
 	We cannot fix this problem as SDL simply does not provide the
 	required information in these corner cases. This is a bug in SDL
 	and as such there is little that we can do about it.
-
-Inconsistent catchment areas [FS#5661]:
-	Due to performance decisions the catchment area for cargo accepted
-	by a station for delivery to houses or industries differs from the
-	catchment area for cargo that is delivered to stations from houses
-	or industries.
-
-	Conceptually they work the same, but the effect in game differs.
-	They work by finding the closest destination "around" the source
-	which is within a certain distance. This distance depends on the
-	type of station, e.g. road stops have a smaller catchment area than
-	large airports. In both cases the bounding box, the smallest
-	rectangle that contains all tiles of something, is searched for the
-	target of the cargo, and then spiraling outwards finding the closest
-	tile of the target.
-
-	In the case of a station with two tiles spread far apart with a house
-	that is within the station's bounding box, it would be possible that
-	the spiraling search from the house does not reach one of the station
-	tiles before the search ends, i.e. all tiles within that distance
-	are searched. So the house does not deliver cargo to the station. On
-	the other hand, the station will deliver cargo because the house
-	falls within the bounding box, and thus search area.
-
-	It is possible to make these consistent, but then cargo from a house
-	to a station needs to search up to 32 tiles around itself, i.e. 64
-	by 64 tiles, to find all possible stations it could deliver to
-	instead of 10 by 10 tiles (40 times more tiles). Alternatively the
-	search from a station could be changed to use the actual tiles, but
-	that would require considering checking 10 by 10 tiles for each of
-	the tiles of a station, instead of just once.
-
-Trains might not stop at platforms that are currently being changed [FS#5553]:
-	If you add tiles to or remove tiles from a platform while a train is
-	approaching to stop at the same platform, that train can miss the place
-	where it's supposed to stop and pass the station without stopping. This
-	is caused by the fact that the train is considered to already have stopped
-	if it's beyond its assigned stopping location. We can't let the train stop
-	just anywhere in the station because then it would never leave the station
-	if you have the same station in the order list multiple times in a row or
-	if there is only one station in the order list (see FS#5684).
-
-Some houses and industries are not affected by transparency [FS#5817]:
-	Some of the default houses and industries (f.e. the iron ore mine) are
-	not affected by the transparency options. This is because the graphics do
-	not (completely) separate the ground from the building.
-	This is a bug of the original graphics, and unfortunately cannot be
-	fixed with OpenGFX for the sake of maintaining compatibility with the
-	original graphics.

media/baseset/orig_dos.obg

@@ -11,21 +11,21 @@ palette           = DOS
 !! description STR_BASEGRAPHICS_DOS_DESCRIPTION
 
 [files]
-base              = TRG1.GRF
-logos             = TRGI.GRF
-arctic            = TRGC.GRF
-tropical          = TRGH.GRF
-toyland           = TRGT.GRF
-extra             = ORIG_EXTRA.GRF
+base         = TRG1.GRF
+logos        = TRGI.GRF
+arctic       = TRGC.GRF
+tropical     = TRGH.GRF
+toyland      = TRGT.GRF
+extra        = OPENTTD.GRF
 
 [md5s]
-TRG1.GRF          = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF          = da6a6c9dcc451eec88d79211437b76a8
-TRGC.GRF          = ed446637e034104c5559b32c18afe78d
-TRGH.GRF          = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGT.GRF          = e30e8a398ae86c03dc534a8ac7dfb3b6
-ORIG_EXTRA.GRF    =
+TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
+TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
+TRGC.GRF     = ed446637e034104c5559b32c18afe78d
+TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
+TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
+OPENTTD.GRF  =
 
 [origin]
-default           = You can find it on your Transport Tycoon Deluxe CD-ROM.
-ORIG_EXTRA.GRF    = This file was part of your OpenTTD installation.
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+OPENTTD.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
-logos             = TRGI.GRF
-arctic            = TRGC.GRF
-tropical          = TRGH.GRF
-toyland           = TRGT.GRF
-extra             = ORIG_EXTRA.GRF
+base         = TRG1.GRF
+logos        = TRGI.GRF
+arctic       = TRGC.GRF
+tropical     = TRGH.GRF
+toyland      = TRGT.GRF
+extra        = OPENTTD.GRF
 
 [md5s]
-TRG1.GRF          = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF          = da6a6c9dcc451eec88d79211437b76a8
-TRGC.GRF          = ed446637e034104c5559b32c18afe78d
-TRGH.GRF          = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGT.GRF          = fcde1d7e8a74197d72a62695884b909e
-ORIG_EXTRA.GRF    =
+TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
+TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
+TRGC.GRF     = ed446637e034104c5559b32c18afe78d
+TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
+TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
+OPENTTD.GRF  =
 
 [origin]
-default           = You can find it on your Transport Tycoon Deluxe CD-ROM.
-ORIG_EXTRA.GRF    = This file was part of your OpenTTD installation.
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+OPENTTD.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
-logos             = TRGIR.GRF
-arctic            = TRGCR.GRF
-tropical          = TRGHR.GRF
-toyland           = TRGTR.GRF
-extra             = ORIG_EXTRA.GRF
+base         = TRG1R.GRF
+logos        = TRGIR.GRF
+arctic       = TRGCR.GRF
+tropical     = TRGHR.GRF
+toyland      = TRGTR.GRF
+extra        = OPENTTD.GRF
 
 [md5s]
-TRG1R.GRF         = b04ce593d8c5016e07473a743d7d3358
-TRGIR.GRF         = 0c2484ff6be49fc63a83be6ab5c38f32
-TRGCR.GRF         = 3668f410c761a050b5e7095a2b14879b
-TRGHR.GRF         = 06bf2b7a31766f048baac2ebe43457b1
-TRGTR.GRF         = de53650517fe661ceaa3138c6edb0eb8
-ORIG_EXTRA.GRF    =
+TRG1R.GRF    = b04ce593d8c5016e07473a743d7d3358
+TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
+TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
+TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
+TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
+OPENTTD.GRF  =
 
 [origin]
-default           = You can find it on your Transport Tycoon Deluxe CD-ROM.
-ORIG_EXTRA.GRF    = This file was part of your OpenTTD installation.
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+OPENTTD.GRF  = This file was part of your OpenTTD installation.

media/extra_grf/assemble_nfo.awk

@@ -1,32 +0,0 @@
-# $Id$
-
-# This file is part of OpenTTD.
-# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-
-BEGIN {
-	# Very basic variant function; barely any error checking.
-	# Just use the first argument as the file to start from when assembling everything
-	path = ARGV[1];
-	gsub("[^/\\\\]*$", "", path);
-	assemble(ARGV[1]);
-}
-
-# Recursive function for assembling by means of resolving the #includes.
-function assemble(filename) {
-	while ((getline < filename) > 0) {
-		if (NF == 2 && $1 == "#include" ) {
-			# Remove the quotes.
-			gsub("[\"'<>]", "", $2);
-			assemble(path $2);
-		} else {
-			print $0;
-		}
-	}
-
-	if (close(filename) < 0) {
-		print "Could not open " filename > "/dev/stderr";
-		exit -1;
-	}
-}

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"
+   -1 * 0	 0C "Canal graphics by George / PaulC"
    -1 * 3	 05 08 41
 // Canal slopes
    -1 sprites/canal_locks.png 8bpp  66    8  64  23 -31   0 normal
@@ -77,3 +77,95 @@
    -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

@@ -1,101 +0,0 @@
-//
-// $Id$
-//
-// This file is part of OpenTTD.
-// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-//
-   -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,7 +8,245 @@
 //
    -1 * 0	 0C "Font characters by PaulC, Bilbo and Jasper Vries"
 
-// Note: Characters in range U+0020..U+00FF may only be defined in chars_orig_extra.nfo.
+// 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
 
 // New characters, all fonts
 

media/extra_grf/chars_orig_extra.nfo

@@ -1,249 +0,0 @@
-//
-// $Id$
-//
-// This file is part of OpenTTD.
-// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-//
-   -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,11 +60,10 @@
              00
 
 // GRF ID, must start with FF so it gets ignored
-//@@WARNING DISABLE 101
-   -1 * 0	 08 08 FF FF FF FE
+   -1 * 0	 08 08 FF "OTT"
 
 // Name of the GRF
-             "OpenTTD's default and fallback extra graphics" 00
+             "OpenTTD's base graphics " 00
 
 // Description of the GRF.
              "License: GNU General Public License version 2" 0D
@@ -87,6 +86,7 @@
 #include "canals.nfo"
 #include "oneway.nfo"
 #include "tramtracks.nfo"
+#include "shore.nfo"
 #include "sloped_tracks.nfo"
 #include "airports.nfo"
 #include "roadstops.nfo"
@@ -97,5 +97,10 @@
 #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/openttdgui.nfo

@@ -7,7 +7,7 @@
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 //
    -1 * 0	 0C "OpenTTD GUI graphics"
-   -1 * 3	 05 15 \b 175 // OPENTTD_SPRITE_COUNT
+   -1 * 3	 05 15 \b 168 // OPENTTD_SPRITE_COUNT
    -1 sprites/openttdgui.png 8bpp  66    8  64  31 -31   7 normal
    -1 sprites/openttdgui.png 8bpp 146    8  64  31 -31   7 normal
    -1 sprites/openttdgui.png 8bpp 226    8  64  31 -31   7 normal
@@ -176,10 +176,3 @@
    -1 sprites/openttdgui.png 8bpp 296  440   8   8   0   0 normal
    -1 sprites/openttdgui.png 8bpp 312  440  14  10   0   0 normal
    -1 sprites/openttdgui.png 8bpp 328  440  14  10   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 348  440   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 362  440  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 388  440  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 414  440  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 440  440  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 466  440  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 490  440  20  20   0   0 normal

media/extra_grf/orig_extra.nfo

@@ -1,86 +0,0 @@
-// 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

@@ -1,20 +0,0 @@
-//
-// $Id$
-//
-// This file is part of OpenTTD.
-// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-//
-
-   -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 * 52	 0C "Missing shore tile graphics for the toyland climate"
+   -1 * 44	 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,3 @@ Exec=!!TTD!!
 Terminal=false
 Categories=!!MENU_GROUP!!
 Comment=A clone of Transport Tycoon Deluxe
-Keywords=game;simulation;transport;tycoon;deluxe;economics;multiplayer;money;train;ship;bus;truck;aircraft;cargo;

os/debian/changelog

@@ -1,249 +1,3 @@
-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
-
- -- OpenTTD <info@openttd.org>  Tue, 21 Oct 2014 21:00:00 +0200
-
-openttd (1.4.4~RC1-0) unstable; urgency=low
-
-  * New upstream release 1.4.4-RC1
-
- -- OpenTTD <info@openttd.org>  Wed, 08 Oct 2014 19:00:00 +0200
-
-openttd (1.4.3-0) unstable; urgency=low
-
-  * New upstream release 1.4.3
-
- -- OpenTTD <info@openttd.org>  Tue, 23 Sep 2014 21:00:00 +0200
-
-openttd (1.4.3~RC2-0) unstable; urgency=low
-
-  * New upstream release 1.4.3-RC2
-
- -- OpenTTD <info@openttd.org>  Sun, 14 Sep 2014 19:00:00 +0200
-
-openttd (1.4.3~RC1-0) unstable; urgency=low
-
-  * New upstream release 1.4.3-RC1
-
- -- OpenTTD <info@openttd.org>  Sun, 07 Sep 2014 19:00:00 +0200
-
-openttd (1.4.2-0) unstable; urgency=low
-
-  * New upstream release 1.4.2
-
- -- OpenTTD <info@openttd.org>  Sat, 16 Aug 2014 21:00:00 +0200
-
-openttd (1.4.2~RC2-0) unstable; urgency=low
-
-  * New upstream release 1.4.2-RC2
-
- -- OpenTTD <info@openttd.org>  Sun, 03 Aug 2014 18:00:00 +0200
-
-openttd (1.4.2~RC1-0) unstable; urgency=low
-
-  * New upstream release 1.4.2-RC1
-
- -- OpenTTD <info@openttd.org>  Thu, 03 Jul 2014 21:00:00 +0200
-
-openttd (1.4.1-0) unstable; urgency=low
-
-  * New upstream release 1.4.1
-
- -- OpenTTD <info@openttd.org>  Mon, 02 Jun 2014 21:00:00 +0200
-
-openttd (1.4.1~RC2-0) unstable; urgency=low
-
-  * New upstream release 1.4.1-RC2
-
- -- OpenTTD <info@openttd.org>  Sun, 18 May 2014 21:00:00 +0200
-
-openttd (1.4.1~RC1-0) unstable; urgency=low
-
-  * New upstream release 1.4.1-RC1
-
- -- OpenTTD <info@openttd.org>  Sun, 04 May 2014 21:00:00 +0200
-
-openttd (1.4.0-0) unstable; urgency=low
-
-  * New upstream release 1.4.0
-
- -- OpenTTD <info@openttd.org>  Tue, 01 Apr 2014 21:00:00 +0200
-
-openttd (1.4.0~RC1-0) unstable; urgency=low
-
-  * New upstream release 1.4.0-RC1
-
- -- OpenTTD <info@openttd.org>  Tue, 17 Mar 2014 21:00:00 +0100
-
-openttd (1.4.0~beta5-0) unstable; urgency=low
-
-  * New upstream release 1.4.0-beta5
-
- -- OpenTTD <info@openttd.org>  Tue, 25 Feb 2014 10:15:00 +0100
-
-openttd (1.4.0~beta4-0) unstable; urgency=low
-
-  * New upstream release 1.4.0-beta4
-
- -- OpenTTD <info@openttd.org>  Thu, 06 Feb 2014 21:00:00 +0100
-
-openttd (1.4.0~beta3-0) unstable; urgency=low
-
-  * New upstream release 1.4.0-beta3
-
- -- OpenTTD <info@openttd.org>  Tue, 21 Jan 2014 21:00:00 +0100
-
-openttd (1.4.0~beta2-0) unstable; urgency=low
-
-  * New upstream release 1.4.0-beta2
-
- -- OpenTTD <info@openttd.org>  Tue, 07 Jan 2014 21:00:00 +0100
-
-openttd (1.4.0~beta1-0) unstable; urgency=low
-
-  * New upstream release 1.4.0-beta1
-
- -- OpenTTD <info@openttd.org>  Tue, 24 Dec 2013 00:00:00 +0100
-
-openttd (1.3.3-0) unstable; urgency=low
-
-  * New upstream release 1.3.3
-
- -- OpenTTD <info@openttd.org>  Fri, 29 Nov 2013 19:00:00 +0100
-
-openttd (1.3.3~RC2-0) unstable; urgency=low
-
-  * New upstream release 1.3.3-RC2
-
- -- OpenTTD <info@openttd.org>  Sun, 24 Nov 2013 19:00:00 +0100
-
-openttd (1.3.3~RC1-0) unstable; urgency=low
-
-  * New upstream release 1.3.3-RC1
-
- -- OpenTTD <info@openttd.org>  Sun, 17 Nov 2013 19:00:00 +0100
-
-openttd (1.3.2-0) unstable; urgency=low
-
-  * New upstream release 1.3.2
-
- -- OpenTTD <info@openttd.org>  Sat, 27 Jul 2013 18:00:00 +0200
-
 openttd (1.3.2~RC2-0) unstable; urgency=low
 
   * New upstream release 1.3.2-RC2

os/debian/control

@@ -3,10 +3,11 @@ Section: games
 Priority: optional
 Maintainer: Matthijs Kooijman <matthijs@stdin.nl>
 Uploaders: Jordi Mallach <jordi@debian.org>
+DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev, libicu-dev, liblzma-dev, liblzo2-dev
 Standards-Version: 3.8.4
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/openttd.git
-Vcs-Git: git://anonscm.debian.org/collab-maint/openttd.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/openttd.git
+Vcs-Git: git://git.debian.org/collab-maint/openttd.git
 Homepage: http://www.openttd.org/
 
 Package: openttd

os/debian/copyright

@@ -1,106 +1,77 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: OpenTTD
-Upstream-Contact: info@openttd.org, #openttd on irc.oftc.net
-Source: http://www.openttd.org
+This package was debianized by Matthijs Kooijman <matthijs@stdin.nl>
+on Wed, 15 Sep 2004 00:24:01 +0200.
 
+Upstream author: Ludvig Strigeus (ludde) and many others.
+Upstream homepage: http://www.openttd.org
 
-Files: *
-Copyright: © 2004-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
- published by the Free Software Foundation;
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- .
- On Debian systems, the complete text of the GNU General Public License
- version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+Copyright © 2004-2009 Ludvig Strigeous and others.
 
-Files: src/3rdparty/squirrel/*
-Copyright: © 2003-2009 Alberto Demichelis
-License: Zlib
+OpenTTD License:
 
-Files: src/3rdparty/md5/*
-Copyright: © 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
-License: Zlib
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License version 2.0 as
+	published by the Free Software Foundation;
 
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
 
-License: Zlib
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software in
- a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- .
- 2. Altered source versions must be plainly marked as such, and must not
- be misrepresented as being the original software.
- .
- 3. This notice may not be removed or altered from any source
- distribution.
+	You should have received a copy of the GNU General Public License
+	along with this package; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-Files: os/dos/exe2coff/*
-Copyright: © 1998 DJ Delorie
-License: GPL-2.0 with additional restrictions
- This document is Copyright (C) DJ Delorie and may be distributed
- verbatim, but changing it is not allowed.
- .
- Source code copyright DJ Delorie is distributed under the terms of the
- GNU General Public Licence, with the following exceptions:
- .
- * Sources used to build crt0.o, gcrt0.o, libc.a, libdbg.a, and
-   libemu.a are distributed under the terms of the GNU Library General
-   Public License, rather than the GNU GPL.
- .
- * Any existing copyright or authorship information in any given source
-   file must remain intact.  If you modify a source file, a notice to that
-   effect must be added to the authorship information in the source file.
- .
- * Runtime binaries, as provided by DJ in DJGPP, may be distributed
-   without sources ONLY if the recipient is given sufficient information
-   to obtain a copy of djgpp themselves.  This primarily applies to
-   go32-v2.exe, emu387.dxe, and stubedit.exe.
- .
- * Runtime objects and libraries, as provided by DJ in DJGPP, when
-   linked into an application, may be distributed without sources ONLY
-   if the recipient is given sufficient information to obtain a copy of
-   djgpp themselves.  This primarily applies to crt0.o and libc.a.
- .
- On Debian systems, the complete text of the GNU General Public License
- version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-Comment:
- Given only the exe2coff.c file is distributed in the source distribution (and
- nothing in Debian binary distribution), it seems only the 2nd condition
- applies.
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
-Files: os/dos/cwsdpmi/*
-Source: http://homer.rice.edu/~sandmann/cwsdpmi/index.html
-Copyright: © 1995-2000 Charles W Sandmann (sandmann@clio.rice.edu)
-License: Custom binary-only license
- This is release 5.  The files in this binary distribution may be redistributed
- under the GPL (with source) or without the source code provided:
- .
- * CWSDPMI.EXE or CWSDPR0.EXE are not modified in any way except via CWSPARAM.
- .
- * CWSDSTUB.EXE internal contents are not modified in any way except via
-   CWSPARAM or STUBEDIT.  It may have a COFF image plus data appended to it.
- .
- * Notice to users that they have the right to receive the source code and/or
-   binary updates for CWSDPMI.  Distributors should indicate a site for the
-   source in their documentation.
-Comment:
- Files are distributed as binary only, so the second option in the license
- ("without source code provided: ...") is applicable.
+This package contains an embedded version of the "Squirrel" programming
+language, which is shipped under the following license:
+
+	Copyright (c) 2003-2009 Alberto Demichelis
+
+	This software is provided 'as-is', without any
+	express or implied warranty. In no event will the
+	authors be held liable for any damages arising from
+	the use of this software.
+
+	Permission is granted to anyone to use this software
+	for any purpose, including commercial applications,
+	and to alter it and redistribute it freely, subject
+	to the following restrictions:
+
+		1. The origin of this software must not be
+		misrepresented; you must not claim that
+		you wrote the original software. If you
+		use this software in a product, an
+		acknowledgment in the product
+		documentation would be appreciated but is
+		not required.
+
+		2. Altered source versions must be plainly
+		marked as such, and must not be
+		misrepresented as being the original
+		software.
+
+		3. This notice may not be removed or
+		altered from any source distribution.
+
+This package contains an implementation of the md5 hash algorithm, which
+is shipped under the following license:
+
+	Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
+
+	This software is provided 'as-is', without any express or implied
+	warranty.  In no event will the authors be held liable for any damages
+	arising from the use of this software.
+
+	Permission is granted to anyone to use this software for any purpose,
+	including commercial applications, and to alter it and redistribute it
+	freely, subject to the following restrictions:
+
+	1. The origin of this software must not be misrepresented; you must not
+	   claim that you wrote the original software. If you use this software
+	   in a product, an acknowledgment in the product documentation would be
+	   appreciated but is not required.
+	2. Altered source versions must be plainly marked as such, and must not be
+	   misrepresented as being the original software.
+	3. This notice may not be removed or altered from any source distribution.

os/debian/menu

@@ -1,2 +1,2 @@
 ?package(openttd):needs="X11" section="Games/Simulation" title="OpenTTD"\
-command="/usr/games/openttd" icon="/usr/share/pixmaps/openttd.32.xpm"
+command="/usr/share/games/openttd/openttd-wrapper" icon="/usr/share/pixmaps/openttd.32.xpm"

os/debian/rules

@@ -4,7 +4,7 @@
 
 # Use debhelper default for all targets (but some are overridden below).
 %:
-	dh --parallel $@
+	dh $@
 
 DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -12,29 +12,21 @@ ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
 CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-# This prevents linking uselessly to libicudata and silences a warning
-# in the build process.
-DEB_LDFLAGS_MAINT_APPEND="-Wl,-as-needed"
-
-# Enable all hardening options (since openttd offers a network-listening
-# service that handles untrusted data).
-DEB_BUILD_MAINT_OPTIONS=hardening=+all
-
-# Load buildflags (this uses dpkg-buildflags). Note that we don't export
-# them, but instead pass them to ./configure explicitly.
-include /usr/share/dpkg/buildflags.mk
-
 # Pass custom options to configure. Since it's not autoconf but a custom
 # script, some of the option names are slightly different. We also need
 # to be explicit about the dependencies, in case we're not running in a
 # clean build root.
 override_dh_auto_configure:
-	./configure $(CROSS) --prefix-dir=/usr --install-dir=debian/openttd --without-allegro --with-zlib --with-sdl --with-png --with-freetype --with-fontconfig --with-icu --with-liblzo2 --with-lzma --without-xdg-basedir --without-iconv --disable-strip CFLAGS="$(CFLAGS) $(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CFLAGS_BUILD="$(CFLAGS) $(CPPFLAGS)" CXXFLAGS_BUILD="$(CXXFLAGS) $(CPPFLAGS)" LDFLAGS_BUILD="$(LDFLAGS)"
+	./configure $(CROSS) --prefix-dir=/usr --install-dir=debian/openttd --without-allegro --with-zlib --with-sdl --with-png --with-freetype --with-fontconfig --with-icu --with-liblzo2 --with-lzma --without-iconv --disable-strip CFLAGS="$(CFLAGS) -g" LDFLAGS="$(LDFLAGS) -Wl,-as-needed"
 
 # Do some extra installation
 override_dh_auto_install:
 	$(MAKE) install DO_NOT_INSTALL_CHANGELOG=1 DO_NOT_INSTALL_LICENSE=1
 
+	# Install the wrapper and make it executable
+	install -d debian/openttd/usr/share/games/openttd/
+	install -m755 debian/openttd-wrapper debian/openttd/usr/share/games/openttd/
+
 # Don't do testing. Because the OpenTTD Makefile always does dependency
 # generation (even on invalid targets), dh_auto_test thinks there is a
 # "test" target, while there isn't.

os/dos/cwsdpmi/README.licensing

@@ -1,3 +0,0 @@
-The files in this directory are not licensed under the same terms as the
-rest of OpenTTD. Licensing details can be found in OpenTTD's readme.txt
-and in this directory or subdirectories as well.

os/dos/exe2coff/README.licensing

@@ -1,3 +0,0 @@
-The files in this directory are not licensed under the same terms as the
-rest of OpenTTD. Licensing details can be found in OpenTTD's readme.txt
-and in this directory or subdirectories as well.

os/dos/make_dos_binary_selfcontained.sh

@@ -3,9 +3,9 @@
 # $Id$
 
 cd `dirname $0`
-cc -o exe2coff/exe2coff exe2coff/exe2coff.c || exit
+cc -o exe2coff exe2coff.c || exit
 cp $1 binary.exe || exit
-./exe2coff/exe2coff binary.exe || exit
-cat cwsdpmi/cwsdstub.exe binary > binary.exe || exit
+./exe2coff binary.exe || exit
+cat cwsdstub.exe binary > binary.exe || exit
 mv binary.exe $1
-rm binary exe2coff/exe2coff
+rm binary exe2coff

os/os2/installer/make_installer.cmd

@@ -1,6 +1,6 @@
 @echo off
 
-set OPENTTD_VERSION=1.7.0
+set OPENTTD_VERSION=1.3.2-RC2
 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-2017 The OpenTTD developers
+# Copyright (c) 2007-2012 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.7.beta1
+Version:        1.3.beta2
 Release:        0
-%define srcver  1.7.0-beta1
+%define srcver  1.3.0-beta2
 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,9 +1,9 @@
 # Version numbers to update
 !define APPV_MAJOR 1
-!define APPV_MINOR 7
+!define APPV_MINOR 3
 !define APPV_MAINT 2
-!define APPV_BUILD 0
-!define APPV_EXTRA "-RC1"
+!define APPV_BUILD 1
+!define APPV_EXTRA "-RC2"
 
 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"  ; Define application version
@@ -408,7 +408,6 @@ 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"
@@ -546,22 +545,15 @@ FunctionEnd
 ;-------------------------------------------------------------------------------
 ; Determine windows version, returns "win9x" if Win9x/Me/2000/XP SP2- or "winnt" for the rest on the stack
 Function GetWindowsVersion
-	GetVersion::WindowsPlatformArchitecture
-	Pop $R0
-	IntCmp $R0 64 WinNT 0
 	ClearErrors
 	StrCpy $R0 "win9x"
 	${If} ${IsNT}
 		${If} ${IsWinXP}
 		${AndIf} ${AtLeastServicePack} 3
 		${OrIf} ${AtLeastWin2003}
-			GoTo WinNT
+			StrCpy $R0 "winnt"
 		${EndIf}
 	${EndIf}
-	GoTo Done
-WinNT:
-	StrCpy $R0 "winnt"
-Done:
 	Push $R0
 FunctionEnd
 

projects/dpi_aware.manifest

@@ -1,7 +0,0 @@
-<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,15 +22,6 @@ 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
@@ -86,7 +77,7 @@ safety_check() {
 	done
 }
 
-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
+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
 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."
@@ -315,17 +306,11 @@ 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,15 +10,6 @@ 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
@@ -182,7 +173,6 @@ Function load_main_data(filename, ByRef vcxproj, ByRef filters, ByRef files)
 						line = "MSVC" Or _
 						line = "DIRECTMUSIC" Or _
 						line = "AI" Or _
-						line = "SSE" Or _
 						line = "HAVE_THREAD" _
 					) Then skip = skip + 1
 					deep = deep + 1
@@ -378,8 +368,6 @@ 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)
@@ -387,8 +375,6 @@ 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)
@@ -396,5 +382,3 @@ 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

@@ -1,40 +0,0 @@
-<?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,12 +227,6 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\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>
@@ -317,12 +311,6 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\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,9 +97,6 @@
     <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>
@@ -142,9 +139,6 @@
     <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

@@ -1,390 +0,0 @@
-<?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

@@ -1,176 +0,0 @@
-<?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

@@ -1,12 +0,0 @@
-<?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

@@ -1,61 +0,0 @@
-<?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,21 +513,6 @@
 					/>
 				</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"
 				>
@@ -738,21 +723,6 @@
 					/>
 				</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,21 +514,6 @@
 					/>
 				</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"
 				>
@@ -739,21 +724,6 @@
 					/>
 				</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"
 				>