(svn r24259) -Release: 1.2.1-RC1

- Fix: Change the unit of the sprite-cache size setting from megabytes to megapixels, so it depends on the blitter being used. Also increase it from 64 to 128, and change the name in the cfg file, so everyone gets the new default [FS#5162] (r24252)
- Fix: Do not immediately display error messages from parsing the cfg file, but schedule them for displaying after the GUI is prepared for it [FS#5154] (r24250, r24249, r24248, r24247)
- Fix: The object GUI did not draw objects when all objects of a class are disabled (r24176)

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
@@ -202,7 +202,7 @@ SKIP_FUNCTION_MACROS   = YES
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 TAGFILES               =
-GENERATE_TAGFILE       = objs/openttd.tag
+GENERATE_TAGFILE       = openttd.tag
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 PERL_PATH              = /usr/bin/perl

Makefile.bundle.in

@@ -10,9 +10,13 @@
 #
 
 # The revision is needed for the bundle name and creating an OSX application bundle.
+ifdef REVISION
+REV := $(REVISION)
+else
 # Detect the revision
 VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh")
 REV      := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
+endif
 
 # Make sure we have something in REV
 ifeq ($(REV),)
@@ -26,13 +30,11 @@ endif
 # An OSX application bundle needs the data files, lang files and openttd executable in a different location.
 ifdef OSXAPP
 AI_DIR      = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/ai
-GAME_DIR    = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/game
 BASESET_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/baseset
 LANG_DIR    = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
 TTD_DIR     = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
 else
 AI_DIR      = $(BUNDLE_DIR)/ai
-GAME_DIR    = $(BUNDLE_DIR)/game
 BASESET_DIR = $(BUNDLE_DIR)/baseset
 LANG_DIR    = $(BUNDLE_DIR)/lang
 TTD_DIR     = $(BUNDLE_DIR)
@@ -47,7 +49,6 @@ bundle: all
 	$(Q)mkdir -p "$(BUNDLE_DIR)/scripts"
 	$(Q)mkdir -p "$(TTD_DIR)"
 	$(Q)mkdir -p "$(AI_DIR)"
-	$(Q)mkdir -p "$(GAME_DIR)"
 	$(Q)mkdir -p "$(BASESET_DIR)"
 	$(Q)mkdir -p "$(LANG_DIR)"
 ifdef OSXAPP
@@ -62,7 +63,6 @@ ifeq ($(OS),UNIX)
 endif
 	$(Q)cp "$(BIN_DIR)/$(TTD)"                "$(TTD_DIR)/"
 	$(Q)cp "$(BIN_DIR)/ai/"compat_*.nut       "$(AI_DIR)/"
-	$(Q)cp "$(BIN_DIR)/game/"compat_*.nut     "$(GAME_DIR)/"
 	$(Q)cp "$(BIN_DIR)/baseset/"*.grf         "$(BASESET_DIR)/"
 	$(Q)cp "$(BIN_DIR)/baseset/"*.obg         "$(BASESET_DIR)/"
 	$(Q)cp "$(BIN_DIR)/baseset/"*.obs         "$(BASESET_DIR)/"
@@ -90,9 +90,9 @@ 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

Makefile.grf.in

@@ -20,8 +20,6 @@
 
 ROOT_DIR = !!ROOT_DIR!!
 GRF_DIR  = $(ROOT_DIR)/media/extra_grf
-BASESET_DIR = $(ROOT_DIR)/media/baseset
-LANG_DIR = $(ROOT_DIR)/src/lang
 BIN_DIR  = !!BIN_DIR!!/baseset
 OBJS_DIR = !!GRF_OBJS_DIR!!
 OS       = !!OS!!
@@ -38,7 +36,6 @@ endif
 
 GRFCODEC := !!GRFCODEC!!
 NFORENUM := !!NFORENUM!!
-CC_BUILD := !!CC_BUILD!!
 MD5SUM   := $(shell [ "$(OS)" = "OSX" ] && echo "md5 -r" || echo "md5sum")
 
 # Some "should not be changed" settings.
@@ -47,7 +44,7 @@ PNG_FILES    := $(GRF_DIR)/*.png $(GRF_DIR)/rivers/*.png
 
 # Build the GRF.
 ifdef GRFCODEC
-all: $(BIN_DIR)/openttd.grf $(BIN_DIR)/orig_dos.obg $(BIN_DIR)/orig_dos_de.obg $(BIN_DIR)/orig_win.obg $(BIN_DIR)/orig_dos.obs $(BIN_DIR)/orig_win.obs $(BIN_DIR)/no_sound.obs $(BIN_DIR)/orig_win.obm $(BIN_DIR)/no_music.obm
+all: $(BIN_DIR)/openttd.grf
 else
 all:
 endif
@@ -56,33 +53,20 @@ endif
 $(OBJS_DIR)/sprites:
 	$(Q)-mkdir "$@"
 
-$(OBJS_DIR)/langfiles.tmp: $(LANG_DIR)/*.txt
+# Generic
-	$(E) '$(STAGE) Collecting baseset translations'
+$(BIN_DIR)/openttd.grf: $(OBJS_DIR)/openttd.grf
-	$(Q) cat $^ > $@
+	$(Q)cp $(OBJS_DIR)/openttd.grf $(BIN_DIR)/openttd.grf
+	$(E) '$(STAGE) Updating base graphics sets'
+	$(Q) for grf in $(BIN_DIR)/orig*.obg; do sed 's/^OPENTTD.GRF  = [0-9a-f]*$$/OPENTTD.GRF  = '`$(MD5SUM) $(BIN_DIR)/openttd.grf | sed 's@ .*@@'`'/' $$grf > $$grf.tmp && mv $$grf.tmp $$grf; done
 
-$(BIN_DIR)/%.obg: $(BASESET_DIR)/%.obg $(BIN_DIR)/openttd.grf $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/translations.awk
+# Yeah, we'd like to use -i in the sed, but Mac OS X's sed and GNU sed just can't agree on the usage of -i. In any case either one of them fails.
-	$(E) '$(STAGE) Updating $(notdir $@)'
+$(OBJS_DIR)/openttd.grf: $(PNG_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites
-	$(Q) sed 's/^OPENTTD.GRF  = *[0-9a-f]*$$/OPENTTD.GRF  = '`$(MD5SUM) $(BIN_DIR)/openttd.grf | sed 's@ .*@@'`'/' $< > $@.tmp
-	$(Q) awk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $@.tmp >$@
-	$(Q) rm $@.tmp
-
-$(BIN_DIR)/%.obs: $(BASESET_DIR)/%.obs $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/translations.awk
-	$(E) '$(STAGE) Updating $(notdir $@)'
-	$(Q) awk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $< >$@
-
-$(BIN_DIR)/%.obm: $(BASESET_DIR)/%.obm $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/translations.awk
-	$(E) '$(STAGE) Updating $(notdir $@)'
-	$(Q) awk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $< >$@
-
-# Compile extra grf
-$(BIN_DIR)/openttd.grf: $(PNG_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites $(GRF_DIR)/assemble_nfo.awk
 	$(E) '$(STAGE) Assembling openttd.nfo'
 	$(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) gcc -I$(GRF_DIR) -C -E - < "$(GRF_DIR)/openttd.nfo" | sed -e '/^#/d' -e '/^$$/d' > $(OBJS_DIR)/sprites/openttd.nfo
 	$(Q) $(NFORENUM) -s $(OBJS_DIR)/sprites/openttd.nfo
 	$(E) '$(STAGE) Compiling openttd.grf'
 	$(Q) $(GRFCODEC) -n -s -e -p1 $(OBJS_DIR)/openttd.grf
-	$(Q)cp $(OBJS_DIR)/openttd.grf $(BIN_DIR)/openttd.grf
 
 # Clean up temporary files.
 clean:

Makefile.in

@@ -41,6 +41,7 @@ TTDS        = $(SRC_DIRS:%=%/$(TTD))
 OS          = !!OS!!
 OSXAPP      = !!OSXAPP!!
 LIPO        = !!LIPO!!
+REVISION    = !!REVISION!!
 AWK         = !!AWK!!
 SORT        = !!SORT!!
 DISTCC      = !!DISTCC!!
@@ -144,15 +145,17 @@ mrproper:
 # output of profiling
 	$(Q)rm -f $(BIN_DIR)/gmon.out
 # output of generating 'API' documentation
+	$(Q)rm -f $(ROOT_DIR)/openttd.tag
 	$(Q)rm -rf $(ROOT_DIR)/docs/source
+# output of generating AI API documentation
+	$(Q)rm -f $(SRC_DIR)/ai/api/openttd.tag
 	$(Q)rm -rf $(ROOT_DIR)/docs/aidocs
-	$(Q)rm -rf $(ROOT_DIR)/docs/gamedocs
 # directories created by OpenTTD on regression testing
 	$(Q)rm -rf $(BIN_DIR)/ai/regression/content_download $(BIN_DIR)/ai/regression/save $(BIN_DIR)/ai/regression/scenario
 distclean: mrproper
 
 maintainer-clean: distclean
-	$(Q)rm -f $(BIN_DIR)/baseset/openttd.grf $(BIN_DIR)/baseset/*.obg $(BIN_DIR)/baseset/*.obs $(BIN_DIR)/baseset/*.obm
+	$(Q)rm -f $(BIN_DIR)/baseset/openttd.grf
 
 depend:
 	@for dir in $(SRC_DIRS); do \

Makefile.lang.in

@@ -14,7 +14,6 @@ LANGS_SRC     = $(shell ls $(LANG_DIR)/*.txt)
 LANGS         = $(LANGS_SRC:$(LANG_DIR)/%.txt=%.lng)
 CXX_BUILD     = !!CXX_BUILD!!
 CFLAGS_BUILD  = !!CFLAGS_BUILD!!
-CXXFLAGS_BUILD= !!CXXFLAGS_BUILD!!
 LDFLAGS_BUILD = !!LDFLAGS_BUILD!!
 STRGEN_FLAGS  = !!STRGEN_FLAGS!!
 STAGE         = !!STAGE!!
@@ -43,25 +42,25 @@ 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 $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<
 
-strgen.o: $(SRC_DIR)/strgen/strgen.cpp $(SRC_DIR)/strgen/strgen.h endian_host.h $(SRC_DIR)/table/control_codes.h $(SRC_DIR)/table/strgen_tables.h $(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 $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_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 $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_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 $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_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 $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<
 
 lang/english.txt: $(LANG_DIR)/english.txt
 	$(Q)mkdir -p lang
@@ -69,7 +68,7 @@ lang/english.txt: $(LANG_DIR)/english.txt
 
 $(STRGEN): alloc_func.o string.o strgen_base.o strgen.o getoptdata.o
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $^ -o $@
+	$(Q)$(CXX_BUILD) $(LDFLAGS_BUILD) $^ -o $@
 
 table/strings.h: lang/english.txt $(STRGEN)
 	$(E) '$(STAGE) Generating $@'
@@ -88,7 +87,7 @@ endian_host.h: $(ENDIAN_CHECK)
 
 $(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $< -o $@
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $< -o $@
 
 depend:
 

Makefile.setting.in

@@ -10,7 +10,6 @@ ENDIAN_CHECK     = !!ENDIAN_CHECK!!
 SRC_DIR          = !!SRC_DIR!!
 CXX_BUILD        = !!CXX_BUILD!!
 CFLAGS_BUILD     = !!CFLAGS_BUILD!!
-CXXFLAGS_BUILD   = !!CXXFLAGS_BUILD!!
 LDFLAGS_BUILD    = !!LDFLAGS_BUILD!!
 STAGE            = !!STAGE!!
 SETTING_OBJS_DIR = !!SETTING_OBJS_DIR!!
@@ -28,29 +27,29 @@ 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 $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_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 $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_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 $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_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 $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
 
-ini_load.o: $(SRC_DIR)/ini_load.cpp $(SRC_DIR)/core/alloc_func.hpp $(SRC_DIR)/core/mem_func.hpp $(SRC_DIR)/ini_type.h $(SRC_DIR)/string_func.h $(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 $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
 
 $(SETTINGSGEN): alloc_func.o string.o ini_load.o settingsgen.o getoptdata.o
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $^ -o $@
+	$(Q)$(CXX_BUILD) $(LDFLAGS_BUILD) $^ -o $@
 
 table/settings.h: $(SETTINGSGEN) $(SRC_DIR)/table/settings.h.preamble $(SRC_DIR)/table/settings.h.postamble $(SRC_DIR)/table/*.ini
 	$(E) '$(STAGE) Generating $@'
@@ -65,7 +64,7 @@ endian_host.h: $(ENDIAN_CHECK)
 
 $(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $< -o $@
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $< -o $@
 
 depend:
 

Makefile.src.in

@@ -229,22 +229,10 @@ $(OBJS_C): %.o: $(SRC_DIR)/%.c $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.c=%.c)'
 	$(Q)$(CC_HOST) $(CFLAGS) -c -o $@ $<
 
-$(filter-out %sse2.o, $(filter-out %ssse3.o, $(filter-out %sse4.o, $(OBJS_CPP)))): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
+$(OBJS_CPP): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -o $@ $<
 
-$(filter %sse2.o, $(OBJS_CPP)): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -msse2 -o $@ $<
-
-$(filter %ssse3.o, $(OBJS_CPP)): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -mssse3 -o $@ $<
-
-$(filter %sse4.o, $(OBJS_CPP)): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -msse4.1 -o $@ $<
-
 $(OBJS_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.mm=%.mm)'
 	$(Q)$(CC_HOST) $(CFLAGS) -c -o $@ $<
@@ -288,7 +276,7 @@ endian_target.h: $(ENDIAN_CHECK) $(CONFIG_CACHE_ENDIAN)
 
 $(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $< -o $@
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $< -o $@
 
 # Revision files
 

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

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

bin/ai/compat_1.3.nut

@@ -1,10 +0,0 @@
-/* $Id$ */
-
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-AILog.Info("1.3 API 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,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("");
+	local list = AIStationList(AIStation.STATION_BUS_STOP + AIStation.STATION_TRUCK_STOP);
-	print("--CargoWaiting--");
-	for (local cargo = 0; cargo <= 1000; cargo += 1000) {
-		for (local station0 = 0; station0 <= 1000; station0 += 1000) {
-			print("  GetCargoWaiting(" + station0 + ", " + cargo + "): " +
-					AIStation.GetCargoWaiting(station0, cargo));
-			for (local station1 = 0; station1 <= 1000; station1 += 1000) {
-				print("  GetCargoWaitingFrom(" + station0 + ", " + station1 + ", " + cargo + "): " +
-						AIStation.GetCargoWaitingFrom(station0, station1, cargo));
-				print("  GetCargoWaitingVia(" + station0 + ", " + station1 + ", " + cargo + "): " +
-						AIStation.GetCargoWaitingFrom(station0, station1, cargo));
-				for (local station2 = 0; station2 <= 1000; station2 += 1000) {
-					print("  GetCargoWaitingFromVia(" + station0 + ", " + station1 + ", " + station2 + ", " + cargo + "): " +
-							AIStation.GetCargoWaitingFromVia(station0, station1, station2, cargo));
-				}
-			}
-		}
-	}
 
 	print("");
-	print("--CargoPlanned--");
+	print("--StationList--");
-	for (local cargo = 0; cargo <= 1000; cargo += 1000) {
+	print("  Count():             " + list.Count());
-		for (local station0 = 0; station0 <= 1000; station0 += 1000) {
+	list.Valuate(AIStation.GetLocation);
-			print("  GetCargoPlanned(" + station0 + ", " + cargo + "): " +
+	print("  Location ListDump:");
-					AIStation.GetCargoPlanned(station0, cargo));
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-			for (local station1 = 0; station1 <= 1000; station1 += 1000) {
+		print("    " + i + " => " + list.GetValue(i));
-				print("  GetCargoPlannedFrom(" + station0 + ", " + station1 + ", " + cargo + "): " +
+	}
-						AIStation.GetCargoPlannedFrom(station0, station1, cargo));
+	list.Valuate(AIStation.GetCargoWaiting, 0);
-				print("  GetCargoPlannedVia(" + station0 + ", " + station1 + ", " + cargo + "): " +
+	print("  CargoWaiting(0) ListDump:");
-						AIStation.GetCargoPlannedFrom(station0, station1, cargo));
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-				for (local station2 = 0; station2 <= 1000; station2 += 1000) {
+		print("    " + i + " => " + list.GetValue(i));
-					print("  GetCargoPlannedFromVia(" + station0 + ", " + station1 + ", " + station2 + ", " + cargo + "): " +
+	}
-							AIStation.GetCargoPlannedFromVia(station0, station1, station2, cargo));
+	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

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

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.5"; }
+	function GetAPIVersion()  { return "1.2"; }
 	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 [ -n "$gdb" ]; then
-if [ -d "ai/regression/tst_$1" ]; then
+	$gdb ./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav
-	tests="ai/regression/tst_$1"
-elif [ -d "ai/regression/tst_$2" ]; then
-	tests="ai/regression/tst_$2"
 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
+if [ -z "$gdb" ]; then
-	echo -n "Running $tst... "
+	res="`diff -ub ai/regression/regression.txt tmp.regression`"
-
+	if [ -z "$res" ]; then
-	# Make sure that only one info.nut is present for each test run. Otherwise openttd gets confused.
+		echo "Regression test passed!"
-	cp ai/regression/regression_info.nut $tst/info.nut
-
-	sav=$tst/test.sav
-	if ! [ -f $sav ]; then
-		sav=ai/regression/empty.sav
-	fi
-
-	if [ -n "$gdb" ]; then
-		$gdb ./openttd -x -c ai/regression/regression.cfg $params -g $sav
 	else
-		./openttd -x -c ai/regression/regression.cfg $params -g $sav -d script=2 -d misc=9 2>&1 | awk '{ gsub("0x(\\(nil\\)|0+)(x0)?", "0x00000000", $0); gsub("^dbg: \\[script\\]", "", $0); gsub("^ ", "ERROR: ", $0); gsub("ERROR: \\[1\\] ", "", $0); gsub("\\[P\\] ", "", $0); print $0; }' | grep -v '^dbg: \[.*\]' > tmp.regression
+		echo "Regression test failed! Difference:"
+		echo "$res"
+		ret=1
 	fi
+	echo ""
+	echo "Regression test done"
+fi
 
-	if [ -z "$gdb" ]; then
+rm -f ai/regression/main.nut ai/regression/info.nut
-		res="`diff -ub $tst/result.txt tmp.regression`"
-		if [ -z "$res" ]; then
-			echo "passed!"
-		else
-			echo "failed! Difference:"
-			echo "$res"
-			ret=1
-		fi
-	fi
-
-	rm $tst/info.nut
-done
 
 if [ -f scripts/game_start.scr.regression ]; then
 	mv scripts/game_start.scr.regression scripts/game_start.scr

bin/ai/regression/tst_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,52 +10,34 @@ fallback          = true
 description       = A music pack without actual music.
 description.af_ZA = 'n Musiek stel sonder enige musiek.
 description.ar_EG = مجموعة موسيقى بدون موسيقى
-description.be_BY = "Пусты" набор музычнага афармлення, які не зьмяшчае ніякай музыкі.
 description.bg_BG = Празен музикален пакет.
 description.ca_ES = Un joc de música sense cap música.
 description.cs_CZ = Prázná hudební sada.
-description.cy_GB = Pecyn cerddoriaeth heb unrhyw gerddoriaeth ynddo.
+description.da_DA = En musikpakke uden musik.
-description.da_DK = En musikpakke uden musik.
 description.de_DE = Ein Musikset ohne Musik.
 description.el_GR = Ένα πάκετο μουσικής χωρίς πραγματική μουσική.
-description.en_AU = A music pack without actual music.
+description.en_GB = A music pack without actual music.
 description.en_US = A music pack without actual music.
 description.es_ES = Un conjunto de música vacío.
-description.et_EE = Muusikakogu ilma muusikata.
+description.et_ET = Muusikakomplekt ilma igasuguse muusikata.
 description.fi_FI = Musiikkipaketti, jossa ei ole musiikkia.
 description.fr_FR = Un pack de musiques sans musiques.
-description.ga_IE = Pacáiste ceoil gan aon cheol iarbhír ann.
-description.gd_GB = Pacaid ciùil anns nach eil fonn sam bith.
-description.gl_ES = Un conxunto de músicas sen ningunha música.
 description.hr_HR = Muzički paket bez ikakve muzike.
 description.hu_HU = Zenei alapcsomag zene nélkül.
-description.id_ID = Paket musik tanpa musik sungguhan.
+description.id_ID = Paket musik tanpa berisi musik.
-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.nb_NO = En musikkpakke uten noe musikk.
 description.nl_NL = Een muziekset zonder muziek.
 description.nn_NO = Ei musikkpakke utan noko musikk.
 description.pl_PL = Zestaw utworów muzycznych nie zawierający żadnej muzyki.
-description.pt_BR = Um pacote de músicas sem músicas.
 description.pt_PT = Um conjunto de música vazio.
 description.ro_RO = Un set de muzică fără muzică inclusă.
 description.ru_RU = "Пустой" набор музыкального оформления, не содержащий никакой музыки.
 description.sk_SK = Sada hudby neobsahujúca hudbu.
-description.sl_SI = Glasbeni paket z vključeno glasbo.
+description.sl_SL = Glasbeni paket z vključeno glasbo.
 description.sr_RS = Prazan skup muzičkih numera.
 description.sv_SE = Ett musikpaket utan någon musik.
-description.ta_IN = இசை இல்லாத இசைத்தொகுப்பு.
-description.th_TH = ชุดเพลงประกอบแบบไม่มีเสียงเพลง
 description.tr_TR = Müzik içermeyen boş bir müzik paketi.
-description.uk_UA = Порожній набір музики.
-description.vi_VN = Gói âm nhạc này không có nhạc nào.
-description.zh_CN = 一个没有实际内容的音乐包.
 description.zh_TW = 不含任何音樂的音樂集。
 
 [files]

bin/baseset/no_sound.obs

@@ -10,52 +10,34 @@ fallback          = true
 description       = A sound pack without any sounds.
 description.af_ZA = 'n Klank stel sonder enige klanke.
 description.ar_EG = مجموعة صوت بدوت اصوات مضافة
-description.be_BY = "Пусты" набор гукавога афармленьня, які не зьмяшчае ніякіх гукаў.
 description.bg_BG = Празен звуков пакет.
 description.ca_ES = Un joc de sons sense cap so.
 description.cs_CZ = Prázdná sada zvuků.
-description.cy_GB = Pecyn sain heb unrhyw effeithiau sain ynddo.
+description.da_DA = En lydpakke uden lyde.
-description.da_DK = En lydpakke uden lyde.
 description.de_DE = Basissounds ohne Sound.
 description.el_GR = Ένα πάκετο ήχων χώρις ήχους.
-description.en_AU = A sound pack without any sounds.
+description.en_GB = A sound pack without any sounds.
 description.en_US = A sound pack without any sounds.
 description.es_ES = Un conjunto de sonidos vacío.
-description.et_EE = Helikogu ilma helideta.
+description.et_ET = Ilma häälteta helipakk.
-description.eu_ES = Soinurik gabeko soinu pakete bat
+description.fi_FI = Äänipaketti ilman ääniä.
-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.hr_HR = Zvučni paket bez ikakvih zvukova.
 description.hu_HU = Hang alapcsomag hangok nélkül.
-description.id_ID = Paket efek suara tanpa suara apapun.
+description.id_ID = Paket efek suara tanpa berisi suara.
-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.nb_NO = En lydpakke uten noen lyder.
 description.nl_NL = Een geluidset zonder geluid.
 description.nn_NO = Ei lydpakke utan nokon lydar.
 description.pl_PL = Zestaw dźwięków nie zawierający żadnych dźwięków.
-description.pt_BR = Um pacote de sons sem sons.
 description.pt_PT = Um conjunto de sons vazio.
 description.ro_RO = Un set de sunete fără nici un sunet inclus.
 description.ru_RU = "Пустой" набор звукового оформления, не содержащий никаких звуков.
 description.sk_SK = Zvuková sada neobsahujúca zvuky.
-description.sl_SI = Zvočni paket brez zvoka.
+description.sl_SL = Zvočni paket brez zvoka.
 description.sr_RS = Prazan skup zvukova.
 description.sv_SE = Ett ljudpaket utan några ljud.
-description.ta_IN = ஒலிகள் இல்லாத ஒலி தொகுப்பு.
-description.th_TH = ชุดเสียงแบบไร้เสียง
 description.tr_TR = Ses içermeyen boş bir ses kümesi.
-description.uk_UA = Порожній набір звуків.
-description.vi_VN = Gói âm thanh này không có âm thanh nào.
-description.zh_CN = 一个空的音效包.
 description.zh_TW = 不含任何音效的音效集。
 
 [files]

bin/baseset/orig_dos.obg

@@ -11,51 +11,34 @@ palette           = DOS
 description       = Original Transport Tycoon Deluxe DOS edition graphics.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS uitgawe grafieke.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الرسومية نسخة الدوس
-description.be_BY = Арыґінальная ґрафіка з Transport Tycoon Deluxe для DOS.
 description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за DOS.
 description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a DOS.
 description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (verze pro DOS).
-description.cy_GB = Graffeg gwreiddiol fersiwn DOS o Transport Tycoon Deluxe.
+description.da_DA = Originalgrafik fra Transport Tycoon Deluxe DOS-version.
-description.da_DK = Originalgrafik fra Transport Tycoon Deluxe DOS-version.
 description.de_DE = Original Transport Tycoon Deluxe DOS Basisgrafiken.
 description.el_GR = Αρχικά γραφικά από το Transport Tycoon Deluxe έκδοση DOS.
-description.en_AU = Original Transport Tycoon Deluxe DOS edition graphics.
+description.en_GB = Original Transport Tycoon Deluxe DOS edition graphics.
 description.en_US = Original Transport Tycoon Deluxe DOS edition graphics.
 description.es_ES = Gráficos originales de Transport Tycoon Deluxe versión DOS.
-description.et_EE = Algse Transport Tycoon Deluxe DOSi versiooni graafika.
+description.et_ET = Algse Transport Tycoon Deluxe DOSi versiooni graafika.
-description.fi_FI = Alkuperäiset Transport Tycoon Deluxen DOS-version grafiikat.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe DOS 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.hr_HR = Originalna grafika za Transport Tycoon Deluxe DOS izdanje.
 description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS verziójának grafikája.
 description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi DOS.
-description.is_IS = Upprunalega grafíkin úr Transport Tycoon Deluxe DOS útgáfunni.
 description.it_IT = Grafica originale di Transport Tycoon Deluxe, edizione DOS.
-description.ja_JP = Transport Tycoon Deluxe オリジナル版 グラフィック (DOS)
-description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 도스 에디션의 그래픽입니다.
-description.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.nb_NO = Original grafikk fra Transport Tycoon Deluxe for DOS.
 description.nl_NL = Originele graphics van de Transport Tycoon Deluxe DOS-versie.
 description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for DOS.
 description.pl_PL = Oryginalna edycja grafik dla Transport Tycoon Deluxe DOS.
-description.pt_BR = Gráficos Originais do Transport Tycoon Deluxe, Edição DOS.
 description.pt_PT = Gráficos originais da edição DOS de Transport Tycoon Deluxe.
 description.ro_RO = Setul grafic original al Transport Tycoon Deluxe pentru DOS.
 description.ru_RU = Оригинальная графика из Transport Tycoon Deluxe для DOS.
 description.sk_SK = Pôvodná grafika Transport Tycoon Deluxe (DOS).
-description.sl_SI = Originalna grafika Transport Tycoon Deluxe za različico DOS.
+description.sl_SL = Originalna grafika Transport Tycoon Deluxe za različico DOS.
 description.sr_RS = Originalni skup grafika Transport Tycoon Deluxe DOS izdanja.
 description.sv_SE = Originalgrafiken från Transport Tycoon Deluxe, DOS-utgåvan.
-description.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் DOS பதிப்பு அசைவூட்டங்கள்.
+description.tr_TR = Orijinal Transport Tycoon Deluxe DOS sürümü grafikleri.
-description.th_TH = กราฟฟิกต้นตำหรับของ Transport Tycoon Deluxe DOS edition
-description.tr_TR = Özgün Transport Tycoon Deluxe DOS sürümü grafikleri.
-description.uk_UA = Оригінальна графіка з Transport Tycoon Deluxe DOS edition.
-description.vi_VN = Đồ họa gốc từ phiên bản Transport Tycoon Deluxe trên DOS
-description.zh_CN = 运输大亨DOS豪华版原版图形包.
 description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版的圖形。
 
 [files]
@@ -72,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF  = 505d96061556d3bb5cec6234096ec5bc
+OPENTTD.GRF  = 51f9d2b8a29a079e83486db13509336c
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.

bin/baseset/orig_dos.obs

@@ -10,51 +10,34 @@ version           = 0
 description       = Original Transport Tycoon Deluxe DOS edition sounds.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS uitgawe klanke.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الصوتية نسخة الدوس
-description.be_BY = Арыґінальны набор гукавога афармленьня з гульні Transport Tycoon Deluxe для DOS.
 description.bg_BG = Оригинални звуци на Transport Tycoon Deluxe за DOS.
 description.ca_ES = Sons originals de Transport Tycoon Deluxe per a DOS.
 description.cs_CZ = Původní sada zvuků Transport Tycoon Deluxe (verze pro DOS).
-description.cy_GB = Effeithiau sain gwreiddiol fersiwn DOS o Transport Tycoon Deluxe.
+description.da_DA = Originallyd fra Transport Tycoon Deluxe DOS-version.
-description.da_DK = Originallyd fra Transport Tycoon Deluxe DOS-version.
 description.de_DE = Original Transport Tycoon Deluxe DOS Basissounds.
 description.el_GR = Αρχικοί ήχοι από το Transport Tycoon Deluxe έκδοση DOS.
-description.en_AU = Original Transport Tycoon Deluxe DOS edition sounds.
+description.en_GB = Original Transport Tycoon Deluxe DOS edition sounds.
 description.en_US = Original Transport Tycoon Deluxe DOS edition sounds.
 description.es_ES = Sonidos originales de Transport Tycoon Deluxe versión DOS.
-description.et_EE = Algse Transport Tycoon Deluxe DOSi versiooni helid.
+description.et_ET = Algse Transport Tycoon Deluxe DOSi versiooni helid.
-description.fi_FI = Alkuperäiset Transport Tycoon Deluxen DOS-version äänet.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe DOS ää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.hr_HR = Originalni zvukovi za Transport Tycoon Deluxe DOS izdanje.
 description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS verziójának hangjai.
+description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version DOS).
 description.id_ID = Efek suara orisinil Transport Tycoon Deluxe versi DOS.
-description.is_IS = Upprunalega hljóðið úr Transport Tycoon Deluxe DOS útgáfunni.
 description.it_IT = Suoni originali di Transport Tycoon Deluxe, edizione DOS.
-description.ja_JP = Transport Tycoon Deluxe オリジナル版 効果音 (DOS)
-description.ko_KR = 오리지널 트랜스포트 타이쿤 도스 에디션의 효과음입니다.
-description.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.
 description.sk_SK = Pôvodné zvuky Transport Tycoon Deluxe (DOS).
-description.sl_SI = Originalni zvoki Transport Tycoon Deluxe različice DOS.
+description.sl_SL = Originalni zvoki Transport Tycoon Deluxe različice DOS.
 description.sr_RS = Originalni skup zvukova Transport Tycoon Deluxe DOS izdanja.
 description.sv_SE = Originalljuden från Transport Tycoon Deluxe, DOS-utgåvan.
-description.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் DOS பதிப்பு ஒலிகள்.
+description.tr_TR = Orijinal Transport Tycoon Deluxe DOS sürümü sesleri.
-description.th_TH = เสียงต้นตำหรับของ Transport Tycoon Deluxe DOS edition
-description.tr_TR = Özgün Transport Tycoon Deluxe DOS sürümü sesleri.
-description.uk_UA = Оригінальний набір звуків з Transport Tycoon Deluxe DOS edition.
-description.vi_VN = Âm thanh gốc từ phiên bản Transport Tycoon Deluxe trên DOS
-description.zh_CN = 运输大亨DOS豪华版原版音效包.
 description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版的音效。
 
 [files]

bin/baseset/orig_dos_de.obg

@@ -11,51 +11,34 @@ palette           = DOS
 description       = Original Transport Tycoon Deluxe DOS (German) edition graphics.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS (German) uitgawe grafieke.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الالمانية نسخة الدوس
-description.be_BY = Арыґінальная ґрафіка зь нямецкай версіі Transport Tycoon Deluxe для DOS.
 description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за DOS (немски) .
 description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a DOS (Alemany).
 description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (německá verze pro DOS).
-description.cy_GB = Graffeg gwreiddiol fersiwn DOS (Almaenig) o Transport Tycoon Deluxe.
+description.da_DA = Originalgrafik fra Transport Tycoon Deluxe DOS (Tysk) version.
-description.da_DK = Originalgrafik fra Transport Tycoon Deluxe DOS (Tysk) version.
 description.de_DE = Original Transport Tycoon Deluxe DOS (Deutsch) Basisgrafiken.
 description.el_GR = Αρχικά γραφικά από το Transport Tycoon Deluxe έκδοση DOS (Γερμανικό).
-description.en_AU = Original Transport Tycoon Deluxe DOS (German) edition graphics.
+description.en_GB = Original Transport Tycoon Deluxe DOS (German) edition graphics.
 description.en_US = Original Transport Tycoon Deluxe DOS (German) edition graphics.
 description.es_ES = Gráficos originales de Transport Tycoon Deluxe versión DOS (Alemán).
-description.et_EE = Algse Transport Tycoon Deluxe DOSi (Saksa) versiooni graafika.
+description.et_ET = Algse Transport Tycoon Deluxe DOSi (Saksa) versiooni graafika.
-description.fi_FI = Alkuperäiset Saksassa julkaistun Transport Tycoon Deluxen DOS-version grafiikat.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe DOS (Saksalainen) 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.hr_HR = Originalna grafika za Transport Tycoon Deluxe DOS (Njemački) izdanje.
 description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS (német) verziójának grafikája.
 description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi DOS (Jerman).
-description.is_IS = Upprunalega grafíkin úr Transport Tycoon Deluxe DOS (þýsku) útgáfunni.
 description.it_IT = Grafica originale di Transport Tycoon Deluxe (tedesco), edizione DOS.
-description.ja_JP = Transport Tycoon Deluxe オリジナル版 グラフィック (DOS・ドイツ版)
-description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 도스 에디션(독일)의 그래픽입니다.
-description.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.nb_NO = Original grafikk fra Transport Tycoon Deluxe for DOS (tysk).
 description.nl_NL = Originele graphics van de Duitse Transport Tycoon Deluxe DOS-versie.
 description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for DOS (tysk).
 description.pl_PL = Oryginalna edycja grafik dla Transport Tycoon Deluxe DOS (German).
-description.pt_BR = Gráficos Originais do Transport Tycoon Deluxe, Edição DOS alemã.
 description.pt_PT = Gráficos originais da edição DOS (Alemã) de Transport Tycoon Deluxe.
 description.ro_RO = Setul grafic original al Transport Tycoon Deluxe pentru DOS (ediţia germană).
 description.ru_RU = Оригинальная графика из немецкой версии Transport Tycoon Deluxe для DOS.
 description.sk_SK = Pôvodná grafika Transport Tycoon Deluxe (DOS) (v jazyku nemčina).
-description.sl_SI = Originalna grafika Transport Tycoon Deluxe za nemško različico DOS.
+description.sl_SL = Originalna grafika Transport Tycoon Deluxe za nemško različico DOS.
 description.sr_RS = Originalni skup grafika nemačkog Transport Tycoon Deluxe DOS izdanja.
 description.sv_SE = Originalgrafiken från Transport Tycoon Deluxe, DOS-utgåvan (tyska).
-description.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் DOS (செருமன்) பதிப்பு அசைவூட்டங்கள்.
+description.tr_TR = Orijinal Transport Tycoon Deluxe DOS (Almanca) sürümü grafikleri.
-description.th_TH = กราฟฟิกต้นตำหรับของ Transport Tycoon Deluxe DOS (German) edition
-description.tr_TR = Özgün Transport Tycoon Deluxe DOS (Almanca) sürümü grafikleri.
-description.uk_UA = Оригінальна графіка з Transport Tycoon Deluxe DOS edition (німецького).
-description.vi_VN = Đồ họa gốc từ phiên bản Transport Tycoon Deluxe trên DOS (tiếng Đức)
-description.zh_CN = 运输大亨DOS豪华德语版原版图形包.
 description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版 (德國版) 的圖形。
 
 [files]
@@ -72,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTD.GRF  = 505d96061556d3bb5cec6234096ec5bc
+OPENTTD.GRF  = 51f9d2b8a29a079e83486db13509336c
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.

bin/baseset/orig_win.obg

@@ -11,51 +11,34 @@ palette           = Windows
 description       = Original Transport Tycoon Deluxe Windows edition graphics.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe grafieke.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الرسومية نسخة وندوز
-description.be_BY = Арыґінальная ґрафіка з Transport Tycoon Deluxe для Windows.
 description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за Windows.
 description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a Windows.
 description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (verze pro Windows).
-description.cy_GB = Graffeg gwreiddiol fersiwn Windows o Transport Tycoon Deluxe.
+description.da_DA = Originalgrafik fra Transport Tycoon Deluxe Windows-version.
-description.da_DK = Originalgrafik fra Transport Tycoon Deluxe Windows-version.
 description.de_DE = Original Transport Tycoon Deluxe Windows Basisgrafiken.
 description.el_GR = Αρχικά γραφικά από το Transport Tycoon Deluxe έκδοση Windows.
-description.en_AU = Original Transport Tycoon Deluxe Windows edition graphics.
+description.en_GB = Original Transport Tycoon Deluxe Windows edition graphics.
 description.en_US = Original Transport Tycoon Deluxe Windows edition graphics.
 description.es_ES = Gráficos originales de Transport Tycoon Deluxe versión Windows.
-description.et_EE = Algse Transport Tycoon Deluxe Windowsi versiooni graafika.
+description.et_ET = Algse Transport Tycoon Deluxe Windowsi versiooni graafika.
-description.fi_FI = Alkuperäiset Transport Tycoon Deluxen Windows-version grafiikat.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe Windows 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.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.lt_LT = Originali Transport Tycoon Deluxe Windows leidimo grafika.
 description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for Windows.
 description.nl_NL = Originele graphics van de Transport Tycoon Deluxe Windows-versie.
 description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for Windows.
 description.pl_PL = Oryginalna edycja grafik dla Transport Tycoon Deluxe Windows.
-description.pt_BR = Gráficos Originais do Transport Tycoon, Edição Windows.
 description.pt_PT = Gráficos originais da edição Windows de Transport Tycoon Deluxe.
 description.ro_RO = Setul grafic original al Transport Tycoon Deluxe pentru Windows.
 description.ru_RU = Оригинальная графика из Transport Tycoon Deluxe для Windows.
 description.sk_SK = Pôvodná grafika Transport Tycoon Deluxe (Windows).
-description.sl_SI = Originalna grafika Transport Tycoon Deluxe za različico oken(windows).
+description.sl_SL = Originalna grafika Transport Tycoon Deluxe za različico oken(windows).
 description.sr_RS = Originalni skup grafika Transport Tycoon Deluxe Windows izdanja.
 description.sv_SE = Originalgrafiken från Transport Tycoon Deluxe, Windows-utgåvan.
-description.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் விண்டோஸ் பதிப்பு அசைவூட்டங்கள்.
+description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü grafikleri.
-description.th_TH = กราฟฟิกต้ำตำหรับของ Transport Tycoon Deluxe Windows edition
-description.tr_TR = Özgün Transport Tycoon Deluxe Windows sürümü grafikleri.
-description.uk_UA = Оригінальна графіка з Transport Tycoon Deluxe Windows edition.
-description.vi_VN = Đồ họa gốc từ phiên bản Transport Tycoon Deluxe trên Windows
-description.zh_CN = 运输大亨Windows豪华版原版图形包.
 description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的圖形。
 
 [files]
@@ -72,7 +55,7 @@ TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
 TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
 TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
 TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTD.GRF  = 505d96061556d3bb5cec6234096ec5bc
+OPENTTD.GRF  = 51f9d2b8a29a079e83486db13509336c
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.

bin/baseset/orig_win.obm

@@ -10,52 +10,34 @@ version           = 1
 description       = Original Transport Tycoon Deluxe Windows edition music.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe musiek.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الموسيقية نسخة وندوز
-description.be_BY = Арыґінальны набор музычнага афармленьня з гульні Transport Tycoon Deluxe для Windows.
 description.bg_BG = Оригинална музика на Transport Tycoon Deluxe за Windows.
 description.ca_ES = Música Original de Transport Tycoon Deluxe per a Windows.
 description.cs_CZ = Původní hudba Transport Tycoon Deluxe (verze pro Windows).
-description.cy_GB = Cerddoriaeth gwreiddiol fersion Windows o Transport Tycoon Deluxe.
+description.da_DA = Originalmusik fra Transport Tycoon Deluxe Windows-version.
-description.da_DK = Originalmusik fra Transport Tycoon Deluxe Windows-version.
 description.de_DE = Original Transport Tycoon Deluxe Windows Musikset.
 description.el_GR = Αρχική μουσική από το Transport Tycoon Deluxe έκδοση Windows.
-description.en_AU = Original Transport Tycoon Deluxe Windows edition music.
+description.en_GB = Original Transport Tycoon Deluxe Windows edition music.
 description.en_US = Original Transport Tycoon Deluxe Windows edition music.
 description.es_ES = Música original de Transport Tycoon Deluxe versión Windows.
-description.et_EE = Algse Transport Tycoon Deluxe Windowsi versiooni muusika.
+description.et_ET = Algse Transport Tycoon Deluxe Windowsi versiooni muusika.
-description.fi_FI = Alkuperäinen Transport Tycoon Deluxen Windows-version musiikki.
+description.fi_FI = Alkuperäinen Transport Tycoon Deluxe Windows musiikki.
 description.fr_FR = Musiques originales de Transport Tycoon Deluxe (version Windows).
-description.ga_IE = Ceol bunaidh Transport Tycoon Deluxe, eagrán Windows.
-description.gd_GB = Ceòl aig an deasachadh Windows tùsail aig Transport Tycoon Deluxe.
-description.gl_ES = Música da edición orixinal de Transport Tycoon Deluxe para Windows.
 description.hr_HR = Originalna muzika za Transport Tycoon Deluxe Windows izdanje.
 description.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.lt_LT = Originali Transport Tycoon Deluxe Windows leidimo muzika.
-description.lv_LV = Oriģinālā Transport Tycoon Deluxe Windows izdevuma mūzika.
 description.nb_NO = Original musikk fra Transport Tycoon Deluxe for Windows.
 description.nl_NL = Originele muziek van de Transport Tycoon Deluxe Windows-versie.
 description.nn_NO = Original musikk frå Transport Tycoon Deluxe for Windows.
 description.pl_PL = Oryginalna edycja utworów muzycznych w Transport Tycoon Deluxe Windows.
-description.pt_BR = Música Original do Transport Tycoon Deluxe, Edição Windows
 description.pt_PT = Música original da edição Windows de Transport Tycoon Deluxe.
 description.ro_RO = Setul de muzică original al Transport Tycoon Deluxe pentru Windows.
-description.ru_RU = Оригинальный набор музыкального оформления из игры Transport Tycoon Deluxe для Windows.
+description.ru_RU = Оригинальный набор музыкального оформления из игры Transport Tycoon Deluxe.
 description.sk_SK = Pôvodná hudba z Transport Tycoon Deluxe (Windows).
-description.sl_SI = Originalna glasba Transport Tycoon Deluxe različice oken(windows).
+description.sl_SL = Originalna glasba Transport Tycoon Deluxe različice oken(windows).
 description.sr_RS = Originalni skup muzičkih numera Transport Tycoon Deluxe Windows izdanja.
 description.sv_SE = Originalmusiken från Transport Tycoon Deluxe, Windows-utgåvan.
-description.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் விண்டோஸ் பதிப்பு இசை.
+description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü müzikleri.
-description.th_TH = เพลงต้นตำหรับชอง Transport Tycoon Deluxe Windows edition
-description.tr_TR = Özgün Transport Tycoon Deluxe Windows sürümü müzikleri.
-description.uk_UA = Оригінальна музика з Transport Tycoon Deluxe Windows edition.
-description.vi_VN = Nhạc gốc từ phiên bản Transport Tycoon Deluxe trên Windows
-description.zh_CN = Transport Tycoon Deluxe（运输大亨Windows豪华版）的原版音乐包
 description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的音樂。
 
 [files]

bin/baseset/orig_win.obs

@@ -10,51 +10,34 @@ version           = 0
 description       = Original Transport Tycoon Deluxe Windows edition sounds.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe klanke.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الصوتية نسخة وندوز
-description.be_BY = Арыґінальны набор гукавога афармленьня з гульні Transport Tycoon Deluxe для Windows.
 description.bg_BG = Оригинални звуци на Transport Tycoon Deluxe за Windows.
 description.ca_ES = Sons originals de Transport Tycoon Deluxe per a Windows.
 description.cs_CZ = Původní sada zvuků Transport Tycoon Deluxe (verze pro Windows).
-description.cy_GB = Effeithiau sain gwreiddiol fersiwn Windows o Transport Tycoon Deluxe.
+description.da_DA = Originallyd fra Transport Tycoon Deluxe Windows-version.
-description.da_DK = Originallyd fra Transport Tycoon Deluxe Windows-version.
 description.de_DE = Original Transport Tycoon Deluxe Windows Basissounds.
 description.el_GR = Αρχικοί ήχοι από το Transport Tycoon Deluxe έκδοση Windows.
-description.en_AU = Original Transport Tycoon Deluxe Windows edition sounds.
+description.en_GB = Original Transport Tycoon Deluxe Windows edition sounds.
 description.en_US = Original Transport Tycoon Deluxe Windows edition sounds.
 description.es_ES = Sonidos originales de Transport Tycoon Deluxe versión Windows.
-description.et_EE = Algse Transport Tycoon Deluxe Windowsi versiooni helid.
+description.et_ET = Algse Transport Tycoon Deluxe Windowsi versiooni helid.
-description.fi_FI = Alkuperäiset Transport Tycoon Deluxen Windows-version äänet.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe Windows ää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.hr_HR = Originalni zvukovi za Transport Tycoon Deluxe Windows izdanje.
 description.hu_HU = Az eredeti Transport Tycoon Deluxe Windows verziójának hangjai.
+description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version Windows).
 description.id_ID = Efek suara orisinil Transport Tycoon Deluxe versi Windows.
-description.is_IS = Upprunalega hljóðið úr Transport Tycoon Deluxe Windows útgáfunni.
 description.it_IT = Suoni originali di Transport Tycoon Deluxe, edizione Windows.
-description.ja_JP = Transport Tycoon Deluxe オリジナル版 効果音 (Windows)
-description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 윈도 에디션의 효과음입니다.
-description.la_VA = Soni ex editione originale Transport Tycoon Deluxe Windows.
-description.lb_LU = Original Transport Tycoon Deluxe Windows Editioun Sound.
-description.lt_LT = Originalūs Transport Tycoon Deluxe Windows leidimo garsai.
 description.nb_NO = Originale lyder fra Transport Tycoon Deluxe for Windows.
 description.nl_NL = Originele geluiden van de Transport Tycoon Deluxe Windows-versie.
 description.nn_NO = Originale lydar frå Transport Tycoon Deluxe for Windows.
 description.pl_PL = Oryginalna edycja dźwięków dla Transport Tycoon Deluxe Windows.
-description.pt_BR = Sons Originais do Transport Tycoon Deluxe, Edição Windows.
 description.pt_PT = Sons originais da edição Windows de Transport Tycoon Deluxe.
 description.ro_RO = Setul de sunete original al Transport Tycoon Deluxe pentru Windows.
 description.ru_RU = Оригинальный набор звукового оформления из игры Transport Tycoon Deluxe для Windows.
 description.sk_SK = Pôvodné zvuky Transport Tycoon Deluxe (Windows).
-description.sl_SI = Originalni zvoki Transport Tycoon Deluxe različice oken(windows).
+description.sl_SL = Originalni zvoki Transport Tycoon Deluxe različice oken(windows).
 description.sr_RS = Originalni skup zvukova Transport Tycoon Deluxe Windows izdanja.
 description.sv_SE = Originalljuden från Transport Tycoon Deluxe, Windows-utgåvan.
-description.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் விண்டோஸ் பதிப்பு ஒலிகள்.
+description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü sesleri.
-description.th_TH = เสียงต้นตำหรับของ Transport Tycoon Deluxe Windows edition
-description.tr_TR = Özgün Transport Tycoon Deluxe Windows sürümü sesleri.
-description.uk_UA = Оригінальний набір звуків з Transport Tycoon Deluxe Windows edition.
-description.vi_VN = Âm thanh gốc từ phiên bản Transport Tycoon Deluxe trên Windows
-description.zh_CN = Transport Tycoon Deluxe Windows (运输大亨Windows豪华版)的原版音效包.
 description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的音效。
 
 [files]

bin/game/compat_1.2.nut

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

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

config.lib

@@ -72,7 +72,6 @@ set_default() {
 	with_zlib="1"
 	with_lzma="1"
 	with_lzo2="1"
-	with_xdg_basedir="1"
 	with_png="1"
 	enable_builtin_depend="1"
 	with_makedepend="0"
@@ -92,7 +91,6 @@ set_default() {
 	with_ccache="1"
 	with_nforenum="1"
 	with_grfcodec="1"
-	with_sse="1"
 
 	save_params_array="
 		build
@@ -147,7 +145,6 @@ set_default() {
 		with_zlib
 		with_lzma
 		with_lzo2
-		with_xdg_basedir
 		with_png
 		enable_builtin_depend
 		with_makedepend
@@ -167,8 +164,7 @@ set_default() {
 		with_ccache
 		with_grfcodec
 		with_nforenum
-		with_sse
+	CC CXX CFLAGS CXXFLAGS LDFLAGS"
-	CC CXX CFLAGS CXXFLAGS LDFLAGS CFLAGS_BUILD CXXFLAGS_BUILD LDFLAGS_BUILD"
 }
 
 detect_params() {
@@ -201,21 +197,21 @@ detect_params() {
 			--cpu-type)                   prev_p="cpu_type";;
 			--cpu-type=*)                 cpu_type="$optarg";;
 
-			--cc-build)                   prev_p="cc_build";;
+			--cc-build)                   prevp_p="cc_build";;
 			--cc-build=*)                 cc_build="$optarg";;
-			--cc-host)                    prev_p="cc_host";;
+			--cc-host)                    prevp_p="cc_host";;
 			--cc-host=*)                  cc_host="$optarg";;
-			--cxx-build)                  prev_p="cxx_build";;
+			--cxx-build)                  prevp_p="cxx_build";;
 			--cxx-build=*)                cxx_build="$optarg";;
-			--cxx-host)                   prev_p="cxx_host";;
+			--cxx-host)                   prevp_p="cxx_host";;
 			--cxx-host=*)                 cxx_host="$optarg";;
-			--windres)                    prev_p="windres";;
+			--windres)                    prevp_p="windres";;
 			--windres=*)                  windres="$optarg";;
-			--awk)                        prev_p="awk";;
+			--awk)                        prevp_p="awk";;
 			--awk=*)                      awk="$optarg";;
-			--strip)                      prev_p="strip";;
+			--strip)                      prevp_p="strip";;
 			--strip=*)                    strip="$optarg";;
-			--lipo)                       prev_p="lipo";;
+			--lipo)                       prevp_p="lipo";;
 			--lipo=*)                     lipo="$optarg";;
 
 			--endian)                     prev_p="endian";;
@@ -223,53 +219,52 @@ detect_params() {
 
 
 
-			# Alias --prefix with --prefix-dir, for compatibility with GNU autotools
+			--prefix-dir)                 prevp_p="prefix-dir";;
-			--prefix-dir | --prefix)      prev_p="prefix_dir";;
+			--prefix-dir=*)               prefix_dir="$optarg";;
-			--prefix-dir=* | --prefix=*)  prefix_dir="$optarg";;
 
-			--binary-dir)                 prev_p="binary_dir";;
+			--binary-dir)                 prevp_p="binary-dir";;
 			--binary-dir=*)               binary_dir="$optarg";;
 
-			--data-dir)                   prev_p="data_dir";;
+			--data-dir)                   prevp_p="data-dir";;
 			--data-dir=*)                 data_dir="$optarg";;
 
-			--doc-dir)                    prev_p="doc_dir";;
+			--doc-dir)                    prevp_p="doc-dir";;
 			--doc-dir=*)                  doc_dir="$optarg";;
 
-			--icon-dir)                   prev_p="icon_dir";;
+			--icon-dir)                   prevp_p="icon-dir";;
 			--icon-dir=*)                 icon_dir="$optarg";;
 
-			--icon-theme-dir)             prev_p="icon_theme_dir";;
+			--icon-theme-dir)             prevp_p="icon-theme-dir";;
 			--icon-theme-dir=*)           icon_theme_dir="$optarg";;
 			--without-icon-theme)         icon_theme_dir="";;
 
-			--menu-dir)                   prev_p="menu_dir";;
+			--menu-dir)                   prevp_p="menu_dir";;
 			--menu-dir=*)                 menu_dir="$optarg";;
 			--without-menu-entry)         menu_dir="";;
 
-			--menu-name)                  prev_p="menu_name";;
+			--menu-name)                  prevp_p="menu_name";;
 			--menu-name=*)                menu_name="$optarg";;
 
-			--binary-name)                prev_p="binary_name";;
+			--binary-name)                prevp_p="binary_name";;
 			--binary-name=*)              binary_name="$optarg";;
 
-			--man-dir)                    prev_p="man_dir";;
+			--man-dir)                    prevp_p="man_dir";;
 			--man-dir=*)                  man_dir="$optarg";;
 
-			--personal-dir)               prev_p="personal_dir";;
+			--personal-dir)               prevp_p="personal-dir";;
 			--personal-dir=*)             personal_dir="$optarg";;
 			--without-personal-dir)       personal_dir="";;
 
-			--shared-dir)                 prev_p="shared_dir";;
+			--shared-dir)                 prevp_p="shared-dir";;
 			--shared-dir=*)               shared_dir="$optarg";;
 			--without-shared-dir)         shared_dir="";;
 
-			--install-dir)                prev_p="install_dir";;
+			--install-dir)                prevp_p="install-dir";;
 			--install-dir=*)              install_dir="$optarg";;
 
 
 
-			--menu-group)                 prev_p="menu_group";;
+			--menu-group)                 prevp_p="menu_group";;
 			--menu-group=*)               menu_group="$optarg";;
 
 
@@ -351,13 +346,6 @@ detect_params() {
 			--without-liblzo2)            with_lzo2="0";;
 			--with-liblzo2=*)             with_lzo2="$optarg";;
 
-			--with-xdg-basedir)           with_xdg_basedir="2";;
-			--without-xdg-basedir)        with_xdg_basedir="0";;
-			--with-xdg-basedir=*)         with_xdg_basedir="$optarg";;
-			--with-libxdg-basedir)        with_xdg_basedir="2";;
-			--without-libxdg-basedir)     with_xdg_basedir="0";;
-			--with-libxdg-basedir=*)      with_xdg_basedir="$optarg";;
-
 			--with-png)                   with_png="2";;
 			--without-png)                with_png="0";;
 			--with-png=*)                 with_png="$optarg";;
@@ -449,18 +437,11 @@ detect_params() {
 			--with-threads)               with_threads="1";;
 			--with-threads=*)             with_threads="$optarg";;
 
-			--without-sse)                with_sse="0";;
-			--with-sse)                   with_sse="1";;
-			--with-sse=*)                 with_sse="$optarg";;
-
 			CC=* | --CC=*)                CC="$optarg";;
 			CXX=* | --CXX=*)              CXX="$optarg";;
 			CFLAGS=* | --CFLAGS=*)        CFLAGS="$optarg";;
 			CXXFLAGS=* | --CXXFLAGS=*)    CXXFLAGS="$optarg";;
 			LDFLAGS=* | --LDFLAGS=*)      LDFLAGS="$optarg";;
-			CFLAGS_BUILD=* | --CFLAGS_BUILD=* | --CFLAGS-BUILD=*)     CFLAGS_BUILD="$optarg";;
-			CXXFLAGS_BUILD=* | --CXXFLAGS_BUILD=* | --CXXFLAGS-BUILD=*) CXXFLAGS_BUILD="$optarg";;
-			LDFLAGS_BUILD=* | --LDFLAGS_BUILD=* | --LDFLAGS-BUILD=*)   LDFLAGS_BUILD="$optarg";;
 
 			--ignore-extra-parameters)    ignore_extra_parameters="1";;
 
@@ -526,10 +507,10 @@ check_params() {
 		log 1 " PREPROCESSOR is only available for OSX"
 		exit 1
 	fi
-	# OS only allows DETECT, UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, MORPHOS, BEOS, HAIKU, SUNOS, CYGWIN, MINGW, OS2, DOS, WINCE, and PSP
+	# OS only allows DETECT, UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, HAIKU, SUNOS, CYGWIN, MINGW, OS2, DOS, WINCE, and PSP
-	if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|DRAGONFLY|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS|WINCE|PSP)$'`" ]; then
+	if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS|WINCE|PSP)$'`" ]; then
 		log 1 "configure: error: invalid option --os=$os"
-		log 1 " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|DRAGONFLY|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS|WINCE|PSP]"
+		log 1 " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS|WINCE|PSP]"
 		exit 1
 	fi
 	# cpu_type can be either 32 or 64
@@ -593,7 +574,6 @@ check_params() {
 
 	check_makedepend
 	detect_cputype
-	detect_sse_capable_architecture
 
 	if [ "$enable_static" = "1" ]; then
 		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "DOS" ]; then
@@ -834,7 +814,6 @@ check_params() {
 		fi
 	fi
 
-	detect_xdg_basedir
 	detect_png
 	detect_freetype
 	detect_fontconfig
@@ -862,7 +841,7 @@ check_params() {
 		endian="PREPROCESSOR"
 	fi
 
-	log 1 "checking endianness... $endian"
+	log 1 "checking endianess... $endian"
 
 	# Suppress language errors when there is a version defined, indicating a release
 	#  It just isn't pretty if any release produces warnings in the languages.
@@ -1029,15 +1008,9 @@ check_params() {
 
 	if [ -d "$ROOT_DIR/.svn" ] && [ -n "`svn help 2>/dev/null`" ]; then
 		log 1 "checking revision... svn detection"
-	elif [ -d "$ROOT_DIR/../.svn" ] && [ -n "`svn help 2>/dev/null`" ] && [ -n "`LC_ALL=C svn info $ROOT_DIR/.. | grep '^URL:.*tags$'`" ]; then
-		# subversion changed its behaviour; now not all folders have a .svn folder,
-		# but only the root folder. Since making tags requires a (sparse) checkout
-		# of the tags folder, the folder of the tag does not have a .svn folder
-		# anymore and this fails to detect the subversion repository checkout.
-		log 1 "checking revision... svn detection (tag)"
 	elif [ -d "$ROOT_DIR/.git" ] && [ -n "`git help 2>/dev/null`" ]; then
 		log 1 "checking revision... git detection"
-	elif [ -d "$ROOT_DIR/.hg" ] && [ -n "`HGPLAIN= hg help 2>/dev/null`" ]; then
+	elif [ -d "$ROOT_DIR/.hg" ] && [ -n "`hg help 2>/dev/null`" ]; then
 		log 1 "checking revision... hg detection"
 	elif [ -f "$ROOT_DIR/.ottdrev" ]; then
 		log 1 "checking revision... source tarball"
@@ -1054,7 +1027,7 @@ check_params() {
 	fi
 
 	if [ "$doc_dir" = "1" ]; then
-		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "DRAGONFLY" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
+		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
 			doc_dir="share/doc/openttd"
 		else
 			doc_dir="$data_dir/docs"
@@ -1064,7 +1037,7 @@ check_params() {
 	fi
 
 	if [ "$icon_theme_dir" = "1" ]; then
-		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "DRAGONFLY" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
+		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
 			icon_theme_dir="share/icons/hicolor"
 		else
 			icon_theme_dir=""
@@ -1098,7 +1071,7 @@ check_params() {
 
 	if [ "$man_dir" = "1" ]; then
 		# add manpage on UNIX systems
-		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "DRAGONFLY" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OSX" ]; then
+		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OSX" ]; then
 			man_dir="share/man/man6"
 		else
 			man_dir=""
@@ -1109,7 +1082,7 @@ check_params() {
 
 	if [ "$menu_dir" = "1" ]; then
 		# add a freedesktop menu item only for some UNIX systems
-		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "DRAGONFLY" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
+		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
 			menu_dir="share/applications"
 		else
 			menu_dir=""
@@ -1326,8 +1299,8 @@ make_compiler_cflags() {
 
 		flags="$flags -Wall -Wno-multichar -Wsign-compare -Wundef"
 		flags="$flags -Wwrite-strings -Wpointer-arith"
-		flags="$flags -W -Wno-unused-parameter -Wredundant-decls"
+		flags="$flags -W -Wno-unused-parameter -Wformat=2"
-		flags="$flags -Wformat=2 -Wformat-security"
+		flags="$flags -Wredundant-decls"
 
 		if [ $enable_assert -eq 0 ]; then
 			# Do not warn about unused variables when building without asserts
@@ -1373,12 +1346,6 @@ make_compiler_cflags() {
 			cxxflags="$cxxflags -std=gnu++0x"
 		fi
 
-		if [ $cc_version -eq 45 ]; then
-			# Prevent optimisation supposing enums are in a range specified by the standard
-			# For details, see http://gcc.gnu.org/PR43680
-			flags="$flags -fno-tree-vrp"
-		fi
-
 		if [ $cc_version -ge 47 ]; then
 			# Disable -Wnarrowing which gives many warnings, such as:
 			# warning: narrowing conversion of '...' from 'unsigned int' to 'int' inside { } [-Wnarrowing]
@@ -1419,11 +1386,11 @@ make_compiler_cflags() {
 
 make_cflags_and_ldflags() {
 	# General CFlags for BUILD
-	CFLAGS_BUILD="$CFLAGS_BUILD"
+	CFLAGS_BUILD=""
 	# Special CXXFlags for BUILD
-	CXXFLAGS_BUILD="$CXXFLAGS_BUILD"
+	CXXFLAGS_BUILD=""
 	# LDFLAGS for BUILD
-	LDFLAGS_BUILD="$LDFLAGS_BUILD"
+	LDFLAGS_BUILD=""
 	# FEATURES for BUILD (lto)
 	FEATURES_BUILD=""
 	# General CFlags for HOST
@@ -1441,7 +1408,6 @@ make_cflags_and_ldflags() {
 	make_compiler_cflags "$cc_host" "CFLAGS" "CXXFLAGS" "LDFLAGS" "FEATURES"
 
 	CFLAGS="$CFLAGS -D$os"
-	CFLAGS_BUILD="$CFLAGS_BUILD -D$os"
 
 	if [ "$enable_debug" = "0" ]; then
 		# No debug, add default stuff
@@ -1451,17 +1417,19 @@ make_cflags_and_ldflags() {
 			LDFLAGS="$LDFLAGS -noixemul"
 		fi
 
-		if [ "$enable_profiling" = "0" ]; then
+		CFLAGS="-O2 -fomit-frame-pointer $CFLAGS"
-			# -fomit-frame-pointer and -pg do not go well together (gcc errors they are incompatible)
-			CFLAGS="-fomit-frame-pointer $CFLAGS"
-		fi
-		CFLAGS="-O2 $CFLAGS"
 	else
 		OBJS_SUBDIR="debug"
 
 		# Each debug level reduces the optimization by a bit
 		if [ $enable_debug -ge 1 ]; then
 			CFLAGS="$CFLAGS -g -D_DEBUG"
+			if basename "$cc_host" | grep "gcc" &>/dev/null; then
+				# Define only when compiling with GCC, some
+				# GLIBC versions use GNU extensions in a way
+				# that breaks build with at least ICC
+				CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
+			fi
 			if [ "$os" = "PSP" ]; then
 				CFLAGS="$CFLAGS -G0"
 			fi
@@ -1476,22 +1444,6 @@ make_cflags_and_ldflags() {
 		fi
 	fi
 
-	if [ $enable_debug -le 2 ]; then
-		cc_host_is_gcc=`basename "$cc_host" | grep "gcc" &>/dev/null`
-		if [ -n "$cc_host_is_gcc" ]; then
-			# Define only when compiling with GCC. Some GLIBC versions use GNU
-			# extensions in a way that breaks build with at least ICC.
-			# This requires -O1 or more, so debug level 3 (-O0) is excluded.
-			CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
-		fi
-
-		cc_build_is_gcc=`basename "$cc_build" | grep "gcc" &>/dev/null`
-		if [ -n "$cc_build_is_gcc" ]; then
-			# Just add -O1 to the tools needed for building.
-			CFLAGS_BUILD="$CFLAGS_BUILD -D_FORTIFY_SOURCE=2 -O1"
-		fi
-	fi
-
 	if [ "$os" = "OSX" ] && [ $cc_version -eq 40 ]; then
 		# Apple's GCC 4.0 has a compiler bug for x86_64 with (higher) optimization,
 		# wrongly optimizing ^= in loops. This disables the failing optimisation.
@@ -1499,16 +1451,13 @@ make_cflags_and_ldflags() {
 	fi
 
 	if [ "$enable_profiling" != "0" ]; then
-		CFLAGS="$CFLAGS -pg"
+		CFLAGS="$CFLAGS -p"
 		LDFLAGS="$LDFLAGS -pg"
 	fi
 
 	if [ "$with_threads" = "0" ]; then
 		CFLAGS="$CFLAGS -DNO_THREADS"
 	fi
-	if [ "$with_sse" = "1" ]; then
-		CFLAGS="$CFLAGS -DWITH_SSE"
-	fi
 
 	if [ "`echo $1 | cut -c 1-3`" != "icc" ]; then
 		if [ "$os" = "CYGWIN" ]; then
@@ -1516,29 +1465,23 @@ make_cflags_and_ldflags() {
 			LDFLAGS="$LDFLAGS -mwin32"
 		fi
 		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
-			if [ $cc_version -lt 46 ]; then
+			flags="$flags -mno-cygwin"
-				flags="$flags -mno-cygwin"
-				LDFLAGS="$LDFLAGS -mno-cygwin"
-			fi
 
 			if [ "$enable_console" != "0" ]; then
-				LDFLAGS="$LDFLAGS -Wl,--subsystem,console"
+				LDFLAGS="$LDFLAGS -mno-cygwin -Wl,--subsystem,console"
 			else
-				LDFLAGS="$LDFLAGS -Wl,--subsystem,windows"
+				LDFLAGS="$LDFLAGS -mno-cygwin -Wl,--subsystem,windows"
 			fi
 
-			LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32 -limm32"
+			LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32"
 
 			if [ $cc_version -ge 44 ]; then
 				LDFLAGS_BUILD="$LDFLAGS_BUILD -static-libgcc -static-libstdc++"
 			fi
-			if [ $cc_version -ge 47 ]; then
-				CFLAGS="$CFLAGS -mno-ms-bitfields"
-			fi
 		fi
 	fi
 
-	if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "DOS" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then
+	if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "FREEBSD" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "DOS" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then
 		LIBS="$LIBS -lpthread"
 	fi
 
@@ -1565,6 +1508,10 @@ make_cflags_and_ldflags() {
 		LIBS="$LIBS -pthread"
 	fi
 
+	if [ "$os" = "FREEBSD" ]; then
+		LIBS="$LIBS -lpthread"
+	fi
+
 	if [ "$os" = "OSX" ]; then
 		LDFLAGS="$LDFLAGS -framework Cocoa"
 
@@ -1583,7 +1530,7 @@ make_cflags_and_ldflags() {
 			LDFLAGS="$OSX_LD_SYSROOT $LDFLAGS"
 		fi
 
-		if [ "$enable_universal" = "0" ] && [ $cc_version -gt 40 ]; then
+		if [ "$enable_universal" = "0" ] && [ $cc_version -ge 40 ]; then
 			# Only set the min version when not doing an universal build.
 			# Universal builds set the version elsewhere.
 			if [ "$cpu_type" = "64" ]; then
@@ -1606,7 +1553,7 @@ make_cflags_and_ldflags() {
 	fi
 
 	# Most targets act like UNIX, just with some additions
-	if [ "$os" = "BEOS" ] || [ "$os" = "HAIKU" ] || [ "$os" = "OSX" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "DRAGONFLY" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OS2" ]; then
+	if [ "$os" = "BEOS" ] || [ "$os" = "HAIKU" ] || [ "$os" = "OSX" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OS2" ]; then
 		CFLAGS="$CFLAGS -DUNIX"
 	fi
 	# And others like Windows
@@ -1682,17 +1629,6 @@ make_cflags_and_ldflags() {
 		CFLAGS="$CFLAGS -DWITH_LZO"
 	fi
 
-	if [ -n "$xdg_basedir_config" ]; then
-		CFLAGS="$CFLAGS -DWITH_XDG_BASEDIR"
-		CFLAGS="$CFLAGS `$xdg_basedir_config --cflags | tr '\n\r' '  '`"
-
-		if [ "$enable_static" != "0" ]; then
-			LIBS="$LIBS `$xdg_basedir_config --libs --static | tr '\n\r' '  '`"
-		else
-			LIBS="$LIBS `$xdg_basedir_config --libs | tr '\n\r' '  '`"
-		fi
-	fi
-
 	# 64bit machines need -D_SQ64
 	if [ "$cpu_type" = "64" ] && [ "$enable_universal" = "0" ]; then
 		CFLAGS="$CFLAGS -D_SQ64"
@@ -1701,18 +1637,17 @@ make_cflags_and_ldflags() {
 
 	if [ -n "$png_config" ]; then
 		CFLAGS="$CFLAGS -DWITH_PNG"
-		CFLAGS="$CFLAGS `$png_config --cflags | tr '\n\r' '  '`"
+		CFLAGS="$CFLAGS `$png_config --cppflags --I_opts | tr '\n\r' '  '`"
 
+		# The extra flags are unneeded for latest libpng-config, but some versions are so broken...
 		if [ "$enable_static" != "0" ]; then
 			if [ "$os" = "OSX" ]; then
-				# fontconfig_config goes via pkg-config on all systems, which doesn't know --prefix
+				LIBS="$LIBS `$png_config --prefix`/lib/libpng.a"
-				# Also, despite the reason we link to the .a file ourself (because we can't use -static), we do need to ask pkg-config about possible other deps
-				LIBS="$LIBS `$png_config --variable=prefix`/lib/libpng.a `$png_config --libs --static | sed s@-lpng[0-9]*@@`"
 			else
-				LIBS="$LIBS `$png_config --libs --static | tr '\n\r' '  '`"
+				LIBS="$LIBS `$png_config --static --ldflags | tr '\n\r' '  '`"
 			fi
 		else
-			LIBS="$LIBS `$png_config --libs | tr '\n\r' '  '`"
+			LIBS="$LIBS `$png_config --ldflags | tr '\n\r' '  '`"
 		fi
 	fi
 
@@ -1755,9 +1690,9 @@ make_cflags_and_ldflags() {
 
 		# Some icu-configs have the 'feature' of not adding a space where others do add the space
 		if [ "$static_icu" != "0" ]; then
-			LIBS="$LIBS `$icu_config --ldflags-searchpath` `($icu_config --ldflags-libsonly; $icu_config --ldflags-layout) | tr '\n\r' '  ' | sed s/licu/lsicu/g`"
+			LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly | tr '\n\r' '  ' | sed s/licu/lsicu/g`"
 		else
-			LIBS="$LIBS `$icu_config --ldflags-searchpath` `($icu_config --ldflags-libsonly; $icu_config --ldflags-layout) | tr '\n\r' '  '`"
+			LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly | tr '\n\r' '  '`"
 		fi
 	fi
 
@@ -1791,7 +1726,7 @@ make_cflags_and_ldflags() {
 			fi
 		fi
 
-		if [ "$os" != "OSX" ] && [ "$have_non_const_iconv" != "no" ]; then
+		if [ "$have_non_const_iconv" != "no" ]; then
 			CFLAGS="$CFLAGS -DHAVE_NON_CONST_ICONV"
 		fi
 	fi
@@ -1836,7 +1771,6 @@ make_cflags_and_ldflags() {
 
 	if [ "$enable_assert" = "0" ]; then
 		CFLAGS="$CFLAGS -DNDEBUG"
-		CFLAGS_BUILD="$CFLAGS_BUILD -DNDEBUG"
 	fi
 
 	if [ "$enable_desync_debug" != "0" ]; then
@@ -1872,9 +1806,6 @@ make_cflags_and_ldflags() {
 		fi
 	fi
 
-	log 1 "using CFLAGS_BUILD... $CFLAGS_BUILD"
-	log 1 "using CXXFLAGS_BUILD... $CXXFLAGS_BUILD"
-	log 1 "using LDFLAGS_BUILD... $LDFLAGS_BUILD"
 	log 1 "using CFLAGS... $CFLAGS"
 	log 1 "using CXXFLAGS... $CXXFLAGS"
 	log 1 "using LDFLAGS... $LIBS $LDFLAGS"
@@ -2199,30 +2130,6 @@ check_makedepend() {
 	log 1 "checking makedepend... $makedepend"
 }
 
-check_version() {
-	# $1 - requested version (major.minor)
-	# $2 - version we got (major.minor)
-
-	if [ -z "$2" ]; then
-		return 0
-	fi
-
-	req_major=`echo $1 | cut -d. -f1`
-	got_major=`echo $2 | cut -d. -f1`
-	if [ $got_major -lt $req_major ]; then
-		return 0
-	elif [ $got_major -gt $req_major ]; then
-		return 1
-	fi
-
-	req_minor=`echo $1 | cut -d. -f2`
-	got_minor=`echo $2 | cut -d. -f2`
-	if [ $got_minor -lt $req_minor ]; then
-		return 0
-	fi
-	return 1
-}
-
 detect_awk() {
 	# Not all awks allow gsub(), so we test for that here! It is in fact all we need...
 
@@ -2264,54 +2171,52 @@ detect_awk() {
 
 detect_os() {
 	if [ "$os" = "DETECT" ]; then
-		# Detect UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, HPUX, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, DOS, WINCE, and PSP
+		# Detect UNIX, OSX, FREEBSD, OPENBSD, NETBSD, HPUX, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, DOS, WINCE, and PSP
 
 		# Try first via dumpmachine, then via uname
 		os=`echo "$host" | tr '[A-Z]' '[a-z]' | $awk '
-					/linux/        { print "UNIX";      exit}
+					/linux/        { print "UNIX";    exit}
-					/darwin/       { print "OSX";       exit}
+					/darwin/       { print "OSX";     exit}
-					/freebsd/      { print "FREEBSD";   exit}
+					/freebsd/      { print "FREEBSD"; exit}
-					/dragonfly/    { print "DRAGONFLY"; exit}
+					/openbsd/      { print "OPENBSD"; exit}
-					/openbsd/      { print "OPENBSD";   exit}
+					/netbsd/       { print "NETBSD";  exit}
-					/netbsd/       { print "NETBSD";    exit}
+					/hp-ux/        { print "HPUX";    exit}
-					/hp-ux/        { print "HPUX";      exit}
+					/morphos/      { print "MORPHOS"; exit}
-					/morphos/      { print "MORPHOS";   exit}
+					/beos/         { print "BEOS";    exit}
-					/beos/         { print "BEOS";      exit}
+					/haiku/        { print "HAIKU";   exit}
-					/haiku/        { print "HAIKU";     exit}
+					/sunos/        { print "SUNOS";   exit}
-					/sunos/        { print "SUNOS";     exit}
+					/solaris/      { print "SUNOS";   exit}
-					/solaris/      { print "SUNOS";     exit}
+					/cygwin/       { print "CYGWIN";  exit}
-					/cygwin/       { print "CYGWIN";    exit}
+					/mingw/        { print "MINGW";   exit}
-					/mingw/        { print "MINGW";     exit}
+					/os2/          { print "OS2";     exit}
-					/os2/          { print "OS2";       exit}
+					/dos/          { print "DOS";     exit}
-					/dos/          { print "DOS";       exit}
+					/wince/        { print "WINCE";   exit}
-					/wince/        { print "WINCE";     exit}
+					/psp/          { print "PSP";     exit}
-					/psp/          { print "PSP";       exit}
 		'`
 
 		if [ -z "$os" ]; then
 			os=`LC_ALL=C uname | tr '[A-Z]' '[a-z]' | $awk '
-					/linux/        { print "UNIX";      exit}
+					/linux/        { print "UNIX";    exit}
-					/darwin/       { print "OSX";       exit}
+					/darwin/       { print "OSX";     exit}
-					/freebsd/      { print "FREEBSD";   exit}
+					/freebsd/      { print "FREEBSD"; exit}
-					/dragonfly/    { print "DRAGONFLY"; exit}
+					/openbsd/      { print "OPENBSD"; exit}
-					/openbsd/      { print "OPENBSD";   exit}
+					/netbsd/       { print "NETBSD";  exit}
-					/netbsd/       { print "NETBSD";    exit}
+					/hp-ux/        { print "HPUX";    exit}
-					/hp-ux/        { print "HPUX";      exit}
+					/morphos/      { print "MORPHOS"; exit}
-					/morphos/      { print "MORPHOS";   exit}
+					/beos/         { print "BEOS";    exit}
-					/beos/         { print "BEOS";      exit}
+					/haiku/        { print "HAIKU";   exit}
-					/haiku/        { print "HAIKU";     exit}
+					/sunos/        { print "SUNOS";   exit}
-					/sunos/        { print "SUNOS";     exit}
+					/cygwin/       { print "CYGWIN";  exit}
-					/cygwin/       { print "CYGWIN";    exit}
+					/mingw/        { print "MINGW";   exit}
-					/mingw/        { print "MINGW";     exit}
+					/os\/2/        { print "OS2";     exit}
-					/os\/2/        { print "OS2";       exit}
+					/gnu/          { print "UNIX";    exit}
-					/gnu/          { print "UNIX";      exit}
 			'`
 		fi
 
 		if [ -z "$os" ]; then
 			log 1 "detecting OS... none detected"
 			log 1 "I couldn't detect your OS. Please use --os=OS to force one"
-			log 1 "Allowed values are: UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, MORPHOS, HPUX, BEOS, HAIKU, SUNOS, CYGWIN, MINGW, OS2, DOS, WINCE, and PSP"
+			log 1 "Allowed values are: UNIX, OSX, FREEBSD, OPENBSD, NETBSD, MORPHOS, HPUX, BEOS, HAIKU, SUNOS, CYGWIN, MINGW, OS2, DOS, WINCE, and PSP"
 			exit 1
 		fi
 
@@ -2719,64 +2624,42 @@ detect_libtimidity() {
 	detect_library "$with_libtimidity" "libtimidity" "libtimidity.a" "" "timidity.h"
 }
 
-detect_pkg_config() {
+detect_lzma() {
-	# $1 - config-param ($with_lzma value)
-	# $2 - package name ('liblzma')
-	# $3 - config name ('lzma_config', sets $lzma_config)
-	# $4 - minimum module version ('2.3')
-
 	# 0 means no, 1 is auto-detect, 2 is force
-	if [ "$1" = "0" ]; then
+	if [ "$with_lzma" = "0" ]; then
-		log 1 "checking $2... disabled"
+		log 1 "checking liblzma... disabled"
 
-		eval "$3=\"\""
+		lzma_config=""
 		return 0
 	fi
 
-	log 2 "detecting $2"
+	if [ "$with_lzma" = "1" ] || [ "$with_lzma" = "" ] || [ "$with_lzma" = "2" ]; then
-
+		lzma_config="pkg-config liblzma"
-	if [ "$1" = "1" ] || [ "$1" = "" ] || [ "$1" = "2" ]; then
-		pkg_config_call="pkg-config $2"
 	else
-		pkg_config_call="$1"
+		lzma_config="$with_lzma"
 	fi
 
-	version=`$pkg_config_call --modversion 2>/dev/null`
+	version=`$lzma_config --modversion 2>/dev/null`
 	ret=$?
-	check_version "$4" "$version"
+	log 2 "executing $lzma_config --modversion"
-	version_ok=$?
-	log 2 "executing $pkg_config_call --modversion"
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 
-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version_ok" != "1" ]; then
+	if [ -z "$version" ] || [ "$ret" != "0" ]; then
-		if [ -n "$version" ] && [ "$version_ok" != "1" ]; then
+		log 1 "checking liblzma... not found"
-			log 1 "checking $2... needs at least version $4, $2 NOT enabled"
-		else
-			log 1 "checking $2... not found"
-		fi
 
 		# It was forced, so it should be found.
-		if [ "$1" != "1" ]; then
+		if [ "$with_lzma" != "1" ]; then
-			log 1 "configure: error: pkg-config $2 couldn't be found"
+			log 1 "configure: error: pkg-config liblzma couldn't be found"
-			log 1 "configure: error: you supplied '$1', but it seems invalid"
+			log 1 "configure: error: you supplied '$with_lzma', but it seems invalid"
 			exit 1
 		fi
 
-		eval "$3=\"\""
+		lzma_config=""
 		return 0
 	fi
 
-	eval "$3=\"$pkg_config_call\""
+	log 1 "checking liblzma... found"
-	log 1 "checking $2... found"
-}
-
-detect_lzma() {
-	detect_pkg_config "$with_lzma" "liblzma" "lzma_config" "5.0"
-}
-
-detect_xdg_basedir() {
-	detect_pkg_config "$with_xdg_basedir" "libxdg-basedir" "xdg_basedir_config" "1.2"
 }
 
 detect_png() {
@@ -2803,7 +2686,33 @@ detect_png() {
 		return 0
 	fi
 
-	detect_pkg_config "$with_png" "libpng" "png_config" "1.2"
+	if [ "$with_png" = "1" ] || [ "$with_png" = "" ] || [ "$with_png" = "2" ]; then
+		png_config="libpng-config"
+	else
+		png_config="$with_png"
+	fi
+
+	version=`$png_config --version 2>/dev/null`
+	ret=$?
+	log 2 "executing $png_config --version"
+	log 2 "  returned $version"
+	log 2 "  exit code $ret"
+
+	if [ -z "$version" ] || [ "$ret" != "0" ]; then
+		log 1 "checking libpng... not found"
+
+		# It was forced, so it should be found.
+		if [ "$with_png" != "1" ]; then
+			log 1 "configure: error: libpng-config couldn't be found"
+			log 1 "configure: error: you supplied '$with_png', but it seems invalid"
+			exit 1
+		fi
+
+		png_config=""
+		return 0
+	fi
+
+	log 1 "checking libpng... found"
 }
 
 detect_freetype() {
@@ -2898,7 +2807,38 @@ detect_fontconfig() {
 		return 0
 	fi
 
-	detect_pkg_config "$with_fontconfig" "fontconfig" "fontconfig_config" "2.3"
+	if [ "$with_fontconfig" = "1" ] || [ "$with_fontconfig" = "" ] || [ "$with_fontconfig" = "2" ]; then
+		fontconfig_config="pkg-config fontconfig"
+	else
+		fontconfig_config="$with_fontconfig"
+	fi
+
+	version=`$fontconfig_config --modversion 2>/dev/null`
+	ret=$?
+	shortversion=`echo $version | cut -c 1,3`
+	log 2 "executing $fontconfig_config --modversion"
+	log 2 "  returned $version"
+	log 2 "  exit code $ret"
+
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$shortversion" -le "22" ]; then
+		if [ -n "$shortversion" ] && [ "$shortversion" -le "22" ]; then
+			log 1 "checking libfontconfig... needs at least version 2.3.0, fontconfig NOT enabled"
+		else
+			log 1 "checking libfontconfig... not found"
+		fi
+
+		# It was forced, so it should be found.
+		if [ "$with_fontconfig" != "1" ]; then
+			log 1 "configure: error: fontconfig-config couldn't be found"
+			log 1 "configure: error: you supplied '$with_fontconfig', but it seems invalid"
+			exit 1
+		fi
+
+		fontconfig_config=""
+		return 0
+	fi
+
+	log 1 "checking libfontconfig... found"
 }
 
 detect_icu() {
@@ -2924,14 +2864,13 @@ detect_icu() {
 
 	version=`$icu_config --version 2>/dev/null`
 	ret=$?
-	check_version '3.6' "$version"
+	shortversion=`echo $version | cut -d\. -f1,2 | sed "s/\.//g" | cut -c1-2`
-	version_ok=$?
 	log 2 "executing $icu_config --version"
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 
-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version_ok" != "1" ]; then
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$shortversion" -lt "36" ]; then
-		if [ -n "$version" ] && [ "$version_ok" != "1" ]; then
+		if [ -n "$shortversion" ] && [ "$shortversion" -lt "36" ]; then
 			log 1 "checking libicu... needs at least version 3.6.0, icu NOT enabled"
 		else
 			log 1 "checking libicu... not found"
@@ -2940,7 +2879,7 @@ detect_icu() {
 		# It was forced, so it should be found.
 		if [ "$with_icu" != "1" ]; then
 			log 1 "configure: error: icu-config couldn't be found"
-			log 1 "configure: error: you supplied '$with_icu', but it seems invalid"
+			log 1 "configure: error: you supplied '$with_icuconfig', but it seems invalid"
 			exit 1
 		fi
 
@@ -3181,9 +3120,9 @@ detect_grfcodec() {
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 
-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "985" ]; then
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "913" ]; then
-		if [ -n "$version" ] && [ "$version" -lt "985" ]; then
+		if [ -n "$version" ] && [ "$version" -lt "913" ]; then
-			log 1 "checking grfcodec... needs at least version 6.0.5 (r985), disabled"
+			log 1 "checking grfcodec... needs at least version 5.1.4 (r913), disabled"
 		else
 			log 1 "checking grfcodec... not found"
 		fi
@@ -3223,9 +3162,9 @@ detect_nforenum() {
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 
-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "985" ]; then
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "913" ]; then
-		if [ -n "$version" ] && [ "$version" -lt "985" ]; then
+		if [ -n "$version" ] && [ "$version" -lt "913" ]; then
-			log 1 "checking nforenum... needs at least version 6.0.5 (r985), disabled"
+			log 1 "checking nforenum... needs at least version 5.1.4 (r913), disabled"
 		else
 			log 1 "checking nforenum... not found"
 		fi
@@ -3264,40 +3203,6 @@ detect_cputype() {
 	rm -f tmp.64bit tmp.64bit.cpp
 }
 
-detect_sse_capable_architecture() {
-	# 0 means no, 1 is auto-detect, 2 is force
-	if [ "$with_sse" = "0" ]; then
-		log 1 "checking SSE... disabled"
-		return
-	fi
-
-	echo "#define _SQ64 1" > tmp.sse.cpp
-	echo "#include <xmmintrin.h>" >> tmp.sse.cpp
-	echo "#include <smmintrin.h>" >> tmp.sse.cpp
-	echo "#include <tmmintrin.h>" >> tmp.sse.cpp
-	echo "int main() { return 0; }" >> tmp.sse.cpp
-	execute="$cxx_host -msse4.1 $CFLAGS tmp.sse.cpp -o tmp.sse 2>&1"
-	sse="`eval $execute 2>/dev/null`"
-	ret=$?
-	log 2 "executing $execute"
-	log 2 "  returned $sse"
-	log 2 "  exit code $ret"
-	if [ "$ret" = "0" ]; then
-		log 1 "detecting SSE... found"
-	else
-		# It was forced, so it should be found.
-		if [ "$with_sse" != "1" ]; then
-			log 1 "configure: error: SSE couln't be found"
-			log 1 "configure: error: you force enabled SSE, but it seems unavailable"
-			exit 1
-		fi
-
-		log 1 "detecting SSE... not found"
-		with_sse="0"
-	fi
-	rm -f tmp.sse tmp.exe tmp.sse.cpp
-}
-
 make_sed() {
 	T_CFLAGS="$CFLAGS"
 	T_CXXFLAGS="$CXXFLAGS"
@@ -3475,7 +3380,7 @@ generate_settings() {
 }
 
 generate_grf() {
-	STAGE="[BASESET]"
+	STAGE="[GRF]"
 
 	make_sed
 
@@ -3525,7 +3430,7 @@ generate_src_osx() {
 				CFLAGS="-isysroot $osx_sdk_path $CFLAGS_orig"
 				LDFLAGS="-Wl,-syslibroot,$osx_sdk_path $LDFLAGS_orig"
 			fi
-			CFLAGS="$CFLAGS -D_SQ64 -DNO_QUICKTIME -UENABLE_COCOA_QUICKDRAW"
+			CFLAGS="$CFLAGS -D_SQ64 -DHAVE_NON_CONST_ICONV -DNO_QUICKTIME -UENABLE_COCOA_QUICKDRAW"
 			LIBS="`echo $LIBS | sed 's/-framework QuickTime//'`"
 		fi
 
@@ -3590,9 +3495,9 @@ showhelp() {
 	echo "  --awk=AWK                      the awk to use in configure [awk]"
 	echo "  --lipo=LIPO                    the lipo to use (OSX ONLY) [HOST-lipo]"
 	echo "  --os=OS                        the OS we are compiling for [DETECT]"
-	echo "                                 DETECT/UNIX/OSX/FREEBSD/DRAGONFLY/OPENBSD/"
+	echo "                                 DETECT/UNIX/OSX/FREEBSD/OPENBSD/NETBSD/"
-	echo "                                 NETBSD/MORPHOS/HPUX/BEOS/SUNOS/CYGWIN/"
+	echo "                                 MORPHOS/HPUX/BEOS/SUNOS/CYGWIN/MINGW/OS2/"
-	echo "                                 MINGW/OS2/DOS/WINCE/PSP/HAIKU"
+	echo "                                 DOS/WINCE/PSP/HAIKU"
 	echo "  --endian=ENDIAN                set the endian of the HOST (AUTO/LE/BE)"
 	echo ""
 	echo "Paths:"
@@ -3668,16 +3573,13 @@ showhelp() {
 	echo "  --with-cocoa                   enables COCOA video driver (OSX ONLY)"
 	echo "  --with-sdl[=sdl-config]        enables SDL video driver support"
 	echo "  --with-zlib[=zlib.a]           enables zlib support"
-	echo "  --with-liblzma[=\"pkg-config liblzma\"]"
+	echo "  --with-liblzma[=liblzma.a]     enables liblzma support"
-	echo "                                 enables liblzma support"
 	echo "  --with-liblzo2[=liblzo2.a]     enables liblzo2 support"
 	echo "  --with-png[=libpng-config]     enables libpng support"
 	echo "  --with-freetype[=freetype-config]"
 	echo "                                 enables libfreetype support"
-	echo "  --with-fontconfig[=\"pkg-config fontconfig\"]"
+	echo "  --with-fontconfig[=pkg-config fontconfig]"
 	echo "                                 enables fontconfig support"
-	echo "  --with-xdg-basedir[=\"pkg-config libxdg-basedir\"]"
-	echo "                                 enables XDG base directory support"
 	echo "  --with-icu[=icu-config]        enables icu (used for right-to-left support)"
 	echo "  --static-icu                   try to link statically (libsicu instead of"
 	echo "                                 libicu; can fail as the new name is guessed)"
@@ -3687,9 +3589,6 @@ showhelp() {
 	echo "  --with-makedepend[=makedepend] enables makedepend support"
 	echo "  --with-ccache                  enables ccache support"
 	echo "  --with-distcc                  enables distcc support"
-	echo "  --without-grfcodec             disable usage of grfcodec and re-generation of base sets"
-	echo "  --without-threads              disable threading support"
-	echo "  --without-sse                  disable SSE support (x86/x86_64 only)"
 	echo ""
 	echo "Some influential environment variables:"
 	echo "  CC                             C compiler command"
@@ -3700,9 +3599,6 @@ showhelp() {
 	echo "  LDFLAGS                        linker flags, e.g. -L<lib dir> if you"
 	echo "                                 have libraries in a nonstandard"
 	echo "                                 directory <lib dir>"
-	echo "  CFLAGS_BUILD                   C compiler flags for build time tool generation"
-	echo "  CXXFLAGS_BUILD                 C++ compiler flags for build time tool generation"
-	echo "  LDFLAGS_BUILD                  linker flags for build time tool generation"
 	echo ""
 	echo "Use these variables to override the choices made by 'configure' or to help"
 	echo "it to find libraries and programs with nonstandard names/locations."

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;
 

docs/admin_network.txt

@@ -150,8 +150,7 @@ Table of contents
 
   Note: No additional authentication is required for rcon commands.
 
-  The server will reply with one or more ADMIN_PACKET_SERVER_RCON packets.
+  The server will reply with a ADMIN_PACKET_SERVER_RCON packet. Applications
-  Finally an ADMIN_PACKET_ADMIN_RCON_END packet will be sent. Applications
   will not receive the answer twice if they have asked for the AdminUpdateType
   ADMIN_UPDATE_CONSOLE, as the result is not printed on the servers console
   (just like clients rcon commands).
@@ -161,13 +160,6 @@ Table of contents
   Chat from the server itself will only be sent to the admin network when it
   was not sent from the admin network.
 
-  Note that when content is queried or updated via rcon, the processing
-  happens asynchronously. But the ADMIN_PACKET_ADMIN_RCON_END packet is sent
-  already right after the content is requested as there's no immediate output.
-  Thus other packages and the output of content rcon command may be sent at
-  an arbitrary later time, mixing into the output of other console activity,
-  e.g. also of possible subsequent other rcon commands sent.
-
 
 5.0) Sending chat
 ---- ------------

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
+ <p>Eight attributes (counting &quot;<span style="font-weight: bold;">type_height</span>&quot;) hold the informations about a tile.<BR>
-  &quot;<span style="font-weight: bold;">height</span>&quot;) hold the informations about a tile.<BR>
   These attributes are referred to as
-  &quot;<span style="font-weight: bold;">type</span>",
+  &quot;<span style="font-weight: bold;">type_height</span>",
-  &quot;<span style="font-weight: bold;">height</span>",
   &quot;<span style="font-weight: bold;">m1</span>&quot;, &quot;<span style="font-weight: bold;">m2</span>&quot;,
   &quot;<span style="font-weight: bold;">m3</span>&quot;, &quot;<span style="font-weight: bold;">m4</span>&quot;,
   &quot;<span style="font-weight: bold;">m5</span>&quot;, &quot;<span style="font-weight: bold;">m6</span>&quot;
   and "<span style="font-weight: bold;">m7</span>".<br>
   The most important value is the class of a tile, stored in the upper 4 bits
-  of the <span style="font-weight: bold;">type</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>m2: index into the array of objects
-     <li>m3: random bits</li>
+     <li>m3: random bits
-     <li>m5: index into the array of objects, bits 16 to 23 (lower bits in m2)</li>
+     <li>m5: tile type:
-     <li>m7: animation counter</li>
+      <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

@@ -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;">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;">height</span> - 8 bits in size, stores tile height</li>
   <li><span style="font-weight: bold;">m1</span> - 8 bits in size, used to identify the owner of that tile (eg piece of rail, bridge, etc.)</li>
   <li><span style="font-weight: bold;">m2</span> - 16 bits in size, used to identify the index of the given tile (object) in the (object-)array</li>
   <li><span style="font-weight: bold;">m3</span> - 8 bits in size, is used for general storage</li>
   <li><span style="font-weight: bold;">m4</span> - 8 bits in size, is used for general storage</li>
   <li><span style="font-weight: bold;">m5</span> - 8 bits in size, is used for general storage</li>
-  <li><span style="font-weight: bold;">m6</span> - 8 bits in size, 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>type_height (8)</th>
-      <th>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">XX<span class="free">O</span>X <span class="free">O</span>XXX</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 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"><span class="free">OOOO OOOO</span></td>
-      <td class="bits">XXXX <span class="free">OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits">XXX<span class="free">O</span> XXXX</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">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX X<span class="free">O</span>XX</td>
     </tr>
     <tr>
       <td>bridge ramp</td>
@@ -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">XXXX XXXX</td>
-      <td class="bits"><span class="free">OO</span>XX XX<span class="free">OO</span></td>
       <td class="bits">-inherit-</td>
     </tr>
     <tr>
       <td rowspan=2>A</td>
       <td class="caption">objects</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">O</span>XXX XXXX</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><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 Ar [level | cat=lvl[,...]]
-.Op Fl D Oo Ar host Oc Ns Op : Ns Ar port
+.Op Fl D Ar [host][:port]
-.Op Fl g Op Ar savegame
+.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
+Set the blitter, see
-.Ar blitter ;
-see
 .Fl h
-for a full list.
+for a full list
 .It Fl c Ar config_file
-Use
+Use 'config_file' instead of 'openttd.cfg'
-.Ar config_file
-instead of
-.Pa openttd.cfg .
 .It Fl d Ar [level]
 Set debug verbosity for all categories to
-.Ar level ,
+.Ar level
-or 1 if omitted.
+or 1 if omitted
-.It Fl d Ar cat Ns = Ns Ar lvl Ns Op , Ns Ar ...
+.It Fl d Ar cat=level[,...]
-Set debug verbosity to
+Set debug verbosity for a specific category
-.Ar lvl
+.It Fl D Ar [host][:port]
-for a specific category
+Start a dedicated server. Sets network debug level to 6. If you want to change this, use
-.Ar cat .
-.It Fl D Oo Ar host Oc Ns Op : Ns Ar port
-Start a dedicated server.
-.Pp
-Network debug level will be set to 6.
-If you want to change this, set
 .Fl d
-after setting
+after
-.Fl D .
+.Fl D
+.It Fl G Ar seed
+Seed the pseudo random number generator
 .It Fl e
-Start in world editor mode.
+Start in world editor mode
 .It Fl f
 Fork into background (dedicated server only, see
-.Fl D ) .
+.Fl D )
-.It Fl g Op Ar savegame
+.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
+must be either absolute or relative to the current path or one of the search paths.
-the search paths.
-.It Fl G Ar seed
-Seed the pseudo random number generator with
-.Ar seed .
 .It Fl h
-Display a summary of all options and list all the available AIs, blitters,
+Display a summary of all options and lists all the available AIs, blitters, sound, music and video drivers, graphics sets and sound sets.
-sound, music and video drivers, graphics sets and sound sets.
 .It Fl I Ar graphicsset
-Select the graphics set
+Set the graphics set, see
-.Ar graphicsset ;
-see
 .Fl h
-for a full list.
+for a full list
-.It Fl l Ar host Ns Op : Ns Ar port
+.It Fl l Ar host[:port]
-Redirect
+Redirect DEBUG(), See
-.Fn DEBUG
+.Fl D
-output; see
-.Fl D .
 .It Fl m Ar driver
-Select the music driver
+Set the music driver, see
-.Ar driver ;
-see
 .Fl h
-for a full list.
+for a full list
 .It Fl M Ar musicset
-Select the music set
+Set the music set, see
-.Ar musicset ;
-see
 .Fl h
-for a full list.
+for a full list
-.It Fl n Ar host Ns Oo : Ns Ar port Oc Ns Op # Ns Ar player
+.It Fl n Ar host[:port][#player]
-Join a network game, optionally specifying a port to connect to and player to
+Join a network game, optionally specify a port to connect to and player to play as
-play as.
 .It Fl p Ar password
-Password used to join server.
+Password used to join server. Only useful with
-Only useful with
+.Fl n
-.Fl n .
 .It Fl P Ar password
-Password used to join company.
+Password used to join company. Only useful with
-Only useful with
+.Fl n
-.Fl n .
 .It Fl q Ar savegame
-Write some information about the specified savegame and exit.
+Write some information about the savegame and exit
-.It Fl r Ar width Ns x Ns Ar height
+.It Fl r Ar widthxheight
-Set the resolution to
+Set the resolution
-.Ar width
-\(mu
-.Ar height
-pixels.
 .It Fl s Ar driver
-Select the sound driver
+Set the sound driver, see
-.Ar driver ;
-see
 .Fl h
-for a full list.
+for a full list
 .It Fl S Ar soundset
-Select the sound set
+Set the sound set, see
-.Ar soundset ;
-see
 .Fl h
-for a full list.
+for a full list
 .It Fl t Ar year
-Set the starting year to
+Set the starting year
-.Ar year .
 .It Fl v Ar driver
-Select the video driver
+Set the video driver, see
-.Ar driver ;
-see
 .Fl h
-for a full list.
+for a full list
 .It Fl x
-Do not automatically save to config file on exit.
+Do not automatically save to config file on exit
 .El
 .Sh SEE ALSO
-.Lk https://wiki.openttd.org "Wiki"
+http://wiki.openttd.org/, http://www.openttd.org
-(includes community maintained manual),
-.Lk https://forum.openttd.org "Forum",
-.Lk https://www.openttd.org "News"
 .Sh HISTORY
 Transport Tycoon Deluxe was written by Chris Sawyer and published by Microprose.
 .Nm

findversion.sh

@@ -70,7 +70,7 @@ ROOT_DIR=`pwd`
 # Determine if we are using a modified version
 # Assume the dir is not modified
 MODIFIED="0"
-if [ -d "$ROOT_DIR/.svn" ] || [ -d "$ROOT_DIR/../.svn" ]; then
+if [ -d "$ROOT_DIR/.svn" ]; then
 	# We are an svn checkout
 	if [ -n "`svnversion | grep 'M'`" ]; then
 		MODIFIED="2"
@@ -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$@@'`"
+	BRANCH="`hg branch | sed 's@^default$@@'`"
-	TAG="`HGPLAIN= hg id -t | grep -v 'tip$'`"
+	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,13 +1,14 @@
 OpenTTD's known bugs
-Last updated:    2015-08-01
+Last updated:    2012-05-16
-Release version: 1.5.2-RC1
+Release version: 1.2.1-RC1
 ------------------------------------------------------------------------
 
 
 Table of contents
 -----------------
 1.0) About
-2.0) Known bugs
+2.0) Known bugs in this release
+ * 2.1) Known bugs that will not be solved
 
 
 1.0) About
@@ -16,13 +17,37 @@ All bugs listed below are marked as known. Please do not submit any bugs
 that are the same as these. If you do, do not act surprised, because
 we WILL flame you!!
 
-The current list of known bugs that we intend to fix can be found in our
+Of course if you have more knowledge about any of these bugs, have more
-bug tracking system at: http://bugs.openttd.org
+specifics, we welcome you to report them. React to the given bug indicated
-Also check the closed bugs when searching for your bug in this system as
+by the number below on http://bugs.openttd.org.
-we might have fixed the bug in the mean time.
 
 
-2.0) Known bugs
+2.0) Known bugs in this release
+---- --------------------------
+The following bugs are known to exist in this release and we intend to
+fix them. Some bugs are known but are not fixable or fixing them would
+cause further problems. Those bugs can be found in the "Known bugs that
+will not be solved" section.
+
+The bugs in this section all refer to a ticket in our bug tracking system
+that you can find at: http://bugs.openttd.org
+If the bugs are closed but still listed here it means that the bug is fixed
+and that the nightlies and next major release will not have that bug.
+
+Issues prefixed with [OSX] are required to be fixed before we consider
+officially supporting Mac OS X again. For now it remains unsupported and
+we only apply bug fixes provided by the community but we are unable to fix
+these bugs ourselves.
+
+- 5154	Crash about old language when there is an error in misc settings
+- 4857	[OSX] No support for detecting mono space font
+- 4847	[OSX] No support for bootstrap downloading of base graphics
+- 4744  [OSX] Crash when switching to full screen with OS X Lion
+- 4689  [OSX] Crash when hiding window after coming from full screen
+- 4420  [OSX] OS' mouse pointer still shows
+- 2484  [OSX] Cannot enter CJK characters
+
+2.1) Known bugs that will not be solved
 ---- ----------------------------------
 This section lists all known bugs that we do not intend to fix and the
 reasons why we think that fixing them is infeasible. We might make some
@@ -33,13 +58,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
+	for this problem: you must change the settings so no AI is started,
-	no AI is started. You find that setting at the top of the window in the
+	this is done in the difficulty settings window. The other solution is
-	"AI / Game Scripts Settings" window.
+	acquiring (downloading) some AI. The easiest way to do this is via
-	The other solution is acquiring (downloading) some AI. The easiest way
+	the "Check Online Content" button in the main (intro) menu or via
-	to do this is via the "Check Online Content" button in the main (intro)
+	"AI Settings" -> "Select AI" -> "Check Online Content" which is also
-	menu or directly in the "AI / Game Scripts Settings" dialogue via the
+	accessed via the main menu.
-	"Check Online Content" button.
 
 After a while of playing, colours get corrupted
 	In Windows 7 the background slideshow corrupts the colour mapping of
@@ -404,52 +428,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/no_music.obm

@@ -1,50 +0,0 @@
-; $Id$
-;
-; This represents more or less nothingness
-;
-[metadata]
-name              = NoMusic
-shortname         = NULL
-version           = 0
-fallback          = true
-!! description STR_BASEMUSIC_NONE_DESCRIPTION
-
-[files]
-theme =
-old_0 =
-old_1 =
-old_2 =
-old_3 =
-old_4 =
-old_5 =
-old_6 =
-old_7 =
-old_8 =
-old_9 =
-new_0 =
-new_1 =
-new_2 =
-new_3 =
-new_4 =
-new_5 =
-new_6 =
-new_7 =
-new_8 =
-new_9 =
-ezy_0 =
-ezy_1 =
-ezy_2 =
-ezy_3 =
-ezy_4 =
-ezy_5 =
-ezy_6 =
-ezy_7 =
-ezy_8 =
-ezy_9 =
-
-[md5s]
-
-[names]
-
-[origin]
-default      = This file was part of your OpenTTD installation.

media/baseset/no_sound.obs

@@ -1,18 +0,0 @@
-; $Id$
-;
-; This represents more or less nothingness
-;
-[metadata]
-name              = NoSound
-shortname         = NULL
-version           = 2
-fallback          = true
-!! description STR_BASESOUNDS_NONE_DESCRIPTION
-
-[files]
-samples      =
-
-[md5s]
-
-[origin]
-default      = This file was part of your OpenTTD installation.

media/baseset/orig_dos.obg

@@ -1,31 +0,0 @@
-; $Id$
-;
-; This represents the original graphics as on the non-German Transport
-; Tycoon Deluxe DOS CD.
-;
-[metadata]
-name              = original_dos
-shortname         = TTDD
-version           = 1
-palette           = DOS
-!! description STR_BASEGRAPHICS_DOS_DESCRIPTION
-
-[files]
-base         = TRG1.GRF
-logos        = TRGI.GRF
-arctic       = TRGC.GRF
-tropical     = TRGH.GRF
-toyland      = TRGT.GRF
-extra        = OPENTTD.GRF
-
-[md5s]
-TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
-TRGC.GRF     = ed446637e034104c5559b32c18afe78d
-TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF  =
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTD.GRF  = This file was part of your OpenTTD installation.

media/baseset/orig_dos.obs

@@ -1,19 +0,0 @@
-; $Id$
-;
-; This represents the original sounds as on the Transport
-; Tycoon Deluxe DOS CD.
-;
-[metadata]
-name              = original_dos
-shortname         = TTDO
-version           = 0
-!! description STR_BASESOUNDS_DOS_DESCRIPTION
-
-[files]
-samples      = SAMPLE.CAT
-
-[md5s]
-SAMPLE.CAT   = 422ea3dd074d2859bb51639a6e0e85da
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.

media/baseset/orig_dos_de.obg

@@ -1,31 +0,0 @@
-; $Id$
-;
-; This represents the original graphics as on the German Transport
-; Tycoon Deluxe DOS CD. It contains one broken sprite.
-;
-[metadata]
-name              = original_dos_de
-shortname         = TTDD
-version           = 0
-palette           = DOS
-!! description STR_BASEGRAPHICS_DOS_DE_DESCRIPTION
-
-[files]
-base         = TRG1.GRF
-logos        = TRGI.GRF
-arctic       = TRGC.GRF
-tropical     = TRGH.GRF
-toyland      = TRGT.GRF
-extra        = OPENTTD.GRF
-
-[md5s]
-TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
-TRGC.GRF     = ed446637e034104c5559b32c18afe78d
-TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTD.GRF  =
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTD.GRF  = This file was part of your OpenTTD installation.

media/baseset/orig_win.obg

@@ -1,31 +0,0 @@
-; $Id$
-;
-; This represents the original graphics as on the Transport
-; Tycoon Deluxe for Windows CD.
-;
-[metadata]
-name              = original_windows
-shortname         = TTDW
-version           = 0
-palette           = Windows
-!! description STR_BASEGRAPHICS_WIN_DESCRIPTION
-
-[files]
-base         = TRG1R.GRF
-logos        = TRGIR.GRF
-arctic       = TRGCR.GRF
-tropical     = TRGHR.GRF
-toyland      = TRGTR.GRF
-extra        = OPENTTD.GRF
-
-[md5s]
-TRG1R.GRF    = b04ce593d8c5016e07473a743d7d3358
-TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
-TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
-TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
-TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTD.GRF  =
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTD.GRF  = This file was part of your OpenTTD installation.

media/baseset/orig_win.obm

@@ -1,94 +0,0 @@
-; $Id$
-;
-; This represents the original music as on the Transport
-; Tycoon Deluxe for Windows CD.
-;
-[metadata]
-name              = original_windows
-shortname         = TTDW
-version           = 1
-!! description STR_BASEMUSIC_WIN_DESCRIPTION
-
-[files]
-theme = GM_TT00.GM
-old_0 = GM_TT02.GM
-old_1 = GM_TT06.GM
-old_2 = GM_TT03.GM
-old_3 = GM_TT12.GM
-old_4 = GM_TT08.GM
-old_5 = GM_TT13.GM
-old_6 = GM_TT14.GM
-old_7 = GM_TT10.GM
-old_8 =
-old_9 =
-new_0 = GM_TT04.GM
-new_1 = GM_TT01.GM
-new_2 = GM_TT05.GM
-new_3 = GM_TT15.GM
-new_4 = GM_TT11.GM
-new_5 = GM_TT16.GM
-new_6 = GM_TT09.GM
-new_7 =
-new_8 =
-new_9 =
-ezy_0 = GM_TT18.GM
-ezy_1 = GM_TT19.GM
-ezy_2 = GM_TT21.GM
-ezy_3 = GM_TT17.GM
-ezy_4 = GM_TT20.GM
-ezy_5 = GM_TT07.GM
-ezy_6 =
-ezy_7 =
-ezy_8 =
-ezy_9 =
-
-[md5s]
-GM_TT00.GM = 45cfec1b9d8c7a0ad45e755833cbf221
-GM_TT01.GM = ab14ed3392d848abd2a2e90a9d75d121
-GM_TT02.GM = dd4f696e4be5987ce738257b08b50171
-GM_TT03.GM = a1bfde23343df9e4063419bf29c166b8
-GM_TT04.GM = 4e6943aa0c455203d76c79389054747d
-GM_TT05.GM = cee281cb85a2e2343552d97640545a47
-GM_TT06.GM = 26d1de5efa8675f94065784e9d539e49
-GM_TT07.GM = 6f2691e17558f552ec4c565e4ab7139c
-GM_TT08.GM = a42bf2cb3340a822f1a69646fc7a487d
-GM_TT09.GM = eb35761a58a8df3c59ed8929cce13916
-GM_TT10.GM = 42fecd686720a785d20a78590c466a82
-GM_TT11.GM = 50ef1ef02e49d2112786dd45e69dc3ee
-GM_TT12.GM = 4ce707a0e0e72419f0681dd9bd95271b
-GM_TT13.GM = e765753be29d889ec818f38009103619
-GM_TT14.GM = 270e2d63bd32b95a4d007ce15a6ce45f
-GM_TT15.GM = 89e116a1c0c69f1845cc903a9bfbe460
-GM_TT16.GM = f824e2371b3bedfe61aad4b9c62dd6be
-GM_TT17.GM = 1b23eebb0796c1ab99cd97fa7082cf7b
-GM_TT18.GM = 15650de3bad645d0e88c4f5c7a2df92a
-GM_TT19.GM = 7aec079e15bd09588660b85545ac4dfc
-GM_TT20.GM = 1509097889dee617aa1e9a1738a5a930
-GM_TT21.GM = a8d0aaad02e1a762d8d54cf81da56bab
-
-[names]
-GM_TT00.GM = Tycoon DELUXE Theme
-GM_TT01.GM = Snarl Up
-GM_TT02.GM = Easy Driver
-GM_TT03.GM = Little Red Diesel
-GM_TT04.GM = City Groove
-GM_TT05.GM = Aliens Ate My Railway
-GM_TT06.GM = Stoke It
-GM_TT07.GM = Don't Walk!
-GM_TT08.GM = Sawyer's Tune
-GM_TT09.GM = Fell Apart On Me
-GM_TT10.GM = Can't Get There From Here
-GM_TT11.GM = Hard Drivin'
-GM_TT12.GM = Road Hog
-GM_TT13.GM = Hold That Train!
-GM_TT14.GM = Broomer's Oil Rag
-GM_TT15.GM = Goss Groove
-GM_TT16.GM = Small Town
-GM_TT17.GM = Cruise Control
-GM_TT18.GM = Stroll On
-GM_TT19.GM = Funk Central
-GM_TT20.GM = Jammit
-GM_TT21.GM = Movin' On
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.

media/baseset/orig_win.obs

@@ -1,19 +0,0 @@
-; $Id$
-;
-; This represents the original sounds as on the Transport
-; Tycoon Deluxe for Windows CD.
-;
-[metadata]
-name              = original_windows
-shortname         = TTDO
-version           = 0
-!! description STR_BASESOUNDS_WIN_DESCRIPTION
-
-[files]
-samples      = SAMPLE.CAT
-
-[md5s]
-SAMPLE.CAT   = 9212e81e72badd4bbe1eaeae66458e10
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.

media/baseset/translations.awk

@@ -1,69 +0,0 @@
-# $Id: openttd.desktop.translation.awk 24100 2012-04-08 14:29:31Z rubidium $
-
-# This file is part of OpenTTD.
-# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-
-#
-# Awk script to extract translations for baseset descriptions
-# from lang files for insertion into .obg/obs/obm files.
-# If there is no translation, there is no output.
-#
-# The input file is scanned for the pattern
-#  !! <ini-key> <STR_id>
-#
-# The lang files (passed as variable 'langfiles') are scanned for <STR_id> and
-# the translations are added to the output file:
-#  <ini-key>.<iso-code> = <translation>
-#
-
-# Simple insertion sort since not all AWKs have a sort implementation
-function isort(A) {
-	n = 0
-	for (val in A) {
-		n++;
-	}
-
-	for (i = 2; i <= n; i++) {
-		j = i;
-		hold = A[j]
-		while (A[j - 1] > hold) {
-			j--;
-			A[j + 1] = A[j]
-		}
-		A[j] = hold
-	}
-
-	return n
-}
-
-/^!!/ {
-	ini_key = $2;
-	str_id = $3;
-
-	file = langfiles
-	while ((getline < file) > 0) {
-		if (match($0, "##isocode") > 0) {
-			lang = $2;
-		} else if (match($0, "^" str_id " *:") > 0) {
-			sub("^[^:]*:", "", $0)
-			i++;
-			if (lang == "en_GB") {
-				texts[i] = ini_key "       = "$0;
-			} else {
-				texts[i] = ini_key "." lang " = "$0;
-			}
-		}
-	}
-	close(file);
-
-	count = isort(texts);
-	for (i = 1; i <= count; i++) {
-		print texts[i]
-	}
-
-	next
-}
-
-{ print }

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/openttd.nfo

@@ -104,4 +104,3 @@
 #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 A2
    -1 sprites/openttdgui.png 8bpp  66    8  64  31 -31   7 normal
    -1 sprites/openttdgui.png 8bpp 146    8  64  31 -31   7 normal
    -1 sprites/openttdgui.png 8bpp 226    8  64  31 -31   7 normal
@@ -170,16 +170,3 @@
    -1 sprites/openttdgui.png 8bpp 194  440  13  10   0  -2 normal
    -1 sprites/openttdgui.png 8bpp 215  440   9  10   0   0 normal
    -1 sprites/openttdgui.png 8bpp 232  440   8  10   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 248  440   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 264  440   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 280  440   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 296  440   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 312  440  14  10   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 328  440  14  10   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 348  440   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 362  440  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 388  440  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 414  440  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 440  440  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 466  440  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 490  440  20  20   0   0 normal

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/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,506 +1,242 @@
-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
-
- -- OpenTTD <info@openttd.org>  Sat, 13 Jul 2013 12:00:00 +0200
-
-openttd (1.3.2~RC1-0) unstable; urgency=low
-
-  * New upstream release 1.3.2-RC1
-
- -- OpenTTD <info@openttd.org>  Sun, 30 Jun 2013 12:00:00 +0200
-
-openttd (1.3.1-0) unstable; urgency=low
-
-  * New upstream release 1.3.1
-
- -- OpenTTD <info@openttd.org>  Sat, 01 Jun 2013 00:00:00 +0300
-
-openttd (1.3.1~RC1-0) unstable; urgency=low
-
-  * New upstream release 1.3.1-RC1
-
- -- OpenTTD <info@openttd.org>  Fri, 17 May 2013 22:00:00 +0200
-
-openttd (1.3.0-0) unstable; urgency=low
-
-  * New upstream release 1.3.0
-
- -- OpenTTD <info@openttd.org>  Mon, 01 Apr 2013 00:00:00 +0200
-
-openttd (1.3.0~RC3) unstable; urgency=low
-
-  * New upstream release 1.3.0-RC3
-
- -- OpenTTD <info@openttd.org>  Mon, 18 Mar 2013 00:00:00 +0100
-
-openttd (1.3.0~RC2) unstable; urgency=low
-
-  * New upstream release 1.3.0-RC2
-
- -- OpenTTD <info@openttd.org>  Tue, 05 Mar 2013 00:00:00 +0100
-
-openttd (1.3.0~RC1) unstable; urgency=low
-
-  * New upstream release 1.3.0-RC1
-
- -- OpenTTD <info@openttd.org>  Tue, 19 Feb 2013 00:00:00 +0100
-
-openttd (1.3.0~beta2) unstable; urgency=low
-
-  * New upstream release 1.3.0-beta2
-
- -- OpenTTD <info@openttd.org>  Thu, 07 Feb 2013 00:00:00 +0100
-
-openttd (1.3.0~beta1) unstable; urgency=low
-
-  * New upstream release 1.3.0-beta1
-
- -- OpenTTD <info@openttd.org>  Mon, 24 Dec 2012 00:00:00 +0100
-
-openttd (1.2.3) unstable; urgency=low
-
-  * New upstream release 1.2.3
-
- -- OpenTTD <info@openttd.org>  Thu, 01 Nov 2012 00:00:00 +0200
-
-openttd (1.2.3~RC1) unstable; urgency=low
-
-  * New upstream release 1.2.3-RC1
-
- -- OpenTTD <info@openttd.org>  Wed, 17 Oct 2012 00:00:00 +0200
-
-openttd (1.2.2) unstable; urgency=low
-
-  * New upstream release 1.2.2
-
- -- OpenTTD <info@openttd.org>  Thu, 16 Aug 2012 20:00:00 +0200
-
-openttd (1.2.2~RC1) unstable; urgency=low
-
-  * New upstream release 1.2.2-RC1
-
- -- OpenTTD <info@openttd.org>  Wed, 01 Aug 2012 00:00:00 +0200
-
-openttd (1.2.1) unstable; urgency=low
-
-  * New upstream release 1.2.1
-
- -- OpenTTD <info@openttd.org>  Fri, 01 Jun 2012 00:00:00 +0200
-
 openttd (1.2.1~RC1) unstable; urgency=low
 
   * New upstream release 1.2.1-RC1
 
- -- OpenTTD <info@openttd.org>  Wed, 16 Apr 2012 22:00:00 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 16 Apr 2012 22:00:00 +0200
 
 openttd (1.2.0) unstable; urgency=low
 
   * New upstream release 1.2.0
 
- -- OpenTTD <info@openttd.org>  Sun, 15 Apr 2012 14:00:00 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 15 Apr 2012 14:00:00 +0200
 
 openttd (1.2.0~RC4) unstable; urgency=low
 
   * New upstream release 1.2.0-RC4
 
- -- OpenTTD <info@openttd.org>  Sun, 01 Apr 2012 00:00:00 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 01 Apr 2012 00:00:00 +0200
 
 openttd (1.2.0~RC3) unstable; urgency=low
 
   * New upstream release 1.2.0-RC3
 
- -- OpenTTD <info@openttd.org>  Sun, 18 Mar 2012 18:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 18 Mar 2012 18:00:00 +0100
 
 openttd (1.2.0~RC2) unstable; urgency=low
 
   * New upstream release 1.2.0-RC2
 
- -- OpenTTD <info@openttd.org>  Sun, 04 Mar 2012 18:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 04 Mar 2012 18:00:00 +0100
 
 openttd (1.2.0~RC1) unstable; urgency=low
 
   * New upstream release 1.2.0-RC1
 
- -- OpenTTD <info@openttd.org>  Sun, 19 Feb 2012 23:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 19 Feb 2012 23:00:00 +0100
 
 openttd (1.2.0~beta4) unstable; urgency=low
 
   * New upstream release 1.2.0-beta4
 
- -- OpenTTD <info@openttd.org>  Sat, 04 Feb 2012 16:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 04 Feb 2012 16:00:00 +0100
 
 openttd (1.2.0~beta3) unstable; urgency=low
 
   * New upstream release 1.2.0-beta3
 
- -- OpenTTD <info@openttd.org>  Sat, 21 Jan 2012 16:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 21 Jan 2012 16:00:00 +0100
 
 openttd (1.2.0~beta2) unstable; urgency=low
 
   * New upstream release 1.2.0-beta2
 
- -- OpenTTD <info@openttd.org>  Sat, 07 Jan 2012 00:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 07 Jan 2012 00:00:00 +0100
 
 openttd (1.2.0~beta1) unstable; urgency=low
 
   * New upstream release 1.2.0-beta1
 
- -- OpenTTD <info@openttd.org>  Sat, 24 Dec 2011 00:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 24 Dec 2011 00:00:00 +0100
 
 openttd (1.1.4) unstable; urgency=low
 
   * New upstream release 1.1.4
 
- -- OpenTTD <info@openttd.org>  Mon, 05 Dec 2011 00:00:00 +0400
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 05 Dec 2011 00:00:00 +0400
 
 openttd (1.1.4-RC1) unstable; urgency=low
 
   * New upstream release 1.1.4-RC1
 
- -- OpenTTD <info@openttd.org>  Sun, 20 Nov 2011 17:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 20 Nov 2011 17:00:00 +0100
 
 openttd (1.1.3) unstable; urgency=low
 
   * New upstream release 1.1.3
 
- -- OpenTTD <info@openttd.org>  Thu, 15 Sep 2011 21:00:00 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 15 Sep 2011 21:00:00 +0200
 
 openttd (1.1.3-RC1) unstable; urgency=low
 
   * New upstream release 1.1.3-RC1
 
- -- OpenTTD <info@openttd.org>  Sun, 04 Sep 2011 17:00:00 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 04 Sep 2011 17:00:00 +0200
 
 openttd (1.1.2) unstable; urgency=low
 
   * New upstream release 1.1.2
 
- -- OpenTTD <info@openttd.org>  Sun, 14 Aug 2011 17:00:00 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 14 Aug 2011 17:00:00 +0200
 
 openttd (1.1.2~RC2) unstable; urgency=low
 
   * New upstream release 1.1.2-RC2
 
- -- OpenTTD <info@openttd.org>  Sat, 30 Jul 2011 21:00:00 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 30 Jul 2011 21:00:00 +0200
 
 openttd (1.1.2~RC1) unstable; urgency=low
 
   * New upstream release 1.1.2-RC1
 
- -- OpenTTD <info@openttd.org>  Sun, 24 Jul 2011 21:00:00 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 24 Jul 2011 21:00:00 +0200
 
 openttd (1.1.1) unstable; urgency=low
 
   * New upstream release 1.1.1
 
- -- OpenTTD <info@openttd.org>  Wed, 01 Jun 2011 00:00:00 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 01 Jun 2011 00:00:00 +0200
 
 openttd (1.1.1~RC1) unstable; urgency=low
 
   * New upstream release 1.1.1-RC1
 
- -- OpenTTD <info@openttd.org>  Sun, 15 May 2011 21:00:00 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 15 May 2011 21:00:00 +0200
 
 openttd (1.1.0) unstable; urgency=low
 
   * New upstream release 1.1.0
 
- -- OpenTTD <info@openttd.org>  Fri, 01 Apr 2011 00:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 01 Apr 2011 00:00:00 +0100
 
 openttd (1.1.0~RC3) unstable; urgency=low
 
   * New upstream release 1.1.0-RC3
 
- -- OpenTTD <info@openttd.org>  Fri, 18 Mar 2011 22:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 18 Mar 2011 22:00:00 +0100
 
 openttd (1.1.0~RC2) unstable; urgency=low
 
   * New upstream release 1.1.0-RC2
 
- -- OpenTTD <info@openttd.org>  Fri, 04 Mar 2011 22:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 04 Mar 2011 22:00:00 +0100
 
 openttd (1.1.0~RC1) unstable; urgency=low
 
   * New upstream release 1.1.0-RC1
 
- -- OpenTTD <info@openttd.org>  Fri, 18 Feb 2011 22:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 18 Feb 2011 22:00:00 +0100
 
 openttd (1.1.0~beta5) unstable; urgency=low
 
   * New upstream release 1.1.0-beta5
 
- -- OpenTTD <info@openttd.org>  Fri, 04 Feb 2011 22:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 04 Feb 2011 22:00:00 +0100
 
 openttd (1.1.0~beta4) unstable; urgency=low
 
   * New upstream release 1.1.0-beta4
 
- -- OpenTTD <info@openttd.org>  Fri, 21 Jan 2011 00:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 21 Jan 2011 00:00:00 +0100
 
 openttd (1.1.0~beta3) unstable; urgency=low
 
   * New upstream release 1.1.0-beta3
 
- -- OpenTTD <info@openttd.org>  Sun, 09 Jan 2011 18:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 09 Jan 2011 18:00:00 +0100
 
 openttd (1.1.0~beta2) unstable; urgency=low
 
   * New upstream release 1.1.0-beta2
 
- -- OpenTTD <info@openttd.org>  Fri, 31 Dec 2010 18:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 31 Dec 2010 18:00:00 +0100
 
 openttd (1.1.0~beta1) unstable; urgency=low
 
   * New upstream release 1.1.0-beta1
 
- -- OpenTTD <info@openttd.org>  Fri, 24 Dec 2010 00:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 24 Dec 2010 00:00:00 +0100
 
 openttd (1.0.5-0) unstable; urgency=low
 
   * New upstream release 1.0.5
 
- -- OpenTTD <info@openttd.org>  Sat, 20 Nov 2010 21:00:00 +0000
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 20 Nov 2010 21:00:00 +0000
 
 openttd (1.0.5~rc2-0) unstable; urgency=low
 
   * New upstream release 1.0.5~rc2
 
- -- OpenTTD <info@openttd.org>  Sun, 14 Nov 2010 15:00:00 +0000
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 14 Nov 2010 15:00:00 +0000
 
 openttd (1.0.5~rc1-0) unstable; urgency=low
 
   * New upstream release 1.0.5-RC1
 
- -- OpenTTD <info@openttd.org>  Sun, 31 Oct 2010 15:00:00 +0000
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 31 Oct 2010 15:00:00 +0000
 
 openttd (1.0.4-0) unstable; urgency=low
 
   * New upstream release 1.0.4
 
- -- OpenTTD <info@openttd.org>  Tue, 14 Sep 2010 20:00:00 +0000
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 14 Sep 2010 20:00:00 +0000
 
 openttd (1.0.4~rc1-0) unstable; urgency=low
 
   * New upstream release 1.0.4-RC1
 
- -- OpenTTD <info@openttd.org>  Mon, 30 Aug 2010 20:00:00 +0000
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 30 Aug 2010 20:00:00 +0000
 
 openttd (1.0.3-0) unstable; urgency=low
 
   * New upstream release 1.0.3
 
- -- OpenTTD <info@openttd.org>  Sun, 01 Aug 2010 00:00:00 +0000
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 01 Aug 2010 00:00:00 +0000
 
 openttd (1.0.3~rc1-0) unstable; urgency=low
 
   * New upstream release 1.0.3-RC1
 
- -- OpenTTD <info@openttd.org>  Sat, 05 Jul 2010 17:37:21 +0000
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 05 Jul 2010 17:37:21 +0000
 
 openttd (1.0.2-0) unstable; urgency=low
 
   * New upstream release 1.0.2
 
- -- OpenTTD <info@openttd.org>  Sat, 19 Jun 2010 18:36:21 +0000
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 19 Jun 2010 18:36:21 +0000
 
 openttd (1.0.2~rc1-0) unstable; urgency=low
 
   * New upstream release 1.0.2-RC1
 
- -- OpenTTD <info@openttd.org>  Sat, 05 Jun 2010 23:36:21 +0000
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 05 Jun 2010 23:36:21 +0000
 
 openttd (1.0.1-0) unstable; urgency=low
 
   * New upstream release 1.0.1
 
- -- OpenTTD <info@openttd.org>  Sat, 01 May 2010 00:00:00 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 01 May 2010 00:00:00 +0200
 
 openttd (1.0.1~rc2-0) unstable; urgency=low
 
   * New upstream release 1.0.1-RC2
 
- -- OpenTTD <info@openttd.org>  Wed, 21 Apr 2010 21:36:21 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 21 Apr 2010 21:36:21 +0200
 
 openttd (1.0.1~rc1-0) unstable; urgency=low
 
   * New upstream release 1.0.1-RC1
 
- -- OpenTTD <info@openttd.org>  Sat, 17 Apr 2010 23:36:21 +0000
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 17 Apr 2010 23:36:21 +0000
 
 openttd (1.0.0-1) unstable; urgency=low
 

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-Browser: http://git.debian.org/?p=collab-maint/openttd.git
-Vcs-Git: git://anonscm.debian.org/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/
+This package was debianized by Matthijs Kooijman <matthijs@stdin.nl>
-Upstream-Name: OpenTTD
+on Wed, 15 Sep 2004 00:24:01 +0200.
-Upstream-Contact: info@openttd.org, #openttd on irc.oftc.net
-Source: http://www.openttd.org
 
+Upstream author: Ludvig Strigeus (ludde) and many others.
+Upstream homepage: http://www.openttd.org
 
-Files: *
+Copyright © 2004-2009 Ludvig Strigeous and others.
-Copyright: © 2004-2012 Ludvig Strigeous and others.
-License: GPL-2.0
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2.0 as
- published by the Free Software Foundation;
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- .
- On Debian systems, the complete text of the GNU General Public License
- version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
-Files: src/3rdparty/squirrel/*
+OpenTTD License:
-Copyright: © 2003-2009 Alberto Demichelis
-License: Zlib
 
-Files: src/3rdparty/md5/*
+	This program is free software; you can redistribute it and/or modify
-Copyright: © 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
+	it under the terms of the GNU General Public License version 2.0 as
-License: Zlib
+	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
+	You should have received a copy of the GNU General Public License
- This software is provided 'as-is', without any express or implied
+	along with this package; if not, write to the Free Software
- warranty. In no event will the authors be held liable for any damages
+	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- 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.
 
-Files: os/dos/exe2coff/*
+On Debian systems, the complete text of the GNU General Public License
-Copyright: © 1998 DJ Delorie
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-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.
 
-Files: os/dos/cwsdpmi/*
+This package contains an embedded version of the "Squirrel" programming
-Source: http://homer.rice.edu/~sandmann/cwsdpmi/index.html
+language, which is shipped under the following license:
-Copyright: © 1995-2000 Charles W Sandmann (sandmann@clio.rice.edu)
+
-License: Custom binary-only license
+	Copyright (c) 2003-2009 Alberto Demichelis
- This is release 5.  The files in this binary distribution may be redistributed
+
- under the GPL (with source) or without the source code provided:
+	This software is provided 'as-is', without any
- .
+	express or implied warranty. In no event will the
- * CWSDPMI.EXE or CWSDPR0.EXE are not modified in any way except via CWSPARAM.
+	authors be held liable for any damages arising from
- .
+	the use of this software.
- * 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.
+	Permission is granted to anyone to use this software
- .
+	for any purpose, including commercial applications,
- * Notice to users that they have the right to receive the source code and/or
+	and to alter it and redistribute it freely, subject
-   binary updates for CWSDPMI.  Distributors should indicate a site for the
+	to the following restrictions:
-   source in their documentation.
+
-Comment:
+		1. The origin of this software must not be
- Files are distributed as binary only, so the second option in the license
+		misrepresented; you must not claim that
- ("without source code provided: ...") is applicable.
+		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
+./exe2coff binary.exe || exit
-cat cwsdpmi/cwsdstub.exe binary > 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.5.0
+set OPENTTD_VERSION=1.2.1-RC1
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
 set OPENGFX_VERSION=1.2.0

os/rpm/openttd.spec

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

os/windows/installer/install.nsi

@@ -1,7 +1,7 @@
 # Version numbers to update
 !define APPV_MAJOR 1
-!define APPV_MINOR 5
+!define APPV_MINOR 2
-!define APPV_MAINT 2
+!define APPV_MAINT 1
 !define APPV_BUILD 0
 !define APPV_EXTRA "-RC1"
 
@@ -124,10 +124,6 @@ Section "!OpenTTD" Section1
 	SetOutPath "$INSTDIR\ai\"
 	File ${PATH_ROOT}bin\ai\compat_*.nut
 
-	; Copy Game Script files
-	SetOutPath "$INSTDIR\game\"
-	File ${PATH_ROOT}bin\game\compat_*.nut
-
 	; Copy data files
 	SetOutPath "$INSTDIR\baseset\"
 	File ${PATH_ROOT}bin\baseset\*.grf
@@ -402,9 +398,6 @@ Section "Uninstall"
 	; AI files
 	Delete "$INSTDIR\ai\compat_*.nut"
 
-	; Game Script files
-	Delete "$INSTDIR\game\compat_*.nut"
-
 	; Baseset files
 	Delete "$INSTDIR\baseset\opntitle.dat"
 	Delete "$INSTDIR\baseset\openttd.grf"
@@ -476,7 +469,6 @@ Section "Uninstall"
 	RMDir "$SMPROGRAMS\$SHORTCUTS\Docs\"
 	RMDir "$SMPROGRAMS\$SHORTCUTS"
 	RMDir "$INSTDIR\ai"
-	RMDir "$INSTDIR\game"
 	RMDir "$INSTDIR\data"
 	RMDir "$INSTDIR\baseset"
 	RMDir "$INSTDIR\gm"
@@ -545,22 +537,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/determineversion.vbs

@@ -177,9 +177,6 @@ Function DetermineSVNVersion()
 				' Make sure index is in sync with disk
 				Set oExec = WshShell.Exec("git update-index --refresh")
 				If Err.Number = 0 Then
-					' StdOut and StdErr share a 4kB buffer so prevent it from filling up as we don't care about the output
-					oExec.StdOut.Close
-					oExec.StdErr.Close
 					' Wait till the application is finished ...
 					Do While oExec.Status = 0
 						WScript.Sleep 10

projects/generate

@@ -77,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."

projects/generate.vbs

@@ -173,7 +173,6 @@ Function load_main_data(filename, ByRef vcxproj, ByRef filters, ByRef files)
 						line = "MSVC" Or _
 						line = "DIRECTMUSIC" Or _
 						line = "AI" Or _
-						line = "SSE" Or _
 						line = "HAVE_THREAD" _
 					) Then skip = skip + 1
 					deep = deep + 1

projects/langs_vs100.vcxproj

@@ -59,12 +59,6 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\arabic_egypt.lng;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\src\lang\basque.txt">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating basque language file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\basque.lng;%(Outputs)</Outputs>
-    </CustomBuild>
     <CustomBuild Include="..\src\lang\belarusian.txt">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating belarusian language file</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
@@ -137,12 +131,6 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\estonian.lng;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\src\lang\faroese.txt">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating faroese language file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\faroese.lng;%(Outputs)</Outputs>
-    </CustomBuild>
     <CustomBuild Include="..\src\lang\finnish.txt">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating finnish language file</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
@@ -155,12 +143,6 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\french.lng;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\src\lang\gaelic.txt">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating gaelic language file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\gaelic.lng;%(Outputs)</Outputs>
-    </CustomBuild>
     <CustomBuild Include="..\src\lang\galician.txt">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating galician language file</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
@@ -227,12 +209,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>
@@ -329,18 +305,6 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\swedish.lng;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\src\lang\tamil.txt">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating tamil language file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\tamil.lng;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\src\lang\thai.txt">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating thai language file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\thai.lng;%(Outputs)</Outputs>
-    </CustomBuild>
     <CustomBuild Include="..\src\lang\traditional_chinese.txt">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating traditional_chinese language file</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>

projects/langs_vs100.vcxproj.filters

@@ -13,9 +13,6 @@
     <CustomBuild Include="..\src\lang\arabic_egypt.txt">
       <Filter>Translations</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\src\lang\basque.txt">
-      <Filter>Translations</Filter>
-    </CustomBuild>
     <CustomBuild Include="..\src\lang\belarusian.txt">
       <Filter>Translations</Filter>
     </CustomBuild>
@@ -52,18 +49,12 @@
     <CustomBuild Include="..\src\lang\estonian.txt">
       <Filter>Translations</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\src\lang\faroese.txt">
-      <Filter>Translations</Filter>
-    </CustomBuild>
     <CustomBuild Include="..\src\lang\finnish.txt">
       <Filter>Translations</Filter>
     </CustomBuild>
     <CustomBuild Include="..\src\lang\french.txt">
       <Filter>Translations</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\src\lang\gaelic.txt">
-      <Filter>Translations</Filter>
-    </CustomBuild>
     <CustomBuild Include="..\src\lang\galician.txt">
       <Filter>Translations</Filter>
     </CustomBuild>
@@ -97,9 +88,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>
@@ -148,12 +136,6 @@
     <CustomBuild Include="..\src\lang\swedish.txt">
       <Filter>Translations</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\src\lang\tamil.txt">
-      <Filter>Translations</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\src\lang\thai.txt">
-      <Filter>Translations</Filter>
-    </CustomBuild>
     <CustomBuild Include="..\src\lang\traditional_chinese.txt">
       <Filter>Translations</Filter>
     </CustomBuild>

projects/langs_vs80.vcproj

@@ -93,21 +93,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\src\lang\basque.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating basque language file"
-						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
-						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
-						Outputs="..\bin\lang\basque.lng"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\src\lang\belarusian.txt"
 				>
@@ -288,21 +273,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\src\lang\faroese.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating faroese language file"
-						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
-						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
-						Outputs="..\bin\lang\faroese.lng"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\src\lang\finnish.txt"
 				>
@@ -333,21 +303,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\src\lang\gaelic.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gaelic language file"
-						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
-						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
-						Outputs="..\bin\lang\gaelic.lng"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\src\lang\galician.txt"
 				>
@@ -513,21 +468,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"
 				>
@@ -768,36 +708,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\src\lang\tamil.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating tamil language file"
-						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
-						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
-						Outputs="..\bin\lang\tamil.lng"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\lang\thai.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating thai language file"
-						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
-						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
-						Outputs="..\bin\lang\thai.lng"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\src\lang\traditional_chinese.txt"
 				>

projects/langs_vs90.vcproj

@@ -94,21 +94,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\src\lang\basque.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating basque language file"
-						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
-						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
-						Outputs="..\bin\lang\basque.lng"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\src\lang\belarusian.txt"
 				>
@@ -289,21 +274,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\src\lang\faroese.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating faroese language file"
-						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
-						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
-						Outputs="..\bin\lang\faroese.lng"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\src\lang\finnish.txt"
 				>
@@ -334,21 +304,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\src\lang\gaelic.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gaelic language file"
-						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
-						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
-						Outputs="..\bin\lang\gaelic.lng"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\src\lang\galician.txt"
 				>
@@ -514,21 +469,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"
 				>
@@ -769,36 +709,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\src\lang\tamil.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating tamil language file"
-						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
-						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
-						Outputs="..\bin\lang\tamil.lng"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\lang\thai.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating thai language file"
-						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
-						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
-						Outputs="..\bin\lang\thai.lng"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\src\lang\traditional_chinese.txt"
 				>

projects/openttd_vs100.vcxproj

@@ -102,7 +102,7 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -131,7 +131,7 @@
       <Culture>0x0809</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -156,7 +156,7 @@
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -176,7 +176,7 @@
       <Culture>0x0809</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -204,7 +204,7 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -233,7 +233,7 @@
       <Culture>0x0809</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -256,7 +256,7 @@
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -280,7 +280,7 @@
       <Culture>0x0809</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -296,22 +296,18 @@
     <ClCompile Include="..\src\articulated_vehicles.cpp" />
     <ClCompile Include="..\src\autoreplace.cpp" />
     <ClCompile Include="..\src\bmp.cpp" />
-    <ClCompile Include="..\src\cargoaction.cpp" />
-    <ClCompile Include="..\src\cargomonitor.cpp" />
     <ClCompile Include="..\src\cargopacket.cpp" />
     <ClCompile Include="..\src\cargotype.cpp" />
     <ClCompile Include="..\src\cheat.cpp" />
     <ClCompile Include="..\src\command.cpp" />
     <ClCompile Include="..\src\console.cpp" />
     <ClCompile Include="..\src\console_cmds.cpp" />
-    <ClCompile Include="..\src\cpu.cpp" />
     <ClCompile Include="..\src\crashlog.cpp" />
     <ClCompile Include="..\src\currency.cpp" />
     <ClCompile Include="..\src\date.cpp" />
     <ClCompile Include="..\src\debug.cpp" />
     <ClCompile Include="..\src\dedicated.cpp" />
     <ClCompile Include="..\src\depot.cpp" />
-    <ClCompile Include="..\src\disaster_vehicle.cpp" />
     <ClCompile Include="..\src\driver.cpp" />
     <ClCompile Include="..\src\economy.cpp" />
     <ClCompile Include="..\src\effectvehicle.cpp" />
@@ -320,13 +316,10 @@
     <ClCompile Include="..\src\fileio.cpp" />
     <ClCompile Include="..\src\fios.cpp" />
     <ClCompile Include="..\src\fontcache.cpp" />
-    <ClCompile Include="..\src\fontdetection.cpp" />
-    <ClCompile Include="..\src\base_consist.cpp" />
     <ClCompile Include="..\src\gamelog.cpp" />
     <ClCompile Include="..\src\genworld.cpp" />
     <ClCompile Include="..\src\gfx.cpp" />
     <ClCompile Include="..\src\gfxinit.cpp" />
-    <ClCompile Include="..\src\gfx_layout.cpp" />
     <ClCompile Include="..\src\goal.cpp" />
     <ClCompile Include="..\src\ground_vehicle.cpp" />
     <ClCompile Include="..\src\heightmap.cpp" />
@@ -335,13 +328,6 @@
     <ClCompile Include="..\src\ini.cpp" />
     <ClCompile Include="..\src\ini_load.cpp" />
     <ClCompile Include="..\src\landscape.cpp" />
-    <ClCompile Include="..\src\linkgraph\demands.cpp" />
-    <ClCompile Include="..\src\linkgraph\flowmapper.cpp" />
-    <ClCompile Include="..\src\linkgraph\linkgraph.cpp" />
-    <ClCompile Include="..\src\linkgraph\linkgraphjob.cpp" />
-    <ClCompile Include="..\src\linkgraph\linkgraphschedule.cpp" />
-    <ClCompile Include="..\src\linkgraph\mcf.cpp" />
-    <ClCompile Include="..\src\linkgraph\refresh.cpp" />
     <ClCompile Include="..\src\map.cpp" />
     <ClCompile Include="..\src\misc.cpp" />
     <ClCompile Include="..\src\mixer.cpp" />
@@ -356,6 +342,7 @@
     <ClCompile Include="..\src\network\network_udp.cpp" />
     <ClCompile Include="..\src\openttd.cpp" />
     <ClCompile Include="..\src\order_backup.cpp" />
+    <ClCompile Include="..\src\os_timer.cpp" />
     <ClCompile Include="..\src\pbs.cpp" />
     <ClCompile Include="..\src\progress.cpp" />
     <ClCompile Include="..\src\rail.cpp" />
@@ -373,11 +360,8 @@
     <ClCompile Include="..\src\station.cpp" />
     <ClCompile Include="..\src\strgen\strgen_base.cpp" />
     <ClCompile Include="..\src\string.cpp" />
-    <ClCompile Include="..\src\stringfilter.cpp" />
     <ClCompile Include="..\src\strings.cpp" />
-    <ClCompile Include="..\src\story.cpp" />
     <ClCompile Include="..\src\subsidy.cpp" />
-    <ClCompile Include="..\src\textbuf.cpp" />
     <ClCompile Include="..\src\texteff.cpp" />
     <ClCompile Include="..\src\tgp.cpp" />
     <ClCompile Include="..\src\tile_map.cpp" />
@@ -386,7 +370,6 @@
     <ClCompile Include="..\src\vehicle.cpp" />
     <ClCompile Include="..\src\vehiclelist.cpp" />
     <ClCompile Include="..\src\viewport.cpp" />
-    <ClCompile Include="..\src\viewport_sprite_sorter_sse4.cpp" />
     <ClCompile Include="..\src\waypoint.cpp" />
     <ClCompile Include="..\src\widget.cpp" />
     <ClCompile Include="..\src\window.cpp" />
@@ -405,8 +388,6 @@
     <ClInclude Include="..\src\bmp.h" />
     <ClInclude Include="..\src\bridge.h" />
     <ClInclude Include="..\src\cargo_type.h" />
-    <ClInclude Include="..\src\cargoaction.h" />
-    <ClInclude Include="..\src\cargomonitor.h" />
     <ClInclude Include="..\src\cargopacket.h" />
     <ClInclude Include="..\src\cargotype.h" />
     <ClInclude Include="..\src\cheat_func.h" />
@@ -424,7 +405,6 @@
     <ClInclude Include="..\src\console_gui.h" />
     <ClInclude Include="..\src\console_internal.h" />
     <ClInclude Include="..\src\console_type.h" />
-    <ClInclude Include="..\src\cpu.h" />
     <ClInclude Include="..\src\crashlog.h" />
     <ClInclude Include="..\src\currency.h" />
     <ClInclude Include="..\src\date_func.h" />
@@ -438,7 +418,6 @@
     <ClInclude Include="..\src\depot_type.h" />
     <ClInclude Include="..\src\direction_func.h" />
     <ClInclude Include="..\src\direction_type.h" />
-    <ClInclude Include="..\src\disaster_vehicle.h" />
     <ClInclude Include="..\src\music\dmusic.h" />
     <ClInclude Include="..\src\driver.h" />
     <ClInclude Include="..\src\economy_base.h" />
@@ -456,13 +435,10 @@
     <ClInclude Include="..\src\fileio_type.h" />
     <ClInclude Include="..\src\fios.h" />
     <ClInclude Include="..\src\fontcache.h" />
-    <ClInclude Include="..\src\fontdetection.h" />
-    <ClInclude Include="..\src\base_consist.h" />
     <ClInclude Include="..\src\gamelog.h" />
     <ClInclude Include="..\src\gamelog_internal.h" />
     <ClInclude Include="..\src\genworld.h" />
     <ClInclude Include="..\src\gfx_func.h" />
-    <ClInclude Include="..\src\gfx_layout.h" />
     <ClInclude Include="..\src\gfx_type.h" />
     <ClInclude Include="..\src\gfxinit.h" />
     <ClInclude Include="..\src\goal_base.h" />
@@ -485,18 +461,6 @@
     <ClInclude Include="..\src\landscape.h" />
     <ClInclude Include="..\src\landscape_type.h" />
     <ClInclude Include="..\src\language.h" />
-    <ClInclude Include="..\src\linkgraph\demands.h" />
-    <ClInclude Include="..\src\linkgraph\flowmapper.h" />
-    <ClInclude Include="..\src\linkgraph\init.h" />
-    <ClInclude Include="..\src\linkgraph\linkgraph.h" />
-    <ClInclude Include="..\src\linkgraph\linkgraph_base.h" />
-    <ClInclude Include="..\src\linkgraph\linkgraph_gui.h" />
-    <ClInclude Include="..\src\linkgraph\linkgraph_type.h" />
-    <ClInclude Include="..\src\linkgraph\linkgraphjob.h" />
-    <ClInclude Include="..\src\linkgraph\linkgraphjob_base.h" />
-    <ClInclude Include="..\src\linkgraph\linkgraphschedule.h" />
-    <ClInclude Include="..\src\linkgraph\mcf.h" />
-    <ClInclude Include="..\src\linkgraph\refresh.h" />
     <ClInclude Include="..\src\livery.h" />
     <ClInclude Include="..\src\map_func.h" />
     <ClInclude Include="..\src\map_type.h" />
@@ -570,13 +534,11 @@
     <ClInclude Include="..\src\road_type.h" />
     <ClInclude Include="..\src\roadstop_base.h" />
     <ClInclude Include="..\src\roadveh.h" />
-    <ClInclude Include="..\src\safeguards.h" />
     <ClInclude Include="..\src\screenshot.h" />
     <ClInclude Include="..\src\sdl.h" />
     <ClInclude Include="..\src\sound\sdl_s.h" />
     <ClInclude Include="..\src\video\sdl_v.h" />
     <ClInclude Include="..\src\settings_func.h" />
-    <ClInclude Include="..\src\settings_gui.h" />
     <ClInclude Include="..\src\settings_internal.h" />
     <ClInclude Include="..\src\settings_type.h" />
     <ClInclude Include="..\src\ship.h" />
@@ -599,13 +561,9 @@
     <ClInclude Include="..\src\station_type.h" />
     <ClInclude Include="..\src\statusbar_gui.h" />
     <ClInclude Include="..\src\stdafx.h" />
-    <ClInclude Include="..\src\story_base.h" />
-    <ClInclude Include="..\src\story_type.h" />
     <ClInclude Include="..\src\strgen\strgen.h" />
-    <ClInclude Include="..\src\string_base.h" />
     <ClInclude Include="..\src\string_func.h" />
     <ClInclude Include="..\src\string_type.h" />
-    <ClInclude Include="..\src\stringfilter_type.h" />
     <ClInclude Include="..\src\strings_func.h" />
     <ClInclude Include="..\src\strings_type.h" />
     <ClInclude Include="..\src\subsidy_base.h" />
@@ -614,7 +572,6 @@
     <ClInclude Include="..\src\tar_type.h" />
     <ClInclude Include="..\src\terraform_gui.h" />
     <ClInclude Include="..\src\textbuf_gui.h" />
-    <ClInclude Include="..\src\textbuf_type.h" />
     <ClInclude Include="..\src\texteff.hpp" />
     <ClInclude Include="..\src\textfile_gui.h" />
     <ClInclude Include="..\src\textfile_type.h" />
@@ -645,7 +602,6 @@
     <ClInclude Include="..\src\vehicle_type.h" />
     <ClInclude Include="..\src\vehiclelist.h" />
     <ClInclude Include="..\src\viewport_func.h" />
-    <ClInclude Include="..\src\viewport_sprite_sorter.h" />
     <ClInclude Include="..\src\viewport_type.h" />
     <ClInclude Include="..\src\water.h" />
     <ClInclude Include="..\src\waypoint_base.h" />
@@ -675,7 +631,6 @@
     <ClCompile Include="..\src\core\math_func.cpp" />
     <ClInclude Include="..\src\core\math_func.hpp" />
     <ClInclude Include="..\src\core\mem_func.hpp" />
-    <ClInclude Include="..\src\core\multimap.hpp" />
     <ClInclude Include="..\src\core\overflowsafe_type.hpp" />
     <ClCompile Include="..\src\core\pool_func.cpp" />
     <ClInclude Include="..\src\core\pool_func.hpp" />
@@ -683,8 +638,6 @@
     <ClCompile Include="..\src\core\random_func.cpp" />
     <ClInclude Include="..\src\core\random_func.hpp" />
     <ClInclude Include="..\src\core\smallmap_type.hpp" />
-    <ClInclude Include="..\src\core\smallmatrix_type.hpp" />
-    <ClInclude Include="..\src\core\smallstack_type.hpp" />
     <ClInclude Include="..\src\core\smallvec_type.hpp" />
     <ClInclude Include="..\src\core\sort_func.hpp" />
     <ClInclude Include="..\src\core\string_compare_type.hpp" />
@@ -710,7 +663,6 @@
     <ClCompile Include="..\src\highscore_gui.cpp" />
     <ClCompile Include="..\src\industry_gui.cpp" />
     <ClCompile Include="..\src\intro_gui.cpp" />
-    <ClCompile Include="..\src\linkgraph\linkgraph_gui.cpp" />
     <ClCompile Include="..\src\main_gui.cpp" />
     <ClCompile Include="..\src\misc_gui.cpp" />
     <ClCompile Include="..\src\music_gui.cpp" />
@@ -732,7 +684,6 @@
     <ClCompile Include="..\src\smallmap_gui.cpp" />
     <ClCompile Include="..\src\station_gui.cpp" />
     <ClCompile Include="..\src\statusbar_gui.cpp" />
-    <ClCompile Include="..\src\story_gui.cpp" />
     <ClCompile Include="..\src\subsidy_gui.cpp" />
     <ClCompile Include="..\src\terraform_gui.cpp" />
     <ClCompile Include="..\src\textfile_gui.cpp" />
@@ -771,7 +722,6 @@
     <ClInclude Include="..\src\widgets\highscore_widget.h" />
     <ClInclude Include="..\src\widgets\industry_widget.h" />
     <ClInclude Include="..\src\widgets\intro_widget.h" />
-    <ClInclude Include="..\src\widgets\link_graph_legend_widget.h" />
     <ClInclude Include="..\src\widgets\main_widget.h" />
     <ClInclude Include="..\src\widgets\misc_widget.h" />
     <ClInclude Include="..\src\widgets\music_widget.h" />
@@ -791,7 +741,6 @@
     <ClInclude Include="..\src\widgets\smallmap_widget.h" />
     <ClInclude Include="..\src\widgets\station_widget.h" />
     <ClInclude Include="..\src\widgets\statusbar_widget.h" />
-    <ClInclude Include="..\src\widgets\story_widget.h" />
     <ClInclude Include="..\src\widgets\subsidy_widget.h" />
     <ClInclude Include="..\src\widgets\terraform_widget.h" />
     <ClInclude Include="..\src\widgets\timetable_widget.h" />
@@ -807,6 +756,7 @@
     <ClCompile Include="..\src\clear_cmd.cpp" />
     <ClCompile Include="..\src\company_cmd.cpp" />
     <ClCompile Include="..\src\depot_cmd.cpp" />
+    <ClCompile Include="..\src\disaster_cmd.cpp" />
     <ClCompile Include="..\src\group_cmd.cpp" />
     <ClCompile Include="..\src\industry_cmd.cpp" />
     <ClCompile Include="..\src\misc_cmd.cpp" />
@@ -833,7 +783,6 @@
     <ClCompile Include="..\src\saveload\airport_sl.cpp" />
     <ClCompile Include="..\src\saveload\animated_tile_sl.cpp" />
     <ClCompile Include="..\src\saveload\autoreplace_sl.cpp" />
-    <ClCompile Include="..\src\saveload\cargomonitor_sl.cpp" />
     <ClCompile Include="..\src\saveload\cargopacket_sl.cpp" />
     <ClCompile Include="..\src\saveload\cheat_sl.cpp" />
     <ClCompile Include="..\src\saveload\company_sl.cpp" />
@@ -846,7 +795,6 @@
     <ClCompile Include="..\src\saveload\group_sl.cpp" />
     <ClCompile Include="..\src\saveload\industry_sl.cpp" />
     <ClCompile Include="..\src\saveload\labelmaps_sl.cpp" />
-    <ClCompile Include="..\src\saveload\linkgraph_sl.cpp" />
     <ClCompile Include="..\src\saveload\map_sl.cpp" />
     <ClCompile Include="..\src\saveload\misc_sl.cpp" />
     <ClCompile Include="..\src\saveload\newgrf_sl.cpp" />
@@ -864,7 +812,6 @@
     <ClCompile Include="..\src\saveload\station_sl.cpp" />
     <ClCompile Include="..\src\saveload\storage_sl.cpp" />
     <ClCompile Include="..\src\saveload\strings_sl.cpp" />
-    <ClCompile Include="..\src\saveload\story_sl.cpp" />
     <ClCompile Include="..\src\saveload\subsidy_sl.cpp" />
     <ClCompile Include="..\src\saveload\town_sl.cpp" />
     <ClCompile Include="..\src\saveload\vehicle_sl.cpp" />
@@ -883,7 +830,6 @@
     <ClInclude Include="..\src\table\elrail_data.h" />
     <ClInclude Include="..\src\table\engines.h" />
     <ClInclude Include="..\src\table\genland.h" />
-    <ClInclude Include="..\src\table\heightmap_colours.h" />
     <ClInclude Include="..\src\table\industry_land.h" />
     <ClInclude Include="..\src\table\landscape_sprite.h" />
     <ClInclude Include="..\src\table\newgrf_debug_data.h" />
@@ -953,8 +899,13 @@
     <ClInclude Include="..\src\3rdparty\squirrel\squirrel\sqpcheader.h" />
     <ClInclude Include="..\src\3rdparty\squirrel\squirrel\sqstate.h" />
     <ClInclude Include="..\src\3rdparty\squirrel\include\sqstdaux.h" />
+    <ClInclude Include="..\src\3rdparty\squirrel\include\sqstdblob.h" />
+    <ClInclude Include="..\src\3rdparty\squirrel\sqstdlib\sqstdblobimpl.h" />
+    <ClInclude Include="..\src\3rdparty\squirrel\include\sqstdio.h" />
     <ClInclude Include="..\src\3rdparty\squirrel\include\sqstdmath.h" />
+    <ClInclude Include="..\src\3rdparty\squirrel\sqstdlib\sqstdstream.h" />
     <ClInclude Include="..\src\3rdparty\squirrel\include\sqstdstring.h" />
+    <ClInclude Include="..\src\3rdparty\squirrel\include\sqstdsystem.h" />
     <ClInclude Include="..\src\3rdparty\squirrel\squirrel\sqstring.h" />
     <ClInclude Include="..\src\3rdparty\squirrel\squirrel\sqtable.h" />
     <ClInclude Include="..\src\3rdparty\squirrel\include\squirrel.h" />
@@ -996,7 +947,6 @@
     <ClInclude Include="..\src\script\api\script_bridgelist.hpp" />
     <ClInclude Include="..\src\script\api\script_cargo.hpp" />
     <ClInclude Include="..\src\script\api\script_cargolist.hpp" />
-    <ClInclude Include="..\src\script\api\script_cargomonitor.hpp" />
     <ClInclude Include="..\src\script\api\script_company.hpp" />
     <ClInclude Include="..\src\script\api\script_companymode.hpp" />
     <ClInclude Include="..\src\script\api\script_controller.hpp" />
@@ -1033,9 +983,6 @@
     <ClInclude Include="..\src\script\api\script_signlist.hpp" />
     <ClInclude Include="..\src\script\api\script_station.hpp" />
     <ClInclude Include="..\src\script\api\script_stationlist.hpp" />
-    <ClInclude Include="..\src\script\api\script_story_page.hpp" />
-    <ClInclude Include="..\src\script\api\script_storypagelist.hpp" />
-    <ClInclude Include="..\src\script\api\script_storypageelementlist.hpp" />
     <ClInclude Include="..\src\script\api\script_subsidy.hpp" />
     <ClInclude Include="..\src\script\api\script_subsidylist.hpp" />
     <ClInclude Include="..\src\script\api\script_testmode.hpp" />
@@ -1061,7 +1008,6 @@
     <ClCompile Include="..\src\script\api\script_bridgelist.cpp" />
     <ClCompile Include="..\src\script\api\script_cargo.cpp" />
     <ClCompile Include="..\src\script\api\script_cargolist.cpp" />
-    <ClCompile Include="..\src\script\api\script_cargomonitor.cpp" />
     <ClCompile Include="..\src\script\api\script_company.cpp" />
     <ClCompile Include="..\src\script\api\script_companymode.cpp" />
     <ClCompile Include="..\src\script\api\script_controller.cpp" />
@@ -1097,9 +1043,6 @@
     <ClCompile Include="..\src\script\api\script_signlist.cpp" />
     <ClCompile Include="..\src\script\api\script_station.cpp" />
     <ClCompile Include="..\src\script\api\script_stationlist.cpp" />
-    <ClCompile Include="..\src\script\api\script_story_page.cpp" />
-    <ClCompile Include="..\src\script\api\script_storypagelist.cpp" />
-    <ClCompile Include="..\src\script\api\script_storypageelementlist.cpp" />
     <ClCompile Include="..\src\script\api\script_subsidy.cpp" />
     <ClCompile Include="..\src\script\api\script_subsidylist.cpp" />
     <ClCompile Include="..\src\script\api\script_testmode.cpp" />
@@ -1117,22 +1060,12 @@
     <ClCompile Include="..\src\script\api\script_window.cpp" />
     <ClCompile Include="..\src\blitter\32bpp_anim.cpp" />
     <ClInclude Include="..\src\blitter\32bpp_anim.hpp" />
-    <ClCompile Include="..\src\blitter\32bpp_anim_sse4.cpp" />
-    <ClInclude Include="..\src\blitter\32bpp_anim_sse4.hpp" />
     <ClCompile Include="..\src\blitter\32bpp_base.cpp" />
     <ClInclude Include="..\src\blitter\32bpp_base.hpp" />
     <ClCompile Include="..\src\blitter\32bpp_optimized.cpp" />
     <ClInclude Include="..\src\blitter\32bpp_optimized.hpp" />
     <ClCompile Include="..\src\blitter\32bpp_simple.cpp" />
     <ClInclude Include="..\src\blitter\32bpp_simple.hpp" />
-    <ClInclude Include="..\src\blitter\32bpp_sse_func.hpp" />
-    <ClInclude Include="..\src\blitter\32bpp_sse_type.h" />
-    <ClCompile Include="..\src\blitter\32bpp_sse2.cpp" />
-    <ClInclude Include="..\src\blitter\32bpp_sse2.hpp" />
-    <ClCompile Include="..\src\blitter\32bpp_sse4.cpp" />
-    <ClInclude Include="..\src\blitter\32bpp_sse4.hpp" />
-    <ClCompile Include="..\src\blitter\32bpp_ssse3.cpp" />
-    <ClInclude Include="..\src\blitter\32bpp_ssse3.hpp" />
     <ClCompile Include="..\src\blitter\8bpp_base.cpp" />
     <ClInclude Include="..\src\blitter\8bpp_base.hpp" />
     <ClCompile Include="..\src\blitter\8bpp_optimized.cpp" />
@@ -1254,7 +1187,6 @@
     <ClCompile Include="..\src\pathfinder\yapf\yapf_rail.cpp" />
     <ClCompile Include="..\src\pathfinder\yapf\yapf_road.cpp" />
     <ClCompile Include="..\src\pathfinder\yapf\yapf_ship.cpp" />
-    <ClInclude Include="..\src\pathfinder\yapf\yapf_type.hpp" />
     <ClCompile Include="..\src\video\dedicated_v.cpp" />
     <ClCompile Include="..\src\video\null_v.cpp" />
     <ClCompile Include="..\src\video\sdl_v.cpp" />

projects/openttd_vs100.vcxproj.filters

@@ -117,12 +117,6 @@
     <ClCompile Include="..\src\bmp.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\cargoaction.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\cargomonitor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\cargopacket.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -141,9 +135,6 @@
     <ClCompile Include="..\src\console_cmds.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\cpu.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\crashlog.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -162,9 +153,6 @@
     <ClCompile Include="..\src\depot.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\disaster_vehicle.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\driver.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -189,12 +177,6 @@
     <ClCompile Include="..\src\fontcache.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\fontdetection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\base_consist.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\gamelog.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -207,9 +189,6 @@
     <ClCompile Include="..\src\gfxinit.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\gfx_layout.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\goal.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -234,27 +213,6 @@
     <ClCompile Include="..\src\landscape.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\linkgraph\demands.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\linkgraph\flowmapper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\linkgraph\linkgraph.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\linkgraph\linkgraphjob.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\linkgraph\linkgraphschedule.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\linkgraph\mcf.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\linkgraph\refresh.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\map.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -297,6 +255,9 @@
     <ClCompile Include="..\src\order_backup.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\os_timer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\pbs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -348,21 +309,12 @@
     <ClCompile Include="..\src\string.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\stringfilter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\strings.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\story.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\subsidy.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\textbuf.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\texteff.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -387,9 +339,6 @@
     <ClCompile Include="..\src\viewport.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\viewport_sprite_sorter_sse4.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\waypoint.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -444,12 +393,6 @@
     <ClInclude Include="..\src\cargo_type.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\cargoaction.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\cargomonitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\cargopacket.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -501,9 +444,6 @@
     <ClInclude Include="..\src\console_type.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\cpu.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\crashlog.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -543,9 +483,6 @@
     <ClInclude Include="..\src\direction_type.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\disaster_vehicle.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\music\dmusic.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -597,12 +534,6 @@
     <ClInclude Include="..\src\fontcache.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\fontdetection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\base_consist.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\gamelog.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -615,9 +546,6 @@
     <ClInclude Include="..\src\gfx_func.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\gfx_layout.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\gfx_type.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -684,42 +612,6 @@
     <ClInclude Include="..\src\language.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\linkgraph\demands.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\flowmapper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\init.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\linkgraph.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\linkgraph_base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\linkgraph_gui.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\linkgraph_type.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\linkgraphjob.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\linkgraphjob_base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\linkgraphschedule.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\mcf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\linkgraph\refresh.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\livery.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -939,9 +831,6 @@
     <ClInclude Include="..\src\roadveh.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\safeguards.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\screenshot.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -957,9 +846,6 @@
     <ClInclude Include="..\src\settings_func.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\settings_gui.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\settings_internal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1026,27 +912,15 @@
     <ClInclude Include="..\src\stdafx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\story_base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\story_type.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\strgen\strgen.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\string_base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\string_func.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\src\string_type.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\stringfilter_type.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\strings_func.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1071,9 +945,6 @@
     <ClInclude Include="..\src\textbuf_gui.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\textbuf_type.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\texteff.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1164,9 +1035,6 @@
     <ClInclude Include="..\src\viewport_func.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\viewport_sprite_sorter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\viewport_type.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1254,9 +1122,6 @@
     <ClInclude Include="..\src\core\mem_func.hpp">
       <Filter>Core Source Code</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\core\multimap.hpp">
-      <Filter>Core Source Code</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\core\overflowsafe_type.hpp">
       <Filter>Core Source Code</Filter>
     </ClInclude>
@@ -1278,12 +1143,6 @@
     <ClInclude Include="..\src\core\smallmap_type.hpp">
       <Filter>Core Source Code</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\core\smallmatrix_type.hpp">
-      <Filter>Core Source Code</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\core\smallstack_type.hpp">
-      <Filter>Core Source Code</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\core\smallvec_type.hpp">
       <Filter>Core Source Code</Filter>
     </ClInclude>
@@ -1359,9 +1218,6 @@
     <ClCompile Include="..\src\intro_gui.cpp">
       <Filter>GUI Source Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\linkgraph\linkgraph_gui.cpp">
-      <Filter>GUI Source Code</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\main_gui.cpp">
       <Filter>GUI Source Code</Filter>
     </ClCompile>
@@ -1425,9 +1281,6 @@
     <ClCompile Include="..\src\statusbar_gui.cpp">
       <Filter>GUI Source Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\story_gui.cpp">
-      <Filter>GUI Source Code</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\subsidy_gui.cpp">
       <Filter>GUI Source Code</Filter>
     </ClCompile>
@@ -1542,9 +1395,6 @@
     <ClInclude Include="..\src\widgets\intro_widget.h">
       <Filter>Widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\widgets\link_graph_legend_widget.h">
-      <Filter>Widgets</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\widgets\main_widget.h">
       <Filter>Widgets</Filter>
     </ClInclude>
@@ -1602,9 +1452,6 @@
     <ClInclude Include="..\src\widgets\statusbar_widget.h">
       <Filter>Widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\widgets\story_widget.h">
-      <Filter>Widgets</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\widgets\subsidy_widget.h">
       <Filter>Widgets</Filter>
     </ClInclude>
@@ -1650,6 +1497,9 @@
     <ClCompile Include="..\src\depot_cmd.cpp">
       <Filter>Command handlers</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\disaster_cmd.cpp">
+      <Filter>Command handlers</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\group_cmd.cpp">
       <Filter>Command handlers</Filter>
     </ClCompile>
@@ -1728,9 +1578,6 @@
     <ClCompile Include="..\src\saveload\autoreplace_sl.cpp">
       <Filter>Save/Load handlers</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\saveload\cargomonitor_sl.cpp">
-      <Filter>Save/Load handlers</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\saveload\cargopacket_sl.cpp">
       <Filter>Save/Load handlers</Filter>
     </ClCompile>
@@ -1767,9 +1614,6 @@
     <ClCompile Include="..\src\saveload\labelmaps_sl.cpp">
       <Filter>Save/Load handlers</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\saveload\linkgraph_sl.cpp">
-      <Filter>Save/Load handlers</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\saveload\map_sl.cpp">
       <Filter>Save/Load handlers</Filter>
     </ClCompile>
@@ -1821,9 +1665,6 @@
     <ClCompile Include="..\src\saveload\strings_sl.cpp">
       <Filter>Save/Load handlers</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\saveload\story_sl.cpp">
-      <Filter>Save/Load handlers</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\saveload\subsidy_sl.cpp">
       <Filter>Save/Load handlers</Filter>
     </ClCompile>
@@ -1878,9 +1719,6 @@
     <ClInclude Include="..\src\table\genland.h">
       <Filter>Tables</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\table\heightmap_colours.h">
-      <Filter>Tables</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\table\industry_land.h">
       <Filter>Tables</Filter>
     </ClInclude>
@@ -2088,12 +1926,27 @@
     <ClInclude Include="..\src\3rdparty\squirrel\include\sqstdaux.h">
       <Filter>Squirrel headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\3rdparty\squirrel\include\sqstdblob.h">
+      <Filter>Squirrel headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\3rdparty\squirrel\sqstdlib\sqstdblobimpl.h">
+      <Filter>Squirrel headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\3rdparty\squirrel\include\sqstdio.h">
+      <Filter>Squirrel headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\3rdparty\squirrel\include\sqstdmath.h">
       <Filter>Squirrel headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\3rdparty\squirrel\sqstdlib\sqstdstream.h">
+      <Filter>Squirrel headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\3rdparty\squirrel\include\sqstdstring.h">
       <Filter>Squirrel headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\3rdparty\squirrel\include\sqstdsystem.h">
+      <Filter>Squirrel headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\3rdparty\squirrel\squirrel\sqstring.h">
       <Filter>Squirrel headers</Filter>
     </ClInclude>
@@ -2217,9 +2070,6 @@
     <ClInclude Include="..\src\script\api\script_cargolist.hpp">
       <Filter>Script API</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\script\api\script_cargomonitor.hpp">
-      <Filter>Script API</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\script\api\script_company.hpp">
       <Filter>Script API</Filter>
     </ClInclude>
@@ -2328,15 +2178,6 @@
     <ClInclude Include="..\src\script\api\script_stationlist.hpp">
       <Filter>Script API</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\script\api\script_story_page.hpp">
-      <Filter>Script API</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\script\api\script_storypagelist.hpp">
-      <Filter>Script API</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\script\api\script_storypageelementlist.hpp">
-      <Filter>Script API</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\script\api\script_subsidy.hpp">
       <Filter>Script API</Filter>
     </ClInclude>
@@ -2412,9 +2253,6 @@
     <ClCompile Include="..\src\script\api\script_cargolist.cpp">
       <Filter>Script API Implementation</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\script\api\script_cargomonitor.cpp">
-      <Filter>Script API Implementation</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\script\api\script_company.cpp">
       <Filter>Script API Implementation</Filter>
     </ClCompile>
@@ -2520,15 +2358,6 @@
     <ClCompile Include="..\src\script\api\script_stationlist.cpp">
       <Filter>Script API Implementation</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\script\api\script_story_page.cpp">
-      <Filter>Script API Implementation</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\script\api\script_storypagelist.cpp">
-      <Filter>Script API Implementation</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\script\api\script_storypageelementlist.cpp">
-      <Filter>Script API Implementation</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\script\api\script_subsidy.cpp">
       <Filter>Script API Implementation</Filter>
     </ClCompile>
@@ -2580,12 +2409,6 @@
     <ClInclude Include="..\src\blitter\32bpp_anim.hpp">
       <Filter>Blitters</Filter>
     </ClInclude>
-    <ClCompile Include="..\src\blitter\32bpp_anim_sse4.cpp">
-      <Filter>Blitters</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\blitter\32bpp_anim_sse4.hpp">
-      <Filter>Blitters</Filter>
-    </ClInclude>
     <ClCompile Include="..\src\blitter\32bpp_base.cpp">
       <Filter>Blitters</Filter>
     </ClCompile>
@@ -2604,30 +2427,6 @@
     <ClInclude Include="..\src\blitter\32bpp_simple.hpp">
       <Filter>Blitters</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\blitter\32bpp_sse_func.hpp">
-      <Filter>Blitters</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\blitter\32bpp_sse_type.h">
-      <Filter>Blitters</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\blitter\32bpp_sse2.cpp">
-      <Filter>Blitters</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\blitter\32bpp_sse2.hpp">
-      <Filter>Blitters</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\blitter\32bpp_sse4.cpp">
-      <Filter>Blitters</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\blitter\32bpp_sse4.hpp">
-      <Filter>Blitters</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\blitter\32bpp_ssse3.cpp">
-      <Filter>Blitters</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\blitter\32bpp_ssse3.hpp">
-      <Filter>Blitters</Filter>
-    </ClInclude>
     <ClCompile Include="..\src\blitter\8bpp_base.cpp">
       <Filter>Blitters</Filter>
     </ClCompile>
@@ -2991,9 +2790,6 @@
     <ClCompile Include="..\src\pathfinder\yapf\yapf_ship.cpp">
       <Filter>YAPF</Filter>
     </ClCompile>
-    <ClInclude Include="..\src\pathfinder\yapf\yapf_type.hpp">
-      <Filter>YAPF</Filter>
-    </ClInclude>
     <ClCompile Include="..\src\video\dedicated_v.cpp">
       <Filter>Video</Filter>
     </ClCompile>

projects/openttd_vs100.vcxproj.in

@@ -102,7 +102,7 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -131,7 +131,7 @@
       <Culture>0x0809</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -156,7 +156,7 @@
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -176,7 +176,7 @@
       <Culture>0x0809</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -204,7 +204,7 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -233,7 +233,7 @@
       <Culture>0x0809</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -256,7 +256,7 @@
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -280,7 +280,7 @@
       <Culture>0x0809</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>

projects/openttd_vs80.vcproj

@@ -52,7 +52,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -87,7 +87,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -156,7 +156,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -184,7 +184,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -257,7 +257,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -292,7 +292,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -362,7 +362,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -392,7 +392,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -454,14 +454,6 @@
 				RelativePath=".\..\src\bmp.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\cargoaction.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\cargomonitor.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\cargopacket.cpp"
 				>
@@ -486,10 +478,6 @@
 				RelativePath=".\..\src\console_cmds.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\cpu.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\crashlog.cpp"
 				>
@@ -514,10 +502,6 @@
 				RelativePath=".\..\src\depot.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\disaster_vehicle.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\driver.cpp"
 				>
@@ -550,14 +534,6 @@
 				RelativePath=".\..\src\fontcache.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\fontdetection.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\base_consist.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\gamelog.cpp"
 				>
@@ -574,10 +550,6 @@
 				RelativePath=".\..\src\gfxinit.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\gfx_layout.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\goal.cpp"
 				>
@@ -610,34 +582,6 @@
 				RelativePath=".\..\src\landscape.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\demands.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\flowmapper.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraphjob.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraphschedule.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\mcf.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\refresh.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\map.cpp"
 				>
@@ -694,6 +638,10 @@
 				RelativePath=".\..\src\order_backup.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\os_timer.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\pbs.cpp"
 				>
@@ -762,26 +710,14 @@
 				RelativePath=".\..\src\string.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\stringfilter.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\strings.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\story.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\subsidy.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\textbuf.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\texteff.cpp"
 				>
@@ -814,10 +750,6 @@
 				RelativePath=".\..\src\viewport.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\viewport_sprite_sorter_sse4.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\waypoint.cpp"
 				>
@@ -894,14 +826,6 @@
 				RelativePath=".\..\src\cargo_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\cargoaction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\cargomonitor.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\cargopacket.h"
 				>
@@ -970,10 +894,6 @@
 				RelativePath=".\..\src\console_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\cpu.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\crashlog.h"
 				>
@@ -1026,10 +946,6 @@
 				RelativePath=".\..\src\direction_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\disaster_vehicle.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\music\dmusic.h"
 				>
@@ -1098,14 +1014,6 @@
 				RelativePath=".\..\src\fontcache.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\fontdetection.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\base_consist.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\gamelog.h"
 				>
@@ -1122,10 +1030,6 @@
 				RelativePath=".\..\src\gfx_func.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\gfx_layout.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\gfx_type.h"
 				>
@@ -1214,54 +1118,6 @@
 				RelativePath=".\..\src\language.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\demands.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\flowmapper.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\init.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph_base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph_gui.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph_type.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraphjob.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraphjob_base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraphschedule.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\mcf.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\refresh.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\livery.h"
 				>
@@ -1554,10 +1410,6 @@
 				RelativePath=".\..\src\roadveh.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\safeguards.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\screenshot.h"
 				>
@@ -1578,10 +1430,6 @@
 				RelativePath=".\..\src\settings_func.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\settings_gui.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\settings_internal.h"
 				>
@@ -1670,22 +1518,10 @@
 				RelativePath=".\..\src\stdafx.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\story_base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\story_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\strgen\strgen.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\string_base.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\string_func.h"
 				>
@@ -1694,10 +1530,6 @@
 				RelativePath=".\..\src\string_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\stringfilter_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\strings_func.h"
 				>
@@ -1730,10 +1562,6 @@
 				RelativePath=".\..\src\textbuf_gui.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\textbuf_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\texteff.hpp"
 				>
@@ -1854,10 +1682,6 @@
 				RelativePath=".\..\src\viewport_func.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\viewport_sprite_sorter.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\viewport_type.h"
 				>
@@ -1978,10 +1802,6 @@
 				RelativePath=".\..\src\core\mem_func.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\core\multimap.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\core\overflowsafe_type.hpp"
 				>
@@ -2010,14 +1830,6 @@
 				RelativePath=".\..\src\core\smallmap_type.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\core\smallmatrix_type.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\core\smallstack_type.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\core\smallvec_type.hpp"
 				>
@@ -2122,10 +1934,6 @@
 				RelativePath=".\..\src\intro_gui.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\main_gui.cpp"
 				>
@@ -2210,10 +2018,6 @@
 				RelativePath=".\..\src\statusbar_gui.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\story_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\subsidy_gui.cpp"
 				>
@@ -2370,10 +2174,6 @@
 				RelativePath=".\..\src\widgets\intro_widget.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\widgets\link_graph_legend_widget.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\widgets\main_widget.h"
 				>
@@ -2450,10 +2250,6 @@
 				RelativePath=".\..\src\widgets\statusbar_widget.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\widgets\story_widget.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\widgets\subsidy_widget.h"
 				>
@@ -2518,6 +2314,10 @@
 				RelativePath=".\..\src\depot_cmd.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\disaster_cmd.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\group_cmd.cpp"
 				>
@@ -2626,10 +2426,6 @@
 				RelativePath=".\..\src\saveload\autoreplace_sl.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\saveload\cargomonitor_sl.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\saveload\cargopacket_sl.cpp"
 				>
@@ -2678,10 +2474,6 @@
 				RelativePath=".\..\src\saveload\labelmaps_sl.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\saveload\linkgraph_sl.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\saveload\map_sl.cpp"
 				>
@@ -2750,10 +2542,6 @@
 				RelativePath=".\..\src\saveload\strings_sl.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\saveload\story_sl.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\saveload\subsidy_sl.cpp"
 				>
@@ -2830,10 +2618,6 @@
 				RelativePath=".\..\src\table\genland.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\table\heightmap_colours.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\table\industry_land.h"
 				>
@@ -3126,14 +2910,34 @@
 				RelativePath=".\..\src\3rdparty\squirrel\include\sqstdaux.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\3rdparty\squirrel\include\sqstdblob.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\3rdparty\squirrel\sqstdlib\sqstdblobimpl.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\3rdparty\squirrel\include\sqstdio.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\3rdparty\squirrel\include\sqstdmath.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\3rdparty\squirrel\sqstdlib\sqstdstream.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\3rdparty\squirrel\include\sqstdstring.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\3rdparty\squirrel\include\sqstdsystem.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\3rdparty\squirrel\squirrel\sqstring.h"
 				>
@@ -3318,10 +3122,6 @@
 				RelativePath=".\..\src\script\api\script_cargolist.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_cargomonitor.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\script\api\script_company.hpp"
 				>
@@ -3466,18 +3266,6 @@
 				RelativePath=".\..\src\script\api\script_stationlist.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_story_page.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_storypagelist.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_storypageelementlist.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\script\api\script_subsidy.hpp"
 				>
@@ -3582,10 +3370,6 @@
 				RelativePath=".\..\src\script\api\script_cargolist.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_cargomonitor.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\script\api\script_company.cpp"
 				>
@@ -3726,18 +3510,6 @@
 				RelativePath=".\..\src\script\api\script_stationlist.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_story_page.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_storypagelist.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_storypageelementlist.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\script\api\script_subsidy.cpp"
 				>
@@ -3810,14 +3582,6 @@
 				RelativePath=".\..\src\blitter\32bpp_anim.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_anim_sse4.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_anim_sse4.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\blitter\32bpp_base.cpp"
 				>
@@ -3842,38 +3606,6 @@
 				RelativePath=".\..\src\blitter\32bpp_simple.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse_func.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse_type.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse2.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse2.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse4.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse4.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_ssse3.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_ssse3.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\blitter\8bpp_base.cpp"
 				>
@@ -4394,10 +4126,6 @@
 				RelativePath=".\..\src\pathfinder\yapf\yapf_ship.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_type.hpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Video"

projects/openttd_vs80.vcproj.in

@@ -52,7 +52,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -87,7 +87,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -156,7 +156,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -184,7 +184,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -257,7 +257,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -292,7 +292,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -362,7 +362,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -392,7 +392,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"

projects/openttd_vs90.vcproj

@@ -53,7 +53,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -88,7 +88,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -155,7 +155,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -183,7 +183,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -255,7 +255,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -290,7 +290,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -359,7 +359,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -389,7 +389,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -451,14 +451,6 @@
 				RelativePath=".\..\src\bmp.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\cargoaction.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\cargomonitor.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\cargopacket.cpp"
 				>
@@ -483,10 +475,6 @@
 				RelativePath=".\..\src\console_cmds.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\cpu.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\crashlog.cpp"
 				>
@@ -511,10 +499,6 @@
 				RelativePath=".\..\src\depot.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\disaster_vehicle.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\driver.cpp"
 				>
@@ -547,14 +531,6 @@
 				RelativePath=".\..\src\fontcache.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\fontdetection.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\base_consist.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\gamelog.cpp"
 				>
@@ -571,10 +547,6 @@
 				RelativePath=".\..\src\gfxinit.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\gfx_layout.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\goal.cpp"
 				>
@@ -607,34 +579,6 @@
 				RelativePath=".\..\src\landscape.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\demands.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\flowmapper.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraphjob.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraphschedule.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\mcf.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\refresh.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\map.cpp"
 				>
@@ -691,6 +635,10 @@
 				RelativePath=".\..\src\order_backup.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\os_timer.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\pbs.cpp"
 				>
@@ -759,26 +707,14 @@
 				RelativePath=".\..\src\string.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\stringfilter.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\strings.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\story.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\subsidy.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\textbuf.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\texteff.cpp"
 				>
@@ -811,10 +747,6 @@
 				RelativePath=".\..\src\viewport.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\viewport_sprite_sorter_sse4.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\waypoint.cpp"
 				>
@@ -891,14 +823,6 @@
 				RelativePath=".\..\src\cargo_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\cargoaction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\cargomonitor.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\cargopacket.h"
 				>
@@ -967,10 +891,6 @@
 				RelativePath=".\..\src\console_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\cpu.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\crashlog.h"
 				>
@@ -1023,10 +943,6 @@
 				RelativePath=".\..\src\direction_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\disaster_vehicle.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\music\dmusic.h"
 				>
@@ -1095,14 +1011,6 @@
 				RelativePath=".\..\src\fontcache.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\fontdetection.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\base_consist.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\gamelog.h"
 				>
@@ -1119,10 +1027,6 @@
 				RelativePath=".\..\src\gfx_func.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\gfx_layout.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\gfx_type.h"
 				>
@@ -1211,54 +1115,6 @@
 				RelativePath=".\..\src\language.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\demands.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\flowmapper.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\init.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph_base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph_gui.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph_type.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraphjob.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraphjob_base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraphschedule.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\mcf.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\refresh.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\livery.h"
 				>
@@ -1551,10 +1407,6 @@
 				RelativePath=".\..\src\roadveh.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\safeguards.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\screenshot.h"
 				>
@@ -1575,10 +1427,6 @@
 				RelativePath=".\..\src\settings_func.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\settings_gui.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\settings_internal.h"
 				>
@@ -1667,22 +1515,10 @@
 				RelativePath=".\..\src\stdafx.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\story_base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\story_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\strgen\strgen.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\string_base.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\string_func.h"
 				>
@@ -1691,10 +1527,6 @@
 				RelativePath=".\..\src\string_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\stringfilter_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\strings_func.h"
 				>
@@ -1727,10 +1559,6 @@
 				RelativePath=".\..\src\textbuf_gui.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\textbuf_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\texteff.hpp"
 				>
@@ -1851,10 +1679,6 @@
 				RelativePath=".\..\src\viewport_func.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\viewport_sprite_sorter.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\viewport_type.h"
 				>
@@ -1975,10 +1799,6 @@
 				RelativePath=".\..\src\core\mem_func.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\core\multimap.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\core\overflowsafe_type.hpp"
 				>
@@ -2007,14 +1827,6 @@
 				RelativePath=".\..\src\core\smallmap_type.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\core\smallmatrix_type.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\core\smallstack_type.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\core\smallvec_type.hpp"
 				>
@@ -2119,10 +1931,6 @@
 				RelativePath=".\..\src\intro_gui.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\linkgraph_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\main_gui.cpp"
 				>
@@ -2207,10 +2015,6 @@
 				RelativePath=".\..\src\statusbar_gui.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\story_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\subsidy_gui.cpp"
 				>
@@ -2367,10 +2171,6 @@
 				RelativePath=".\..\src\widgets\intro_widget.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\widgets\link_graph_legend_widget.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\widgets\main_widget.h"
 				>
@@ -2447,10 +2247,6 @@
 				RelativePath=".\..\src\widgets\statusbar_widget.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\widgets\story_widget.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\widgets\subsidy_widget.h"
 				>
@@ -2515,6 +2311,10 @@
 				RelativePath=".\..\src\depot_cmd.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\disaster_cmd.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\group_cmd.cpp"
 				>
@@ -2623,10 +2423,6 @@
 				RelativePath=".\..\src\saveload\autoreplace_sl.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\saveload\cargomonitor_sl.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\saveload\cargopacket_sl.cpp"
 				>
@@ -2675,10 +2471,6 @@
 				RelativePath=".\..\src\saveload\labelmaps_sl.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\saveload\linkgraph_sl.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\saveload\map_sl.cpp"
 				>
@@ -2747,10 +2539,6 @@
 				RelativePath=".\..\src\saveload\strings_sl.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\saveload\story_sl.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\saveload\subsidy_sl.cpp"
 				>
@@ -2827,10 +2615,6 @@
 				RelativePath=".\..\src\table\genland.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\table\heightmap_colours.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\table\industry_land.h"
 				>
@@ -3123,14 +2907,34 @@
 				RelativePath=".\..\src\3rdparty\squirrel\include\sqstdaux.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\3rdparty\squirrel\include\sqstdblob.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\3rdparty\squirrel\sqstdlib\sqstdblobimpl.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\3rdparty\squirrel\include\sqstdio.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\3rdparty\squirrel\include\sqstdmath.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\3rdparty\squirrel\sqstdlib\sqstdstream.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\3rdparty\squirrel\include\sqstdstring.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\3rdparty\squirrel\include\sqstdsystem.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\3rdparty\squirrel\squirrel\sqstring.h"
 				>
@@ -3315,10 +3119,6 @@
 				RelativePath=".\..\src\script\api\script_cargolist.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_cargomonitor.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\script\api\script_company.hpp"
 				>
@@ -3463,18 +3263,6 @@
 				RelativePath=".\..\src\script\api\script_stationlist.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_story_page.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_storypagelist.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_storypageelementlist.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\script\api\script_subsidy.hpp"
 				>
@@ -3579,10 +3367,6 @@
 				RelativePath=".\..\src\script\api\script_cargolist.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_cargomonitor.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\script\api\script_company.cpp"
 				>
@@ -3723,18 +3507,6 @@
 				RelativePath=".\..\src\script\api\script_stationlist.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_story_page.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_storypagelist.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\api\script_storypageelementlist.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\script\api\script_subsidy.cpp"
 				>
@@ -3807,14 +3579,6 @@
 				RelativePath=".\..\src\blitter\32bpp_anim.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_anim_sse4.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_anim_sse4.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\blitter\32bpp_base.cpp"
 				>
@@ -3839,38 +3603,6 @@
 				RelativePath=".\..\src\blitter\32bpp_simple.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse_func.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse_type.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse2.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse2.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse4.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse4.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_ssse3.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_ssse3.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\blitter\8bpp_base.cpp"
 				>
@@ -4391,10 +4123,6 @@
 				RelativePath=".\..\src\pathfinder\yapf\yapf_ship.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_type.hpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Video"

projects/openttd_vs90.vcproj.in

@@ -53,7 +53,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -88,7 +88,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -155,7 +155,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -183,7 +183,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -255,7 +255,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -290,7 +290,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -359,7 +359,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -389,7 +389,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"

projects/settings_vs100.vcxproj

@@ -23,7 +23,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <SettingsCommandLine>
-..\objs\settings\settings_gen.exe -o ..\objs\settings\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble ..\src\table\company_settings.ini ..\src\table\currency_settings.ini ..\src\table\gameopt_settings.ini ..\src\table\misc_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini ..\src\table\window_settings.ini
+..\objs\settings\settings_gen.exe -o ..\objs\settings\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble ..\src\table\company_settings.ini ..\src\table\currency_settings.ini ..\src\table\gameopt_settings.ini ..\src\table\misc_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini
     </SettingsCommandLine>
   </PropertyGroup>
   <PropertyGroup>
@@ -42,7 +42,6 @@
     <None Include="..\src\table\misc_settings.ini" />
     <None Include="..\src\table\settings.ini" />
     <None Include="..\src\table\win32_settings.ini" />
-    <None Include="..\src\table\window_settings.ini" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\src\table\settings.h.postamble" />

projects/settings_vs100.vcxproj.filters

@@ -24,9 +24,6 @@
     <None Include="..\src\table\win32_settings.ini">
       <Filter>INI</Filter>
     </None>
-    <None Include="..\src\table\window_settings.ini">
-      <Filter>INI</Filter>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\src\table\settings.h.postamble" />