(svn r24979) -Release: 1.3.0-beta2

(svn r24978) -Update: some assorted documentation tidbits
(svn r24977) -Update from WebTranslator v3.0:
2026-07-15 15:19:52 +00:00 · 2013-02-07 21:01:54 +00:00 · 2013-02-07 20:53:55 +00:00 · 2013-02-07 18:45:07 +00:00 · 2013-02-06 18:45:20 +00:00 · 2013-02-06 17:51:05 +00:00
1306 changed files with 176111 additions and 92117 deletions
@@ -4,16 +4,14 @@ bin/ai/*
 !bin/ai/compat*.nut
 !bin/ai/regression
 !bin/data
-bin/data/*
-!bin/data/openttd.grf
-!bin/data/opntitle.dat
-!bin/data/orig_*.obg
-!bin/data/orig_*.obs
-!bin/data/no_sound.obs
-!bin/gm
-bin/gm/*
-!bin/gm/no_music.obm
-!bin/gm/orig_*.obm
+bin/baseset/*
+!bin/baseset/openttd.grf
+!bin/baseset/opntitle.dat
+!bin/baseset/orig_*.obg
+!bin/baseset/orig_*.obs
+!bin/baseset/no_sound.obs
+!bin/baseset/no_music.obm
+!bin/baseset/orig_*.obm
 !bin/scripts
 bin/scripts/*
 !bin/scripts/*.example
@@ -22,6 +20,7 @@ bin/scripts/*
 bundle/*
 bundles/*
 docs/aidocs/*
+docs/gamedocs/*
 docs/source/*
 media/openttd.desktop
 media/openttd.desktop.install
@@ -1,5 +1,7 @@
 syntax: glob

+.svn
+bin/baseset/openttd.32.bmp
 bin/lang/*
 bin/openttd*
 bin/*.cfg
@@ -9,6 +11,7 @@ config.cache*
 config.log
 config.pwd
 docs/aidocs/*
+docs/gamedocs/*
 docs/source/*
 Makefile
 Makefile.am
@@ -93,7 +93,7 @@ FILE_PATTERNS          = *.c \
 RECURSIVE              = YES
 EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = */3rdparty */.svn
+EXCLUDE_PATTERNS       = */3rdparty */.svn */script/api
 EXAMPLE_PATH           =
 EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = NO
@@ -195,7 +195,7 @@ EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           =
 INCLUDE_FILE_PATTERNS  =
-PREDEFINED             = ENABLE_NETWORK ENABLE_AI WITH_ZLIB WITH_LZO WITH_PNG WITH_FONTCONFIG WITH_FREETYPE WITH_ICU UNICODE _UNICODE
+PREDEFINED             = ENABLE_NETWORK WITH_ZLIB WITH_LZO WITH_LZMA WITH_SDL WITH_PNG WITH_FONTCONFIG WITH_FREETYPE WITH_ICU UNICODE _UNICODE _GNU_SOURCE FINAL=
 EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
@@ -10,13 +10,9 @@
 #

 # 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),)
@@ -29,17 +25,17 @@ 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
-DATA_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/data
-LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
-GM_DIR   = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/gm
-TTD_DIR  = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
+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
-DATA_DIR = $(BUNDLE_DIR)/data
-LANG_DIR = $(BUNDLE_DIR)/lang
-GM_DIR   = $(BUNDLE_DIR)/gm
-TTD_DIR  = $(BUNDLE_DIR)
+AI_DIR      = $(BUNDLE_DIR)/ai
+GAME_DIR    = $(BUNDLE_DIR)/game
+BASESET_DIR = $(BUNDLE_DIR)/baseset
+LANG_DIR    = $(BUNDLE_DIR)/lang
+TTD_DIR     = $(BUNDLE_DIR)
 endif

 bundle: all
@@ -51,29 +47,32 @@ bundle: all
 	$(Q)mkdir -p "$(BUNDLE_DIR)/scripts"
 	$(Q)mkdir -p "$(TTD_DIR)"
 	$(Q)mkdir -p "$(AI_DIR)"
-	$(Q)mkdir -p "$(DATA_DIR)"
+	$(Q)mkdir -p "$(GAME_DIR)"
+	$(Q)mkdir -p "$(BASESET_DIR)"
 	$(Q)mkdir -p "$(LANG_DIR)"
-	$(Q)mkdir -p "$(GM_DIR)"
 ifdef OSXAPP
 	$(Q)mkdir -p "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources"
 	$(Q)echo "APPL????" >                                          "$(BUNDLE_DIR)/$(OSXAPP)/Contents/PkgInfo"
 	$(Q)cp    "$(ROOT_DIR)/os/macosx/openttd.icns"                 "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/openttd.icns"
 	$(Q)$(ROOT_DIR)/os/macosx/plistgen.sh                          "$(BUNDLE_DIR)/$(OSXAPP)" "$(REV)"
-	$(Q)cp    "$(ROOT_DIR)/os/macosx/splash.png"                   "$(DATA_DIR)"
+	$(Q)cp    "$(ROOT_DIR)/os/macosx/splash.png"                   "$(BASESET_DIR)"
+endif
+ifeq ($(OS),UNIX)
+	$(Q)cp "$(ROOT_DIR)/media/openttd.32.bmp" "$(BASESET_DIR)/"
 endif
 	$(Q)cp "$(BIN_DIR)/$(TTD)"                "$(TTD_DIR)/"
 	$(Q)cp "$(BIN_DIR)/ai/"compat_*.nut       "$(AI_DIR)/"
-	$(Q)cp "$(BIN_DIR)/data/"*.grf            "$(DATA_DIR)/"
-	$(Q)cp "$(BIN_DIR)/data/"*.obg            "$(DATA_DIR)/"
-	$(Q)cp "$(BIN_DIR)/data/"*.obs            "$(DATA_DIR)/"
-	$(Q)cp "$(BIN_DIR)/data/opntitle.dat"     "$(DATA_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)/"
+	$(Q)cp "$(BIN_DIR)/baseset/opntitle.dat"  "$(BASESET_DIR)/"
+	$(Q)cp "$(BIN_DIR)/baseset/"*.obm         "$(BASESET_DIR)/"
 	$(Q)cp "$(BIN_DIR)/lang/"*.lng            "$(LANG_DIR)/"
-	$(Q)cp "$(BIN_DIR)/gm/"*.obm              "$(GM_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/readme.txt"           "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/COPYING"              "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/known-bugs.txt"       "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/docs/multiplayer.txt" "$(BUNDLE_DIR)/docs/"
-	$(Q)cp "$(ROOT_DIR)/docs/32bpp.txt"       "$(BUNDLE_DIR)/docs/"
 	$(Q)cp "$(ROOT_DIR)/changelog.txt"        "$(BUNDLE_DIR)/"
 ifdef MAN_DIR
 	$(Q)mkdir -p "$(BUNDLE_DIR)/man/"
@@ -85,7 +84,7 @@ endif
 	$(Q)cp "$(BIN_DIR)/scripts/"*             "$(BUNDLE_DIR)/scripts/"
 ifdef MENU_DIR
 	$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
-	$(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | $(SORT) >> "$(BUNDLE_DIR)/media/openttd.desktop"
+	$(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | $(SORT) |  $(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.filter.awk" >> "$(BUNDLE_DIR)/media/openttd.desktop"
 	$(Q)sed s/=openttd/=$(BINARY_NAME)/g "$(BUNDLE_DIR)/media/openttd.desktop" > "$(ROOT_DIR)/media/openttd.desktop.install"
 endif
 ifeq ($(TTD), openttd.exe)
@@ -172,11 +171,9 @@ install: bundle
 	@echo '[INSTALL] Installing OpenTTD'
 	$(Q)install -d "$(INSTALL_BINARY_DIR)"
 	$(Q)install -d "$(INSTALL_ICON_DIR)"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/gm"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/ai"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/data"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/baseset"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/lang"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/gm"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/scripts"
 ifeq ($(TTD), openttd.exe)
 	$(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)/${BINARY_NAME}.exe"
@@ -185,8 +182,7 @@ else
 endif
 	$(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/ai/"* "$(INSTALL_DATA_DIR)/ai"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/data/"* "$(INSTALL_DATA_DIR)/data"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/gm/"* "$(INSTALL_DATA_DIR)/gm"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/baseset/"* "$(INSTALL_DATA_DIR)/baseset"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/scripts/"* "$(INSTALL_DATA_DIR)/scripts"
 ifndef DO_NOT_INSTALL_DOCS
 	$(Q)install -d "$(INSTALL_DOC_DIR)"
@@ -20,7 +20,7 @@

 ROOT_DIR = !!ROOT_DIR!!
 GRF_DIR  = $(ROOT_DIR)/media/extra_grf
-BIN_DIR  = !!BIN_DIR!!/data
+BIN_DIR  = !!BIN_DIR!!/baseset
 OBJS_DIR = !!GRF_OBJS_DIR!!
 OS       = !!OS!!
 STAGE    = !!STAGE!!
@@ -34,40 +34,39 @@ else
 	E = @echo
 endif

-# Some configurational settings for your environment.
-# If GRFCodec doesn't know a command, it'll exit with a non-zero exit code.
-GRFCODEC := $(shell grfcodec -s -v >/dev/null 2>/dev/null && echo "grfcodec -s" || echo "grfcodec")
-# Old NFORenums don't give an error code when a parameter isn't known, so we have to work around that.
-NFORENUM := $(shell [ `nforenum -s -v 2>/dev/null | wc -l ` -eq 1 ] && echo "nforenum -s" || echo "nforenum")
+GRFCODEC := !!GRFCODEC!!
+NFORENUM := !!NFORENUM!!
 MD5SUM   := $(shell [ "$(OS)" = "OSX" ] && echo "md5 -r" || echo "md5sum")

 # Some "should not be changed" settings.
-NFO_FILES    := $(GRF_DIR)/*.nfo
-PNG_FILES    := $(GRF_DIR)/*.png
+NFO_FILES    := $(GRF_DIR)/*.nfo $(GRF_DIR)/rivers/*.nfo
+PNG_FILES    := $(GRF_DIR)/*.png $(GRF_DIR)/rivers/*.png

 # Build the GRF.
+ifdef GRFCODEC
 all: $(BIN_DIR)/openttd.grf
+else
+all:
+endif

 # Make sure the sprites directory exists.
 $(OBJS_DIR)/sprites:
 	$(Q)-mkdir "$@"

 # Generic
-$(BIN_DIR)/openttd.grf: $(PNG_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites
-	@# Only try; if nforenum isn't available, just retouch the file as they likely didn't need it anyway.
-	$(Q) ($(NFORENUM) --help > /dev/null 2>&1 && $(MAKE) $(OBJS_DIR)/openttd.grf && cp $(OBJS_DIR)/openttd.grf $(BIN_DIR)/openttd.grf) || ([ -e $(BIN_DIR)/openttd.grf ] && touch $(BIN_DIR)/openttd.grf && echo "no NFORenum and GRFCodec found, skipping rebuild of openttd.grf...") || (echo "no NFORenum and GRFCodec found, but no openttd.grf either. Install NFORenum and GRFCodec." && exit 1)
+$(BIN_DIR)/openttd.grf: $(OBJS_DIR)/openttd.grf
+	$(Q)cp $(OBJS_DIR)/openttd.grf $(BIN_DIR)/openttd.grf
+	$(E) '$(STAGE) Updating base graphics sets'
+	$(Q) for grf in $(BIN_DIR)/orig*.obg; do sed 's/^OPENTTD.GRF  = [0-9a-f]*$$/OPENTTD.GRF  = '`$(MD5SUM) $(BIN_DIR)/openttd.grf | sed 's@ .*@@'`'/' $$grf > $$grf.tmp && mv $$grf.tmp $$grf; done

 # Yeah, we'd like to use -i in the sed, but Mac OS X's sed and GNU sed just can't agree on the usage of -i. In any case either one of them fails.
 $(OBJS_DIR)/openttd.grf: $(PNG_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites
 	$(E) '$(STAGE) Assembling openttd.nfo'
 	$(Q)-cp $(PNG_FILES) $(OBJS_DIR)/sprites 2> /dev/null
 	$(Q) gcc -I$(GRF_DIR) -C -E - < "$(GRF_DIR)/openttd.nfo" | sed -e '/^#/d' -e '/^$$/d' > $(OBJS_DIR)/sprites/openttd.nfo
-	$(Q) $(NFORENUM) $(OBJS_DIR)/sprites/openttd.nfo
+	$(Q) $(NFORENUM) -s $(OBJS_DIR)/sprites/openttd.nfo
 	$(E) '$(STAGE) Compiling openttd.grf'
-	$(Q) $(GRFCODEC) -e -p1 $(OBJS_DIR)/openttd.grf
-	$(Q) cp $(OBJS_DIR)/openttd.grf $(BIN_DIR)/openttd.grf
-	$(E) '$(STAGE) Updating base graphics sets'
-	$(Q) for grf in $(BIN_DIR)/orig*.obg; do sed 's/^OPENTTD.GRF  = [0-9a-f]*$$/OPENTTD.GRF  = '`$(MD5SUM) $(BIN_DIR)/openttd.grf | sed 's@ .*@@'`'/' $$grf > $$grf.tmp && mv $$grf.tmp $$grf; done
+	$(Q) $(GRFCODEC) -n -s -e -p1 $(OBJS_DIR)/openttd.grf

 # Clean up temporary files.
 clean:
@@ -41,7 +41,6 @@ TTDS        = $(SRC_DIRS:%=%/$(TTD))
 OS          = !!OS!!
 OSXAPP      = !!OSXAPP!!
 LIPO        = !!LIPO!!
-REVISION    = !!REVISION!!
 AWK         = !!AWK!!
 SORT        = !!SORT!!
 DISTCC      = !!DISTCC!!
@@ -126,6 +125,13 @@ lang:
 mrproper:
 	@for dir in $(DIRS); do \
 		$(MAKE) -C $$dir mrproper; \
+	done
+# Don't be tempted to merge these two for loops. Doing that breaks make
+# --dry-run, since make has this "feature" that it always runs commands
+# containing $(MAKE), even when --dry-run is passed. The objective is of
+# course to also get a dry-run of submakes, but make is not smart enough
+# to see that a for loop runs both a submake and an actual command.
+	@for dir in $(DIRS); do \
 		rm -f $$dir/Makefile; \
 	done
 	$(Q)rm -rf objs
@@ -148,7 +154,7 @@ mrproper:
 distclean: mrproper

 maintainer-clean: distclean
-	$(Q)rm -f $(BIN_DIR)/data/openttd.grf
+	$(Q)rm -f $(BIN_DIR)/baseset/openttd.grf

 depend:
 	@for dir in $(SRC_DIRS); do \
@@ -14,6 +14,7 @@ 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!!
@@ -42,25 +43,33 @@ RES := $(shell mkdir -p $(BIN_DIR)/lang )

 all: table/strings.h $(LANGS)

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

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

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

 lang/english.txt: $(LANG_DIR)/english.txt
 	$(Q)mkdir -p lang
 	$(Q)cp $(LANG_DIR)/english.txt lang/english.txt

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

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

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

 depend:

 clean:
 	$(E) '$(STAGE) Cleaning up language files'
-	$(Q)rm -f strgen.o string.o table/strings.h $(STRGEN) $(LANGS) $(LANGS:%=$(BIN_DIR)/lang/%) lang/english.* $(ENDIAN_TARGETS)
+	$(Q)rm -f strgen.o string.o alloc_func.o getoptdata.o table/strings.h $(STRGEN) $(LANGS) $(LANGS:%=$(BIN_DIR)/lang/%) lang/english.* $(ENDIAN_TARGETS)

 mrproper: clean
 	$(Q)rm -rf $(BIN_DIR)/lang
@@ -27,9 +27,21 @@ SRC_DIR     = "$(ROOT_DIR)/src"
 BUNDLE_DIR  = "$(ROOT_DIR)/bundle"
 BUNDLES_DIR = "$(ROOT_DIR)/bundles"
 TTD         = openttd.exe
+PDB         = openttd.pdb
+MODE        = Release
 TARGET     := $(shell echo $(PLATFORM) | sed "s@win64@x64@;s@win32@Win32@")

 all:
-	$(Q)cp objs/$(TARGET)/Release/$(TTD) $(BIN_DIR)/$(TTD)
+	$(Q)cp objs/$(TARGET)/$(MODE)/$(TTD) $(BIN_DIR)/$(TTD)

 include Makefile.bundle.in
+
+bundle_pdb:
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).pdb.xz'
+	$(Q)mkdir -p "$(BUNDLES_DIR)"
+	$(Q)cp objs/$(TARGET)/Release/$(PDB) $(BUNDLES_DIR)/$(BUNDLE_NAME).pdb
+	$(Q)xz -9 $(BUNDLES_DIR)/$(BUNDLE_NAME).pdb
+
+regression: all
+	$(Q)cp bin/$(TTD) bin/openttd
+	$(Q)cd bin && sh ai/regression/run.sh
@@ -0,0 +1,78 @@
+# $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/>.
+
+SETTINGSGEN      = !!SETTINGSGEN!!
+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!!
+
+ENDIAN_TARGETS := endian_host.h endian_target.h $(ENDIAN_CHECK)
+
+# Check if we want to show what we are doing
+ifdef VERBOSE
+	Q =
+	E = @true
+else
+	Q = @
+	E = @echo
+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
+	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
+
+alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h
+	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
+
+getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h
+	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/misc/%.cpp=%.cpp)'
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
+
+string.o: $(SRC_DIR)/string.cpp endian_host.h
+	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
+
+ini_load.o: $(SRC_DIR)/ini_load.cpp $(SRC_DIR)/core/alloc_func.hpp $(SRC_DIR)/core/mem_func.hpp $(SRC_DIR)/ini_type.h $(SRC_DIR)/string_func.h
+	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_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 $@
+
+table/settings.h: $(SETTINGSGEN) $(SRC_DIR)/table/settings.h.preamble $(SRC_DIR)/table/settings.h.postamble $(SRC_DIR)/table/*.ini
+	$(E) '$(STAGE) Generating $@'
+	@mkdir -p table
+	$(Q)./$(SETTINGSGEN) -o table/settings.h -b $(SRC_DIR)/table/settings.h.preamble -a $(SRC_DIR)/table/settings.h.postamble $(SRC_DIR)/table/*.ini
+
+# The targets to compile the endian-code
+
+endian_host.h: $(ENDIAN_CHECK)
+	$(E) '$(STAGE) Testing endianness for host'
+	$(Q)./$(ENDIAN_CHECK) > $@
+
+$(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
+	$(E) '$(STAGE) Compiling and Linking $@'
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $< -o $@
+
+depend:
+
+clean:
+	$(E) '$(STAGE) Cleaning up settings files'
+	$(Q)rm -f settingsgen.o alloc_func.o getoptdata.o ini_load.o $(SETTINGSGEN) $(ENDIAN_TARGETS) table/settings.h
+
+mrproper: clean
+
+.PHONY: all mrproper depend clean
@@ -23,6 +23,7 @@ BIN_DIR        = !!BIN_DIR!!
 LANG_DIR       = !!LANG_DIR!!
 SRC_OBJS_DIR   = !!SRC_OBJS_DIR!!
 LANG_OBJS_DIR  = !!LANG_OBJS_DIR!!
+SETTING_OBJS_DIR= !!SETTING_OBJS_DIR!!
 SRC_DIR        = !!SRC_DIR!!
 SCRIPT_SRC_DIR = !!SCRIPT_SRC_DIR!!
 MEDIA_DIR      = !!MEDIA_DIR!!
@@ -36,7 +37,6 @@ STAGE          = !!STAGE!!
 MAKEDEPEND     = !!MAKEDEPEND!!
 CFLAGS_MAKEDEP = !!CFLAGS_MAKEDEP!!
 SORT           = !!SORT!!
-REVISION       = !!REVISION!!
 AWK            = !!AWK!!
 CONFIG_CACHE_COMPILER = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_COMPILER!!
 CONFIG_CACHE_LINKER   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_LINKER!!
@@ -57,8 +57,8 @@ FILE_DEP := $(CONFIG_CACHE_COMPILER) endian_target.h
 RES      := $(shell mkdir -p $(BIN_DIR) $(sort $(dir $(OBJS))))

 # Make sure endian_target.h is reasable as if it was in the src/ dir
-CFLAGS += -I $(SRC_OBJS_DIR) -I $(LANG_OBJS_DIR)
-CFLAGS_MAKEDEP += -I $(SRC_OBJS_DIR) -I $(LANG_OBJS_DIR)
+CFLAGS += -I $(SRC_OBJS_DIR) -I $(LANG_OBJS_DIR) -I $(SETTING_OBJS_DIR)
+CFLAGS_MAKEDEP += -I $(SRC_OBJS_DIR) -I $(LANG_OBJS_DIR) -I $(SETTING_OBJS_DIR)
 ifdef SCRIPT_SRC_DIR
 	CFLAGS_MAKEDEP += -I $(SCRIPT_SRC_DIR)
 endif
@@ -93,15 +93,9 @@ $(LANG_OBJS_DIR)/table/strings.h: $(LANG_DIR)/english.txt $(LANG_OBJS_DIR)/$(STR
 VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh")
 MODIFIED := $(shell echo "$(VERSIONS)" | cut -f 3 -d'	')

-ifdef REVISION
-# Use specified revision (which should be of the form "r000").
-REV := $(REVISION)
-REV_NR := $(shell echo $(REVISION) | sed "s@[^0-9]@@g")
-else
 # Use autodetected revisions
 REV      := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
 REV_NR   := $(shell echo "$(VERSIONS)" | cut -f 2 -d'	')
-endif

 # Make sure we have something in REV and REV_NR
 ifeq ($(REV),)
@@ -112,7 +106,7 @@ REV_NR := 0
 endif

 # This helps to recompile if flags change
-RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CXXFLAGS) $(CFLAGS)" ]; then echo "$(CXXFLAGS) $(CFLAGS)" > $(CONFIG_CACHE_COMPILER); fi )
+RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CFLAGS) $(CXXFLAGS)" ]; then echo "$(CFLAGS) $(CXXFLAGS)" > $(CONFIG_CACHE_COMPILER); fi )
 RES := $(shell if [ "`cat $(CONFIG_CACHE_LINKER) 2>/dev/null`" != "$(LDFLAGS) $(LIBS)" ]; then echo "$(LDFLAGS) $(LIBS)" > $(CONFIG_CACHE_LINKER); fi )
 RES := $(shell if [ "`cat $(CONFIG_CACHE_ENDIAN) 2>/dev/null`" != "$(ENDIAN_FORCE)" ]; then echo "$(ENDIAN_FORCE)" > $(CONFIG_CACHE_ENDIAN); fi )

@@ -145,7 +139,7 @@ $(OBJS_C:%.o=%.d): %.d: $(SRC_DIR)/%.c $(FILE_DEP)

 $(OBJS_CPP:%.o=%.d): %.d: $(SRC_DIR)/%.cpp $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CXXFLAGS) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
+	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@

 $(OBJS_MM:%.o=%.d): %.d: $(SRC_DIR)/%.mm $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.mm=%.mm)'
@@ -169,7 +163,7 @@ ifeq ("$(SRC_OBJS_DIR)/$(DEPEND)","$(MAKEDEPEND)")
 DEP := $(MAKEDEPEND)
 $(SRC_OBJS_DIR)/$(DEPEND): $(SRC_DIR)/depend/depend.cpp
 	$(E) '$(STAGE) Compiling and linking $(DEPEND)'
-	$(Q)$(CXX_BUILD) $(CXXFLAGS_BUILD) $(CFLAGS_BUILD) $(LDFLAGS_BUILD) -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) -o $@ $<
 endif

 # Make sure that only 'make depend' ALWAYS triggers a recheck
@@ -237,7 +231,7 @@ $(OBJS_C): %.o: $(SRC_DIR)/%.c $(DEP_MASK) $(FILE_DEP)

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

 $(OBJS_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.mm=%.mm)'
@@ -248,7 +242,13 @@ $(OBJS_RC): %.o: $(SRC_DIR)/%.rc $(FILE_DEP)
 	$(Q)$(WINDRES) -o $@ -I `basename $<` $<

 $(BIN_DIR)/$(TTD): $(TTD)
-	$(Q)cp $< $@
+	$(Q)cp $(TTD) $(BIN_DIR)/$(TTD)
+ifeq ($(OS), UNIX)
+	$(Q)cp $(MEDIA_DIR)/openttd.32.bmp $(BIN_DIR)/baseset/
+endif
+ifeq ($(OS), OSX)
+	$(Q)cp $(ROOT_DIR)/os/macosx/splash.png $(BIN_DIR)/baseset/
+endif

 $(TTD): $(OBJS) $(CONFIG_CACHE_LINKER)
 	$(E) '$(STAGE) Linking $@'
@@ -276,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) $(CXXFLAGS_BUILD) $(CFLAGS_BUILD) $< -o $@
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $< -o $@

 # Revision files

@@ -292,7 +292,7 @@ depend: $(DEPS)

 clean:
 	$(E) '$(STAGE) Cleaning up object files'
-	$(Q)rm -f $(DEPS) $(OBJS) $(TTD) $(DEPEND) $(TTD:%=$(BIN_DIR)/%) $(CONFIG_CACHE_COMPILER) $(CONFIG_CACHE_LINKER) $(CONFIG_CACHE_ENDIAN) $(CONFIG_CACHE_SOURCE) $(ENDIAN_TARGETS)
+	$(Q)rm -f $(DEPS) $(OBJS) $(TTD) $(DEPEND) $(TTD:%=$(BIN_DIR)/%) $(BIN_DIR)/baseset/openttd.32.bmp $(CONFIG_CACHE_COMPILER) $(CONFIG_CACHE_LINKER) $(CONFIG_CACHE_ENDIAN) $(CONFIG_CACHE_SOURCE) $(ENDIAN_TARGETS)

 mrproper: clean
 	$(Q)rm -f $(SRC_DIR)/rev.cpp $(SRC_DIR)/os/windows/ottdres.rc
@@ -321,3 +321,49 @@ AIAbstractList <- AIList;
 AIList.ChangeItem <- AIList.SetValue;

 AIRail.ERR_NONUNIFORM_STATIONS_DISABLED <- 0xFFFF;
+
+AICompany.GetCompanyValue <- function(company)
+{
+	return AICompany.GetQuarterlyCompanyValue(company, AICompany.CURRENT_QUARTER);
+}
+
+AITown.GetLastMonthTransported <- AITown.GetLastMonthSupplied;
+
+AIEvent.AI_ET_INVALID <- AIEvent.ET_INVALID;
+AIEvent.AI_ET_TEST <- AIEvent.ET_TEST;
+AIEvent.AI_ET_SUBSIDY_OFFER <- AIEvent.ET_SUBSIDY_OFFER;
+AIEvent.AI_ET_SUBSIDY_OFFER_EXPIRED <- AIEvent.ET_SUBSIDY_OFFER_EXPIRED;
+AIEvent.AI_ET_SUBSIDY_AWARDED <- AIEvent.ET_SUBSIDY_AWARDED;
+AIEvent.AI_ET_SUBSIDY_EXPIRED <- AIEvent.ET_SUBSIDY_EXPIRED;
+AIEvent.AI_ET_ENGINE_PREVIEW <- AIEvent.ET_ENGINE_PREVIEW;
+AIEvent.AI_ET_COMPANY_NEW <- AIEvent.ET_COMPANY_NEW;
+AIEvent.AI_ET_COMPANY_IN_TROUBLE <- AIEvent.ET_COMPANY_IN_TROUBLE;
+AIEvent.AI_ET_COMPANY_MERGER <- AIEvent.ET_COMPANY_MERGER;
+AIEvent.AI_ET_COMPANY_BANKRUPT <- AIEvent.ET_COMPANY_BANKRUPT;
+AIEvent.AI_ET_VEHICLE_CRASHED <- AIEvent.ET_VEHICLE_CRASHED;
+AIEvent.AI_ET_VEHICLE_LOST <- AIEvent.ET_VEHICLE_LOST;
+AIEvent.AI_ET_VEHICLE_WAITING_IN_DEPOT <- AIEvent.ET_VEHICLE_WAITING_IN_DEPOT;
+AIEvent.AI_ET_VEHICLE_UNPROFITABLE <- AIEvent.ET_VEHICLE_UNPROFITABLE;
+AIEvent.AI_ET_INDUSTRY_OPEN <- AIEvent.ET_INDUSTRY_OPEN;
+AIEvent.AI_ET_INDUSTRY_CLOSE <- AIEvent.ET_INDUSTRY_CLOSE;
+AIEvent.AI_ET_ENGINE_AVAILABLE <- AIEvent.ET_ENGINE_AVAILABLE;
+AIEvent.AI_ET_STATION_FIRST_VEHICLE <- AIEvent.ET_STATION_FIRST_VEHICLE;
+AIEvent.AI_ET_DISASTER_ZEPPELINER_CRASHED <- AIEvent.ET_DISASTER_ZEPPELINER_CRASHED;
+AIEvent.AI_ET_DISASTER_ZEPPELINER_CLEARED <- AIEvent.ET_DISASTER_ZEPPELINER_CLEARED;
+AIOrder.AIOF_NONE <- AIOrder.OF_NONE
+AIOrder.AIOF_NON_STOP_INTERMEDIATE <- AIOrder.OF_NON_STOP_INTERMEDIATE
+AIOrder.AIOF_NON_STOP_DESTINATION <- AIOrder.OF_NON_STOP_DESTINATION
+AIOrder.AIOF_UNLOAD <- AIOrder.OF_UNLOAD
+AIOrder.AIOF_TRANSFER <- AIOrder.OF_TRANSFER
+AIOrder.AIOF_NO_UNLOAD <- AIOrder.OF_NO_UNLOAD
+AIOrder.AIOF_FULL_LOAD <- AIOrder.OF_FULL_LOAD
+AIOrder.AIOF_FULL_LOAD_ANY <- AIOrder.OF_FULL_LOAD_ANY
+AIOrder.AIOF_NO_LOAD <- AIOrder.OF_NO_LOAD
+AIOrder.AIOF_SERVICE_IF_NEEDED <- AIOrder.OF_SERVICE_IF_NEEDED
+AIOrder.AIOF_STOP_IN_DEPOT <- AIOrder.OF_STOP_IN_DEPOT
+AIOrder.AIOF_GOTO_NEAREST_DEPOT <- AIOrder.OF_GOTO_NEAREST_DEPOT
+AIOrder.AIOF_NON_STOP_FLAGS <- AIOrder.OF_NON_STOP_FLAGS
+AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
+AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
+AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
+AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID
@@ -72,3 +72,50 @@ AIAbstractList <- AIList;
 AIList.ChangeItem <- AIList.SetValue;

 AIRail.ERR_NONUNIFORM_STATIONS_DISABLED <- 0xFFFF;
+
+AICompany.GetCompanyValue <- function(company)
+{
+	return AICompany.GetQuarterlyCompanyValue(company, AICompany.CURRENT_QUARTER);
+}
+
+AITown.GetLastMonthTransported <- AITown.GetLastMonthSupplied;
+
+AIEvent.AI_ET_INVALID <- AIEvent.ET_INVALID;
+AIEvent.AI_ET_TEST <- AIEvent.ET_TEST;
+AIEvent.AI_ET_SUBSIDY_OFFER <- AIEvent.ET_SUBSIDY_OFFER;
+AIEvent.AI_ET_SUBSIDY_OFFER_EXPIRED <- AIEvent.ET_SUBSIDY_OFFER_EXPIRED;
+AIEvent.AI_ET_SUBSIDY_AWARDED <- AIEvent.ET_SUBSIDY_AWARDED;
+AIEvent.AI_ET_SUBSIDY_EXPIRED <- AIEvent.ET_SUBSIDY_EXPIRED;
+AIEvent.AI_ET_ENGINE_PREVIEW <- AIEvent.ET_ENGINE_PREVIEW;
+AIEvent.AI_ET_COMPANY_NEW <- AIEvent.ET_COMPANY_NEW;
+AIEvent.AI_ET_COMPANY_IN_TROUBLE <- AIEvent.ET_COMPANY_IN_TROUBLE;
+AIEvent.AI_ET_COMPANY_ASK_MERGER <- AIEvent.ET_COMPANY_ASK_MERGER;
+AIEvent.AI_ET_COMPANY_MERGER <- AIEvent.ET_COMPANY_MERGER;
+AIEvent.AI_ET_COMPANY_BANKRUPT <- AIEvent.ET_COMPANY_BANKRUPT;
+AIEvent.AI_ET_VEHICLE_CRASHED <- AIEvent.ET_VEHICLE_CRASHED;
+AIEvent.AI_ET_VEHICLE_LOST <- AIEvent.ET_VEHICLE_LOST;
+AIEvent.AI_ET_VEHICLE_WAITING_IN_DEPOT <- AIEvent.ET_VEHICLE_WAITING_IN_DEPOT;
+AIEvent.AI_ET_VEHICLE_UNPROFITABLE <- AIEvent.ET_VEHICLE_UNPROFITABLE;
+AIEvent.AI_ET_INDUSTRY_OPEN <- AIEvent.ET_INDUSTRY_OPEN;
+AIEvent.AI_ET_INDUSTRY_CLOSE <- AIEvent.ET_INDUSTRY_CLOSE;
+AIEvent.AI_ET_ENGINE_AVAILABLE <- AIEvent.ET_ENGINE_AVAILABLE;
+AIEvent.AI_ET_STATION_FIRST_VEHICLE <- AIEvent.ET_STATION_FIRST_VEHICLE;
+AIEvent.AI_ET_DISASTER_ZEPPELINER_CRASHED <- AIEvent.ET_DISASTER_ZEPPELINER_CRASHED;
+AIEvent.AI_ET_DISASTER_ZEPPELINER_CLEARED <- AIEvent.ET_DISASTER_ZEPPELINER_CLEARED;
+AIOrder.AIOF_NONE <- AIOrder.OF_NONE
+AIOrder.AIOF_NON_STOP_INTERMEDIATE <- AIOrder.OF_NON_STOP_INTERMEDIATE
+AIOrder.AIOF_NON_STOP_DESTINATION <- AIOrder.OF_NON_STOP_DESTINATION
+AIOrder.AIOF_UNLOAD <- AIOrder.OF_UNLOAD
+AIOrder.AIOF_TRANSFER <- AIOrder.OF_TRANSFER
+AIOrder.AIOF_NO_UNLOAD <- AIOrder.OF_NO_UNLOAD
+AIOrder.AIOF_FULL_LOAD <- AIOrder.OF_FULL_LOAD
+AIOrder.AIOF_FULL_LOAD_ANY <- AIOrder.OF_FULL_LOAD_ANY
+AIOrder.AIOF_NO_LOAD <- AIOrder.OF_NO_LOAD
+AIOrder.AIOF_SERVICE_IF_NEEDED <- AIOrder.OF_SERVICE_IF_NEEDED
+AIOrder.AIOF_STOP_IN_DEPOT <- AIOrder.OF_STOP_IN_DEPOT
+AIOrder.AIOF_GOTO_NEAREST_DEPOT <- AIOrder.OF_GOTO_NEAREST_DEPOT
+AIOrder.AIOF_NON_STOP_FLAGS <- AIOrder.OF_NON_STOP_FLAGS
+AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
+AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
+AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
+AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID
@@ -6,3 +6,53 @@
 * 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.1 API compatability in effect.");
+
+AICompany.GetCompanyValue <- function(company)
+{
+	return AICompany.GetQuarterlyCompanyValue(company, AICompany.CURRENT_QUARTER);
+}
+
+AITown.GetLastMonthTransported <- AITown.GetLastMonthSupplied;
+
+AIEvent.AI_ET_INVALID <- AIEvent.ET_INVALID;
+AIEvent.AI_ET_TEST <- AIEvent.ET_TEST;
+AIEvent.AI_ET_SUBSIDY_OFFER <- AIEvent.ET_SUBSIDY_OFFER;
+AIEvent.AI_ET_SUBSIDY_OFFER_EXPIRED <- AIEvent.ET_SUBSIDY_OFFER_EXPIRED;
+AIEvent.AI_ET_SUBSIDY_AWARDED <- AIEvent.ET_SUBSIDY_AWARDED;
+AIEvent.AI_ET_SUBSIDY_EXPIRED <- AIEvent.ET_SUBSIDY_EXPIRED;
+AIEvent.AI_ET_ENGINE_PREVIEW <- AIEvent.ET_ENGINE_PREVIEW;
+AIEvent.AI_ET_COMPANY_NEW <- AIEvent.ET_COMPANY_NEW;
+AIEvent.AI_ET_COMPANY_IN_TROUBLE <- AIEvent.ET_COMPANY_IN_TROUBLE;
+AIEvent.AI_ET_COMPANY_ASK_MERGER <- AIEvent.ET_COMPANY_ASK_MERGER;
+AIEvent.AI_ET_COMPANY_MERGER <- AIEvent.ET_COMPANY_MERGER;
+AIEvent.AI_ET_COMPANY_BANKRUPT <- AIEvent.ET_COMPANY_BANKRUPT;
+AIEvent.AI_ET_VEHICLE_CRASHED <- AIEvent.ET_VEHICLE_CRASHED;
+AIEvent.AI_ET_VEHICLE_LOST <- AIEvent.ET_VEHICLE_LOST;
+AIEvent.AI_ET_VEHICLE_WAITING_IN_DEPOT <- AIEvent.ET_VEHICLE_WAITING_IN_DEPOT;
+AIEvent.AI_ET_VEHICLE_UNPROFITABLE <- AIEvent.ET_VEHICLE_UNPROFITABLE;
+AIEvent.AI_ET_INDUSTRY_OPEN <- AIEvent.ET_INDUSTRY_OPEN;
+AIEvent.AI_ET_INDUSTRY_CLOSE <- AIEvent.ET_INDUSTRY_CLOSE;
+AIEvent.AI_ET_ENGINE_AVAILABLE <- AIEvent.ET_ENGINE_AVAILABLE;
+AIEvent.AI_ET_STATION_FIRST_VEHICLE <- AIEvent.ET_STATION_FIRST_VEHICLE;
+AIEvent.AI_ET_DISASTER_ZEPPELINER_CRASHED <- AIEvent.ET_DISASTER_ZEPPELINER_CRASHED;
+AIEvent.AI_ET_DISASTER_ZEPPELINER_CLEARED <- AIEvent.ET_DISASTER_ZEPPELINER_CLEARED;
+AIEvent.AI_ET_TOWN_FOUNDED <- AIEvent.ET_TOWN_FOUNDED;
+AIOrder.AIOF_NONE <- AIOrder.OF_NONE
+AIOrder.AIOF_NON_STOP_INTERMEDIATE <- AIOrder.OF_NON_STOP_INTERMEDIATE
+AIOrder.AIOF_NON_STOP_DESTINATION <- AIOrder.OF_NON_STOP_DESTINATION
+AIOrder.AIOF_UNLOAD <- AIOrder.OF_UNLOAD
+AIOrder.AIOF_TRANSFER <- AIOrder.OF_TRANSFER
+AIOrder.AIOF_NO_UNLOAD <- AIOrder.OF_NO_UNLOAD
+AIOrder.AIOF_FULL_LOAD <- AIOrder.OF_FULL_LOAD
+AIOrder.AIOF_FULL_LOAD_ANY <- AIOrder.OF_FULL_LOAD_ANY
+AIOrder.AIOF_NO_LOAD <- AIOrder.OF_NO_LOAD
+AIOrder.AIOF_SERVICE_IF_NEEDED <- AIOrder.OF_SERVICE_IF_NEEDED
+AIOrder.AIOF_STOP_IN_DEPOT <- AIOrder.OF_STOP_IN_DEPOT
+AIOrder.AIOF_GOTO_NEAREST_DEPOT <- AIOrder.OF_GOTO_NEAREST_DEPOT
+AIOrder.AIOF_NON_STOP_FLAGS <- AIOrder.OF_NON_STOP_FLAGS
+AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
+AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
+AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
+AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID
@@ -0,0 +1,10 @@
+/* $Id$ */
+
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+AILog.Info("1.2 API compatability in effect.");
@@ -0,0 +1,8 @@
+/* $Id$ */
+
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
@@ -10,9 +10,11 @@ function Regression::TestInit()
 {
 	print("");
 	print("--TestInit--");
+	print(" Ops:      " + this.GetOpsTillSuspend());
 	print(" TickTest: " + this.GetTick());
 	this.Sleep(1);
 	print(" TickTest: " + this.GetTick());
+	print(" Ops:      " + this.GetOpsTillSuspend());
 	print(" SetCommandDelay: " + AIController.SetCommandDelay(1));
 	print(" IsValid(vehicle.plane_speed): " + AIGameSettings.IsValid("vehicle.plane_speed"));
 	print(" vehicle.plane_speed: " + AIGameSettings.GetValue("vehicle.plane_speed"));
@@ -166,6 +168,8 @@ function Regression::TestInit()
 	foreach (idx, val in list) {
 		print("   " + idx);
 	}
+
+	print(" Ops:      " + this.GetOpsTillSuspend());
 }

 function Regression::Std()
@@ -394,50 +398,57 @@ function Regression::Company()
 		}
 	}

-	print("  GetName():                   " + AICompany.GetName(AICompany.COMPANY_SELF));
-	print("  GetPresidentName():          " + AICompany.GetPresidentName(AICompany.COMPANY_SELF));
-	print("  SetPresidentName():          " + AICompany.SetPresidentName("Regression AI"));
-	print("  GetPresidentName():          " + AICompany.GetPresidentName(AICompany.COMPANY_SELF));
-	print("  GetCompanyValue():           " + AICompany.GetCompanyValue(AICompany.COMPANY_SELF));
-	print("  GetBankBalance():            " + AICompany.GetBankBalance(AICompany.COMPANY_SELF));
-	print("  GetName():                   " + AICompany.GetName(240));
-	print("  GetLoanAmount():             " + AICompany.GetLoanAmount());
-	print("  GetMaxLoanAmount():          " + AICompany.GetMaxLoanAmount());
-	print("  GetLoanInterval():           " + AICompany.GetLoanInterval());
-	print("  SetLoanAmount(1):            " + AICompany.SetLoanAmount(1));
-	print("  SetLoanAmount(100):          " + AICompany.SetLoanAmount(100));
-	print("  SetLoanAmount(10000):        " + AICompany.SetLoanAmount(10000));
-	print("  GetLastErrorString():        " + AIError.GetLastErrorString());
-	print("  GetBankBalance():            " + AICompany.GetBankBalance(AICompany.COMPANY_SELF));
-	print("  GetLoanAmount():             " + AICompany.GetLoanAmount());
-	print("  SetMinimumLoanAmount(31337): " + AICompany.SetMinimumLoanAmount(31337));
-	print("  GetBankBalance():            " + AICompany.GetBankBalance(AICompany.COMPANY_SELF));
-	print("  GetLoanAmount():             " + AICompany.GetLoanAmount());
-	print("  SetLoanAmount(10000):        " + AICompany.SetLoanAmount(AICompany.GetMaxLoanAmount()));
-	print("  GetBankBalance():            " + AICompany.GetBankBalance(AICompany.COMPANY_SELF));
-	print("  GetLoanAmount():             " + AICompany.GetLoanAmount());
-	print("  GetCompanyHQ():              " + AICompany.GetCompanyHQ(AICompany.COMPANY_SELF));
-	print("  BuildCompanyHQ():            " + AICompany.BuildCompanyHQ(AIMap.GetTileIndex(127, 129)));
-	print("  GetCompanyHQ():              " + AICompany.GetCompanyHQ(AICompany.COMPANY_SELF));
-	print("  BuildCompanyHQ():            " + AICompany.BuildCompanyHQ(AIMap.GetTileIndex(129, 129)));
-	print("  GetCompanyHQ():              " + AICompany.GetCompanyHQ(AICompany.COMPANY_SELF));
-	print("  BuildCompanyHQ():            " + AICompany.BuildCompanyHQ(AIMap.GetTileIndex(129, 128)));
-	print("  GetLastErrorString():        " + AIError.GetLastErrorString());
-	print("  GetAutoRenewStatus();        " + AICompany.GetAutoRenewStatus(AICompany.COMPANY_SELF));
-	print("  SetAutoRenewStatus(true);    " + AICompany.SetAutoRenewStatus(true));
-	print("  GetAutoRenewStatus();        " + AICompany.GetAutoRenewStatus(AICompany.COMPANY_SELF));
-	print("  SetAutoRenewStatus(true);    " + AICompany.SetAutoRenewStatus(true));
-	print("  SetAutoRenewStatus(false);   " + AICompany.SetAutoRenewStatus(false));
-	print("  GetAutoRenewMonths();        " + AICompany.GetAutoRenewMonths(AICompany.COMPANY_SELF));
-	print("  SetAutoRenewMonths(-12);     " + AICompany.SetAutoRenewMonths(-12));
-	print("  GetAutoRenewMonths();        " + AICompany.GetAutoRenewMonths(AICompany.COMPANY_SELF));
-	print("  SetAutoRenewMonths(-12);     " + AICompany.SetAutoRenewMonths(-12));
-	print("  SetAutoRenewMonths(6);       " + AICompany.SetAutoRenewMonths(6));
-	print("  GetAutoRenewMoney();         " + AICompany.GetAutoRenewMoney(AICompany.COMPANY_SELF));
-	print("  SetAutoRenewMoney(200000);   " + AICompany.SetAutoRenewMoney(200000));
-	print("  GetAutoRenewMoney();         " + AICompany.GetAutoRenewMoney(AICompany.COMPANY_SELF));
-	print("  SetAutoRenewMoney(200000);   " + AICompany.SetAutoRenewMoney(200000));
-	print("  SetAutoRenewMoney(100000);   " + AICompany.SetAutoRenewMoney(100000));
+	print("  GetName():                         " + AICompany.GetName(AICompany.COMPANY_SELF));
+	print("  GetPresidentName():                " + AICompany.GetPresidentName(AICompany.COMPANY_SELF));
+	print("  SetPresidentName():                " + AICompany.SetPresidentName("Regression AI"));
+	print("  GetPresidentName():                " + AICompany.GetPresidentName(AICompany.COMPANY_SELF));
+	print("  GetBankBalance():                  " + AICompany.GetBankBalance(AICompany.COMPANY_SELF));
+	print("  GetName():                         " + AICompany.GetName(240));
+	print("  GetLoanAmount():                   " + AICompany.GetLoanAmount());
+	print("  GetMaxLoanAmount():                " + AICompany.GetMaxLoanAmount());
+	print("  GetLoanInterval():                 " + AICompany.GetLoanInterval());
+	print("  SetLoanAmount(1):                  " + AICompany.SetLoanAmount(1));
+	print("  SetLoanAmount(100):                " + AICompany.SetLoanAmount(100));
+	print("  SetLoanAmount(10000):              " + AICompany.SetLoanAmount(10000));
+	print("  GetLastErrorString():              " + AIError.GetLastErrorString());
+	print("  GetBankBalance():                  " + AICompany.GetBankBalance(AICompany.COMPANY_SELF));
+	print("  GetLoanAmount():                   " + AICompany.GetLoanAmount());
+	print("  SetMinimumLoanAmount(31337):       " + AICompany.SetMinimumLoanAmount(31337));
+	print("  GetBankBalance():                  " + AICompany.GetBankBalance(AICompany.COMPANY_SELF));
+	print("  GetLoanAmount():                   " + AICompany.GetLoanAmount());
+	print("  SetLoanAmount(10000):              " + AICompany.SetLoanAmount(AICompany.GetMaxLoanAmount()));
+	print("  GetBankBalance():                  " + AICompany.GetBankBalance(AICompany.COMPANY_SELF));
+	print("  GetLoanAmount():                   " + AICompany.GetLoanAmount());
+	print("  GetCompanyHQ():                    " + AICompany.GetCompanyHQ(AICompany.COMPANY_SELF));
+	print("  BuildCompanyHQ():                  " + AICompany.BuildCompanyHQ(AIMap.GetTileIndex(127, 129)));
+	print("  GetCompanyHQ():                    " + AICompany.GetCompanyHQ(AICompany.COMPANY_SELF));
+	print("  BuildCompanyHQ():                  " + AICompany.BuildCompanyHQ(AIMap.GetTileIndex(129, 129)));
+	print("  GetCompanyHQ():                    " + AICompany.GetCompanyHQ(AICompany.COMPANY_SELF));
+	print("  BuildCompanyHQ():                  " + AICompany.BuildCompanyHQ(AIMap.GetTileIndex(129, 128)));
+	print("  GetLastErrorString():              " + AIError.GetLastErrorString());
+	print("  GetAutoRenewStatus();              " + AICompany.GetAutoRenewStatus(AICompany.COMPANY_SELF));
+	print("  SetAutoRenewStatus(true);          " + AICompany.SetAutoRenewStatus(true));
+	print("  GetAutoRenewStatus();              " + AICompany.GetAutoRenewStatus(AICompany.COMPANY_SELF));
+	print("  SetAutoRenewStatus(true);          " + AICompany.SetAutoRenewStatus(true));
+	print("  SetAutoRenewStatus(false);         " + AICompany.SetAutoRenewStatus(false));
+	print("  GetAutoRenewMonths();              " + AICompany.GetAutoRenewMonths(AICompany.COMPANY_SELF));
+	print("  SetAutoRenewMonths(-12);           " + AICompany.SetAutoRenewMonths(-12));
+	print("  GetAutoRenewMonths();              " + AICompany.GetAutoRenewMonths(AICompany.COMPANY_SELF));
+	print("  SetAutoRenewMonths(-12);           " + AICompany.SetAutoRenewMonths(-12));
+	print("  SetAutoRenewMonths(6);             " + AICompany.SetAutoRenewMonths(6));
+	print("  GetAutoRenewMoney();               " + AICompany.GetAutoRenewMoney(AICompany.COMPANY_SELF));
+	print("  SetAutoRenewMoney(200000);         " + AICompany.SetAutoRenewMoney(200000));
+	print("  GetAutoRenewMoney();               " + AICompany.GetAutoRenewMoney(AICompany.COMPANY_SELF));
+	print("  SetAutoRenewMoney(200000);         " + AICompany.SetAutoRenewMoney(200000));
+	print("  SetAutoRenewMoney(100000);         " + AICompany.SetAutoRenewMoney(100000));
+	for (local i = -1; i <= AICompany.EARLIEST_QUARTER; i++) {
+		print("  Quarter: " + i);
+		print("    GetQuarterlyIncome();            " + AICompany.GetQuarterlyIncome(AICompany.COMPANY_SELF, i));
+		print("    GetQuarterlyExpenses();          " + AICompany.GetQuarterlyExpenses(AICompany.COMPANY_SELF, i));
+		print("    GetQuarterlyCargoDelivered();    " + AICompany.GetQuarterlyCargoDelivered(AICompany.COMPANY_SELF, i));
+		print("    GetQuarterlyPerformanceRating(); " + AICompany.GetQuarterlyPerformanceRating(AICompany.COMPANY_SELF, i));
+		print("    GetQuarterlyCompanyValue();      " + AICompany.GetQuarterlyCompanyValue(AICompany.COMPANY_SELF, i));
+	}
 }

 function Regression::Engine()
@@ -912,12 +923,12 @@ function Regression::Order()
 	print("--Order--");
 	print("  GetOrderCount():       " + AIOrder.GetOrderCount(12));
 	print("  GetOrderDestination(): " + AIOrder.GetOrderDestination(12, 1));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.AIOF_TRANSFER));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.AIOF_TRANSFER | AIOrder.AIOF_UNLOAD));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.AIOF_TRANSFER | AIOrder.AIOF_FULL_LOAD));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33417, AIOrder.AIOF_SERVICE_IF_NEEDED));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33417, AIOrder.AIOF_STOP_IN_DEPOT));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(0, AIOrder.AIOF_SERVICE_IF_NEEDED | AIOrder.AIOF_GOTO_NEAREST_DEPOT));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.OF_TRANSFER));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.OF_TRANSFER | AIOrder.OF_UNLOAD));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.OF_TRANSFER | AIOrder.OF_FULL_LOAD));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33417, AIOrder.OF_SERVICE_IF_NEEDED));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33417, AIOrder.OF_STOP_IN_DEPOT));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(0, AIOrder.OF_SERVICE_IF_NEEDED | AIOrder.OF_GOTO_NEAREST_DEPOT));
 	print("  IsValidConditionalOrder(): " + AIOrder.IsValidConditionalOrder(AIOrder.OC_LOAD_PERCENTAGE, AIOrder.CF_EQUALS));
 	print("  IsValidConditionalOrder(): " + AIOrder.IsValidConditionalOrder(AIOrder.OC_RELIABILITY, AIOrder.CF_IS_TRUE));
 	print("  IsValidConditionalOrder(): " + AIOrder.IsValidConditionalOrder(AIOrder.OC_REQUIRES_SERVICE, AIOrder.CF_IS_FALSE));
@@ -929,8 +940,8 @@ function Regression::Order()
 	print("  IsConditionalOrder():  " + AIOrder.IsConditionalOrder(12, 1));
 	print("  IsCurrentOrderPartOfOrderList(): " + AIOrder.IsCurrentOrderPartOfOrderList(12));
 	print("  GetOrderFlags():       " + AIOrder.GetOrderFlags(12, 1));
-	print("  AppendOrder():         " + AIOrder.AppendOrder(12, 33416, AIOrder.AIOF_TRANSFER));
-	print("  InsertOrder():         " + AIOrder.InsertOrder(12, 0, 33416, AIOrder.AIOF_TRANSFER));
+	print("  AppendOrder():         " + AIOrder.AppendOrder(12, 33416, AIOrder.OF_TRANSFER));
+	print("  InsertOrder():         " + AIOrder.InsertOrder(12, 0, 33416, AIOrder.OF_TRANSFER));
 	print("  GetOrderCount():       " + AIOrder.GetOrderCount(12));
 	print("  IsValidVehicleOrder(): " + AIOrder.IsValidVehicleOrder(12, 1));
 	print("  IsGotoStationOrder():  " + AIOrder.IsGotoStationOrder(12, 1));
@@ -942,7 +953,7 @@ function Regression::Order()
 	print("  GetOrderFlags():       " + AIOrder.GetOrderFlags(12, 1));
 	print("  GetOrderJumpTo():      " + AIOrder.GetOrderJumpTo(12, 1));
 	print("  RemoveOrder():         " + AIOrder.RemoveOrder(12, 0));
-	print("  SetOrderFlags():       " + AIOrder.SetOrderFlags(12, 0, AIOrder.AIOF_FULL_LOAD));
+	print("  SetOrderFlags():       " + AIOrder.SetOrderFlags(12, 0, AIOrder.OF_FULL_LOAD));
 	print("  GetOrderFlags():       " + AIOrder.GetOrderFlags(12, 0));
 	print("  GetOrderDestination(): " + AIOrder.GetOrderDestination(12, 0));
 	print("  CopyOrders():          " + AIOrder.CopyOrders(12, 1));
@@ -950,12 +961,12 @@ function Regression::Order()
 	print("  ShareOrders():         " + AIOrder.ShareOrders(13, 1));
 	print("  ShareOrders():         " + AIOrder.ShareOrders(13, 12));
 	print("  UnshareOrders():       " + AIOrder.UnshareOrders(13));
-	print("  AppendOrder():         " + AIOrder.AppendOrder(12, 33421, AIOrder.AIOF_NONE));
+	print("  AppendOrder():         " + AIOrder.AppendOrder(12, 33421, AIOrder.OF_NONE));

 	print("  GetStopLocation():     " + AIOrder.GetStopLocation(13, 0));
 	print("  BuildVehicle():        " + AIVehicle.BuildVehicle(23596, 8));
 	print("  BuildRailStation():    " + AIRail.BuildRailStation(7958, AIRail.RAILTRACK_NE_SW, 1, 1, AIStation.STATION_NEW));
-	print("  AppendOrder():         " + AIOrder.AppendOrder(20, 7958, AIOrder.AIOF_NONE));
+	print("  AppendOrder():         " + AIOrder.AppendOrder(20, 7958, AIOrder.OF_NONE));
 	print("  GetOrderCount():       " + AIOrder.GetOrderCount(20));
 	print("  GetStopLocation():     " + AIOrder.GetStopLocation(20, 0));
 	print("  SetStopLocation():     " + AIOrder.SetStopLocation(20, 0, AIOrder.STOPLOCATION_MIDDLE));
@@ -1380,11 +1391,19 @@ function Regression::TileList()
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
+
+	list.AddRectangle(31895 - 256 * 5, 256 * 5 + 31895 + 8);
+
 	list.Valuate(AITile.GetOwner);
 	print("  GetOwner() ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
+	list.Valuate(AITile.GetTownAuthority);
+	print("  GetTownAuthority() ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
 	list.Valuate(AITile.GetClosestTown);
 	print("  GetClosestTown() ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
@@ -1848,13 +1867,13 @@ function Regression::Start()
 		print("  GetNextEvent:          " + (e == null ? "null" : "instance"));
 		print("    GetEventType:        " + e.GetEventType());
 		switch (e.GetEventType()) {
-			case AIEvent.AI_ET_SUBSIDY_OFFER: {
+			case AIEvent.ET_SUBSIDY_OFFER: {
 				local c = AIEventSubsidyOffer.Convert(e);
 				print("      EventName:         SubsidyOffer");
 				PrintSubsidy(c.GetSubsidyID());
 			} break;

-			case AIEvent.AI_ET_VEHICLE_WAITING_IN_DEPOT: {
+			case AIEvent.ET_VEHICLE_WAITING_IN_DEPOT: {
 				local c = AIEventVehicleWaitingInDepot.Convert(e);
 				print("      EventName:         VehicleWaitingInDepot");
 				print("      VehicleID:         " + c.GetVehicleID());
@@ -1,7 +1,9 @@

 --TestInit--
+ Ops:      9988
 TickTest: 1
 TickTest: 2
+ Ops:      9990
 SetCommandDelay: (null : 0x00000000)
 IsValid(vehicle.plane_speed): true
 vehicle.plane_speed: 2
@@ -79,15 +81,16 @@
   20
   30
   40
+ Ops:      8673

 --Std--
 abs(-21): 21
 abs( 21): 21

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

@@ -417,144 +420,144 @@
    1098 => 46116
    1099 => 46158
  Randomize ListDump:
-    1 => 966621566
-    2 => -606766557
-    1000 => -1138727825
-    1001 => -749544262
-    1002 => 2004771271
-    1003 => 686734186
-    1004 => 923274744
-    1005 => -1672035149
-    1006 => -1642064950
-    1007 => 1363389551
-    1008 => -559500928
-    1009 => 1656196991
-    1010 => 1655354425
-    1011 => -1027156689
-    1012 => 1952644328
-    1013 => 1217870217
-    1014 => 242274100
-    1015 => 201816080
-    1016 => 2127464758
-    1017 => 446043650
-    1018 => -319728455
-    1019 => 204701002
-    1020 => -571265398
-    1021 => -1422217131
-    1022 => -391208397
-    1023 => -1822628371
-    1024 => -1499755350
-    1025 => -1422137641
-    1026 => 1621693134
-    1027 => -1428728134
-    1028 => -147587573
-    1029 => 681719500
-    1030 => 1172011190
-    1031 => -1834344882
-    1032 => 1157634586
-    1033 => 1902133676
-    1034 => -1967780161
-    1035 => -1618025531
-    1036 => -810220453
-    1037 => 1582854921
-    1038 => -410004643
-    1039 => 1159917159
-    1040 => -1377804984
-    1041 => -738843914
-    1042 => -1578756103
-    1043 => -464090986
-    1044 => 1711504679
-    1045 => 545330655
-    1046 => 379462570
-    1047 => 514511099
-    1048 => -1813251176
-    1049 => 1424958266
-    1051 => -825255131
-    1052 => 539054595
-    1053 => -1764192010
-    1054 => -1243277769
-    1055 => 2017874281
-    1056 => -1972353607
-    1057 => 1879761467
-    1058 => 1638986560
-    1059 => -1832287507
-    1060 => -492411882
-    1061 => 658940812
-    1062 => -1044199400
-    1063 => 1586504918
-    1064 => -125492611
-    1065 => -1562883174
-    1066 => -1013778441
-    1067 => 1560228607
-    1068 => -550265689
-    1069 => 524767105
-    1070 => -713387661
-    1071 => 1425927738
-    1072 => 942653932
-    1073 => 1233220698
-    1074 => 1313602368
-    1075 => -140318584
-    1076 => 1199179892
-    1077 => 91450916
-    1078 => -1471626821
-    1079 => -552692855
-    1080 => -801295697
-    1081 => 1307607393
-    1082 => -2111765574
-    1083 => 1773729008
-    1084 => -81987003
-    1085 => -1090790034
-    1086 => -843700327
-    1087 => -1306436740
-    1088 => 735656985
-    1089 => -1933491876
-    1090 => 642759863
-    1091 => 255293949
-    1092 => -1052469001
-    1093 => -1043605053
-    1094 => -2080328201
-    1095 => -1825196581
-    1096 => -1789181164
-    1097 => -1636072563
-    1098 => -111321262
-    1099 => 1979741000
+    1 => -200078348
+    2 => -29799264
+    1000 => 1630721656
+    1001 => 959306175
+    1002 => 1527421791
+    1003 => 1259692483
+    1004 => -1289244298
+    1005 => -1572996668
+    1006 => -2069479746
+    1007 => -1819131606
+    1008 => -1007163964
+    1009 => -1185394870
+    1010 => -1471365065
+    1011 => 364354366
+    1012 => -1478084253
+    1013 => 405281367
+    1014 => -11170062
+    1015 => 156767750
+    1016 => 1288924796
+    1017 => 1796884876
+    1018 => -1947073702
+    1019 => -1999614238
+    1020 => -231292809
+    1021 => 966621566
+    1022 => -606766557
+    1023 => -1138727825
+    1024 => -749544262
+    1025 => 2004771271
+    1026 => 686734186
+    1027 => 923274744
+    1028 => -1672035149
+    1029 => -1642064950
+    1030 => 1363389551
+    1031 => -559500928
+    1032 => 1656196991
+    1033 => 1655354425
+    1034 => -1027156689
+    1035 => 1952644328
+    1036 => 1217870217
+    1037 => 242274100
+    1038 => 201816080
+    1039 => 2127464758
+    1040 => 446043650
+    1041 => -319728455
+    1042 => 204701002
+    1043 => -571265398
+    1044 => -1422217131
+    1045 => -391208397
+    1046 => -1822628371
+    1047 => -1499755350
+    1048 => -1422137641
+    1049 => 1621693134
+    1051 => -1428728134
+    1052 => -147587573
+    1053 => 681719500
+    1054 => 1172011190
+    1055 => -1834344882
+    1056 => 1157634586
+    1057 => 1902133676
+    1058 => -1967780161
+    1059 => -1618025531
+    1060 => -810220453
+    1061 => 1582854921
+    1062 => -410004643
+    1063 => 1159917159
+    1064 => -1377804984
+    1065 => -738843914
+    1066 => -1578756103
+    1067 => -464090986
+    1068 => 1711504679
+    1069 => 545330655
+    1070 => 379462570
+    1071 => 514511099
+    1072 => -1813251176
+    1073 => 1424958266
+    1074 => -825255131
+    1075 => 539054595
+    1076 => -1764192010
+    1077 => -1243277769
+    1078 => 2017874281
+    1079 => -1972353607
+    1080 => 1879761467
+    1081 => 1638986560
+    1082 => -1832287507
+    1083 => -492411882
+    1084 => 658940812
+    1085 => -1044199400
+    1086 => 1586504918
+    1087 => -125492611
+    1088 => -1562883174
+    1089 => -1013778441
+    1090 => 1560228607
+    1091 => -550265689
+    1092 => 524767105
+    1093 => -713387661
+    1094 => 1425927738
+    1095 => 942653932
+    1096 => 1233220698
+    1097 => 1313602368
+    1098 => -140318584
+    1099 => 1199179892
  KeepTop(10):
-    1 => 966621566
-    2 => -606766557
-    1000 => -1138727825
-    1001 => -749544262
-    1002 => 2004771271
-    1003 => 686734186
-    1004 => 923274744
-    1005 => -1672035149
-    1006 => -1642064950
-    1007 => 1363389551
+    1 => -200078348
+    2 => -29799264
+    1000 => 1630721656
+    1001 => 959306175
+    1002 => 1527421791
+    1003 => 1259692483
+    1004 => -1289244298
+    1005 => -1572996668
+    1006 => -2069479746
+    1007 => -1819131606
  KeepBottom(8):
-    1000 => -1138727825
-    1001 => -749544262
-    1002 => 2004771271
-    1003 => 686734186
-    1004 => 923274744
-    1005 => -1672035149
-    1006 => -1642064950
-    1007 => 1363389551
+    1000 => 1630721656
+    1001 => 959306175
+    1002 => 1527421791
+    1003 => 1259692483
+    1004 => -1289244298
+    1005 => -1572996668
+    1006 => -2069479746
+    1007 => -1819131606
  RemoveBottom(2):
-    1000 => -1138727825
-    1001 => -749544262
-    1002 => 2004771271
-    1003 => 686734186
-    1004 => 923274744
-    1005 => -1672035149
+    1000 => 1630721656
+    1001 => 959306175
+    1002 => 1527421791
+    1003 => 1259692483
+    1004 => -1289244298
+    1005 => -1572996668
  RemoveTop(2):
-    1002 => 2004771271
-    1003 => 686734186
-    1004 => 923274744
-    1005 => -1672035149
+    1002 => 1527421791
+    1003 => 1259692483
+    1004 => -1289244298
+    1005 => -1572996668
  RemoveList({1003, 1004}):
-    1002 => 2004771271
-    1005 => -1672035149
+    1002 => 1527421791
+    1005 => -1572996668
  KeepList({1003, 1004, 1005}):
-    1005 => -1672035149
+    1005 => -1572996668
  AddList({1005, 4000, 4001, 4002}):
    1005 => 1005
    4000 => 8000
@@ -584,56 +587,211 @@ ERROR: IsEnd() is invalid as Begin() is never called
  SetName():            true
  SetName():            false
  GetLastErrorString(): ERR_NAME_IS_NOT_UNIQUE
-  GetName():                   Regression
-  GetPresidentName():          I. McAlpine
-  SetPresidentName():          true
-  GetPresidentName():          Regression AI
-  GetCompanyValue():           1
-  GetBankBalance():            100000
-  GetName():                   (null : 0x00000000)
-  GetLoanAmount():             100000
-  GetMaxLoanAmount():          500000
-  GetLoanInterval():           10000
-  SetLoanAmount(1):            false
-  SetLoanAmount(100):          false
-  SetLoanAmount(10000):        true
-  GetLastErrorString():        ERR_NONE
-  GetBankBalance():            10000
-  GetLoanAmount():             10000
-  SetMinimumLoanAmount(31337): true
-  GetBankBalance():            40000
-  GetLoanAmount():             40000
-  SetLoanAmount(10000):        true
-  GetBankBalance():            500000
-  GetLoanAmount():             500000
-  GetCompanyHQ():              -1
-  BuildCompanyHQ():            true
-  GetCompanyHQ():              33151
-  BuildCompanyHQ():            true
-  GetCompanyHQ():              33153
-  BuildCompanyHQ():            false
-  GetLastErrorString():        ERR_AREA_NOT_CLEAR
-  GetAutoRenewStatus();        false
-  SetAutoRenewStatus(true);    true
-  GetAutoRenewStatus();        true
-  SetAutoRenewStatus(true);    true
-  SetAutoRenewStatus(false);   true
-  GetAutoRenewMonths();        6
-  SetAutoRenewMonths(-12);     true
-  GetAutoRenewMonths();        -12
-  SetAutoRenewMonths(-12);     true
-  SetAutoRenewMonths(6);       true
-  GetAutoRenewMoney();         100000
-  SetAutoRenewMoney(200000);   true
-  GetAutoRenewMoney();         200000
-  SetAutoRenewMoney(200000);   true
-  SetAutoRenewMoney(100000);   true
+  GetName():                         Regression
+  GetPresidentName():                P. Sharkey
+  SetPresidentName():                true
+  GetPresidentName():                Regression AI
+  GetBankBalance():                  100000
+  GetName():                         (null : 0x00000000)
+  GetLoanAmount():                   100000
+  GetMaxLoanAmount():                500000
+  GetLoanInterval():                 10000
+  SetLoanAmount(1):                  false
+  SetLoanAmount(100):                false
+  SetLoanAmount(10000):              true
+  GetLastErrorString():              ERR_NONE
+  GetBankBalance():                  10000
+  GetLoanAmount():                   10000
+  SetMinimumLoanAmount(31337):       true
+  GetBankBalance():                  40000
+  GetLoanAmount():                   40000
+  SetLoanAmount(10000):              true
+  GetBankBalance():                  500000
+  GetLoanAmount():                   500000
+  GetCompanyHQ():                    -1
+  BuildCompanyHQ():                  true
+  GetCompanyHQ():                    33151
+  BuildCompanyHQ():                  true
+  GetCompanyHQ():                    33153
+  BuildCompanyHQ():                  false
+  GetLastErrorString():              ERR_AREA_NOT_CLEAR
+  GetAutoRenewStatus();              false
+  SetAutoRenewStatus(true);          true
+  GetAutoRenewStatus();              true
+  SetAutoRenewStatus(true);          true
+  SetAutoRenewStatus(false);         true
+  GetAutoRenewMonths();              6
+  SetAutoRenewMonths(-12);           true
+  GetAutoRenewMonths();              -12
+  SetAutoRenewMonths(-12);           true
+  SetAutoRenewMonths(6);             true
+  GetAutoRenewMoney();               100000
+  SetAutoRenewMoney(200000);         true
+  GetAutoRenewMoney();               200000
+  SetAutoRenewMoney(200000);         true
+  SetAutoRenewMoney(100000);         true
+  Quarter: -1
+    GetQuarterlyIncome();            -1
+    GetQuarterlyExpenses();          -1
+    GetQuarterlyCargoDelivered();    -1
+    GetQuarterlyPerformanceRating(); -1
+    GetQuarterlyCompanyValue();      -1
+  Quarter: 0
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          -210
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); -1
+    GetQuarterlyCompanyValue();      1
+  Quarter: 1
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 2
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 3
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 4
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 5
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 6
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 7
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 8
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 9
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 10
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 11
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 12
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 13
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 14
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 15
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 16
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 17
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 18
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 19
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 20
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 21
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 22
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 23
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0
+  Quarter: 24
+    GetQuarterlyIncome();            0
+    GetQuarterlyExpenses();          0
+    GetQuarterlyCargoDelivered();    0
+    GetQuarterlyPerformanceRating(); 0
+    GetQuarterlyCompanyValue();      0

 --AIAirport--
  IsHangarTile():       false
  IsAirportTile():      false
  GetHangarOfAirport(): -1
-  GetAirportType():     255
+  GetAirportType():     254
  IsAirportInformationAvailable(-1): false
  IsValidAirportType(-1):            false
  GetAirportWidth(-1):               -1
@@ -7226,7 +7384,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
    HasRoadType(Road):             true
    HasRoadType(Tram):             false
    GetNeighbourRoadCount():       2
-    RemoveRoad():                  true
+    RemoveRoad():                  false
    RemoveRoad():                  true
    RemoveRoad():                  false
    RemoveRoad():                  true
@@ -7705,7 +7863,205 @@ ERROR: IsEnd() is invalid as Begin() is never called
    41386 => -1
    41385 => -1
    41384 => -1
-  GetClosestTown() ListDump:
+    33183 => -1
+    33182 => -1
+    33181 => -1
+    33180 => -1
+    33179 => -1
+    33178 => -1
+    33177 => -1
+    33176 => -1
+    33175 => -1
+    32927 => -1
+    32926 => -1
+    32925 => -1
+    32924 => -1
+    32923 => -1
+    32922 => -1
+    32921 => -1
+    32920 => -1
+    32919 => -1
+    32671 => -1
+    32670 => -1
+    32669 => -1
+    32668 => -1
+    32667 => -1
+    32666 => -1
+    32665 => -1
+    32664 => -1
+    32663 => -1
+    32415 => -1
+    32414 => -1
+    32413 => -1
+    32412 => -1
+    32411 => -1
+    32410 => -1
+    32409 => -1
+    32408 => -1
+    32407 => -1
+    32159 => -1
+    32158 => -1
+    32157 => -1
+    32156 => -1
+    32155 => -1
+    32154 => -1
+    32153 => -1
+    32152 => -1
+    32151 => -1
+    31903 => -1
+    31902 => -1
+    31901 => -1
+    31900 => -1
+    31899 => -1
+    31898 => -1
+    31897 => -1
+    31896 => -1
+    31895 => -1
+    31647 => -1
+    31646 => -1
+    31645 => -1
+    31644 => -1
+    31643 => -1
+    31642 => -1
+    31641 => -1
+    31640 => -1
+    31639 => -1
+    31391 => -1
+    31390 => -1
+    31389 => -1
+    31388 => -1
+    31387 => -1
+    31386 => -1
+    31385 => -1
+    31384 => -1
+    31383 => -1
+    31135 => -1
+    31134 => -1
+    31133 => -1
+    31132 => -1
+    31131 => -1
+    31130 => -1
+    31129 => -1
+    31128 => -1
+    31127 => -1
+    30879 => -1
+    30878 => -1
+    30877 => -1
+    30876 => -1
+    30875 => -1
+    30874 => -1
+    30873 => -1
+    30872 => -1
+    30871 => -1
+    30623 => -1
+    30622 => -1
+    30621 => -1
+    30620 => -1
+    30619 => -1
+    30618 => -1
+    30617 => -1
+    30616 => -1
+    30615 => -1
+  GetTownAuthority() ListDump:
+    33183 => 65535
+    33182 => 65535
+    33181 => 65535
+    33180 => 65535
+    33179 => 65535
+    33178 => 65535
+    33177 => 65535
+    33176 => 65535
+    33175 => 65535
+    32927 => 65535
+    32926 => 65535
+    32925 => 65535
+    32924 => 65535
+    32923 => 65535
+    32922 => 65535
+    32921 => 65535
+    32920 => 65535
+    32919 => 65535
+    32671 => 65535
+    32670 => 65535
+    32669 => 65535
+    32668 => 65535
+    32667 => 65535
+    32666 => 65535
+    32665 => 65535
+    32664 => 65535
+    32663 => 65535
+    32415 => 65535
+    32414 => 65535
+    32413 => 65535
+    32412 => 65535
+    32411 => 65535
+    32410 => 65535
+    32409 => 65535
+    32408 => 65535
+    32407 => 65535
+    32159 => 65535
+    32158 => 65535
+    32157 => 65535
+    32156 => 65535
+    32155 => 65535
+    32154 => 65535
+    32153 => 65535
+    32152 => 65535
+    32151 => 65535
+    31903 => 65535
+    31902 => 65535
+    31901 => 65535
+    31900 => 65535
+    31899 => 65535
+    31898 => 65535
+    31897 => 65535
+    31896 => 65535
+    31895 => 65535
+    31647 => 65535
+    31646 => 65535
+    31645 => 65535
+    31644 => 65535
+    31643 => 65535
+    31642 => 65535
+    31641 => 65535
+    31640 => 65535
+    31639 => 65535
+    31391 => 65535
+    31390 => 65535
+    31389 => 65535
+    31388 => 65535
+    31387 => 65535
+    31386 => 65535
+    31385 => 65535
+    31384 => 65535
+    31383 => 65535
+    31135 => 65535
+    31134 => 65535
+    31133 => 65535
+    31132 => 65535
+    31131 => 65535
+    31130 => 65535
+    31129 => 65535
+    31128 => 65535
+    31127 => 65535
+    30879 => 65535
+    30878 => 65535
+    30877 => 65535
+    30876 => 65535
+    30875 => 65535
+    30874 => 65535
+    30873 => 65535
+    30872 => 65535
+    30871 => 65535
+    30623 => 65535
+    30622 => 65535
+    30621 => 65535
+    30620 => 65535
+    30619 => 65535
+    30618 => 65535
+    30617 => 65535
+    30616 => 65535
+    30615 => 65535
    42415 => 3
    42414 => 3
    42413 => 3
@@ -7741,6 +8097,141 @@ ERROR: IsEnd() is invalid as Begin() is never called
    41386 => 3
    41385 => 3
    41384 => 3
+  GetClosestTown() ListDump:
+    31127 => 24
+    30872 => 24
+    30871 => 24
+    30617 => 24
+    30616 => 24
+    30615 => 24
+    42415 => 3
+    42414 => 3
+    42413 => 3
+    42412 => 3
+    42411 => 3
+    42410 => 3
+    42159 => 3
+    42158 => 3
+    42157 => 3
+    42156 => 3
+    42155 => 3
+    42154 => 3
+    42153 => 3
+    41903 => 3
+    41902 => 3
+    41901 => 3
+    41900 => 3
+    41899 => 3
+    41898 => 3
+    41897 => 3
+    41647 => 3
+    41646 => 3
+    41645 => 3
+    41644 => 3
+    41643 => 3
+    41642 => 3
+    41641 => 3
+    41391 => 3
+    41390 => 3
+    41389 => 3
+    41388 => 3
+    41387 => 3
+    41386 => 3
+    41385 => 3
+    41384 => 3
+    33183 => 3
+    33182 => 3
+    33181 => 3
+    33180 => 3
+    33179 => 3
+    33178 => 3
+    33177 => 3
+    33176 => 3
+    33175 => 3
+    32927 => 3
+    32926 => 3
+    32925 => 3
+    32924 => 3
+    32923 => 3
+    32922 => 3
+    32921 => 3
+    32920 => 3
+    32919 => 3
+    32671 => 3
+    32670 => 3
+    32669 => 3
+    32668 => 3
+    32667 => 3
+    32666 => 3
+    32665 => 3
+    32664 => 3
+    32663 => 3
+    32415 => 3
+    32414 => 3
+    32413 => 3
+    32412 => 3
+    32411 => 3
+    32410 => 3
+    32409 => 3
+    32408 => 3
+    32407 => 3
+    32159 => 3
+    32158 => 3
+    32157 => 3
+    32156 => 3
+    32155 => 3
+    32154 => 3
+    32153 => 3
+    32152 => 3
+    32151 => 3
+    31903 => 3
+    31902 => 3
+    31901 => 3
+    31900 => 3
+    31899 => 3
+    31898 => 3
+    31897 => 3
+    31896 => 3
+    31895 => 3
+    31647 => 3
+    31646 => 3
+    31645 => 3
+    31644 => 3
+    31643 => 3
+    31642 => 3
+    31641 => 3
+    31640 => 3
+    31639 => 3
+    31391 => 3
+    31390 => 3
+    31389 => 3
+    31388 => 3
+    31387 => 3
+    31386 => 3
+    31385 => 3
+    31384 => 3
+    31383 => 3
+    31135 => 3
+    31134 => 3
+    31133 => 3
+    31132 => 3
+    31131 => 3
+    31130 => 3
+    31129 => 3
+    31128 => 3
+    30879 => 3
+    30878 => 3
+    30877 => 3
+    30876 => 3
+    30875 => 3
+    30874 => 3
+    30873 => 3
+    30623 => 3
+    30622 => 3
+    30621 => 3
+    30620 => 3
+    30619 => 3
+    30618 => 3
  CargoAcceptance():   done
  KeepAboveValue(10):  done
  Count():             15
@@ -8456,9 +8947,9 @@ ERROR: IsEnd() is invalid as Begin() is never called
  GetNumWagons():       3
  GetLength():          24
  GetWagonEngineType(): 9
-  GetWagonAge():        0
+  GetWagonAge():        1
  GetWagonEngineType(): 27
-  GetWagonAge():        0
+  GetWagonAge():        1
  GetWagonEngineType(): 27
  GetWagonAge():        0
  GetWagonEngineType(): 65535
@@ -8492,11 +8983,11 @@ ERROR: IsEnd() is invalid as Begin() is never called
    14 => 1
    12 => 1
  Age ListDump:
+    17 => 1
+    16 => 1
    14 => 1
    13 => 1
    12 => 1
-    17 => 0
-    16 => 0
  MaxAge ListDump:
    16 => 10980
    14 => 10980
@@ -8504,9 +8995,9 @@ ERROR: IsEnd() is invalid as Begin() is never called
    13 => 5490
    12 => 5490
  AgeLeft ListDump:
-    16 => 10980
+    16 => 10979
    14 => 10979
-    17 => 7320
+    17 => 7319
    13 => 5489
    12 => 5489
  CurrentSpeed ListDump:
@@ -8657,9 +9148,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
        GetDestinationType():  1
        GetDestinationIndex(): 7
        GetCargoType():        0
-  GetNextEvent:          instance
-    GetEventType:        6
-      Unknown Event
  IsEventWaiting:        false

 --Math--
@@ -8694,4 +9182,4 @@ ERROR: IsEnd() is invalid as Begin() is never called
  -1          >  2147483647:   false
  -2147483648 >  2147483647:   false
   13725      > -2147483648:   true
-ERROR: The AI died unexpectedly.
+ERROR: The script died unexpectedly.
@@ -6,7 +6,7 @@ class Regression extends AIInfo {
 	function GetShortName()   { return "REGR"; }
 	function GetDescription() { return "This runs regression-tests on all commands. On the same map the result should always be the same."; }
 	function GetVersion()     { return 1; }
-	function GetAPIVersion()  { return "1.1"; }
+	function GetAPIVersion()  { return "1.3"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
 }
@@ -25,9 +25,10 @@ fi
 if [ -n "$gdb" ]; then
 	$gdb ./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav
 else
-	./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav -d ai=2 2>&1 | awk '{ gsub("0x(\\(nil\\)|0+)(x0)?", "0x00000000", $0); gsub("^dbg: \\[ai\\]", "", $0); gsub("^ ", "ERROR: ", $0); gsub("ERROR: \\[1\\] ", "", $0); gsub("\\[P\\] ", "", $0); print $0; }' > tmp.regression
+	./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
 if [ -z "$gdb" ]; then
 	res="`diff -ub ai/regression/regression.txt tmp.regression`"
 	if [ -z "$res" ]; then
@@ -35,6 +36,7 @@ if [ -z "$gdb" ]; then
 	else
 		echo "Regression test failed! Difference:"
 		echo "$res"
+		ret=1
 	fi
 	echo ""
 	echo "Regression test done"
@@ -49,3 +51,5 @@ fi
 if [ "$1" != "-k" ]; then
 	rm -f tmp.regression
 fi
+
+exit $ret
@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF  = e67a3aaf13b81bab5d72d7440244e20c
+OPENTTD.GRF  = c683a77e1a43aed7db29ef318b166dd9

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTD.GRF  = e67a3aaf13b81bab5d72d7440244e20c
+OPENTTD.GRF  = c683a77e1a43aed7db29ef318b166dd9

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
@@ -55,7 +55,7 @@ TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
 TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
 TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
 TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTD.GRF  = e67a3aaf13b81bab5d72d7440244e20c
+OPENTTD.GRF  = c683a77e1a43aed7db29ef318b166dd9

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
@@ -0,0 +1,10 @@
+/* $Id$ */
+
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+GSLog.Info("1.2 API compatability in effect.");
@@ -0,0 +1,8 @@
+/* $Id$ */
+
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
@@ -32,7 +32,6 @@ set_default() {
 	os="DETECT"
 	endian="AUTO"
 	cpu_type="DETECT"
-	revision=""
 	config_log="config.log"
 	prefix_dir="/usr/local"
 	binary_dir="games"
@@ -54,7 +53,6 @@ set_default() {
 	enable_lto="0"
 	enable_dedicated="0"
 	enable_network="1"
-	enable_ai="1"
 	enable_static="1"
 	enable_translator="0"
 	enable_unicode="1"
@@ -91,6 +89,8 @@ set_default() {
 	with_threads="1"
 	with_distcc="1"
 	with_ccache="1"
+	with_nforenum="1"
+	with_grfcodec="1"

 	save_params_array="
 		build
@@ -106,7 +106,6 @@ set_default() {
 		os
 		endian
 		cpu_type
-		revision
 		config_log
 		prefix_dir
 		binary_dir
@@ -128,7 +127,6 @@ set_default() {
 		enable_lto
 		enable_dedicated
 		enable_network
-		enable_ai
 		enable_static
 		enable_translator
 		enable_unicode
@@ -164,7 +162,9 @@ set_default() {
 		with_threads
 		with_distcc
 		with_ccache
-	CC CXX CFLAGS CXXFLAGS LDFLAGS"
+		with_grfcodec
+		with_nforenum
+	CC CXX CFLAGS CXXFLAGS LDFLAGS CFLAGS_BUILD CXXFLAGS_BUILD LDFLAGS_BUILD"
 }

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

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

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



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

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

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

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

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

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

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

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

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

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

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

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

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



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


@@ -286,9 +285,6 @@ detect_params() {
 			--enable-network)             enable_network="2";;
 			--enable-network=*)           enable_network="$optarg";;
 			--disable-network)            enable_network="0";;
-			--enable-ai)                  enable_ai="2";;
-			--enable-ai=*)                enable_ai="$optarg";;
-			--disable-ai)                 enable_ai="0";;
 			--disable-static)             enable_static="0";;
 			--enable-static)              enable_static="2";;
 			--enable-static=*)            enable_static="$optarg";;
@@ -422,6 +418,14 @@ detect_params() {
 			--with-ccache)                with_ccache="2";;
 			--with-ccache=*)              with_ccache="$optarg";;

+			--without-nforenum)           with_nforenum="0";;
+			--with-nforenum)              with_nforenum="2";;
+			--with-nforenum=*)            with_nforenum="$optarg";;
+
+			--without-grfcodec)           with_grfcodec="0";;
+			--with-grfcodec)              with_grfcodec="2";;
+			--with-grfcodec=*)            with_grfcodec="$optarg";;
+
 			--without-osx-sysroot)        with_osx_sysroot="0";;
 			--with-osx-sysroot)           with_osx_sysroot="2";;
 			--with-osx-sysroot=*)         with_osx_sysroot="$optarg";;
@@ -439,6 +443,9 @@ detect_params() {
 			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";;

@@ -743,13 +750,8 @@ check_params() {
 		log 1 "checking network... disabled"
 	fi

-	if [ "$enable_ai" != "0" ]; then
-		log 1 "checking ai... found"
-		SCRIPT_SRC_DIR="$ROOT_DIR/src/3rdparty/squirrel/include"
-	else
-		log 1 "checking ai... disabled"
-		SCRIPT_SRC_DIR=""
-	fi
+	log 1 "checking squirrel... found"
+	SCRIPT_SRC_DIR="$ROOT_DIR/src/3rdparty/squirrel/include"

 	if [ "$enable_translator" != "0" ]; then
 		log 1 "checking translator... debug"
@@ -936,6 +938,19 @@ check_params() {
 		log 1 "checking ccache... $ccache"
 	fi

+	detect_grfcodec
+	detect_nforenum
+
+	if [ -z "$grfcodec" ] && [ -n "$nforenum" ]; then
+		log 1 "checking nforenum/grfcodec... nforenum needs grfcodec enabled, disabling nforenum"
+		nforenum=""
+	fi
+
+	if [ -z "$nforenum" ] && [ -n "$grfcodec" ]; then
+		log 1 "checking nforenum/grfcodec... grfcodec needs nforenum enabled, disabling grfcodec"
+		grfcodec=""
+	fi
+
 	if [ "$os" = "DOS" ]; then
 		with_threads="0"
 	fi
@@ -995,31 +1010,15 @@ check_params() {
 		fi
 	fi

-	if [ -n "$revision" ]; then
-		log 1 "checking revision... $revision"
-		log 1 "WARNING: we do not advise you to use this setting"
-		log 1 "WARNING: in most cases it is not safe for network use"
-		log 1 "WARNING: USE WITH CAUTION!"
-
-		sleep 5
-	elif [ -f "$ROOT_DIR/version" ]; then
-		revision="`cat $ROOT_DIR/version`"
-
-		log 1 "checking revision... $revision"
-	elif [ -d "$ROOT_DIR/.svn" ] && [ -n "`svn help 2>/dev/null`" ]; then
-		revision=""
+	if [ -d "$ROOT_DIR/.svn" ] && [ -n "`svn help 2>/dev/null`" ]; then
 		log 1 "checking revision... svn detection"
 	elif [ -d "$ROOT_DIR/.git" ] && [ -n "`git help 2>/dev/null`" ]; then
-		revision=""
 		log 1 "checking revision... git detection"
 	elif [ -d "$ROOT_DIR/.hg" ] && [ -n "`hg help 2>/dev/null`" ]; then
-		revision=""
 		log 1 "checking revision... hg detection"
 	elif [ -f "$ROOT_DIR/.ottdrev" ]; then
-		revision=""
 		log 1 "checking revision... source tarball"
 	else
-		revision=""
 		log 1 "checking revision... no detection"
 		log 1 "WARNING: there is no means to determine the version."
 		log 1 "WARNING: please use a subversion, mercurial, or git checkout of OpenTTD."
@@ -1164,11 +1163,11 @@ make_compiler_cflags() {
 		if [ -z "$first_time_icc_check" ]; then
 			first_time_icc_check=no
 			if [ $cc_version -lt 90 ]; then
-				log 1 "WARNING: you seem to be using very old version of ICC"
+				log 1 "WARNING: you seem to be using a very old version of ICC"
 				log 1 "WARNING: OpenTTD hasn't been tested with this version"
 				sleep 5
 			elif [ $cc_version -lt 120 ]; then
-				log 1 "WARNING: you seem to be using unsupported ICC version"
+				log 1 "WARNING: you seem to be using an unsupported ICC version"
 				log 1 "WARNING: ICC older than 12.0 is known to fail to compile OpenTTD"
 				sleep 5
 			fi
@@ -1241,6 +1240,58 @@ make_compiler_cflags() {
 				features="$features lto"
 			fi
 		fi
+	elif [ `basename $1 | grep 'clang'` ]; then
+		# Enable some things only for certain clang versions
+		cc_version="`$1 -v 2>&1 | head -n 1 | sed s@[^0-9]@@g | cut -c 1-2`"
+
+		# aliasing rules are not held in openttd code
+		flags="$flags -fno-strict-aliasing"
+
+		# -W alone doesn't enable all warnings enabled by -Wall; on the other hand,
+		# -Weverything enables too many useless warnings that can't be disabled (as of 3.0)
+		flags="$flags -Wall -W"
+
+		# warning: unused parameter '...'
+		flags="$flags -Wno-unused-parameter"
+
+		# warning: expression result unused
+		flags="$flags -Wno-unused-value"
+
+		# warning: multi-character character constant
+		flags="$flags -Wno-multichar"
+
+		# warning: explicitly assigning a variable of type '...' to itself
+		# it happens when using the FOR_ALL_WINDOWS_FROM_BACK_FROM macro
+		flags="$flags -Wno-self-assign"
+
+		if [ "$cc_version" -lt "30" ]; then
+			# warning: equality comparison with extraneous parentheses
+			flags="$flags -Wno-parentheses"
+			# warning: operands of ? are integers of different signs: 'unsigned int' and 'int'
+			flags="$flags -Wno-sign-compare"
+		fi
+
+		if [ "$cc_version" -ge "30" ]; then
+			# warning: equality comparison with extraneous parentheses
+			# this warning could be useful, but it warns about code in squirrel
+			flags="$flags -Wno-parentheses-equality"
+		fi
+
+		if [ "$with_ccache" != "0" -o "$with_distcc" != "0" ]; then
+			# ccache and distcc run separate preprocess and compile passes,
+			# both are fed with the same CFLAGS. Unfortunately, clang
+			# complains about -I when compiling preprocessed files:
+			# "clang: warning: argument unused during compilation: '-I /usr/include'"
+			flags="$flags -Qunused-arguments"
+		fi
+
+		if [ "$enable_assert" -eq "0" ]; then
+			# do not warn about unused variables when building without asserts
+			flags="$flags -Wno-unused-variable"
+		fi
+
+		# rdynamic is used to get useful stack traces from crash reports.
+		ldflags="$ldflags -rdynamic"
 	else
 		# Enable some things only for certain GCC versions
 		cc_version=`$1 -dumpversion | cut -c 1,3`
@@ -1252,8 +1303,8 @@ make_compiler_cflags() {

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

 		if [ $enable_assert -eq 0 ]; then
 			# Do not warn about unused variables when building without asserts
@@ -1288,6 +1339,9 @@ make_compiler_cflags() {
 			# sure that they will not happen. It furthermore complains
 			# about its own optimized code in some places.
 			flags="$flags -fno-strict-overflow"
+			# GCC 4.2 no longer includes -Wnon-virtual-dtor in -Wall.
+			# Enable it in order to be consistent with older GCC versions.
+			flags="$flags -Wnon-virtual-dtor"
 		fi

 		if [ $cc_version -ge 43 ]; then
@@ -1296,6 +1350,21 @@ 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]
+			# They are valid according to the C++ standard, but useless.
+			cxxflags="$cxxflags -Wno-narrowing"
+			# Disable bogus 'attempt to free a non-heap object' warning
+			flags="$flags -Wno-free-nonheap-object"
+		fi
+
 		if [ "$enable_lto" != "0" ]; then
 			# GCC 4.5 outputs '%{flto}', GCC 4.6 outputs '%{flto*}'
 			has_lto=`$1 -dumpspecs | grep '\%{flto'`
@@ -1327,11 +1396,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
@@ -1365,12 +1434,6 @@ make_cflags_and_ldflags() {
 		# Each debug level reduces the optimization by a bit
 		if [ $enable_debug -ge 1 ]; then
 			CFLAGS="$CFLAGS -g -D_DEBUG"
-			if basename "$cc_host" | grep "gcc" &>/dev/null; then
-				# Define only when compiling with GCC, some
-				# GLIBC versions use GNU extensions in a way
-				# that breaks build with at least ICC
-				CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
-			fi
 			if [ "$os" = "PSP" ]; then
 				CFLAGS="$CFLAGS -G0"
 			fi
@@ -1385,6 +1448,18 @@ make_cflags_and_ldflags() {
 		fi
 	fi

+	if [ $enable_debug -le 2 ]; then
+		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.
+			# This requires -O1 or more, so debug level 3 (-O0) is excluded.
+			CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
+
+			# 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.
@@ -1417,7 +1492,10 @@ make_cflags_and_ldflags() {
 			LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32"

 			if [ $cc_version -ge 44 ]; then
-				LDFLAGS_BUILD="$LDFLAGS_BUILD -static-libgcc"
+				LDFLAGS_BUILD="$LDFLAGS_BUILD -static-libgcc -static-libstdc++"
+			fi
+			if [ $cc_version -ge 47 ]; then
+				CFLAGS="$CFLAGS -mno-ms-bitfields"
 			fi
 		fi
 	fi
@@ -1574,9 +1652,7 @@ make_cflags_and_ldflags() {
 	if [ "$cpu_type" = "64" ] && [ "$enable_universal" = "0" ]; then
 		CFLAGS="$CFLAGS -D_SQ64"
 	fi
-	if [ "$enable_ai" != "0" ]; then
-		CFLAGS="$CFLAGS -I$SCRIPT_SRC_DIR -DENABLE_AI"
-	fi
+	CFLAGS="$CFLAGS -I$SCRIPT_SRC_DIR"

 	if [ -n "$png_config" ]; then
 		CFLAGS="$CFLAGS -DWITH_PNG"
@@ -1714,6 +1790,7 @@ make_cflags_and_ldflags() {

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

 	if [ "$enable_desync_debug" != "0" ]; then
@@ -1749,6 +1826,9 @@ 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"
@@ -2073,6 +2153,30 @@ 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...

@@ -2758,13 +2862,14 @@ detect_fontconfig() {

 	version=`$fontconfig_config --modversion 2>/dev/null`
 	ret=$?
-	shortversion=`echo $version | cut -c 1,3`
+	check_version '2.3' "$version"
+	version_ok=$?
 	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
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version_ok" != "1" ]; then
+		if [ -n "$version" ] && [ "$version_ok" != "1" ]; then
 			log 1 "checking libfontconfig... needs at least version 2.3.0, fontconfig NOT enabled"
 		else
 			log 1 "checking libfontconfig... not found"
@@ -2807,13 +2912,14 @@ detect_icu() {

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

-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$shortversion" -lt "36" ]; then
-		if [ -n "$shortversion" ] && [ "$shortversion" -lt "36" ]; then
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version_ok" != "1" ]; then
+		if [ -n "$version" ] && [ "$version_ok" != "1" ]; then
 			log 1 "checking libicu... needs at least version 3.6.0, icu NOT enabled"
 		else
 			log 1 "checking libicu... not found"
@@ -3042,6 +3148,90 @@ detect_sort() {
 	fi
 }

+detect_grfcodec() {
+	# 0 means no, 1 is auto-detect, 2 is force
+	if [ "$with_grfcodec" = "0" ]; then
+		log 1 "checking grfcodec... disabled"
+
+		grfcodec=""
+		return 0
+	fi
+
+	if [ "$with_grfcodec" = "1" ] || [ "$with_grfcodec" = "" ] || [ "$with_grfcodec" = "2" ]; then
+		grfcodec="grfcodec"
+	else
+		grfcodec="$with_grfcodec"
+	fi
+
+	version=`$grfcodec -v 2>/dev/null | $awk '{print $3}' | sed 's/[rM]//g;s/-/0/'`
+	ret=$?
+	log 2 "executing grfcodec -v"
+	log 2 "  returned $version"
+	log 2 "  exit code $ret"
+
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "949" ]; then
+		if [ -n "$version" ] && [ "$version" -lt "949" ]; then
+			log 1 "checking grfcodec... needs at least version 6.0.2 (r949), disabled"
+		else
+			log 1 "checking grfcodec... not found"
+		fi
+
+		# It was forced, so it should be found.
+		if [ "$with_grfcodec" != "1" ]; then
+			log 1 "configure: error: grfcodec couldn't be found"
+			log 1 "configure: error: you supplied '$with_grfcodec', but it seems invalid"
+			exit 1
+		fi
+
+		grfcodec=""
+		return 0
+	fi
+
+	log 1 "checking grfcodec... found"
+}
+
+detect_nforenum() {
+	# 0 means no, 1 is auto-detect, 2 is force
+	if [ "$with_nforenum" = "0" ]; then
+		log 1 "checking nforenum... disabled"
+
+		nforenum=""
+		return 0
+	fi
+
+	if [ "$with_nforenum" = "1" ] || [ "$with_nforenum" = "" ] || [ "$with_nforenum" = "2" ]; then
+		nforenum="nforenum"
+	else
+		nforenum="$with_nforenum"
+	fi
+
+	version=`$nforenum -v 2>/dev/null | $awk '{print $3}' | sed 's/[rM]//g;s/-/0/'`
+	ret=$?
+	log 2 "executing nforenum -v"
+	log 2 "  returned $version"
+	log 2 "  exit code $ret"
+
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "949" ]; then
+		if [ -n "$version" ] && [ "$version" -lt "949" ]; then
+			log 1 "checking nforenum... needs at least version 6.0.2 (r949), disabled"
+		else
+			log 1 "checking nforenum... not found"
+		fi
+
+		# It was forced, so it should be found.
+		if [ "$with_nforenum" != "1" ]; then
+			log 1 "configure: error: nforenum couldn't be found"
+			log 1 "configure: error: you supplied '$with_nforenum', but it seems invalid"
+			exit 1
+		fi
+
+		nforenum=""
+		return 0
+	fi
+
+	log 1 "checking nforenum... found"
+}
+
 detect_cputype() {
 	if [ -n "$cpu_type" ] && [ "$cpu_type" != "DETECT" ]; then
 		log 1 "forcing cpu-type... $cpu_type bits"
@@ -3096,6 +3286,7 @@ make_sed() {
 		s@!!SRC_OBJS_DIR!!@$SRC_OBJS_DIR@g;
 		s@!!LANG_OBJS_DIR!!@$LANG_OBJS_DIR@g;
 		s@!!GRF_OBJS_DIR!!@$GRF_OBJS_DIR@g;
+		s@!!SETTING_OBJS_DIR!!@$SETTING_OBJS_DIR@g;
 		s@!!SRC_DIR!!@$SRC_DIR@g;
 		s@!!SCRIPT_SRC_DIR!!@$SCRIPT_SRC_DIR@g;
 		s@!!OSXAPP!!@$OSXAPP@g;
@@ -3114,6 +3305,7 @@ make_sed() {
 		s@!!STRGEN!!@$STRGEN@g;
 		s@!!ENDIAN_CHECK!!@$ENDIAN_CHECK@g;
 		s@!!DEPEND!!@$DEPEND@g;
+		s@!!SETTINGSGEN!!@$SETTINGSGEN@g;
 		s@!!ENDIAN_FORCE!!@$endian@g;
 		s@!!STAGE!!@$STAGE@g;
 		s@!!MAKEDEPEND!!@$makedepend@g;
@@ -3134,9 +3326,10 @@ make_sed() {
 		s@!!SRCS!!@$SRCS@g;
 		s@!!OS!!@$os@g;
 		s@!!CONFIGURE_FILES!!@$CONFIGURE_FILES@g;
-		s@!!REVISION!!@$revision@g;
 		s@!!AWK!!@$awk@g;
 		s@!!DISTCC!!@$distcc@g;
+		s@!!NFORENUM!!@$nforenum@g;
+		s@!!GRFCODEC!!@$grfcodec@g;
 	"

 	if [ "$icon_theme_dir" != "" ]; then
@@ -3221,6 +3414,20 @@ generate_lang() {
 	echo "LANG_DIRS += $LANG_OBJS_DIR" >> Makefile.am
 }

+generate_settings() {
+	STAGE="[SETTING]"
+
+	make_sed
+
+	# Create the language file
+	mkdir -p $SETTING_OBJS_DIR
+
+	log 1 "Generating setting/Makefile..."
+	echo "# Auto-generated file from 'Makefile.settings.in' -- DO NOT EDIT" > $SETTING_OBJS_DIR/Makefile
+	< $ROOT_DIR/Makefile.setting.in sed "$SRC_REPLACE" >> $SETTING_OBJS_DIR/Makefile
+	echo "DIRS += $SETTING_OBJS_DIR" >> Makefile.am
+}
+
 generate_grf() {
 	STAGE="[GRF]"

@@ -3341,8 +3548,6 @@ showhelp() {
 	echo "                                 MORPHOS/HPUX/BEOS/SUNOS/CYGWIN/MINGW/OS2/"
 	echo "                                 DOS/WINCE/PSP/HAIKU"
 	echo "  --endian=ENDIAN                set the endian of the HOST (AUTO/LE/BE)"
-	echo "  --revision=rXXXX               overwrite the revision detection."
-	echo "                                 Use with care!"
 	echo ""
 	echo "Paths:"
 	echo "  --prefix-dir=dir               specifies the prefix for all installed"
@@ -48,6 +48,7 @@ OBJS_DIR="$PWD/objs"
 BASE_SRC_OBJS_DIR="$OBJS_DIR"
 LANG_OBJS_DIR="$OBJS_DIR/lang"
 GRF_OBJS_DIR="$OBJS_DIR/extra_grf"
+SETTING_OBJS_DIR="$OBJS_DIR/setting"
 BIN_DIR="$PREFIX"
 SRC_DIR="$ROOT_DIR/src"
 LANG_DIR="$SRC_DIR/lang"
@@ -82,6 +83,7 @@ TTD="openttd$EXE"
 STRGEN="strgen$EXE"
 ENDIAN_CHECK="endian_check$EXE"
 DEPEND="depend$EXE"
+SETTINGSGEN="settings_gen$EXE"

 if [ -z "$sort" ]; then
 	PIPE_SORT="sed s@a@a@"
@@ -161,10 +163,11 @@ else
 	sort="$sort -u"
 fi

-CONFIGURE_FILES="$ROOT_DIR/configure $ROOT_DIR/config.lib $ROOT_DIR/Makefile.in $ROOT_DIR/Makefile.grf.in $ROOT_DIR/Makefile.lang.in $ROOT_DIR/Makefile.src.in $ROOT_DIR/Makefile.bundle.in"
+CONFIGURE_FILES="$ROOT_DIR/configure $ROOT_DIR/config.lib $ROOT_DIR/Makefile.in $ROOT_DIR/Makefile.grf.in $ROOT_DIR/Makefile.lang.in $ROOT_DIR/Makefile.src.in $ROOT_DIR/Makefile.bundle.in $ROOT_DIR/Makefile.setting.in"

 generate_main
 generate_lang
+generate_settings
 generate_grf
 generate_src

@@ -1,44 +0,0 @@
-32bpp and OpenTTD
-Last updated:    2007-06-13
------------------------------------------------------------------------
-
-
-Table of contents
-----------------
-1.0) About
-2.0) The format
-
-
-1.0) About
---- -----
-OpenTTD has 32bpp support. This means: OpenTTD still is 8bpp, but it has the
-posibility to override the graphics with 32bpp. This means that it isn't a
-replacement of grf or newgrf, but simply an addition. If you want to use 32bpp
-graphics of a newgrf, you do need the newgrf itself too (with 8bpp graphics).
-
-
-2.0) The format
---- ----------
-32bpp images are stored in PNG. They should go in:
-  data/sprites/<grfname>/<SpriteID>.png
-
-For example, a grfname would be 'openttd' (without .grf, lowercase), and the
-SpriteID 3, to override the 3rd sprite in openttd.grf with a 32bpp version.
-
-The format of this PNG can be almost anything, but we advise to use RGBA
-format. Alpha-channel is fully supported.
-
-As the core of OpenTTD is 8bpp, and because you of course want company colours
-in your images, you will need to add a mask for every sprite that needs colour
-remapping. The name is simular as above, only you have to put a 'm' behind the
-SpriteID. This image should be a 8bpp palette image, where the palette is the
-OpenTTD palette. Upon load of the PNG, the mask is loaded too, and overrides
-the RGB (not the Alpha) of the original PNG image, and replacing it with a
-8bpp color remapped and converted to 32bpp.
-
-Another thing that OpenTTD needs in your png, is 2 tEXt chunks: x_offs and
-y_offs. This to define the x- and y-offset, of course. Use the tool we supply
-to add this information. Sadly enough most graphical editors trashes those
-chunks upon save, so you have to readd it every time you save your image.
-
-Your images should be the same as the grf, in size.
@@ -106,6 +106,7 @@
    <ul>
     <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the tile (normally <tt>10</tt>)</li>
     <li>m2: see fields</li>
+     <li>m3 bits 7..5: type of hedge on NE border of the tile</li>
     <li>m3 bits 3..0: see fields</li>
     <li>m3 bit 4: set if the tile is covered with snow</li>
     <li>m4 bits 7..5: type of hedge on the SW border of the tile (1 through 6, or 0=none)</li>
@@ -196,6 +197,7 @@
      </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>
@@ -816,8 +818,6 @@
      </table>
      <small>Note: the actually displayed set of trees depends on both type and number of trees</small>
     </li>
-     <li>m4 bits 7..5: type of hedge on the SW border of the tile (1 through 6, or 0=none)</li>
-     <li>m4 bits 4..2: type of hedge on the SE border of the tile (1 through 6, or 0=none)</li>
     <li>m5 bits 7..6: number of trees minus one</li>
     <li>m5 bits 2..0: growth status:
      <table border="0">
@@ -68,10 +68,10 @@ the array so you can quickly see what is used and what is not.
      <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"><span class="free">OOO</span>X <span class="free">OOOO</span></td>
+      <td class="bits">XXXX <span class="free">OOOO</span></td>
      <td class="bits">XXXX XX<span class="free">OO</span></td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</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>
@@ -79,10 +79,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">XXXX XXXX XXXX XXXX</td>
-      <td class="bits"><span class="free">OOO</span>X XXXX</td>
+      <td class="bits">XXXX XXXX</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</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>
@@ -172,7 +172,7 @@ the array so you can quickly see what is used and what is not.
      <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">XXXX XX<span class="free">OO</span></td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">XX<span class="free">OO O</span>XXX</td>
      <td class="bits"><span class="free">OOOO OO</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
@@ -1,5 +1,5 @@
 Multiplayer manual for OpenTTD
-Last updated:    2011-01-20
+Last updated:    2011-02-16
 ------------------------------------------------------------------------


@@ -17,6 +17,12 @@ Table of contents

 1.0) Starting a server
 ---- -----------------
+ - Make sure that you have your firewall of the computer as well as possible
+   routers or modems of the server configured such that:
+   * port 3979 is free for both UDP and TCP connections in- and outgoing
+   * port 3978 is free outbound for UDP in order to advertise with the master
+     server (if desired). Otherwise you'll have to tell players your IP.
+   * port 3977 if use of the admin interface is desired (see admin_network.txt)
 - Click "multiplayer" on the startup screen
 - Click "start server"
 - Type in a game name
@@ -206,7 +212,8 @@ Table of contents
 6.0) Troubleshooting
 ---- ---------------
 - My advertising server does not show up in list at servers.openttd.org
-     Run openttd with the '-d net=2' parameter, as this will show whether it
-     receives replies from the master server. If it does not receive replies it
-     is most likely that you need to configure your router to forward ports
-     3979 (both TCP and UDP) to the computer that is hosting the game.
+     Run openttd with the '-d net=2' parameter. That will show which incoming
+     communication is received, whether the replies from the master server or
+     communication from an admin tool reach the programme. See section 1
+     'Starting a server' further up for the ports and protocols used by OpenTTD.
+     The ports can be configured in the config file.
@@ -42,6 +42,8 @@ description  = foo
 description.en_US = howdie
 ; palette used by the set; either DOS or Windows
 palette      = DOS
+; preferred blitter, optional; either 8bpp (default) or 32bpp.
+blitter      = 8bpp

 ; The files section lists the files that replace sprites.
 ; The file names are case sensitive.
@@ -1,6 +1,6 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd Dec 31, 2010
+.Dd May 31, 2011
 .Dt OPENTTD 6
 .Sh NAME
 .Nm openttd
@@ -14,7 +14,6 @@
 .Op Fl D Ar [host][:port]
 .Op Fl g Ar [savegame]
 .Op Fl G Ar seed
-.Op Fl i Ar palette
 .Op Fl I Ar graphicsset
 .Op Fl l Ar host[:port]
 .Op Fl m Ar driver
@@ -22,6 +21,7 @@
 .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 widthxheight
 .Op Fl s Ar driver
 .Op Fl S Ar soundset
@@ -61,10 +61,6 @@ at start or start a new game if omitted. The
 must be either absolute or relative to the current path or one of the search paths.
 .It Fl h
 Display a summary of all options and lists all the available AIs, blitters, sound, music and video drivers, graphics sets and sound sets.
-.It Fl i Ar palette
-Set the palette. '0' for the DOS palette, '1' for the Windows palette and '2' to autodetect (default).
-.sp
-The palette depends where the base graphics set originated from. If it came from the Transport Tycoon Deluxe for DOS it has the DOS palette, if it came from the Windows version of Transport Tycoon Deluxe it has the Windows palette. All others likely have the Windows palette as that is the most used palette.
 .It Fl I Ar graphicsset
 Set the graphics set, see
 .Fl h
@@ -88,6 +84,8 @@ Password used to join server. Only useful with
 .It Fl P Ar password
 Password used to join company. Only useful with
 .Fl n
+.It Fl q Ar savegame
+Write some information about the savegame and exit
 .It Fl r Ar widthxheight
 Set the resolution
 .It Fl s Ar driver
@@ -99,7 +99,7 @@ elif [ -d "$ROOT_DIR/.git" ]; then
 		# No rev? Maybe it is a custom git-svn clone
 		REV_NR=`LC_ALL=C git log --pretty=format:%b --grep="git-svn-id:.*@[0-9]*" -1 | sed "s@.*\@\([0-9]*\).*@\1@"`
 	fi
-	TAG="`git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null`"
+	TAG="`git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null | sed 's@\^0$@@'`"
 	if [ -n "$TAG" ]; then
 		BRANCH=""
 		REV="$TAG"
@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2011-02-04
-Release version: 1.1.0-beta5
+Last updated:    2012-06-01
+Release version: 1.2.1
 ------------------------------------------------------------------------


@@ -39,7 +39,12 @@ 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.

- 2484	[OSX] Cannot enter CJK characters
+- 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
 ---- ----------------------------------
@@ -262,7 +267,7 @@ OpenTTD hangs when started on 32 bits Windows [FS#4083]
 	default we are not able to detect this failure, except when Windows'
 	music initialisation function returns after several hours and then
 	there is no point in switching the music driver anymore.
-	The reason we do not use the "win32" music driver as default are
+	The reason we still use the "win32" music driver as default are
 	described in the "Long delay between switching music/song" section
 	of this document.

@@ -292,3 +297,133 @@ Can't change volume inside OpenTTD [FS#4416]
 	in OpenTTD. As a result you can't change the volume inside OpenTTD
 	for backends such as SDL; just use the volume control provided by
 	your operating system.
+
+Can't run OpenTTD with the -d option from a MSYS console [FS#4587]
+	The MSYS console does not allow OpenTTD to open an extra console for
+	debugging output. Compiling OpenTTD with the --enable-console
+	configure option prevents this issue and allows the -d option to use
+	the MSYS console for its output.
+
+Unreadable characters for non-latin locales [FS#4607]
+	OpenTTD does not ship a non-latin font in its graphics files. As a
+	result OpenTTD needs to acquire the font from somewhere else. What
+	OpenTTD does is ask the operating system, or a system library, for
+	the best font for a given language if the currently loaded font
+	does not provide all characters of the chosen translation. This
+	means that OpenTTD has no influence over the quality of the chosen
+	font; it just does the best it can do.
+
+	If the text is unreadable there are several steps that you can take
+	to improve this. The first step is finding a good font and configure
+	this in the configuration file. See section 9.0 of readme.txt for
+	more information. You can also increase the font size to make the
+	characters bigger and possible better readable.
+
+	If the problem is with the clarity of the font you might want to
+	enable anti-aliasing by setting the small_aa/medium_aa/large_aa
+	settings to "true". However, anti-aliasing only works when a 32 bits
+	blitter has been selected, e.g. blitter = "32bpp-anim", as with the
+	8 bits blitter there are not enough colours to properly perform the
+	anti-aliasing.
+
+(Temporary) wrong colours when switching to full screen [FS#4511]:
+	On Windows it can happen that you temporarily see wrong colours
+	when switching to full screen OpenTTD, either by starting
+	OpenTTD in full screen mode, changing to full screen mode or by
+	ALT-TAB-ing into a full screen OpenTTD. This is caused by the
+	fact that OpenTTD, by default, uses 8bpp paletted output. The
+	wrong colours you are seeing is a temporary effect of the video
+	driver switching to 8bpp palette mode.
+
+	This issue can be worked around in two ways:
+		a) Setting fullscreen_bpp to 32
+		b) Setting up the 32bpp-anim or 32bpp-optimized blitter
+
+Train does not crash with itself [FS#4635]:
+	When a train drives in a circle the front engine passes through
+	wagons of the same train without crashing. This is intentional.
+	Signals are only aware of tracks, they do not consider the train
+	length and whether there would be enough room for a train in some
+	circle it might drive on. Also the path a train might take is not
+	necessarily known when passing a signal.
+	Checking all circumstances would take a lot of additional computational
+	power for signals, which is not considered worth the effort, as
+	it does not add anything to gameplay.
+	Nevertheless trains shall not crash in normal operation, so making
+	a train not crash with itself is the best solution for everyone.
+
+Aircraft coming through wall in rotated airports [FS#4705]:
+	With rotated airports, specifically hangars, you will see that the
+	aircraft will show a part through the back wall of the hangar.
+	This can be solved by only drawing a part of the plane when being
+	at the back of the hangar, however then with transparency turned on
+	the aircraft would be shown partially which would be even weirder.
+	As such the current behaviour is deemed the least bad.
+	The same applies to overly long ships and their depots.
+
+Vehicles not keeping their "maximum" speed [FS#4815]:
+	Vehicles that have not enough power to reach and maintain their
+	advertised maximum speed might be constantly jumping between two
+	speeds. This is due to the fact that speed and its calculations
+	are done with integral numbers instead of floating point numbers.
+	As a result of this a vehicle will never reach its equilibrium
+	between the drag/friction and propulsion. So in effect it will be
+	in a vicious circle of speeding up and slowing down due to being
+	just at the other side of the equilibrium.
+
+	Not speeding up when near the equilibrium will cause the vehicle
+	to never come in the neighbourhood of the equilibrium and not
+	slowing down when near the equilibrium will cause the vehicle
+	to never slow down towards the equilibrium once it has come down
+	a hill.
+
+	It is possible to calculate whether the equilibrium will be
+	passed, but then all acceleration calculations need to be done
+	twice.
+
+Settings not saved when OpenTTD crashes [FS#4846]:
+	The settings are not saved when OpenTTD crashes for several reasons.
+	The most important is that the game state is broken and as such the
+	settings might contain invalid values, or the settings have not even
+	been loaded yet. This would cause invalid or totally wrong settings
+	to be written to the configuration file.
+
+	A solution to that would be saving the settings whenever one changes,
+	however due to the way the configuration file is saved this requires
+	a flush of the file to the disk and OpenTTD needs to wait till that
+	is finished. On some file system implementations this causes the
+	flush of all 'write-dirty' caches, which can be a significant amount
+	of data to be written. This can further be aggravated by spinning
+	down disks to conserve power, in which case this disk needs to be
+	spun up first. This means that many seconds may pass before the
+	configuration file is actually written, and all that time OpenTTD
+	will not be able to show any progress. Changing the way the
+	configuration file is saved is not an option as that leaves us more
+	vulnerable to corrupt configuration files.
+
+	Finally, crashes should not be happening. If they happen they should
+	be reported and fixed, so essentially fixing this is fixing the
+	wrong thing. If you really need the configuration changes to be
+	saved, and you need to run a version that crashes regularly, then
+	you can use the 'saveconfig' command in the console to save the
+	settings.
+
+Not all NewGRFs, AIs, game scripts are found [FS#4887]:
+	Under certain situations, where the path for the content within a
+	tar file is the same as other content on the file system or in another
+	tar file, it is possible that content is not found. A more thorough
+	explanation and solutions are described in section 4.4 of readme.txt.
+
+Mouse cursor going missing with SDL [FS#4997]:
+	Under certain circumstances SDL does not notify OpenTTD of changes
+	with respect to the mouse pointer, specifically whether the mouse
+	pointer is within the bounds of OpenTTD or not. For example, if you
+	Alt-tab to another application the mouse cursor will still be shown
+	in OpenTTD, and when you move the mouse outside of the OpenTTD
+	window so the cursor gets hidden, open/move another application on
+	top of the OpenTTD window and then Alt-tab back into OpenTTD the
+	cursor will not be shown.
+
+	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.
@@ -8,12 +8,12 @@
 //
   -1 * 0	 0C "Airport previews"
   -1 * 0	 05 16 09
-   -1 sprites/airport_preview.png 50 8 09 140 230 0 0
-   -1 sprites/airport_preview.png 290 8 09 140 230 0 0
-   -1 sprites/airport_preview.png 530 8 09 140 230 0 0
-   -1 sprites/airport_preview.png 2 168 09 140 230 0 0
-   -1 sprites/airport_preview.png 242 168 09 140 230 0 0
-   -1 sprites/airport_preview.png 482 168 09 140 230 0 0
-   -1 sprites/airport_preview.png 2 328 09 140 230 0 0
-   -1 sprites/airport_preview.png 242 328 09 140 230 0 0
-   -1 sprites/airport_preview.png 482 328 09 140 230 0 0
+   -1 sprites/airport_preview.png 8bpp  50    8 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp 290    8 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp 530    8 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp   2  168 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp 242  168 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp 482  168 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp   2  328 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp 242  328 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp 482  328 230 140   0   0 normal
@@ -8,18 +8,18 @@
 //
   -1 * 0	 0C "Extra airport graphics"
   -1 * 3	 05 10 0F
-   -1 sprites/airports.png 18 8 09 31 64 -31 0
-   -1 sprites/airports.png 98 8 09 31 64 -31 0
-   -1 sprites/airports.png 178 8 09 31 64 -31 0
-   -1 sprites/airports.png 258 8 09 31 64 -31 0
-   -1 sprites/airports.png 338 8 09 31 64 -31 0
-   -1 sprites/airports.png 418 8 09 31 64 -31 0
-   -1 sprites/airports.png 498 8 09 55 64 -2 -38
-   -1 sprites/airports.png 578 8 09 17 18 16 -1
-   -1 sprites/airports.png 610 8 09 55 64 -2 -38
-   -1 sprites/airports.png 690 8 09 17 18 -30 1
-   -1 sprites/airports.png 722 8 09 55 64 -2 -38
-   -1 sprites/airports.png 2 88 09 55 64 -2 -38
-   -1 sprites/airports.png 82 88 09 31 64 -31 0
-   -1 sprites/airports.png 162 88 09 31 64 -31 0
-   -1 sprites/airports.png 242 88 09 31 64 -31 0
+   -1 sprites/airports.png 8bpp  18    8  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp  98    8  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp 178    8  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp 258    8  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp 338    8  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp 418    8  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp 498    8  64  55  -2 -38 normal
+   -1 sprites/airports.png 8bpp 578    8  18  17  16  -1 normal
+   -1 sprites/airports.png 8bpp 610    8  64  55  -2 -38 normal
+   -1 sprites/airports.png 8bpp 690    8  18  17 -30   1 normal
+   -1 sprites/airports.png 8bpp 722    8  64  55  -2 -38 normal
+   -1 sprites/airports.png 8bpp   2   88  64  55  -2 -38 normal
+   -1 sprites/airports.png 8bpp  82   88  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp 162   88  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp 242   88  64  31 -31   0 normal
@@ -6,13 +6,26 @@
 // 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 "Aqueduct graphics by Jonathan G. Rennison"
+   -1 * 0	 0C "Aqueduct graphics by Jonathan G. Rennison / PaulC"
+// temperate aqueduct
+   -1 * 6	 07 83 01 \7! 00 09
   -1 * 3	 05 12 08
-   -1 sprites/aqueduct.png 34 8 09 33 64 -34 -10
-   -1 sprites/aqueduct.png 114 8 09 33 66 -37 -9
-   -1 sprites/aqueduct.png 194 8 09 33 64 -34 -10
-   -1 sprites/aqueduct.png 274 8 09 33 66 -37 -9
-   -1 sprites/aqueduct.png 354 8 09 33 64 -34 -5
-   -1 sprites/aqueduct.png 434 8 09 33 66 -37 -4
-   -1 sprites/aqueduct.png 514 8 09 23 33 -31 0
-   -1 sprites/aqueduct.png 562 8 09 23 33 0 1
+   -1 sprites/aqueduct.png 8bpp  34    8  61  32 -30  -9 normal
+   -1 sprites/aqueduct.png 8bpp 114    8  62  31 -29  -9 normal
+   -1 sprites/aqueduct.png 8bpp 194    8  61  32 -30  -9 normal
+   -1 sprites/aqueduct.png 8bpp 274    8  62  31 -29  -9 normal
+   -1 sprites/aqueduct.png 8bpp 354    8  61  32 -30  -4 normal
+   -1 sprites/aqueduct.png 8bpp 434    8  62  31 -29  -4 normal
+   -1 sprites/aqueduct.png 8bpp 514    8  33  23 -31   0 normal
+   -1 sprites/aqueduct.png 8bpp 562    8  33  23   0   1 normal
+// non-temperate aqueduct
+   -1 * 6	 07 83 01 \7= 00 09
+   -1 * 3	 05 12 08
+   -1 sprites/aqueduct.png 8bpp  34   48  61  32 -30  -9 normal
+   -1 sprites/aqueduct.png 8bpp 114   48  62  31 -29  -9 normal
+   -1 sprites/aqueduct.png 8bpp 194   48  61  32 -30  -9 normal
+   -1 sprites/aqueduct.png 8bpp 274   48  62  31 -29  -9 normal
+   -1 sprites/aqueduct.png 8bpp 354   48  61  32 -30  -4 normal
+   -1 sprites/aqueduct.png 8bpp 434   48  62  31 -29  -4 normal
+   -1 sprites/aqueduct.png 8bpp 514   48  33  23 -31   0 normal
+   -1 sprites/aqueduct.png 8bpp 562   48  33  23   0   1 normal
@@ -8,58 +8,58 @@
 //
   -1 * 0	 0C "Autorail graphics"
   -1 * 3	 05 13 37
-   -1 sprites/autorail.png 18 8 09 31 64 -31 7
-   -1 sprites/autorail.png 98 8 09 31 64 -31 -1
-   -1 sprites/autorail.png 178 8 09 39 64 -31 -1
-   -1 sprites/autorail.png 258 8 09 47 64 -31 -9
-   -1 sprites/autorail.png 338 8 09 31 64 -31 -5
-   -1 sprites/autorail.png 418 8 09 23 64 -31 7
-   -1 sprites/autorail.png 498 8 09 18 64 -31 4
-   -1 sprites/autorail.png 578 8 09 31 64 -31 -1
-   -1 sprites/autorail.png 658 8 09 31 64 -31 7
-   -1 sprites/autorail.png 2 72 09 31 64 -31 -1
-   -1 sprites/autorail.png 82 72 09 23 64 -31 7
-   -1 sprites/autorail.png 162 72 09 18 64 -31 4
-   -1 sprites/autorail.png 242 72 09 31 64 -31 -1
-   -1 sprites/autorail.png 322 72 09 39 64 -31 -1
-   -1 sprites/autorail.png 402 72 09 47 64 -31 -9
-   -1 sprites/autorail.png 482 72 09 31 64 -31 -5
-   -1 sprites/autorail.png 562 72 09 31 64 -31 7
-   -1 sprites/autorail.png 642 72 09 31 64 -31 -1
-   -1 sprites/autorail.png 722 72 09 47 64 -31 -9
-   -1 sprites/autorail.png 2 136 09 26 64 -31 4
-   -1 sprites/autorail.png 82 136 09 23 64 -31 4
-   -1 sprites/autorail.png 162 136 09 31 64 -31 -3
-   -1 sprites/autorail.png 242 136 09 26 64 -31 4
-   -1 sprites/autorail.png 322 136 09 23 64 -31 4
-   -1 sprites/autorail.png 402 136 09 31 64 -31 -3
-   -1 sprites/autorail.png 482 136 09 31 64 -31 7
-   -1 sprites/autorail.png 562 136 09 31 64 -31 -1
-   -1 sprites/autorail.png 642 136 09 15 64 -31 7
-   -1 sprites/autorail.png 722 136 09 31 64 -31 7
-   -1 sprites/autorail.png 2 184 09 39 64 -31 -1
-   -1 sprites/autorail.png 82 184 09 31 64 -31 -1
-   -1 sprites/autorail.png 162 184 09 31 64 -31 7
-   -1 sprites/autorail.png 242 184 09 39 64 -31 -1
-   -1 sprites/autorail.png 322 184 09 31 64 -31 -1
-   -1 sprites/autorail.png 402 184 09 31 64 -31 7
-   -1 sprites/autorail.png 482 184 09 31 64 -31 -1
-   -1 sprites/autorail.png 562 184 09 31 64 -31 -1
-   -1 sprites/autorail.png 642 184 09 31 64 -31 -1
-   -1 sprites/autorail.png 722 184 09 23 64 -31 7
-   -1 sprites/autorail.png 2 248 09 15 64 -31 7
-   -1 sprites/autorail.png 82 248 09 39 64 -31 -1
-   -1 sprites/autorail.png 162 248 09 47 64 -31 -9
-   -1 sprites/autorail.png 242 248 09 31 64 -31 7
-   -1 sprites/autorail.png 322 248 09 31 64 -31 -1
-   -1 sprites/autorail.png 402 248 09 31 64 -31 -1
-   -1 sprites/autorail.png 482 248 09 31 64 -31 -1
-   -1 sprites/autorail.png 562 248 09 23 64 -31 7
-   -1 sprites/autorail.png 642 248 09 15 64 -31 7
-   -1 sprites/autorail.png 722 248 09 39 64 -31 -1
-   -1 sprites/autorail.png 2 312 09 47 64 -31 -9
-   -1 sprites/autorail.png 82 312 09 31 64 -31 -1
-   -1 sprites/autorail.png 162 312 09 31 64 -31 -1
-   -1 sprites/autorail.png 242 312 09 23 64 -31 7
-   -1 sprites/autorail.png 322 312 09 31 64 -31 7
-   -1 sprites/autorail.png 402 312 09 31 64 -31 7
+   -1 sprites/autorail.png 8bpp  18    8  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp  98    8  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 178    8  64  39 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 258    8  64  47 -31  -9 normal
+   -1 sprites/autorail.png 8bpp 338    8  64  31 -31  -5 normal
+   -1 sprites/autorail.png 8bpp 418    8  64  23 -31   7 normal
+   -1 sprites/autorail.png 8bpp 498    8  64  18 -31   4 normal
+   -1 sprites/autorail.png 8bpp 578    8  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 658    8  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp   2   72  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp  82   72  64  23 -31   7 normal
+   -1 sprites/autorail.png 8bpp 162   72  64  18 -31   4 normal
+   -1 sprites/autorail.png 8bpp 242   72  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 322   72  64  39 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 402   72  64  47 -31  -9 normal
+   -1 sprites/autorail.png 8bpp 482   72  64  31 -31  -5 normal
+   -1 sprites/autorail.png 8bpp 562   72  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp 642   72  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 722   72  64  47 -31  -9 normal
+   -1 sprites/autorail.png 8bpp   2  136  64  26 -31   4 normal
+   -1 sprites/autorail.png 8bpp  82  136  64  23 -31   4 normal
+   -1 sprites/autorail.png 8bpp 162  136  64  31 -31  -3 normal
+   -1 sprites/autorail.png 8bpp 242  136  64  26 -31   4 normal
+   -1 sprites/autorail.png 8bpp 322  136  64  23 -31   4 normal
+   -1 sprites/autorail.png 8bpp 402  136  64  31 -31  -3 normal
+   -1 sprites/autorail.png 8bpp 482  136  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp 562  136  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 642  136  64  15 -31   7 normal
+   -1 sprites/autorail.png 8bpp 722  136  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp   2  184  64  39 -31  -1 normal
+   -1 sprites/autorail.png 8bpp  82  184  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 162  184  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp 242  184  64  39 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 322  184  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 402  184  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp 482  184  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 562  184  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 642  184  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 722  184  64  23 -31   7 normal
+   -1 sprites/autorail.png 8bpp   2  248  64  15 -31   7 normal
+   -1 sprites/autorail.png 8bpp  82  248  64  39 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 162  248  64  47 -31  -9 normal
+   -1 sprites/autorail.png 8bpp 242  248  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp 322  248  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 402  248  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 482  248  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 562  248  64  23 -31   7 normal
+   -1 sprites/autorail.png 8bpp 642  248  64  15 -31   7 normal
+   -1 sprites/autorail.png 8bpp 722  248  64  39 -31  -1 normal
+   -1 sprites/autorail.png 8bpp   2  312  64  47 -31  -9 normal
+   -1 sprites/autorail.png 8bpp  82  312  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 162  312  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 242  312  64  23 -31   7 normal
+   -1 sprites/autorail.png 8bpp 322  312  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp 402  312  64  31 -31   7 normal
@@ -6,70 +6,166 @@
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 //
-   -1 * 0	 0C "Canal graphics by George"
+   -1 * 0	 0C "Canal graphics by George / PaulC"
   -1 * 3	 05 08 41
-   -1 sprites/canals.png 66 8 09 23 64 -31 0
-   -1 sprites/canals.png 146 8 09 39 64 -31 -8
-   -1 sprites/canals.png 226 8 09 23 64 -31 0
-   -1 sprites/canals.png 306 8 09 39 64 -31 -8
-   -1 sprites/canals.png 386 8 09 59 64 -31 -36
-   -1 sprites/canals.png 466 8 09 65 64 -31 -34
-   -1 sprites/canals.png 546 8 09 59 64 -31 -36
-   -1 sprites/canals.png 626 8 09 59 64 -31 -28
-   -1 sprites/canals.png 706 8 09 62 64 -1 -51
-   -1 sprites/canals.png 2 88 09 62 64 -61 -43
-   -1 sprites/canals.png 82 88 09 62 64 -61 -51
-   -1 sprites/canals.png 162 88 09 62 64 -1 -43
-   -1 sprites/canals.png 242 88 09 59 64 -31 -28
-   -1 sprites/canals.png 322 88 09 65 66 -33 -34
-   -1 sprites/canals.png 402 88 09 59 64 -31 -28
-   -1 sprites/canals.png 482 88 09 59 64 -31 -28
-   -1 sprites/canals.png 562 88 09 62 64 -1 -43
-   -1 sprites/canals.png 642 88 09 60 64 -61 -43
-   -1 sprites/canals.png 722 88 09 62 66 -61 -43
-   -1 sprites/canals.png 2 168 09 60 64 -1 -43
-   -1 sprites/canals.png 82 168 09 59 64 -31 -28
-   -1 sprites/canals.png 162 168 09 59 64 -31 -28
-   -1 sprites/canals.png 242 168 09 59 64 -31 -28
-   -1 sprites/canals.png 322 168 09 59 64 -31 -28
-   -1 sprites/canals.png 402 168 09 60 64 -1 -43
-   -1 sprites/canals.png 482 168 09 62 68 -61 -43
-   -1 sprites/canals.png 562 168 09 60 64 -61 -43
-   -1 sprites/canals.png 642 168 09 62 64 -1 -43
-   -1 sprites/canals.png 722 168 09 59 64 -31 -36
-   -1 sprites/canals.png 2 248 09 65 64 -31 -34
-   -1 sprites/canals.png 82 248 09 59 64 -31 -36
-   -1 sprites/canals.png 162 248 09 59 64 -31 -28
-   -1 sprites/canals.png 242 248 09 62 64 -1 -51
-   -1 sprites/canals.png 322 248 09 62 64 -61 -43
-   -1 sprites/canals.png 402 248 09 62 64 -61 -51
-   -1 sprites/canals.png 482 248 09 62 64 -1 -43
-   -1 sprites/canals.png 562 248 09 59 64 -31 -28
-   -1 sprites/canals.png 642 248 09 65 66 -33 -34
-   -1 sprites/canals.png 722 248 09 59 64 -31 -28
-   -1 sprites/canals.png 2 328 09 59 64 -31 -28
-   -1 sprites/canals.png 82 328 09 62 64 -1 -43
-   -1 sprites/canals.png 162 328 09 60 64 -61 -43
-   -1 sprites/canals.png 242 328 09 62 66 -61 -43
-   -1 sprites/canals.png 322 328 09 60 64 -1 -43
-   -1 sprites/canals.png 402 328 09 59 64 -31 -28
-   -1 sprites/canals.png 482 328 09 59 64 -31 -28
-   -1 sprites/canals.png 562 328 09 59 64 -31 -28
-   -1 sprites/canals.png 642 328 09 59 64 -31 -28
-   -1 sprites/canals.png 722 328 09 60 64 -1 -43
-   -1 sprites/canals.png 2 408 09 62 68 -61 -43
-   -1 sprites/canals.png 82 408 09 60 64 -61 -43
-   -1 sprites/canals.png 162 408 09 62 64 -1 -43
-   -1 sprites/canals.png 242 408 09 37 70 -31 -6
-   -1 sprites/canals.png 322 408 09 37 70 -31 0
-   -1 sprites/canals.png 402 408 09 37 70 -37 0
-   -1 sprites/canals.png 482 408 09 37 70 -37 -6
-   -1 sprites/canals.png 562 408 09 31 64 -31 0
-   -1 sprites/canals.png 642 408 09 31 64 -31 0
-   -1 sprites/canals.png 722 408 09 31 64 -31 0
-   -1 sprites/canals.png 2 488 09 37 64 -31 -6
-   -1 sprites/canals.png 82 488 09 31 64 -31 0
-   -1 sprites/canals.png 162 488 09 31 64 -31 0
-   -1 sprites/canals.png 242 488 09 31 64 -31 0
-   -1 sprites/canals.png 322 488 09 37 64 -31 -6
-   -1 sprites/canals.png 402 488 09 20 20 0 0
+// Canal slopes
+   -1 sprites/canal_locks.png 8bpp  66    8  64  23 -31   0 normal
+   -1 sprites/canal_locks.png 8bpp 146    8  64  39 -31  -8 normal
+   -1 sprites/canal_locks.png 8bpp 226    8  64  23 -31   0 normal
+   -1 sprites/canal_locks.png 8bpp 306    8  64  39 -31  -8 normal
+// Lock sides
+   -1 sprites/canal_locks.png 8bpp 386    8  40  26  -7 -12 normal
+   -1 sprites/canal_locks.png 8bpp 434    8  42  33 -31 -13 normal
+   -1 sprites/canal_locks.png 8bpp 482    8  40  25 -31 -12 normal
+   -1 sprites/canal_locks.png 8bpp 530    8  42  34  -9 -14 normal
+   -1 sprites/canal_locks.png 8bpp 578    8  32  27  -1 -17 normal
+   -1 sprites/canal_locks.png 8bpp 626    8  32  35 -29 -17 normal
+   -1 sprites/canal_locks.png 8bpp 674    8  32  27 -29 -17 normal
+   -1 sprites/canal_locks.png 8bpp 722    8  32  35  -1 -17 normal
+   -1 sprites/canal_locks.png 8bpp   2   72  40  44  -7 -24 normal
+   -1 sprites/canal_locks.png 8bpp  50   72  42  33 -31 -13 normal
+   -1 sprites/canal_locks.png 8bpp  98   72  40  32 -31 -12 normal
+   -1 sprites/canal_locks.png 8bpp 146   72  41  31  -8 -12 normal
+   -1 sprites/canal_locks.png 8bpp 194   72  34  32  -1 -13 normal
+   -1 sprites/canal_locks.png 8bpp 242   72  38  34 -35 -17 normal
+   -1 sprites/canal_locks.png 8bpp 290   72  34  44 -29 -26 normal
+   -1 sprites/canal_locks.png 8bpp 338   72  38  34  -1 -17 normal
+   -1 sprites/canal_locks.png 8bpp 386   72  42  24  -9  -4 normal
+   -1 sprites/canal_locks.png 8bpp 434   72  43  24 -31  -4 normal
+   -1 sprites/canal_locks.png 8bpp 482   72  53  24 -31  -4 normal
+   -1 sprites/canal_locks.png 8bpp 546   72  43  37 -10 -16 normal
+   -1 sprites/canal_locks.png 8bpp 594   72  38  26  -1  -9 normal
+   -1 sprites/canal_locks.png 8bpp 642   72  34  37 -29 -18 normal
+   -1 sprites/canal_locks.png 8bpp 690   72  38  26 -35  -9 normal
+   -1 sprites/canal_locks.png 8bpp 738   72  32  23  -1  -5 normal
+   -1 sprites/canal_locks.png 8bpp   2  136  40  26  -7 -12 normal
+   -1 sprites/canal_locks.png 8bpp  50  136  42  33 -31 -13 normal
+   -1 sprites/canal_locks.png 8bpp  98  136  40  25 -31 -12 normal
+   -1 sprites/canal_locks.png 8bpp 146  136  42  34  -9 -14 normal
+   -1 sprites/canal_locks.png 8bpp 194  136  32  27  -1 -17 normal
+   -1 sprites/canal_locks.png 8bpp 242  136  32  35 -29 -17 normal
+   -1 sprites/canal_locks.png 8bpp 290  136  32  27 -29 -17 normal
+   -1 sprites/canal_locks.png 8bpp 338  136  32  35  -1 -17 normal
+   -1 sprites/canal_locks.png 8bpp 386  136  40  32  -7 -12 normal
+   -1 sprites/canal_locks.png 8bpp 434  136  42  33 -31 -13 normal
+   -1 sprites/canal_locks.png 8bpp 482  136  40  32 -31 -12 normal
+   -1 sprites/canal_locks.png 8bpp 530  136  41  31  -8 -12 normal
+   -1 sprites/canal_locks.png 8bpp 578  136  34  32  -1 -13 normal
+   -1 sprites/canal_locks.png 8bpp 626  136  38  34 -35 -17 normal
+   -1 sprites/canal_locks.png 8bpp 674  136  34  32 -29 -14 normal
+   -1 sprites/canal_locks.png 8bpp 722  136  38  34  -1 -17 normal
+   -1 sprites/canal_locks.png 8bpp   2  184  42  24  -9  -4 normal
+   -1 sprites/canal_locks.png 8bpp  50  184  43  24 -31  -4 normal
+   -1 sprites/canal_locks.png 8bpp  98  184  53  24 -31  -4 normal
+   -1 sprites/canal_locks.png 8bpp 162  184  43  25 -10  -4 normal
+   -1 sprites/canal_locks.png 8bpp 210  184  38  26  -1  -9 normal
+   -1 sprites/canal_locks.png 8bpp 258  184  34  25 -29  -6 normal
+   -1 sprites/canal_locks.png 8bpp 306  184  38  26 -35  -9 normal
+   -1 sprites/canal_locks.png 8bpp 354  184  32  23  -1  -5 normal
+// Canal edges (temperate)
+   -1 sprites/canals.png 8bpp  30   10  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94   10  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142   10  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190   10  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238   10  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270   10  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302   10  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334   10  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366   10  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398   10  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430   10  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446   10  24  16 -11  -6 normal
+// Canal icon
+   -1 sprites/canal_locks.png 8bpp  50  232  20  20   0   0 normal
+
+// Differentiation for the climates starts here
+
+// Canal edges (arctic snowy)
+   -1 * 4        01 05 01 \b12
+   -1 sprites/canals.png 8bpp  30   40  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94   40  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142   40  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190   40  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238   40  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270   40  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302   40  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334   40  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366   40  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398   40  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430   40  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446   40  24  16 -11  -6 normal
+   -1 * 7        02 05 10 01 00 00 00
+
+// Canal edges (arctic normal)
+   -1 * 4        01 05 01 \b12
+   -1 sprites/canals.png 8bpp  30   70  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94   70  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142   70  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190   70  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238   70  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270   70  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302   70  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334   70  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366   70  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398   70  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430   70  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446   70  24  16 -11  -6 normal
+   -1 * 7        02 05 11 01 00 00 00
+// Choose the right arctic canal edges
+   -1 * 14       02 05 12 81 81 00 FF 01 10 00 04 04 11 00
+   -1 * 6        07 83 01 \7! 01 01
+   -1 * 7        03 05 01 02 00 12 00
+
+// Canal edges (tropic desert)
+   -1 * 4        01 05 01 \b12
+   -1 sprites/canals.png 8bpp  30  100  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94  100  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142  100  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190  100  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238  100  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270  100  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302  100  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334  100  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366  100  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398  100  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430  100  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446  100  24  16 -11  -6 normal
+   -1 * 7        02 05 13 01 00 00 00
+
+// Canal edges (tropic rainforest)
+   -1 * 4        01 05 01 \b12
+   -1 sprites/canals.png 8bpp  30  130  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94  130  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142  130  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190  130  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238  130  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270  130  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302  130  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334  130  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366  130  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398  130  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430  130  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446  130  24  16 -11  -6 normal
+   -1 * 7        02 05 14 01 00 00 00
+// Choose the right tropic canal edges
+   -1 * 14       02 05 15 81 81 00 FF 01 13 00 01 01 14 00
+   -1 * 6        07 83 01 \7! 02 01
+   -1 * 7        03 05 01 02 00 15 00
+
+// Canal edges (toyland)
+   -1 * 4        01 05 01 \b12
+   -1 sprites/canals.png 8bpp  30  160  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94  160  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142  160  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190  160  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238  160  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270  160  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302  160  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334  160  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366  160  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398  160  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430  160  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446  160  24  16 -11  -6 normal
+   -1 * 7        02 05 16 01 00 00 00
+   -1 * 6        07 83 01 \7! 03 01
+   -1 * 7        03 05 01 02 00 16 00
@@ -8,51 +8,51 @@
 //
   -1 * 0	 0C "Electrified rail by Michael Blunck"
   -1 * 3	 05 05 30
-   -1 sprites/elrails.png 66 8 01 16 32 -29 -2
-   -1 sprites/elrails.png 114 8 01 16 32 -1 -2
-   -1 sprites/elrails.png 162 8 01 1 32 -1 -2
-   -1 sprites/elrails.png 210 8 01 16 1 0 -3
-   -1 sprites/elrails.png 226 8 01 24 32 -29 -2
-   -1 sprites/elrails.png 274 8 01 9 32 -1 6
-   -1 sprites/elrails.png 322 8 01 9 32 -29 6
-   -1 sprites/elrails.png 370 8 01 24 32 -1 -2
-   -1 sprites/elrails.png 418 8 01 16 32 -29 -2
-   -1 sprites/elrails.png 466 8 01 16 32 -1 -2
-   -1 sprites/elrails.png 514 8 01 1 32 -1 -2
-   -1 sprites/elrails.png 562 8 01 16 1 0 -3
-   -1 sprites/elrails.png 578 8 01 24 32 -29 -2
-   -1 sprites/elrails.png 626 8 01 9 32 -1 6
-   -1 sprites/elrails.png 674 8 01 9 32 -29 6
-   -1 sprites/elrails.png 722 8 01 24 32 -1 -2
-   -1 sprites/elrails.png 2 56 01 16 32 -29 -2
-   -1 sprites/elrails.png 50 56 01 16 32 -1 -2
-   -1 sprites/elrails.png 98 56 01 1 32 -1 -2
-   -1 sprites/elrails.png 146 56 01 16 1 0 -3
-   -1 sprites/elrails.png 162 56 01 24 32 -29 -2
-   -1 sprites/elrails.png 210 56 01 9 32 -1 6
-   -1 sprites/elrails.png 258 56 01 9 32 -29 6
-   -1 sprites/elrails.png 306 56 01 24 32 -1 -2
-   -1 sprites/elrails.png 354 56 01 8 16 -29 6
-   -1 sprites/elrails.png 386 56 01 8 16 -1 -2
-   -1 sprites/elrails.png 418 56 01 8 16 -13 -2
-   -1 sprites/elrails.png 450 56 01 8 16 15 6
-   -1 sprites/elrails.png 482 56 01 16 8 -7 -14
-   -1 sprites/elrails.png 498 56 01 18 8 0 -17
-   -1 sprites/elrails.png 514 56 01 16 8 0 -14
-   -1 sprites/elrails.png 530 56 01 18 8 -7 -17
-   -1 sprites/elrails.png 546 56 01 16 2 0 -15
-   -1 sprites/elrails.png 562 56 01 18 2 0 -16
-   -1 sprites/elrails.png 578 56 01 16 8 0 -15
-   -1 sprites/elrails.png 594 56 01 16 8 -7 -15
-   -1 sprites/elrails.png 610 56 09 16 13 4 2
-   -1 sprites/elrails.png 642 56 09 16 20 0 2
-   -1 sprites/elrails.png 674 56 09 16 20 0 2
-   -1 sprites/elrails.png 706 56 09 16 20 0 2
-   -1 sprites/elrails.png 738 56 03 30 38 -3 -14
-   -1 sprites/elrails.png 2 104 03 44 72 -16 -8
-   -1 sprites/elrails.png 82 104 03 35 44 -21 -2
-   -1 sprites/elrails.png 146 104 03 44 72 -16 -35
-   -1 sprites/elrails.png 226 104 09 19 20 0 1
-   -1 sprites/elrails.png 258 104 03 32 32 0 0
-   -1 sprites/elrails.png 306 104 01 22 12 -9 -18
-   -1 sprites/elrails.png 338 104 01 22 12 -1 -18
+   -1 sprites/elrails.png 8bpp  66    8  32  16 -29  -2 normal
+   -1 sprites/elrails.png 8bpp 114    8  32  16  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 162    8  32   1  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 210    8   1  16   0  -3 normal
+   -1 sprites/elrails.png 8bpp 226    8  32  24 -29  -2 normal
+   -1 sprites/elrails.png 8bpp 274    8  32   9  -1   6 normal
+   -1 sprites/elrails.png 8bpp 322    8  32   9 -29   6 normal
+   -1 sprites/elrails.png 8bpp 370    8  32  24  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 418    8  32  16 -29  -2 normal
+   -1 sprites/elrails.png 8bpp 466    8  32  16  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 514    8  32   1  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 562    8   1  16   0  -3 normal
+   -1 sprites/elrails.png 8bpp 578    8  32  24 -29  -2 normal
+   -1 sprites/elrails.png 8bpp 626    8  32   9  -1   6 normal
+   -1 sprites/elrails.png 8bpp 674    8  32   9 -29   6 normal
+   -1 sprites/elrails.png 8bpp 722    8  32  24  -1  -2 normal
+   -1 sprites/elrails.png 8bpp   2   56  32  16 -29  -2 normal
+   -1 sprites/elrails.png 8bpp  50   56  32  16  -1  -2 normal
+   -1 sprites/elrails.png 8bpp  98   56  32   1  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 146   56   1  16   0  -3 normal
+   -1 sprites/elrails.png 8bpp 162   56  32  24 -29  -2 normal
+   -1 sprites/elrails.png 8bpp 210   56  32   9  -1   6 normal
+   -1 sprites/elrails.png 8bpp 258   56  32   9 -29   6 normal
+   -1 sprites/elrails.png 8bpp 306   56  32  24  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 354   56  16   8 -29   6 normal
+   -1 sprites/elrails.png 8bpp 386   56  16   8  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 418   56  16   8 -13  -2 normal
+   -1 sprites/elrails.png 8bpp 450   56  16   8  15   6 normal
+   -1 sprites/elrails.png 8bpp 482   56   8  16  -7 -14 normal
+   -1 sprites/elrails.png 8bpp 498   56   8  18   0 -17 normal
+   -1 sprites/elrails.png 8bpp 514   56   8  16   0 -14 normal
+   -1 sprites/elrails.png 8bpp 530   56   8  18  -7 -17 normal
+   -1 sprites/elrails.png 8bpp 546   56   2  16   0 -15 normal
+   -1 sprites/elrails.png 8bpp 562   56   2  18   0 -16 normal
+   -1 sprites/elrails.png 8bpp 578   56   8  16   0 -15 normal
+   -1 sprites/elrails.png 8bpp 594   56   8  16  -7 -15 normal
+   -1 sprites/elrails.png 8bpp 610   56  13  16   4   2 normal
+   -1 sprites/elrails.png 8bpp 642   56  20  16   0   2 normal
+   -1 sprites/elrails.png 8bpp 674   56  20  16   0   2 normal
+   -1 sprites/elrails.png 8bpp 706   56  20  16   0   2 normal
+   -1 sprites/elrails.png 8bpp 738   56  38  30  -3 -14 normal
+   -1 sprites/elrails.png 8bpp   2  104  72  44 -16  -8 normal
+   -1 sprites/elrails.png 8bpp  82  104  44  35 -21  -2 normal
+   -1 sprites/elrails.png 8bpp 146  104  72  44 -16 -35 normal
+   -1 sprites/elrails.png 8bpp 226  104  20  19   0   1 normal
+   -1 sprites/elrails.png 8bpp 258  104  32  32   0   0 normal
+   -1 sprites/elrails.png 8bpp 306  104  12  22  -9 -18 normal
+   -1 sprites/elrails.png 8bpp 338  104  12  22  -1 -18 normal
@@ -6,159 +6,371 @@
 // 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 "Fixing (alignment) bugs in the orignal graphics. By Addi."
-   -1 * 6	 07 83 01 \7= 03 69
-// Different grahpics for same wood truck
+   -1 * 0	 0C "Fix bugs in the original graphics. By Addi and PaulC."
+
+// Non-toyland specific
+   -1 * 6	 07 83 01 \7= 03 3D
+// Fix missing wheels on the wood trucks
   -1 * 14	 0A 04 01 87 0C 01 89 0C 01 07 0E 01 09 0E
-   -1 sprites/fix_graphics.png 82 8 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 114 8 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 146 8 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 178 8 09 16 22 -14 -7
-// Different grahpics for lots of trucks
+   -1 sprites/fix_graphics.png 8bpp  82    8  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 114    8  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 146    8  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 178    8  22  16 -14  -7 normal
+// Show correct graphics for various 3rd generation trucks
   -1 * 5	 0A 01 28 C4 0D
-   -1 sprites/fix_graphics.png 226 8 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 242 8 09 16 20 -14 -7
-   -1 sprites/fix_graphics.png 274 8 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 322 8 09 16 20 -6 -7
-   -1 sprites/fix_graphics.png 354 8 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 370 8 09 16 20 -14 -7
-   -1 sprites/fix_graphics.png 402 8 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 450 8 09 16 20 -6 -7
-   -1 sprites/fix_graphics.png 482 8 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 498 8 09 16 20 -14 -7
-   -1 sprites/fix_graphics.png 530 8 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 578 8 09 16 20 -6 -7
-   -1 sprites/fix_graphics.png 610 8 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 626 8 09 16 20 -14 -7
-   -1 sprites/fix_graphics.png 658 8 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 706 8 09 16 20 -6 -7
-   -1 sprites/fix_graphics.png 738 8 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 754 8 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 2 40 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 50 40 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 82 40 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 98 40 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 130 40 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 178 40 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 210 40 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 226 40 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 258 40 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 306 40 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 338 40 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 354 40 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 386 40 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 434 40 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 466 40 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 482 40 09 16 20 -14 -7
-   -1 sprites/fix_graphics.png 514 40 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 562 40 09 16 20 -6 -7
-   -1 sprites/fix_graphics.png 594 40 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 610 40 09 16 20 -14 -7
-   -1 sprites/fix_graphics.png 642 40 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 690 40 09 16 20 -6 -7
-// Different grahpics for same truck
+   -1 sprites/fix_graphics.png 8bpp 226    8   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 242    8  20  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 274    8  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 322    8  20  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 354    8   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 370    8  20  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 402    8  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 450    8  20  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 482    8   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 498    8  20  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 530    8  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 578    8  20  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 610    8   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 626    8  20  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 658    8  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 706    8  20  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 738    8   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 754    8  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp   2   40  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp  50   40  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp  82   40   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp  98   40  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 130   40  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 178   40  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 210   40   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 226   40  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 258   40  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 306   40  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 338   40   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 354   40  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 386   40  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 434   40  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 466   40   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 482   40  20  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 514   40  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 562   40  20  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 594   40   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 610   40  20  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 642   40  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 690   40  20  16  -6  -7 normal
+// Fix clipping on the 2nd generation paper truck
   -1 * 14	 0A 04 01 9D 0C 01 9F 0C 01 A1 0C 01 A3 0C
-   -1 sprites/fix_graphics.png 738 40 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 770 40 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 2 72 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 34 72 09 16 22 -6 -7
-// Different grahpics for same paper truck
+   -1 sprites/fix_graphics.png 8bpp 738   40  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 770   40  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp   2   72  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp  34   72  22  16  -6  -7 normal
+// Fix clipping on the 1st generation paper truck
   -1 * 14	 0A 04 01 5D 0D 01 5F 0D 01 61 0D 01 63 0D
-   -1 sprites/fix_graphics.png 82 72 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 114 72 09 17 22 -5 -7
-   -1 sprites/fix_graphics.png 146 72 09 17 22 -14 -8
-   -1 sprites/fix_graphics.png 178 72 09 16 22 -6 -7
-// Different grahpics for same paper truck (truck #2)
+   -1 sprites/fix_graphics.png 8bpp  82   72  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 114   72  22  17  -5  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 146   72  22  17 -14  -8 normal
+   -1 sprites/fix_graphics.png 8bpp 178   72  22  16  -6  -7 normal
+// Fix clipping on the 3rd generation paper truck
   -1 * 14	 0A 04 01 1D 0E 01 1F 0E 01 21 0E 01 23 0E
-   -1 sprites/fix_graphics.png 226 72 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 258 72 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 290 72 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 322 72 09 16 22 -6 -7
-// Misaligned monorail bridge heads
+   -1 sprites/fix_graphics.png 8bpp 226   72  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 258   72  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 290   72  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 322   72  22  16  -6  -7 normal
+
+// Fix clipping on the toyland toy van in the German DOS graphics
+   -1 * 6 07 83 01 \7! 03 02
+   -1 * 5 0A 01 01 5D 0C
+   -1 sprites/fix_graphics.png 8bpp  18  296  20  16 -14  -7 normal
+
+// Non-toyland specific
+   -1 * 6	 07 83 01 \7= 03 08
+// Fix offsets for the monorail bridge heads
   -1 * 8	 0A 02 01 EA 10 02 EC 10
-   -1 sprites/fix_graphics.png 370 72 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 434 72 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 498 72 09 21 49 -24 3
-// Improperly cut cinema
+   -1 sprites/fix_graphics.png 8bpp 370   72  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 434   72  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 498   72  49  21 -24   3 normal
+// Fix offsets for the maglev bridge heads
+   -1 * 8	 0A 02 01 12 11 02 14 11
+   -1 sprites/fix_graphics.png 8bpp 322  486  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 386  486  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 450  486  49  21 -24   3 normal
+
+// Toyland specific
+   -1 * 6	 07 83 01 \7! 03 0F
+// Fix offsets for the toyland monorail bridge heads
+   -1 * 8	 0A 02 01 EA 10 02 EC 10
+   -1 sprites/fix_graphics.png 8bpp 610  630  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 674  630  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 738  630  49  21 -24   3 normal
+// Fix offsets for the toyland maglev bridge heads
+   -1 * 8	 0A 02 01 12 11 02 14 11
+   -1 sprites/fix_graphics.png 8bpp  18  678  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp  82  678  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 146  678  49  21 -24   3 normal
+// Fix colours for toyland maglev junction overlays
+   -1 * 5	 0A 01 06 91 04
+   -1 sprites/fix_graphics.png 8bpp 338  630  30  16 -14   8 normal
+   -1 sprites/fix_graphics.png 8bpp 386  630  30  16 -14   8 normal
+   -1 sprites/fix_graphics.png 8bpp 434  630  40   7 -19   4 normal
+   -1 sprites/fix_graphics.png 8bpp 482  630  40   7 -19  20 normal
+   -1 sprites/fix_graphics.png 8bpp 530  630  12  19  11   6 normal
+   -1 sprites/fix_graphics.png 8bpp 562  630  12  19 -21   6 normal
+
+// Fix transparency of cinema
   -1 * 5	 0A 01 02 34 11
-   -1 sprites/fix_graphics.png 578 72 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 658 72 09 47 50 -28 -20
-// Misaligned undergrounds for temperate monorail
+   -1 sprites/fix_graphics.png 8bpp 578   72  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 658   72  50  47 -28 -20 normal
+
+// Fix misaligned undergrounds for temperate monorail
   -1 * 6	 07 83 01 \7! 00 06
   -1 * 5	 0A 01 05 4C 04
-   -1 sprites/fix_graphics.png 2 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 162 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 322 136 09 31 64 -31 0
-// Misaligned undergrounds for arctic monorail
+   -1 sprites/fix_graphics.png 8bpp   2  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 162  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 242  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 322  136  64  31 -31   0 normal
+
+// Fix misaligned undergrounds for arctic monorail
   -1 * 6	 07 83 01 \7! 01 06
   -1 * 5	 0A 01 05 4C 04
-   -1 sprites/fix_graphics.png 434 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 514 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 594 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 674 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 184 09 31 64 -31 0
-// Misaligned undergrounds for tropical/desert monorail/maglev
+   -1 sprites/fix_graphics.png 8bpp 434  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 514  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 594  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 674  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  184  64  31 -31   0 normal
+
+// Fix misaligned undergrounds for tropical/desert monorail/maglev
   -1 * 6	 07 83 01 \7! 02 10
   -1 * 11	 0A 03 05 4C 04 05 66 04 05 B8 04
-   -1 sprites/fix_graphics.png 114 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 194 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 274 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 354 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 434 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 514 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 594 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 674 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 232 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 232 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 162 232 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 232 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 322 232 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 402 232 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 482 232 09 31 64 -31 0
-// Misaligned monorail snowed X crossing
+   -1 sprites/fix_graphics.png 8bpp 114  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 194  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 274  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 354  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 434  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 514  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 594  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 674  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  232  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  232  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 162  232  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 242  232  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 322  232  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 402  232  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 482  232  64  31 -31   0 normal
+
+// Fix misaligned X crossing for snow-covered monorail
   -1 * 6	 07 83 01 \7! 01 02
   -1 * 5	 0A 01 01 65 04
-   -1 sprites/fix_graphics.png 594 232 09 31 64 -31 0
-// Floating tropical house
-   -1 * 6	 07 83 01 \7! 02 02
+   -1 sprites/fix_graphics.png 8bpp 594  232  64  31 -31   0 normal
+
+// Fix offsets for the tropical house
   -1 * 5	 0A 01 01 FF 11
-   -1 sprites/fix_graphics.png 706 232 09 47 64 -31 -16
-// Clipped vehicle in the original German DOS graphics
-   -1 * 6	 07 83 01 \7! 03 02
-   -1 * 5	 0A 01 01 5D 0C
-   -1 sprites/fix_graphics.png 18 296 09 16 20 -14 -7
+   -1 sprites/fix_graphics.png 8bpp 706  232  64  47 -31 -16 normal
+
 // Graphics metadata pixel higher than actual graphics
   -1 * 6	 12 01 00 01 AC E2
-   -1 sprites/fix_graphics.png 66 296 01 10 9 0 0
+   -1 sprites/fix_graphics.png 8bpp  66  296   9  10   0   0 normal

 // Non-toyland specific
   -1 * 6	 07 83 01 \7= 03 0A
-// Grahpics for the tubular bridge pillars had incorrect offsets
+// Fix offsets for the tubular bridge pillars
   -1 * 5	 0A 01 04 05 0A
-   -1 sprites/fix_graphics.png 98 296 09 9 4 2 -1
-   -1 sprites/fix_graphics.png 114 296 09 9 4 2 -1
-   -1 sprites/fix_graphics.png 130 296 09 9 4 -4 0
-   -1 sprites/fix_graphics.png 146 296 09 9 4 -4 0
-// Grahpics for the cantilever bridge pillars had incorrect offsets
+   -1 sprites/fix_graphics.png 8bpp  98  296   4   9   2  -1 normal
+   -1 sprites/fix_graphics.png 8bpp 114  296   4   9   2  -1 normal
+   -1 sprites/fix_graphics.png 8bpp 130  296   4   9  -4   0 normal
+   -1 sprites/fix_graphics.png 8bpp 146  296   4   9  -4   0 normal
+// Fix offsets for the cantilever bridge pillars
   -1 * 5	 0A 01 04 DD 09
-   -1 sprites/fix_graphics.png 178 296 09 11 10 2 -3
-   -1 sprites/fix_graphics.png 194 296 09 12 10 2 -2
-   -1 sprites/fix_graphics.png 210 296 09 11 10 -10 -1
-   -1 sprites/fix_graphics.png 226 296 09 11 10 -10 -1
+   -1 sprites/fix_graphics.png 8bpp 178  296  10  11   2  -3 normal
+   -1 sprites/fix_graphics.png 8bpp 194  296  10  12   2  -2 normal
+   -1 sprites/fix_graphics.png 8bpp 210  296  10  11 -10  -1 normal
+   -1 sprites/fix_graphics.png 8bpp 226  296  10  11 -10  -1 normal

 // Toyland specific
   -1 * 6	 07 83 01 \7! 03 0A
-// Grahpics for the toyland tubular bridge pillars had incorrect offsets
+// Fix offsets for the toyland tubular bridge pillars
   -1 * 5	 0A 01 04 05 0A
-   -1 sprites/fix_graphics.png 248 296 09 9 4 2 -1
-   -1 sprites/fix_graphics.png 264 296 09 9 4 2 -1
-   -1 sprites/fix_graphics.png 280 296 09 9 4 -4 0
-   -1 sprites/fix_graphics.png 296 296 09 9 4 -4 0
-// Grahpics for the toyland cantilever bridge pillars had incorrect offsets
+   -1 sprites/fix_graphics.png 8bpp 248  296   4   9   2  -1 normal
+   -1 sprites/fix_graphics.png 8bpp 264  296   4   9   2  -1 normal
+   -1 sprites/fix_graphics.png 8bpp 280  296   4   9  -4   0 normal
+   -1 sprites/fix_graphics.png 8bpp 296  296   4   9  -4   0 normal
+// Fix offsets for the toyland cantilever bridge pillars
   -1 * 5	 0A 01 04 DD 09
-   -1 sprites/fix_graphics.png 328 296 09 11 10 2 -3
-   -1 sprites/fix_graphics.png 344 296 09 12 10 2 -2
-   -1 sprites/fix_graphics.png 360 296 09 11 10 -10 -1
-   -1 sprites/fix_graphics.png 376 296 09 11 10 -10 -1
+   -1 sprites/fix_graphics.png 8bpp 328  296  10  11   2  -3 normal
+   -1 sprites/fix_graphics.png 8bpp 344  296  10  12   2  -2 normal
+   -1 sprites/fix_graphics.png 8bpp 360  296  10  11 -10  -1 normal
+   -1 sprites/fix_graphics.png 8bpp 376  296  10  11 -10  -1 normal
+
+// Wrong, non-translated colours in tubular bridge in 'normal' climates
+// Toyland has separate sprites which are not colour translated, thus
+// this does not apply there;
+// Pillars are changed for all climates further up
+   -1 * 6	 07 83 01 \7= 03 \b22
+// Main tubular bridge sprites
+   -1 * 5	 0A 01 \b6 \w2559
+   -1 sprites/fix_graphics.png 8bpp   2  330  32  40 -30 -26 normal
+   -1 sprites/fix_graphics.png 8bpp  52  330  44  50 -42 -26 normal
+   -1 sprites/fix_graphics.png 8bpp 116  330  46  45 -42 -21 normal
+   -1 sprites/fix_graphics.png 8bpp 180  330  46  45  -2 -20 normal
+   -1 sprites/fix_graphics.png 8bpp 244  330  44  50   0 -25 normal
+   -1 sprites/fix_graphics.png 8bpp 308  330  32  41   0 -25 normal
+// start rail bridge
+   -1 * 5	 0A 01 01 \w2569
+   -1 sprites/fix_graphics.png 8bpp 350  330  52  29 -25  -4 normal
+// start rail + road bridge
+   -1 * 5	 0A 01 02 \w2574
+   -1 sprites/fix_graphics.png 8bpp 420  330  50  29 -25  -4 normal
+   -1 sprites/fix_graphics.png 8bpp 489  330  52  29 -25  -4 normal
+// start road + monorail bridge
+   -1 * 5	 0A 01 02 \w2580
+   -1 sprites/fix_graphics.png 8bpp 559  330  50  29 -25  -4 normal
+   -1 sprites/fix_graphics.png 8bpp 629  330  52  29 -25  -4 normal
+// start monrail + maglev bridge
+   -1 * 5	 0A 01 02 \w2586
+   -1 sprites/fix_graphics.png 8bpp 699  330  50  29 -25  -4 normal
+   -1 sprites/fix_graphics.png 8bpp 489  283  52  29 -25  -4 normal
+// start maglev bridge
+   -1 * 5	 0A 01 01 \w2592
+   -1 sprites/fix_graphics.png 8bpp 559  283  50  29 -25  -4 normal
+// GUI sprite
+   -1 * 5	 0A 01 01 \w2600
+   -1 sprites/fix_graphics.png 8bpp 433  298  40  15   0   5 normal
+
+// Remove road markings from tropical rail crossings
+   -1 * 6	 07 83 01 \7! 02 19
+   -1 * 14	 0A 04 04 5A 05 08 62 05 08 6E 05 04 7A 05
+   -1 sprites/fix_graphics.png 8bpp   2  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 162  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 242  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 322  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 402  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 482  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 562  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 642  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 722  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 162  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 242  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 322  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 402  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 482  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 562  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 642  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 722  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  486  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  486  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 162  486  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 242  486  64  31 -31   0 normal
+
+// Fix transparency of steel mill
+   -1 * 5	 0A 01 06 46 08
+   -1 sprites/fix_graphics.png 8bpp 162  870  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 242  870  64  51 -31 -21 normal
+   -1 sprites/fix_graphics.png 8bpp 322  870  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 402  870  49  58 -29 -29 normal
+   -1 sprites/fix_graphics.png 8bpp 466  870  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 546  870  45  42 -18 -12 normal
+   -1 * 5	 0A 01 0A 4D 08
+   -1 sprites/fix_graphics.png 8bpp 610  486  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 690  486  59  61 -31 -33 normal
+   -1 sprites/fix_graphics.png 8bpp   2  566  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  566  51  50 -25 -21 normal
+   -1 sprites/fix_graphics.png 8bpp 606  870  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 686  870  64  46 -31 -16 normal
+   -1 sprites/fix_graphics.png 8bpp   2  945  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  945  50  51 -29 -21 normal
+   -1 sprites/fix_graphics.png 8bpp 146  945  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 226  945  47  42 -18 -12 normal
+   -1 * 5	 0A 01 04 58 08
+   -1 sprites/fix_graphics.png 8bpp 162  566  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 242  566  59  52 -31 -24 normal
+   -1 sprites/fix_graphics.png 8bpp 306  566  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 386  566  51  44 -25 -15 normal
+
+// Fix transparency of oil well
+   -1 * 5	 0A 01 07 7D 08
+   -1 sprites/fix_graphics.png 8bpp   2  630  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 482  566  31  50 -11 -28 normal
+   -1 sprites/fix_graphics.png 8bpp 530  566  31  47 -11 -25 normal
+   -1 sprites/fix_graphics.png 8bpp 578  566  31  47 -11 -25 normal
+   -1 sprites/fix_graphics.png 8bpp 626  566  31  47 -11 -25 normal
+   -1 sprites/fix_graphics.png 8bpp 674  566  31  49 -11 -27 normal
+   -1 sprites/fix_graphics.png 8bpp 722  566  31  52 -11 -30 normal
+   -1 * 6	 07 83 01 \7! 01 02
+   -1 * 5	 0A 01 01 7D 08
+   -1 sprites/fix_graphics.png 8bpp 114  630  64  31 -31   0 normal
+   -1 * 6	 07 83 01 \7! 02 02
+   -1 * 5	 0A 01 01 7D 08
+   -1 sprites/fix_graphics.png 8bpp 226  630  64  31 -31   0 normal
+
+// Fix city airport's grass for temperate
+   -1 * 6	 07 83 01 \7! 00 0A
+   -1 * 5	 0A 01 09 4C 0A
+   -1 sprites/fix_graphics.png 8bpp 242  678  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 322  678  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 402  678  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 482  678  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 562  678  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 642  678  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 722  678  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  726  64  31 -31   0 normal
+
+// Fix city airport's grass for arctic
+   -1 * 6	 07 83 01 \7! 01 0A
+   -1 * 5	 0A 01 09 4C 0A
+   -1 sprites/fix_graphics.png 8bpp 194  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 274  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 354  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 434  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 514  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 594  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 674  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  774  64  31 -31   0 normal
+
+// Fix city airport's grass for tropical
+   -1 * 6	 07 83 01 \7! 02 0A
+   -1 * 5	 0A 01 09 4C 0A
+   -1 sprites/fix_graphics.png 8bpp 194  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 274  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 354  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 434  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 514  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 594  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 674  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  822  64  31 -31   0 normal
+
+// Fix city airport's grass for toyland
+   -1 * 6	 07 83 01 \7! 03 0A
+   -1 * 5	 0A 01 09 4C 0A
+   -1 sprites/fix_graphics.png 8bpp 194  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 274  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 354  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 434  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 514  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 594  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 674  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  870  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  870  64  31 -31   0 normal
+
+// Wrong, non-translated colours in arctic buildings
+   -1 * 8	 0A 02 01 1F 06 01 DB 11
+   -1 sprites/fix_graphics.png 8bpp 305  945  59  29 -29 -12 normal
+   -1 sprites/fix_graphics.png 8bpp 369  945  59  29 -29 -12 normal
+   -1 * 8	 0A 02 01 76 11 01 E6 11
+   -1 sprites/fix_graphics.png 8bpp 449  945  64  69 -31 -38 normal
+   -1 sprites/fix_graphics.png 8bpp 529  945  64  69 -31 -38 normal
+   -1 * 8	 0A 02 02 7E 11 01 E1 11
+   -1 sprites/fix_graphics.png 8bpp 625  945  54  75 -25 -47 normal
+   -1 sprites/fix_graphics.png 8bpp   2 1037  54  75 -25 -47 normal
+   -1 sprites/fix_graphics.png 8bpp  66 1037  54  75 -25 -47 normal
+
+// Fix buoy in-game; don't show black outline
+   -1 * 4        01 05 01 \b1
+   -1 sprites/fix_graphics.png 8bpp 575  490   7  11   7   4 normal
+   -1 * 7        02 05 17 01 00 00 00
+   -1 * 7        03 05 01 08 00 17 00
@@ -8,39 +8,39 @@
 //
   -1 * 0	 0C "Flag graphics"
   -1 * 3	 05 14 24
-   -1 sprites/flags.png 34 8 09 8 11 0 0
-   -1 sprites/flags.png 50 8 09 8 11 0 0
-   -1 sprites/flags.png 66 8 09 8 11 0 0
-   -1 sprites/flags.png 82 8 09 8 11 0 0
-   -1 sprites/flags.png 98 8 09 8 11 0 0
-   -1 sprites/flags.png 114 8 09 8 11 0 0
-   -1 sprites/flags.png 130 8 09 8 11 0 0
-   -1 sprites/flags.png 146 8 09 8 11 0 0
-   -1 sprites/flags.png 162 8 09 8 11 0 0
-   -1 sprites/flags.png 178 8 09 8 11 0 0
-   -1 sprites/flags.png 194 8 09 8 11 0 0
-   -1 sprites/flags.png 210 8 09 8 11 0 0
-   -1 sprites/flags.png 226 8 09 8 11 0 0
-   -1 sprites/flags.png 242 8 09 8 11 0 0
-   -1 sprites/flags.png 258 8 09 8 11 0 0
-   -1 sprites/flags.png 274 8 09 8 11 0 0
-   -1 sprites/flags.png 290 8 09 8 11 0 0
-   -1 sprites/flags.png 306 8 09 8 11 0 0
-   -1 sprites/flags.png 322 8 09 8 11 0 0
-   -1 sprites/flags.png 338 8 09 8 11 0 0
-   -1 sprites/flags.png 354 8 09 8 11 0 0
-   -1 sprites/flags.png 370 8 09 8 11 0 0
-   -1 sprites/flags.png 386 8 09 8 11 0 0
-   -1 sprites/flags.png 402 8 09 8 11 0 0
-   -1 sprites/flags.png 418 8 09 8 11 0 0
-   -1 sprites/flags.png 434 8 09 8 11 0 0
-   -1 sprites/flags.png 450 8 09 8 11 0 0
-   -1 sprites/flags.png 466 8 09 8 11 0 0
-   -1 sprites/flags.png 482 8 09 8 11 0 0
-   -1 sprites/flags.png 498 8 09 8 11 0 0
-   -1 sprites/flags.png 514 8 09 8 11 0 0
-   -1 sprites/flags.png 530 8 09 8 11 0 0
-   -1 sprites/flags.png 546 8 09 8 11 0 0
-   -1 sprites/flags.png 562 8 09 8 11 0 0
-   -1 sprites/flags.png 578 8 09 8 11 0 0
-   -1 sprites/flags.png 594 8 09 8 11 0 0
+   -1 sprites/flags.png 8bpp  34    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp  50    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp  66    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp  82    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp  98    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 114    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 130    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 146    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 162    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 178    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 194    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 210    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 226    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 242    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 258    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 274    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 290    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 306    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 322    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 338    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 354    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 370    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 386    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 402    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 418    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 434    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 450    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 466    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 482    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 498    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 514    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 530    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 546    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 562    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 578    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 594    8  11   8   0   0 normal
@@ -9,369 +9,369 @@
   -1 * 0	 0C "Foundations. Non-halftile ones by Marcin Grzegorczyk"
   -1 * 6	 07 83 01 \7! 00 5B
   -1 * 3	 05 06 5A
-   -1 sprites/foundations.png 82 8 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 8 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 8 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 8 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 8 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 8 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 8 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 8 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 8 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 72 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 72 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 72 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 72 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 72 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 72 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 72 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 72 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 72 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 72 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 136 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 136 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 136 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 136 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 136 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 136 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 136 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 136 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 136 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 136 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 200 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 200 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 200 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 200 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 200 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 200 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 200 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 200 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 200 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 200 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 264 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 264 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 264 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 264 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 264 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 264 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 264 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 264 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 264 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 264 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 328 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 328 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 328 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 328 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 328 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 328 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 328 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 328 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 328 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 328 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 392 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 392 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 392 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 392 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 392 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 392 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 392 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 392 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 392 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 392 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 456 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 456 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 456 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 456 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 456 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 456 09 40 64 -15 -17
-   -1 sprites/foundations.png 482 456 09 33 64 -31 -25
-   -1 sprites/foundations.png 562 456 09 40 64 -47 -17
-   -1 sprites/foundations.png 642 456 09 33 64 -31 -9
-   -1 sprites/foundations.png 722 456 09 40 64 -15 -17
-   -1 sprites/foundations.png 2 520 09 33 64 -31 -25
-   -1 sprites/foundations.png 82 520 09 40 64 -47 -17
-   -1 sprites/foundations.png 162 520 09 33 64 -31 -9
-   -1 sprites/foundations.png 242 520 09 40 64 -15 -17
-   -1 sprites/foundations.png 322 520 09 33 64 -31 -25
-   -1 sprites/foundations.png 402 520 09 40 64 -47 -17
-   -1 sprites/foundations.png 482 520 09 33 64 -31 -9
-   -1 sprites/foundations.png 562 520 09 40 64 -15 -17
-   -1 sprites/foundations.png 642 520 09 33 64 -31 -25
-   -1 sprites/foundations.png 722 520 09 40 64 -47 -17
-   -1 sprites/foundations.png 2 584 09 33 64 -31 -9
+   -1 sprites/foundations.png 8bpp  82    8  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162    8  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242    8  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322    8  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402    8  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482    8  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562    8  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642    8  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722    8  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2   72  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82   72  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162   72  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242   72  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322   72  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402   72  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482   72  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562   72  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642   72  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722   72  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  136  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  136  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  136  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  136  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  136  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  136  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  136  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  136  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  136  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  136  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  200  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  200  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  200  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  200  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  200  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  200  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  200  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  200  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  200  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  200  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  264  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  264  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  264  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  264  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  264  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  264  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  264  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  264  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  264  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  264  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  328  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  328  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  328  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  328  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  328  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  328  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  328  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  328  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  328  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  328  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  392  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  392  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  392  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  392  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  392  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  392  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  392  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  392  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  392  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  392  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  456  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  456  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  456  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  456  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  456  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  456  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 482  456  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 562  456  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 642  456  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  456  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp   2  520  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp  82  520  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 162  520  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  520  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 322  520  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 402  520  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 482  520  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  520  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 642  520  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 722  520  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp   2  584  64  33 -31  -9 normal
   -1 * 6	 07 83 01 \7! 01 5B
   -1 * 3	 05 06 5A
-   -1 sprites/foundations.png 114 584 09 40 64 -31 -9
-   -1 sprites/foundations.png 194 584 09 40 64 -31 -9
-   -1 sprites/foundations.png 274 584 09 32 64 -31 -9
-   -1 sprites/foundations.png 354 584 09 32 64 -31 -9
-   -1 sprites/foundations.png 434 584 09 40 64 -31 -9
-   -1 sprites/foundations.png 514 584 09 40 64 -31 -9
-   -1 sprites/foundations.png 594 584 09 40 64 -31 -9
-   -1 sprites/foundations.png 674 584 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 648 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 648 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 648 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 648 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 648 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 648 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 648 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 648 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 648 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 648 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 712 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 712 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 712 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 712 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 712 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 712 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 712 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 712 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 712 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 712 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 776 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 776 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 776 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 776 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 776 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 776 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 776 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 776 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 776 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 776 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 840 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 840 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 840 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 840 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 840 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 840 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 840 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 840 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 840 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 840 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 904 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 904 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 904 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 904 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 904 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 904 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 904 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 904 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 904 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 904 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 968 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 968 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 968 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 968 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 968 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 968 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 968 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 968 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 968 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 968 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1032 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 1032 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 1032 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1032 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1032 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 1032 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1032 09 40 64 -15 -17
-   -1 sprites/foundations.png 562 1032 09 33 64 -31 -25
-   -1 sprites/foundations.png 642 1032 09 40 64 -47 -17
-   -1 sprites/foundations.png 722 1032 09 33 64 -31 -9
-   -1 sprites/foundations.png 2 1096 09 40 64 -15 -17
-   -1 sprites/foundations.png 82 1096 09 33 64 -31 -25
-   -1 sprites/foundations.png 162 1096 09 40 64 -47 -17
-   -1 sprites/foundations.png 242 1096 09 33 64 -31 -9
-   -1 sprites/foundations.png 322 1096 09 40 64 -15 -17
-   -1 sprites/foundations.png 402 1096 09 33 64 -31 -25
-   -1 sprites/foundations.png 482 1096 09 40 64 -47 -17
-   -1 sprites/foundations.png 562 1096 09 33 64 -31 -9
-   -1 sprites/foundations.png 642 1096 09 40 64 -15 -17
-   -1 sprites/foundations.png 722 1096 09 33 64 -31 -25
-   -1 sprites/foundations.png 2 1160 09 40 64 -47 -17
-   -1 sprites/foundations.png 82 1160 09 33 64 -31 -9
+   -1 sprites/foundations.png 8bpp 114  584  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 194  584  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 274  584  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 354  584  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 434  584  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 514  584  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 594  584  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 674  584  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  648  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  648  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  648  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  648  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  648  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  648  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  648  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  648  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  648  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  648  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  712  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  712  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  712  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  712  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  712  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  712  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  712  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  712  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  712  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  712  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  776  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  776  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  776  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  776  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  776  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  776  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  776  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  776  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  776  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  776  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  840  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  840  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  840  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  840  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  840  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  840  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  840  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  840  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  840  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  840  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  904  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  904  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  904  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  904  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  904  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  904  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  904  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  904  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  904  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  904  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  968  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  968  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  968  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  968  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  968  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  968  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  968  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  968  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  968  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  968  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1032  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1032  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1032  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1032  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1032  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1032  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1032  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 562 1032  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 642 1032  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 722 1032  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1096  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp  82 1096  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 162 1096  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 242 1096  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1096  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 402 1096  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 482 1096  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 562 1096  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1096  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 722 1096  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp   2 1160  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp  82 1160  64  33 -31  -9 normal
   -1 * 6	 07 83 01 \7! 02 5B
   -1 * 3	 05 06 5A
-   -1 sprites/foundations.png 194 1160 09 40 64 -31 -9
-   -1 sprites/foundations.png 274 1160 09 40 64 -31 -9
-   -1 sprites/foundations.png 354 1160 09 32 64 -31 -9
-   -1 sprites/foundations.png 434 1160 09 32 64 -31 -9
-   -1 sprites/foundations.png 514 1160 09 40 64 -31 -9
-   -1 sprites/foundations.png 594 1160 09 40 64 -31 -9
-   -1 sprites/foundations.png 674 1160 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1224 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 1224 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 1224 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 1224 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 1224 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 1224 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1224 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 1224 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 1224 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 1224 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1288 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 1288 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 1288 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1288 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1288 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 1288 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1288 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 1288 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 1288 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 1288 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1352 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 1352 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 1352 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1352 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1352 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 1352 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 1352 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 1352 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 1352 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 1352 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 1416 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 1416 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 1416 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 1416 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 1416 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 1416 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1416 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 1416 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 1416 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 1416 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 1480 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 1480 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 1480 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1480 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1480 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 1480 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1480 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 1480 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 1480 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 1480 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1544 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 1544 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 1544 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1544 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1544 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 1544 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 1544 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 1544 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 1544 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 1544 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1608 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 1608 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 1608 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 1608 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1608 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 1608 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1608 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 1608 09 40 64 -15 -17
-   -1 sprites/foundations.png 642 1608 09 33 64 -31 -25
-   -1 sprites/foundations.png 722 1608 09 40 64 -47 -17
-   -1 sprites/foundations.png 2 1672 09 33 64 -31 -9
-   -1 sprites/foundations.png 82 1672 09 40 64 -15 -17
-   -1 sprites/foundations.png 162 1672 09 33 64 -31 -25
-   -1 sprites/foundations.png 242 1672 09 40 64 -47 -17
-   -1 sprites/foundations.png 322 1672 09 33 64 -31 -9
-   -1 sprites/foundations.png 402 1672 09 40 64 -15 -17
-   -1 sprites/foundations.png 482 1672 09 33 64 -31 -25
-   -1 sprites/foundations.png 562 1672 09 40 64 -47 -17
-   -1 sprites/foundations.png 642 1672 09 33 64 -31 -9
-   -1 sprites/foundations.png 722 1672 09 40 64 -15 -17
-   -1 sprites/foundations.png 2 1736 09 33 64 -31 -25
-   -1 sprites/foundations.png 82 1736 09 40 64 -47 -17
-   -1 sprites/foundations.png 162 1736 09 33 64 -31 -9
+   -1 sprites/foundations.png 8bpp 194 1160  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 274 1160  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 354 1160  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 434 1160  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 514 1160  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 594 1160  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 674 1160  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1224  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1224  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1224  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1224  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1224  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1224  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1224  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1224  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1224  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1224  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1288  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1288  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1288  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1288  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1288  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1288  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1288  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1288  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1288  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1288  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1352  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1352  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1352  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1352  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1352  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1352  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1352  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1352  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1352  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1352  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1416  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1416  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1416  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1416  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1416  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1416  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1416  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1416  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1416  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1416  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1480  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1480  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1480  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1480  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1480  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1480  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1480  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1480  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1480  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1480  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1544  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1544  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1544  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1544  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1544  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1544  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1544  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1544  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1544  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1544  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1608  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1608  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1608  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1608  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1608  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1608  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1608  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1608  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 642 1608  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 722 1608  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp   2 1672  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1672  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 162 1672  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 242 1672  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 322 1672  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1672  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 482 1672  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 562 1672  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 642 1672  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1672  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp   2 1736  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp  82 1736  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 162 1736  64  33 -31  -9 normal
   -1 * 6	 07 83 01 \7! 03 5B
   -1 * 3	 05 06 5A
-   -1 sprites/foundations.png 274 1736 09 40 64 -31 -9
-   -1 sprites/foundations.png 354 1736 09 40 64 -31 -9
-   -1 sprites/foundations.png 434 1736 09 32 64 -31 -9
-   -1 sprites/foundations.png 514 1736 09 32 64 -31 -9
-   -1 sprites/foundations.png 594 1736 09 40 64 -31 -9
-   -1 sprites/foundations.png 674 1736 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1800 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 1800 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 1800 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1800 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 1800 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 1800 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1800 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 1800 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 1800 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 1800 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1864 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 1864 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 1864 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 1864 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1864 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 1864 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 1864 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 1864 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 1864 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 1864 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 1928 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 1928 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 1928 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1928 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1928 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 1928 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 1928 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 1928 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 1928 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 1928 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 1992 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 1992 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 1992 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1992 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 1992 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 1992 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1992 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 1992 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 1992 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 1992 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 2056 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 2056 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 2056 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 2056 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 2056 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 2056 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 2056 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 2056 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 2056 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 2056 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 2120 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 2120 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 2120 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 2120 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 2120 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 2120 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 2120 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 2120 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 2120 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 2120 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 2184 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 2184 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 2184 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 2184 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 2184 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 2184 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 2184 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 2184 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 2184 09 40 64 -15 -17
-   -1 sprites/foundations.png 722 2184 09 33 64 -31 -25
-   -1 sprites/foundations.png 2 2248 09 40 64 -47 -17
-   -1 sprites/foundations.png 82 2248 09 33 64 -31 -9
-   -1 sprites/foundations.png 162 2248 09 40 64 -15 -17
-   -1 sprites/foundations.png 242 2248 09 33 64 -31 -25
-   -1 sprites/foundations.png 322 2248 09 40 64 -47 -17
-   -1 sprites/foundations.png 402 2248 09 33 64 -31 -9
-   -1 sprites/foundations.png 482 2248 09 40 64 -15 -17
-   -1 sprites/foundations.png 562 2248 09 33 64 -31 -25
-   -1 sprites/foundations.png 642 2248 09 40 64 -47 -17
-   -1 sprites/foundations.png 722 2248 09 33 64 -31 -9
-   -1 sprites/foundations.png 2 2312 09 40 64 -15 -17
-   -1 sprites/foundations.png 82 2312 09 33 64 -31 -25
-   -1 sprites/foundations.png 162 2312 09 40 64 -47 -17
-   -1 sprites/foundations.png 242 2312 09 33 64 -31 -9
+   -1 sprites/foundations.png 8bpp 274 1736  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 354 1736  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 434 1736  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 514 1736  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 594 1736  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 674 1736  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1800  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1800  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1800  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1800  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1800  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1800  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1800  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1800  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1800  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1800  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1864  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1864  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1864  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1864  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1864  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1864  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1864  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1864  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1864  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1864  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1928  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1928  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1928  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1928  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1928  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1928  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1928  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1928  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1928  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1928  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1992  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1992  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1992  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1992  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1992  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1992  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1992  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1992  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1992  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1992  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 2056  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 2056  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 2056  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 2056  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 2056  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 2056  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 2056  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 2056  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 2056  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 2056  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 2120  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 2120  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 2120  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 2120  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 2120  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 2120  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 2120  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 2120  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 2120  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 2120  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 2184  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 2184  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 2184  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 2184  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 2184  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 2184  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 2184  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 2184  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 2184  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 722 2184  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp   2 2248  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp  82 2248  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 2248  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 242 2248  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 322 2248  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 402 2248  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 2248  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 562 2248  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 642 2248  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 722 2248  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 2312  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp  82 2312  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 162 2312  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 242 2312  64  33 -31  -9 normal
@@ -0,0 +1,240 @@
+//
+// $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 "Monospaced characters (Liberation Mono)"
+   -1 * 0 12 01 03 60 20 00
+   -1 sprites/mono.png 8bpp  10   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  25   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  40   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  55   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  70   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  85   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 100   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 115   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 130   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 145   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 160   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 175   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 190   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 205   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 220   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 235   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 250   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 265   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 280   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 295   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 310   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 325   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 340   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 355   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 370   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 385   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 400   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 415   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 430   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 445   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 460   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 475   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  10   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  25   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  40   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  55   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  70   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  85   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 100   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 115   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 130   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 145   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 160   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 175   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 190   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 205   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 220   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 235   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 250   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 265   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 280   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 295   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 310   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 325   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 340   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 355   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 370   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 385   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 400   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 415   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 430   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 445   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 460   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 475   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  10   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  25   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  40   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  55   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  70   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  85   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 100   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 115   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 130   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 145   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 160   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 175   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 190   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 205   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 220   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 235   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 250   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 265   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 280   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 295   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 310   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 325   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 340   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 355   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 370   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 385   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 400   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 415   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 430   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 445   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 460   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 475   70   7  13   0   0 normal
+
+   -1 * 0 12 01 03 80 80 00
+   -1 sprites/mono.png 8bpp  10   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  25   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  40   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  55   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  70   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  85   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 100   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 115   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 130   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 145   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 160   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 175   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 190   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 205   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 220   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 235   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 250   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 265   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 280   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 295   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 310   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 325   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 340   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 355   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 370   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 385   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 400   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 415   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 430   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 445   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 460   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 475   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  10  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  25  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  40  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  55  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  70  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  85  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 100  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 115  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 130  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 145  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 160  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 175  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 190  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 205  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 220  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 235  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 250  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 265  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 280  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 295  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 310  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 325  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 340  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 355  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 370  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 385  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 400  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 415  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 430  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 445  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 460  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 475  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  10  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  25  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  40  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  55  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  70  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  85  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 100  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 115  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 130  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 145  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 160  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 175  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 190  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 205  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 220  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 235  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 250  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 265  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 280  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 295  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 310  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 325  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 340  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 355  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 370  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 385  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 400  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 415  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 430  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 445  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 460  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 475  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  10  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  25  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  40  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  55  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  70  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  85  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 100  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 115  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 130  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 145  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 160  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 175  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 190  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 205  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 220  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 235  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 250  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 265  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 280  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 295  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 310  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 325  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 340  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 355  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 370  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 385  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 400  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 415  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 430  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 445  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 460  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 475  150   7  13   0   0 normal
+
+//U+0178 Latin Capital Letter Y With Diaeresis (only needed for mono as it is in the base set, but relocated by some code)
+   -1 * 0 12 01 03 01 78 01
+   -1 sprites/mono.png 8bpp 370  230   7  13   0   0 normal
@@ -8,9 +8,9 @@
 //
   -1 * 0	 0C "One way road graphics"
   -1 * 3	 05 09 06
-   -1 sprites/oneway.png 34 8 01 16 24 -12 -8
-   -1 sprites/oneway.png 66 8 01 16 24 -12 -8
-   -1 sprites/oneway.png 98 8 01 16 24 -12 -8
-   -1 sprites/oneway.png 130 8 01 16 24 -12 -8
-   -1 sprites/oneway.png 162 8 01 16 24 -12 -8
-   -1 sprites/oneway.png 194 8 01 16 24 -12 -8
+   -1 sprites/oneway.png 8bpp  34    8  24  16 -12  -8 normal
+   -1 sprites/oneway.png 8bpp  66    8  24  16 -12  -8 normal
+   -1 sprites/oneway.png 8bpp  98    8  24  16 -12  -8 normal
+   -1 sprites/oneway.png 8bpp 130    8  24  16 -12  -8 normal
+   -1 sprites/oneway.png 8bpp 162    8  24  16 -12  -8 normal
+   -1 sprites/oneway.png 8bpp 194    8  24  16 -12  -8 normal
@@ -1,6 +1,6 @@
 // Automatically generated by GRFCODEC. Do not modify!
-// (Info version 7)
-// Format: spritenum.pngfile xpos ypos compression ysize xsize xrel yrel
+// (Info version 32)
+// Format: spritenum imagefile depth xpos ypos xsize ysize xrel yrel zoom flags
 //
 // $Id$
 //
@@ -14,13 +14,6 @@
 // allowing it to be used.
 //

-//
-// -- NFO Renum 'settings' --
-// Do not make nforenum warn about the fact that we use a reserved GRF ID
-// @@WARNING DISABLE 101
-// -- End of NFO Renum 'settings' --
-//
-
 //
 // Number of sprites, it is wrong, but GRFcodec automagically gets it right.
 //
@@ -67,7 +60,7 @@
             00

 // GRF ID, must start with FF so it gets ignored
-   -1 * 0	 08 07 FF "OTT"
+   -1 * 0	 08 08 FF "OTT"

 // Name of the GRF
             "OpenTTD's base graphics " 00
@@ -80,6 +73,7 @@
             "David Dallaston: tram tracks" 0D
             "Jonathan G. Rennison: aqueducts" 0D
             "Bilbo, Jasper Vries: font" 0D
+             "Andrew Parkhouse: rivers" 0D
             "OpenTTD developers: other graphics" 00

 //
@@ -102,5 +96,11 @@
 #include "openttdgui.nfo"
 #include "airport_preview.nfo"
 #include "chars.nfo"
-#include "overrides.nfo"
+#include "mono.nfo"
 #include "fix_graphics.nfo"
+#include "rivers/rapids.nfo"
+#include "rivers/temperate.nfo"
+#include "rivers/arctic.nfo"
+#include "rivers/tropic.nfo"
+#include "rivers/toyland.nfo"
+#include "tunnel_portals.nfo"
@@ -5,177 +5,174 @@
 // 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/>.
-//
-// -- NFO Renum 'settings' --
-// Do not make nforenum warn about the fact that we use more sprites.
-// We are the 'authority' on how many sprites may be used.
-// @@WARNING DISABLE 60
-// -- End of NFO Renum 'settings' --
 //
   -1 * 0	 0C "OpenTTD GUI graphics"
-   -1 * 3	 05 15 A0
-   -1 sprites/openttdgui.png 66 8 09 31 64 -31 7
-   -1 sprites/openttdgui.png 146 8 09 31 64 -31 7
-   -1 sprites/openttdgui.png 226 8 09 31 64 -31 7
-   -1 sprites/openttdgui.png 306 8 09 31 64 -31 7
-   -1 sprites/openttdgui.png 386 8 09 31 64 -31 -1
-   -1 sprites/openttdgui.png 466 8 09 39 64 -31 -1
-   -1 sprites/openttdgui.png 546 8 09 31 64 -31 -1
-   -1 sprites/openttdgui.png 626 8 09 23 64 -31 7
-   -1 sprites/openttdgui.png 706 8 09 31 64 -31 7
-   -1 sprites/openttdgui.png 2 72 09 23 64 -31 7
-   -1 sprites/openttdgui.png 82 72 09 31 64 -31 7
-   -1 sprites/openttdgui.png 162 72 09 39 64 -31 -1
-   -1 sprites/openttdgui.png 242 72 01 26 23 0 0
-   -1 sprites/openttdgui.png 274 72 09 26 24 0 0
-   -1 sprites/openttdgui.png 306 72 01 8 4 28 16
-   -1 sprites/openttdgui.png 322 72 01 9 4 0 1
-   -1 sprites/openttdgui.png 338 72 09 23 32 0 1
-   -1 sprites/openttdgui.png 386 72 01 8 4 -31 15
-   -1 sprites/openttdgui.png 402 72 01 9 4 -3 0
-   -1 sprites/openttdgui.png 418 72 09 23 32 -31 0
-   -1 sprites/openttdgui.png 466 72 01 8 4 28 16
-   -1 sprites/openttdgui.png 482 72 01 9 4 0 1
-   -1 sprites/openttdgui.png 498 72 09 23 32 0 1
-   -1 sprites/openttdgui.png 546 72 01 8 4 -31 15
-   -1 sprites/openttdgui.png 562 72 01 9 4 -3 0
-   -1 sprites/openttdgui.png 578 72 09 23 32 -31 0
-   -1 sprites/openttdgui.png 626 72 01 8 4 28 16
-   -1 sprites/openttdgui.png 642 72 01 9 4 0 1
-   -1 sprites/openttdgui.png 658 72 09 23 32 0 1
-   -1 sprites/openttdgui.png 706 72 01 8 4 -31 15
-   -1 sprites/openttdgui.png 722 72 01 9 4 -3 0
-   -1 sprites/openttdgui.png 738 72 09 23 32 -31 0
-   -1 sprites/openttdgui.png 786 72 01 8 4 28 16
-   -1 sprites/openttdgui.png 2 136 01 9 4 0 1
-   -1 sprites/openttdgui.png 18 136 09 23 32 0 1
-   -1 sprites/openttdgui.png 66 136 01 8 4 -31 15
-   -1 sprites/openttdgui.png 82 136 01 9 4 -3 0
-   -1 sprites/openttdgui.png 98 136 09 23 32 -31 0
-   -1 sprites/openttdgui.png 146 136 09 10 10 0 0
-   -1 sprites/openttdgui.png 162 136 01 8 8 0 0
-   -1 sprites/openttdgui.png 178 136 09 9 7 0 0
-   -1 sprites/openttdgui.png 194 136 01 7 9 0 0
-   -1 sprites/openttdgui.png 210 136 01 7 9 0 0
-   -1 sprites/openttdgui.png 226 136 01 10 10 0 0
-   -1 sprites/openttdgui.png 242 136 09 7 7 0 0
-   -1 sprites/openttdgui.png 258 136 09 4 7 1 2
-   -1 sprites/openttdgui.png 274 136 09 4 7 1 2
-   -1 sprites/openttdgui.png 290 136 09 7 4 1 1
-   -1 sprites/openttdgui.png 306 136 09 7 4 2 1
-   -1 sprites/openttdgui.png 322 136 01 8 8 1 1
-   -1 sprites/openttdgui.png 338 136 01 9 9 0 0
-   -1 sprites/openttdgui.png 354 136 01 8 7 0 0
-   -1 sprites/openttdgui.png 370 136 01 8 8 0 0
-   -1 sprites/openttdgui.png 386 136 09 13 20 0 4
-   -1 sprites/openttdgui.png 418 136 03 36 56 0 0
-   -1 sprites/openttdgui.png 482 136 01 20 20 0 0
-   -1 sprites/openttdgui.png 514 136 01 32 32 0 0
-   -1 sprites/openttdgui.png 562 136 09 16 20 0 3
-   -1 sprites/openttdgui.png 594 136 03 43 56 0 0
-   -1 sprites/openttdgui.png 658 136 01 19 20 0 1
-   -1 sprites/openttdgui.png 690 136 01 32 32 0 0
-   -1 sprites/openttdgui.png 738 136 01 20 20 0 0
-   -1 sprites/openttdgui.png 2 200 01 31 31 1 1
-   -1 sprites/openttdgui.png 50 200 09 15 20 0 3
-   -1 sprites/openttdgui.png 82 200 03 36 56 0 0
-   -1 sprites/openttdgui.png 146 200 01 20 20 0 0
-   -1 sprites/openttdgui.png 178 200 01 32 32 0 0
-   -1 sprites/openttdgui.png 226 200 01 20 20 0 0
-   -1 sprites/openttdgui.png 258 200 01 32 32 0 0
-   -1 sprites/openttdgui.png 306 200 09 11 19 0 6
-   -1 sprites/openttdgui.png 338 200 03 36 56 0 0
-   -1 sprites/openttdgui.png 402 200 01 20 20 0 0
-   -1 sprites/openttdgui.png 434 200 01 32 32 0 0
-   -1 sprites/openttdgui.png 482 200 01 20 20 0 0
-   -1 sprites/openttdgui.png 514 200 01 32 32 0 0
-   -1 sprites/openttdgui.png 562 200 09 20 20 0 0
-   -1 sprites/openttdgui.png 594 200 09 20 20 0 0
-   -1 sprites/openttdgui.png 626 200 03 32 52 0 0
-   -1 sprites/openttdgui.png 690 200 09 33 29 -27 -16
-   -1 sprites/openttdgui.png 738 200 09 39 35 -29 -29
-   -1 sprites/openttdgui.png 2 264 09 34 29 1 -17
-   -1 sprites/openttdgui.png 50 264 09 39 34 -3 -28
-   -1 sprites/openttdgui.png 98 264 09 13 20 0 4
-   -1 sprites/openttdgui.png 130 264 03 36 56 0 0
-   -1 sprites/openttdgui.png 194 264 09 13 20 0 4
-   -1 sprites/openttdgui.png 226 264 03 36 56 0 0
-   -1 sprites/openttdgui.png 290 264 01 18 39 -9 -9
-   -1 sprites/openttdgui.png 338 264 01 44 72 -16 -35
-   -1 sprites/openttdgui.png 418 264 01 20 20 0 0
-   -1 sprites/openttdgui.png 450 264 01 44 72 -16 -35
-   -1 sprites/openttdgui.png 530 264 09 18 18 1 1
-   -1 sprites/openttdgui.png 562 264 01 20 20 0 0
-   -1 sprites/openttdgui.png 594 264 01 32 32 0 0
-   -1 sprites/openttdgui.png 642 264 01 18 18 0 0
-   -1 sprites/openttdgui.png 674 264 01 18 18 0 0
-   -1 sprites/openttdgui.png 706 264 01 18 18 0 0
-   -1 sprites/openttdgui.png 738 264 01 18 18 0 0
-   -1 sprites/openttdgui.png 770 264 01 18 18 0 0
-   -1 sprites/openttdgui.png 2 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 34 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 66 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 98 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 130 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 162 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 194 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 226 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 258 328 09 16 16 0 0
-   -1 sprites/openttdgui.png 290 328 01 16 16 0 0
-   -1 sprites/openttdgui.png 322 328 01 16 16 0 0
-   -1 sprites/openttdgui.png 354 328 01 16 16 0 0
-   -1 sprites/openttdgui.png 386 328 09 31 35 0 0
-   -1 sprites/openttdgui.png 434 328 01 30 33 0 0
-   -1 sprites/openttdgui.png 482 328 01 33 36 0 0
-   -1 sprites/openttdgui.png 530 328 01 33 37 0 0
-   -1 sprites/openttdgui.png 578 328 09 18 18 0 0
-   -1 sprites/openttdgui.png 610 328 09 18 18 0 0
-   -1 sprites/openttdgui.png 642 328 09 18 18 0 0
-   -1 sprites/openttdgui.png 674 328 09 18 18 0 0
-   -1 sprites/openttdgui.png 706 328 09 18 18 0 0
-   -1 sprites/openttdgui.png 738 328 09 18 18 0 0
-   -1 sprites/openttdgui.png 770 328 09 18 18 0 0
-   -1 sprites/openttdgui.png 2 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 34 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 66 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 98 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 130 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 162 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 194 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 226 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 258 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 290 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 322 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 354 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 386 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 418 376 01 20 20 0 0
-   -1 sprites/openttdgui.png 450 376 01 22 19 0 0
-   -1 sprites/openttdgui.png 482 376 01 20 20 0 0
-   -1 sprites/openttdgui.png 514 376 01 44 54 -16 -35
-   -1 sprites/openttdgui.png 578 376 01 7 7 3 4
-   -1 sprites/openttdgui.png 594 376 01 7 7 3 4
-   -1 sprites/openttdgui.png 610 376 01 9 10 2 3
-   -1 sprites/openttdgui.png 626 376 01 9 10 2 3
-   -1 sprites/openttdgui.png 642 376 01 7 11 2 1
-   -1 sprites/openttdgui.png 658 376 01 9 9 3 3
-   -1 sprites/openttdgui.png 674 376 09 20 20 0 0
-   -1 sprites/openttdgui.png 706 376 09 20 20 0 0
-   -1 sprites/openttdgui.png 738 376 09 32 32 0 0
-   -1 sprites/openttdgui.png 786 376 09 10 10 0 0
-   -1 sprites/openttdgui.png 2 440 09 10 10 0 0
-   -1 sprites/openttdgui.png 18 440 09 7 7 0 0
-   -1 sprites/openttdgui.png 34 440 09 13 14 4 4
-   -1 sprites/openttdgui.png 66 440 09 8 7 0 0
-   -1 sprites/openttdgui.png 82 440 09 8 7 0 0
-   -1 sprites/openttdgui.png 98 440 09 8 7 0 0
-   -1 sprites/openttdgui.png 114 440 01 8 8 0 0
-   -1 sprites/openttdgui.png 130 440 01 8 8 0 0
-   -1 sprites/openttdgui.png 146 440 01 8 8 0 0
-   -1 sprites/openttdgui.png 162 440 01 8 8 0 0
-   -1 sprites/openttdgui.png 178 440 01 10 8 0 0
-   -1 sprites/openttdgui.png 194 440 09 10 13 0 -2
-
-// -- NFO Renum 'settings' --
-// Undo disabling the warning
-// @@WARNING ENABLE 60
-// -- End of NFO Renum 'settings' --
+   -1 * 3	 05 15 \b 168 // OPENTTD_SPRITE_COUNT
+   -1 sprites/openttdgui.png 8bpp  66    8  64  31 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp 146    8  64  31 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp 226    8  64  31 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp 306    8  64  31 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp 386    8  64  31 -31  -1 normal
+   -1 sprites/openttdgui.png 8bpp 466    8  64  39 -31  -1 normal
+   -1 sprites/openttdgui.png 8bpp 546    8  64  31 -31  -1 normal
+   -1 sprites/openttdgui.png 8bpp 626    8  64  23 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp 706    8  64  31 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp   2   72  64  23 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp  82   72  64  31 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp 162   72  64  39 -31  -1 normal
+   -1 sprites/openttdgui.png 8bpp 242   72  23  26   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 274   72  24  26   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 306   72   4   8  28  16 normal
+   -1 sprites/openttdgui.png 8bpp 322   72   4   9   0   1 normal
+   -1 sprites/openttdgui.png 8bpp 338   72  32  23   0   1 normal
+   -1 sprites/openttdgui.png 8bpp 386   72   4   8 -31  15 normal
+   -1 sprites/openttdgui.png 8bpp 402   72   4   9  -3   0 normal
+   -1 sprites/openttdgui.png 8bpp 418   72  32  23 -31   0 normal
+   -1 sprites/openttdgui.png 8bpp 466   72   4   8  28  16 normal
+   -1 sprites/openttdgui.png 8bpp 482   72   4   9   0   1 normal
+   -1 sprites/openttdgui.png 8bpp 498   72  32  23   0   1 normal
+   -1 sprites/openttdgui.png 8bpp 546   72   4   8 -31  15 normal
+   -1 sprites/openttdgui.png 8bpp 562   72   4   9  -3   0 normal
+   -1 sprites/openttdgui.png 8bpp 578   72  32  23 -31   0 normal
+   -1 sprites/openttdgui.png 8bpp 626   72   4   8  28  16 normal
+   -1 sprites/openttdgui.png 8bpp 642   72   4   9   0   1 normal
+   -1 sprites/openttdgui.png 8bpp 658   72  32  23   0   1 normal
+   -1 sprites/openttdgui.png 8bpp 706   72   4   8 -31  15 normal
+   -1 sprites/openttdgui.png 8bpp 722   72   4   9  -3   0 normal
+   -1 sprites/openttdgui.png 8bpp 738   72  32  23 -31   0 normal
+   -1 sprites/openttdgui.png 8bpp 786   72   4   8  28  16 normal
+   -1 sprites/openttdgui.png 8bpp   2  136   4   9   0   1 normal
+   -1 sprites/openttdgui.png 8bpp  18  136  32  23   0   1 normal
+   -1 sprites/openttdgui.png 8bpp  66  136   4   8 -31  15 normal
+   -1 sprites/openttdgui.png 8bpp  82  136   4   9  -3   0 normal
+   -1 sprites/openttdgui.png 8bpp  98  136  32  23 -31   0 normal
+   -1 sprites/openttdgui.png 8bpp 146  136  10  10   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 162  136   8   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 178  136   7   9   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 194  136   9   7   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 210  136   9   7   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 226  136  10  10   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 242  136   7   7   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 258  136   7   4   1   2 normal
+   -1 sprites/openttdgui.png 8bpp 274  136   7   4   1   2 normal
+   -1 sprites/openttdgui.png 8bpp 290  136   4   7   1   1 normal
+   -1 sprites/openttdgui.png 8bpp 306  136   4   7   2   1 normal
+   -1 sprites/openttdgui.png 8bpp 322  136   8   8   1   1 normal
+   -1 sprites/openttdgui.png 8bpp 338  136   9   9   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 354  136   7   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 370  136   8   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 386  136  20  13   0   4 normal
+   -1 sprites/openttdgui.png 8bpp 418  136  56  36   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 482  136  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 514  136  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 562  136  20  16   0   3 normal
+   -1 sprites/openttdgui.png 8bpp 594  136  56  43   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 658  136  20  19   0   1 normal
+   -1 sprites/openttdgui.png 8bpp 690  136  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 738  136  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp   2  200  31  31   1   1 normal
+   -1 sprites/openttdgui.png 8bpp  50  200  20  15   0   3 normal
+   -1 sprites/openttdgui.png 8bpp  82  200  56  36   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 146  200  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 178  200  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 226  200  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 258  200  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 306  200  19  11   0   6 normal
+   -1 sprites/openttdgui.png 8bpp 338  200  56  36   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 402  200  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 434  200  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 482  200  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 514  200  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 562  200  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 594  200  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 626  200  52  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 690  200  29  33 -27 -16 normal
+   -1 sprites/openttdgui.png 8bpp 738  200  35  39 -29 -29 normal
+   -1 sprites/openttdgui.png 8bpp   2  264  29  34   1 -17 normal
+   -1 sprites/openttdgui.png 8bpp  50  264  34  39  -3 -28 normal
+   -1 sprites/openttdgui.png 8bpp  98  264  20  13   0   4 normal
+   -1 sprites/openttdgui.png 8bpp 130  264  56  36   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 194  264  20  13   0   4 normal
+   -1 sprites/openttdgui.png 8bpp 226  264  56  36   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 290  264  39  18  -9  -9 normal
+   -1 sprites/openttdgui.png 8bpp 338  264  72  44 -16 -35 normal
+   -1 sprites/openttdgui.png 8bpp 418  264  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 450  264  72  44 -16 -35 normal
+   -1 sprites/openttdgui.png 8bpp 530  264  18  18   1   1 normal
+   -1 sprites/openttdgui.png 8bpp 562  264  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 594  264  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 642  264  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 674  264  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 706  264  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 738  264  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 770  264  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp   2  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  34  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  66  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  98  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 130  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 162  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 194  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 226  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 258  328  16  16   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 290  328  16  16   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 322  328  16  16   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 354  328  16  16   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 386  328  35  31   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 434  328  33  30   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 482  328  36  33   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 530  328  37  33   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 578  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 610  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 642  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 674  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 706  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 738  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 770  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp   2  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  34  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  66  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  98  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 130  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 162  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 194  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 226  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 258  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 290  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 322  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 354  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 386  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 418  376  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 450  376  19  22   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 482  376  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 514  376  54  44 -16 -35 normal
+   -1 sprites/openttdgui.png 8bpp 578  376   7   7   3   4 normal
+   -1 sprites/openttdgui.png 8bpp 594  376   7   7   3   4 normal
+   -1 sprites/openttdgui.png 8bpp 610  376  10   9   2   3 normal
+   -1 sprites/openttdgui.png 8bpp 626  376  10   9   2   3 normal
+   -1 sprites/openttdgui.png 8bpp 642  376  11   7   2   1 normal
+   -1 sprites/openttdgui.png 8bpp 658  376   9   9   3   3 normal
+   -1 sprites/openttdgui.png 8bpp 674  376  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 706  376  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 738  376  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 786  376  10  10   0   0 normal
+   -1 sprites/openttdgui.png 8bpp   2  440  10  10   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  18  440   7   7   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  34  440  14  13   4   4 normal
+   -1 sprites/openttdgui.png 8bpp  66  440   7   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  82  440   7   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  98  440   7   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 114  440   8   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 130  440   8   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 146  440   8   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 162  440   8   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 178  440   8  10   0   0 normal
+   -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,13 +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 "NewGRF overrides"
-   -1 * 30	 00 08 01 03 00 11
-	 44 44 22 02    44 44 01 11  // UKRS addons modifies UKRS
-	 6D 62 04 02    6D 62 04 01  // DBSetXL ECS extension modifies DBSetXL
-	 4D 65 6f 20    4D 65 6F 17  // LV4cut modifies LV4
@@ -0,0 +1,282 @@
+//
+// $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 "Arctic river graphics by andythenorth (Andrew Parkhouse)"
+   -1 * 4	 01 05 01 3C
+   -1 sprites/arctic_snowy.png 8bpp  10   10  38  19  -5   0 normal
+   -1 sprites/arctic_snowy.png 8bpp  58   10  38  18  -5  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 106   10  38  18 -31  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 154   10  38  19 -31   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 202   10  19   9  14  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 234   10  16   9  -7  22 normal
+   -1 sprites/arctic_snowy.png 8bpp 266   10  19   9 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 298   10  16   9  -7   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 330   10   8   6  25  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 346   10  12   4  -5  27 normal
+   -1 sprites/arctic_snowy.png 8bpp 364   10   8   6 -31  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 380   10  12   5  -5   0 normal
+
+   -1 sprites/arctic_snowy.png 8bpp  10   40  40  11  -7   0 normal
+   -1 sprites/arctic_snowy.png 8bpp  58   40  39  18  -6   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 106   40  38  11 -31  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 154   40  39  18 -31   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 202   40  20   6  13   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 234   40  13   7  -6  16 normal
+   -1 sprites/arctic_snowy.png 8bpp 266   40  20   6 -31  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 298   40  13   7  -5   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 330   40   8   5  25   6 normal
+   -1 sprites/arctic_snowy.png 8bpp 346   40  12   3  -5  20 normal
+   -1 sprites/arctic_snowy.png 8bpp 364   40   8   4 -31  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 380   40  15   4  -7   0 normal
+
+   -1 sprites/arctic_snowy.png 8bpp  10   70  38  20  -5  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp  58   70  38  26  -5   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 106   70  37  20 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 154   70  38  27 -31  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 202   70  16   9  17   3 normal
+   -1 sprites/arctic_snowy.png 8bpp 234   70  15   9  -7  22 normal
+   -1 sprites/arctic_snowy.png 8bpp 266   70  16   9 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 298   70  15   9  -6  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 330   70   8   7  25   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 346   70  10   5  -4  27 normal
+   -1 sprites/arctic_snowy.png 8bpp 364   70   8   7 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 380   70  12   6  -5  -8 normal
+
+   -1 sprites/arctic_snowy.png 8bpp  10  100  39  18  -6   0 normal
+   -1 sprites/arctic_snowy.png 8bpp  58  100  38  11  -5  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 106  100  39  18 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 154  100  40  11 -32   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 202  100  20   6  13  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 234  100  13   7  -5  16 normal
+   -1 sprites/arctic_snowy.png 8bpp 266  100  20   6 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 298  100  13   7  -6   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 330  100   8   4  26  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 346  100  12   3  -5  20 normal
+   -1 sprites/arctic_snowy.png 8bpp 364  100   8   5 -31   6 normal
+   -1 sprites/arctic_snowy.png 8bpp 380  100  15   4  -6   0 normal
+
+   -1 sprites/arctic_snowy.png 8bpp  10  130  38  27  -5  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp  58  130  37  20  -4  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 106  130  37  26 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 154  130  38  20 -31  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 202  130  16   9  17  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 234  130  15   9  -6  22 normal
+   -1 sprites/arctic_snowy.png 8bpp 266  130  16   9 -31   3 normal
+   -1 sprites/arctic_snowy.png 8bpp 298  130  15   9  -7  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 330  130   8   7  25  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 346  130  10   5  -4  26 normal
+   -1 sprites/arctic_snowy.png 8bpp 364  130   8   7 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 380  130  12   6  -5  -8 normal
+   -1 * 7	 02 05 30 01 00 00 00
+
+   -1 * 4	 01 05 01 3C
+   -1 sprites/arctic_brown.png 8bpp  10   10  38  19  -5   0 normal
+   -1 sprites/arctic_brown.png 8bpp  58   10  38  18  -5  13 normal
+   -1 sprites/arctic_brown.png 8bpp 106   10  38  18 -31  13 normal
+   -1 sprites/arctic_brown.png 8bpp 154   10  38  19 -31   0 normal
+   -1 sprites/arctic_brown.png 8bpp 202   10  19   9  14  11 normal
+   -1 sprites/arctic_brown.png 8bpp 234   10  16   9  -7  22 normal
+   -1 sprites/arctic_brown.png 8bpp 266   10  19   9 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 298   10  16   9  -7   0 normal
+   -1 sprites/arctic_brown.png 8bpp 330   10   8   6  25  13 normal
+   -1 sprites/arctic_brown.png 8bpp 346   10  12   4  -5  27 normal
+   -1 sprites/arctic_brown.png 8bpp 364   10   8   6 -31  13 normal
+   -1 sprites/arctic_brown.png 8bpp 380   10  12   5  -5   0 normal
+
+   -1 sprites/arctic_brown.png 8bpp  10   40  40  11  -7   0 normal
+   -1 sprites/arctic_brown.png 8bpp  58   40  39  18  -6   5 normal
+   -1 sprites/arctic_brown.png 8bpp 106   40  38  11 -31  12 normal
+   -1 sprites/arctic_brown.png 8bpp 154   40  39  18 -31   0 normal
+   -1 sprites/arctic_brown.png 8bpp 202   40  20   6  13   5 normal
+   -1 sprites/arctic_brown.png 8bpp 234   40  13   7  -6  16 normal
+   -1 sprites/arctic_brown.png 8bpp 266   40  20   6 -31  12 normal
+   -1 sprites/arctic_brown.png 8bpp 298   40  13   7  -5   0 normal
+   -1 sprites/arctic_brown.png 8bpp 330   40   8   5  25   6 normal
+   -1 sprites/arctic_brown.png 8bpp 346   40  12   3  -5  20 normal
+   -1 sprites/arctic_brown.png 8bpp 364   40   8   4 -31  13 normal
+   -1 sprites/arctic_brown.png 8bpp 380   40  15   4  -7   0 normal
+
+   -1 sprites/arctic_brown.png 8bpp  10   70  38  20  -5  -8 normal
+   -1 sprites/arctic_brown.png 8bpp  58   70  38  26  -5   5 normal
+   -1 sprites/arctic_brown.png 8bpp 106   70  37  20 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 154   70  38  27 -31  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 202   70  16   9  17   3 normal
+   -1 sprites/arctic_brown.png 8bpp 234   70  15   9  -7  22 normal
+   -1 sprites/arctic_brown.png 8bpp 266   70  16   9 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 298   70  15   9  -6  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 330   70   8   7  25   5 normal
+   -1 sprites/arctic_brown.png 8bpp 346   70  10   5  -4  27 normal
+   -1 sprites/arctic_brown.png 8bpp 364   70   8   7 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 380   70  12   6  -5  -8 normal
+
+   -1 sprites/arctic_brown.png 8bpp  10  100  39  18  -6   0 normal
+   -1 sprites/arctic_brown.png 8bpp  58  100  38  11  -5  12 normal
+   -1 sprites/arctic_brown.png 8bpp 106  100  39  18 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 154  100  40  11 -32   0 normal
+   -1 sprites/arctic_brown.png 8bpp 202  100  20   6  13  12 normal
+   -1 sprites/arctic_brown.png 8bpp 234  100  13   7  -5  16 normal
+   -1 sprites/arctic_brown.png 8bpp 266  100  20   6 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 298  100  13   7  -6   0 normal
+   -1 sprites/arctic_brown.png 8bpp 330  100   8   4  26  13 normal
+   -1 sprites/arctic_brown.png 8bpp 346  100  12   3  -5  20 normal
+   -1 sprites/arctic_brown.png 8bpp 364  100   8   5 -31   6 normal
+   -1 sprites/arctic_brown.png 8bpp 380  100  15   4  -6   0 normal
+
+   -1 sprites/arctic_brown.png 8bpp  10  130  38  27  -5  -8 normal
+   -1 sprites/arctic_brown.png 8bpp  58  130  37  20  -4  11 normal
+   -1 sprites/arctic_brown.png 8bpp 106  130  37  26 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 154  130  38  20 -31  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 202  130  16   9  17  11 normal
+   -1 sprites/arctic_brown.png 8bpp 234  130  15   9  -6  22 normal
+   -1 sprites/arctic_brown.png 8bpp 266  130  16   9 -31   3 normal
+   -1 sprites/arctic_brown.png 8bpp 298  130  15   9  -7  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 330  130   8   7  25  11 normal
+   -1 sprites/arctic_brown.png 8bpp 346  130  10   5  -4  26 normal
+   -1 sprites/arctic_brown.png 8bpp 364  130   8   7 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 380  130  12   6  -5  -8 normal
+   -1 * 7	 02 05 31 01 00 00 00
+
+   -1 * 4	 01 05 01 3C
+   -1 sprites/arctic_snowy.png 8bpp  10  210  38  19  -5   0 normal
+   -1 sprites/arctic_snowy.png 8bpp  58  210  38  18  -5  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 106  210  38  18 -31  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 154  210  38  19 -31   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 202  210  19   9  14  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 234  210  16   9  -7  22 normal
+   -1 sprites/arctic_snowy.png 8bpp 266  210  19   9 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 298  210  16   9  -7   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 330  210   8   6  25  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 346  210  12   4  -5  27 normal
+   -1 sprites/arctic_snowy.png 8bpp 364  210   8   6 -31  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 380  210  12   5  -5   0 normal
+
+   -1 sprites/arctic_snowy.png 8bpp  10  240  40  11  -7   0 normal
+   -1 sprites/arctic_snowy.png 8bpp  58  240  39  18  -6   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 106  240  38  11 -31  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 154  240  39  18 -31   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 202  240  20   6  13   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 234  240  13   7  -6  16 normal
+   -1 sprites/arctic_snowy.png 8bpp 266  240  20   6 -31  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 298  240  13   7  -5   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 330  240   8   5  25   6 normal
+   -1 sprites/arctic_snowy.png 8bpp 346  240  12   3  -5  20 normal
+   -1 sprites/arctic_snowy.png 8bpp 364  240   8   4 -31  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 380  240  15   4  -7   0 normal
+
+   -1 sprites/arctic_snowy.png 8bpp  10  270  38  20  -5  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp  58  270  38  26  -5   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 106  270  37  20 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 154  270  38  27 -31  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 202  270  16   9  17   3 normal
+   -1 sprites/arctic_snowy.png 8bpp 234  270  15   9  -7  22 normal
+   -1 sprites/arctic_snowy.png 8bpp 266  270  16   9 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 298  270  15   9  -6  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 330  270   8   7  25   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 346  270  10   5  -4  27 normal
+   -1 sprites/arctic_snowy.png 8bpp 364  270   8   7 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 380  270  12   6  -5  -8 normal
+
+   -1 sprites/arctic_snowy.png 8bpp  10  300  39  18  -6   0 normal
+   -1 sprites/arctic_snowy.png 8bpp  58  300  38  11  -5  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 106  300  39  18 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 154  300  40  11 -32   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 202  300  20   6  13  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 234  300  13   7  -5  16 normal
+   -1 sprites/arctic_snowy.png 8bpp 266  300  20   6 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 298  300  13   7  -6   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 330  300   8   4  26  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 346  300  12   3  -5  20 normal
+   -1 sprites/arctic_snowy.png 8bpp 364  300   8   5 -31   6 normal
+   -1 sprites/arctic_snowy.png 8bpp 380  300  15   4  -6   0 normal
+
+   -1 sprites/arctic_snowy.png 8bpp  10  330  38  27  -5  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp  58  330  37  20  -4  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 106  330  37  26 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 154  330  38  20 -31  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 202  330  16   9  17  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 234  330  15   9  -6  22 normal
+   -1 sprites/arctic_snowy.png 8bpp 266  330  16   9 -31   3 normal
+   -1 sprites/arctic_snowy.png 8bpp 298  330  15   9  -7  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 330  330   8   7  25  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 346  330  10   5  -4  26 normal
+   -1 sprites/arctic_snowy.png 8bpp 364  330   8   7 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 380  330  12   6  -5  -8 normal
+   -1 * 7	 02 05 32 01 00 00 00
+
+   -1 * 4	 01 05 01 3C
+   -1 sprites/arctic_brown.png 8bpp  10  210  38  19  -5   0 normal
+   -1 sprites/arctic_brown.png 8bpp  58  210  38  18  -5  13 normal
+   -1 sprites/arctic_brown.png 8bpp 106  210  38  18 -31  13 normal
+   -1 sprites/arctic_brown.png 8bpp 154  210  38  19 -31   0 normal
+   -1 sprites/arctic_brown.png 8bpp 202  210  19   9  14  11 normal
+   -1 sprites/arctic_brown.png 8bpp 234  210  16   9  -7  22 normal
+   -1 sprites/arctic_brown.png 8bpp 266  210  19   9 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 298  210  16   9  -7   0 normal
+   -1 sprites/arctic_brown.png 8bpp 330  210   8   6  25  13 normal
+   -1 sprites/arctic_brown.png 8bpp 346  210  12   4  -5  27 normal
+   -1 sprites/arctic_brown.png 8bpp 364  210   8   6 -31  13 normal
+   -1 sprites/arctic_brown.png 8bpp 380  210  12   5  -5   0 normal
+
+   -1 sprites/arctic_brown.png 8bpp  10  240  40  11  -7   0 normal
+   -1 sprites/arctic_brown.png 8bpp  58  240  39  18  -6   5 normal
+   -1 sprites/arctic_brown.png 8bpp 106  240  38  11 -31  12 normal
+   -1 sprites/arctic_brown.png 8bpp 154  240  39  18 -31   0 normal
+   -1 sprites/arctic_brown.png 8bpp 202  240  20   6  13   5 normal
+   -1 sprites/arctic_brown.png 8bpp 234  240  13   7  -6  16 normal
+   -1 sprites/arctic_brown.png 8bpp 266  240  20   6 -31  12 normal
+   -1 sprites/arctic_brown.png 8bpp 298  240  13   7  -5   0 normal
+   -1 sprites/arctic_brown.png 8bpp 330  240   8   5  25   6 normal
+   -1 sprites/arctic_brown.png 8bpp 346  240  12   3  -5  20 normal
+   -1 sprites/arctic_brown.png 8bpp 364  240   8   4 -31  13 normal
+   -1 sprites/arctic_brown.png 8bpp 380  240  15   4  -7   0 normal
+
+   -1 sprites/arctic_brown.png 8bpp  10  270  38  20  -5  -8 normal
+   -1 sprites/arctic_brown.png 8bpp  58  270  38  26  -5   5 normal
+   -1 sprites/arctic_brown.png 8bpp 106  270  37  20 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 154  270  38  27 -31  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 202  270  16   9  17   3 normal
+   -1 sprites/arctic_brown.png 8bpp 234  270  15   9  -7  22 normal
+   -1 sprites/arctic_brown.png 8bpp 266  270  16   9 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 298  270  15   9  -6  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 330  270   8   7  25   5 normal
+   -1 sprites/arctic_brown.png 8bpp 346  270  10   5  -4  27 normal
+   -1 sprites/arctic_brown.png 8bpp 364  270   8   7 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 380  270  12   6  -5  -8 normal
+
+   -1 sprites/arctic_brown.png 8bpp  10  300  39  18  -6   0 normal
+   -1 sprites/arctic_brown.png 8bpp  58  300  38  11  -5  12 normal
+   -1 sprites/arctic_brown.png 8bpp 106  300  39  18 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 154  300  40  11 -32   0 normal
+   -1 sprites/arctic_brown.png 8bpp 202  300  20   6  13  12 normal
+   -1 sprites/arctic_brown.png 8bpp 234  300  13   7  -5  16 normal
+   -1 sprites/arctic_brown.png 8bpp 266  300  20   6 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 298  300  13   7  -6   0 normal
+   -1 sprites/arctic_brown.png 8bpp 330  300   8   4  26  13 normal
+   -1 sprites/arctic_brown.png 8bpp 346  300  12   3  -5  20 normal
+   -1 sprites/arctic_brown.png 8bpp 364  300   8   5 -31   6 normal
+   -1 sprites/arctic_brown.png 8bpp 380  300  15   4  -6   0 normal
+
+   -1 sprites/arctic_brown.png 8bpp  10  330  38  27  -5  -8 normal
+   -1 sprites/arctic_brown.png 8bpp  58  330  37  20  -4  11 normal
+   -1 sprites/arctic_brown.png 8bpp 106  330  37  26 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 154  330  38  20 -31  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 202  330  16   9  17  11 normal
+   -1 sprites/arctic_brown.png 8bpp 234  330  15   9  -6  22 normal
+   -1 sprites/arctic_brown.png 8bpp 266  330  16   9 -31   3 normal
+   -1 sprites/arctic_brown.png 8bpp 298  330  15   9  -7  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 330  330   8   7  25  11 normal
+   -1 sprites/arctic_brown.png 8bpp 346  330  10   5  -4  26 normal
+   -1 sprites/arctic_brown.png 8bpp 364  330   8   7 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 380  330  12   6  -5  -8 normal
+   -1 * 7	 02 05 33 01 00 00 00
+
+   -1 * 14	 02 05 34 81 81 00 FF 01 30 00 04 04 31 00
+   -1 * 14	 02 05 35 81 81 00 FF 01 32 00 04 04 33 00
+   -1 * 14	 02 05 36 81 80 00 FF 01 34 00 00 00 35 00
+   -1 * 6	 07 83 01 \7! 01 01
+   -1 * 7	 03 05 01 06 00 36 00
@@ -0,0 +1,139 @@
+//
+// $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 "Rapid graphics"
+   -1 * 4	 01 05 01 04
+   -1 sprites/rapids.png 8bpp  10   10  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90   10  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170   10  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250   10  64  39 -31  -8 normal
+   -1 * 7	 02 05 00 01 00 00 00
+
+   -1 * 4	 01 05 01 04
+   -1 sprites/rapids.png 8bpp  10   60  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90   60  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170   60  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250   60  64  39 -31  -8 normal
+   -1 * 7	 02 05 01 01 00 00 00
+
+   -1 * 4	 01 05 01 04
+   -1 sprites/rapids.png 8bpp  10  110  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  110  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  110  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  110  64  39 -31  -8 normal
+   -1 * 7	 02 05 02 01 00 00 00
+
+   -1 * 4	 01 05 01 04
+   -1 sprites/rapids.png 8bpp  10  160  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  160  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  160  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  160  64  39 -31  -8 normal
+   -1 * 7	 02 05 03 01 00 00 00
+
+   -1 * 4	 01 05 01 04
+   -1 sprites/rapids.png 8bpp  10  210  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  210  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  210  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  210  64  39 -31  -8 normal
+   -1 * 7	 02 05 04 01 00 00 00
+
+   -1 * 4	 01 05 01 04
+   -1 sprites/rapids.png 8bpp  10  260  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  260  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  260  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  260  64  39 -31  -8 normal
+   -1 * 7	 02 05 05 01 00 00 00
+
+   -1 * 4	 01 05 01 04
+   -1 sprites/rapids.png 8bpp  10  310  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  310  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  310  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  310  64  39 -31  -8 normal
+   -1 * 7	 02 05 06 01 00 00 00
+
+   -1 * 4	 01 05 01 04
+   -1 sprites/rapids.png 8bpp  10  360  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  360  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  360  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  360  64  39 -31  -8 normal
+   -1 * 7	 02 05 07 01 00 00 00
+
+   -1 * 4	 01 05 01 04
+   -1 sprites/rapids.png 8bpp  10  410  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  410  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  410  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  410  64  39 -31  -8 normal
+   -1 * 7	 02 05 08 01 00 00 00
+
+   -1 * 4	 01 05 01 04
+   -1 sprites/rapids.png 8bpp  10  460  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  460  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  460  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  460  64  39 -31  -8 normal
+   -1 * 7	 02 05 09 01 00 00 00
+
+   -1 * 4	 01 05 01 04
+   -1 sprites/rapids.png 8bpp  10  510  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  510  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  510  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  510  64  39 -31  -8 normal
+   -1 * 7	 02 05 0A 01 00 00 00
+
+   -1 * 4	 01 05 01 04
+   -1 sprites/rapids.png 8bpp  10  560  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  560  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  560  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  560  64  39 -31  -8 normal
+   -1 * 7	 02 05 0B 01 00 00 00
+
+   -1 * 4	 01 05 01 04
+   -1 sprites/rapids.png 8bpp  10  610  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  610  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  610  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  610  64  39 -31  -8 normal
+   -1 * 7	 02 05 0C 01 00 00 00
+
+   -1 * 4	 01 05 01 04
+   -1 sprites/rapids.png 8bpp  10  660  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  660  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  660  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  660  64  39 -31  -8 normal
+   -1 * 7	 02 05 0D 01 00 00 00
+
+   -1 * 4	 01 05 01 04
+   -1 sprites/rapids.png 8bpp  10  710  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  710  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  710  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  710  64  39 -31  -8 normal
+   -1 * 7	 02 05 0E 01 00 00 00
+
+   -1 * 4	 01 05 01 04
+   -1 sprites/rapids.png 8bpp  10  760  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  760  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  760  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  760  64  39 -31  -8 normal
+   -1 * 7	 02 05 0F 01 00 00 00
+
+   -1 * 39	 02 05 10 80 00 01 10
+            00 00
+            01 00
+            02 00
+            03 00
+            04 00
+            05 00
+            06 00
+            07 00
+            08 00
+            09 00
+            0A 00
+            0B 00
+            0C 00
+            0D 00
+            0E 00
+            0F 00
+   -1 * 7	 03 05 01 05 00 10 00
@@ -0,0 +1,146 @@
+//
+// $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 "Temperate river graphics by andythenorth (Andrew Parkhouse)"
+   -1 * 4	 01 05 01 3C
+   -1 sprites/temperate.png 8bpp  10   10  38  19  -5   0 normal
+   -1 sprites/temperate.png 8bpp  58   10  38  18  -5  13 normal
+   -1 sprites/temperate.png 8bpp 106   10  38  18 -31  13 normal
+   -1 sprites/temperate.png 8bpp 154   10  38  19 -31   0 normal
+   -1 sprites/temperate.png 8bpp 202   10  19   9  14  11 normal
+   -1 sprites/temperate.png 8bpp 234   10  16   9  -7  22 normal
+   -1 sprites/temperate.png 8bpp 266   10  19   9 -31  11 normal
+   -1 sprites/temperate.png 8bpp 298   10  16   9  -7   0 normal
+   -1 sprites/temperate.png 8bpp 330   10   8   6  25  13 normal
+   -1 sprites/temperate.png 8bpp 346   10  12   4  -5  27 normal
+   -1 sprites/temperate.png 8bpp 364   10   8   6 -31  13 normal
+   -1 sprites/temperate.png 8bpp 380   10  12   5  -5   0 normal
+
+   -1 sprites/temperate.png 8bpp  10   40  40  11  -7   0 normal
+   -1 sprites/temperate.png 8bpp  58   40  39  18  -6   5 normal
+   -1 sprites/temperate.png 8bpp 106   40  38  11 -31  12 normal
+   -1 sprites/temperate.png 8bpp 154   40  39  18 -31   0 normal
+   -1 sprites/temperate.png 8bpp 202   40  20   6  13   5 normal
+   -1 sprites/temperate.png 8bpp 234   40  13   7  -6  16 normal
+   -1 sprites/temperate.png 8bpp 266   40  20   6 -31  12 normal
+   -1 sprites/temperate.png 8bpp 298   40  13   7  -5   0 normal
+   -1 sprites/temperate.png 8bpp 330   40   8   5  25   6 normal
+   -1 sprites/temperate.png 8bpp 346   40  12   3  -5  20 normal
+   -1 sprites/temperate.png 8bpp 364   40   8   4 -31  13 normal
+   -1 sprites/temperate.png 8bpp 380   40  15   4  -7   0 normal
+
+   -1 sprites/temperate.png 8bpp  10   70  38  20  -5  -8 normal
+   -1 sprites/temperate.png 8bpp  58   70  38  26  -5   5 normal
+   -1 sprites/temperate.png 8bpp 106   70  37  20 -31  11 normal
+   -1 sprites/temperate.png 8bpp 154   70  38  27 -31  -8 normal
+   -1 sprites/temperate.png 8bpp 202   70  16   9  17   3 normal
+   -1 sprites/temperate.png 8bpp 234   70  15   9  -7  22 normal
+   -1 sprites/temperate.png 8bpp 266   70  16   9 -31  11 normal
+   -1 sprites/temperate.png 8bpp 298   70  15   9  -6  -8 normal
+   -1 sprites/temperate.png 8bpp 330   70   8   7  25   5 normal
+   -1 sprites/temperate.png 8bpp 346   70  10   5  -4  27 normal
+   -1 sprites/temperate.png 8bpp 364   70   8   7 -31  11 normal
+   -1 sprites/temperate.png 8bpp 380   70  12   6  -5  -8 normal
+
+   -1 sprites/temperate.png 8bpp  10  100  39  18  -6   0 normal
+   -1 sprites/temperate.png 8bpp  58  100  38  11  -5  12 normal
+   -1 sprites/temperate.png 8bpp 106  100  39  18 -31   5 normal
+   -1 sprites/temperate.png 8bpp 154  100  40  11 -32   0 normal
+   -1 sprites/temperate.png 8bpp 202  100  20   6  13  12 normal
+   -1 sprites/temperate.png 8bpp 234  100  13   7  -5  16 normal
+   -1 sprites/temperate.png 8bpp 266  100  20   6 -31   5 normal
+   -1 sprites/temperate.png 8bpp 298  100  13   7  -6   0 normal
+   -1 sprites/temperate.png 8bpp 330  100   8   4  26  13 normal
+   -1 sprites/temperate.png 8bpp 346  100  12   3  -5  20 normal
+   -1 sprites/temperate.png 8bpp 364  100   8   5 -31   6 normal
+   -1 sprites/temperate.png 8bpp 380  100  15   4  -6   0 normal
+
+   -1 sprites/temperate.png 8bpp  10  130  38  27  -5  -8 normal
+   -1 sprites/temperate.png 8bpp  58  130  37  20  -4  11 normal
+   -1 sprites/temperate.png 8bpp 106  130  37  26 -31   5 normal
+   -1 sprites/temperate.png 8bpp 154  130  38  20 -31  -8 normal
+   -1 sprites/temperate.png 8bpp 202  130  16   9  17  11 normal
+   -1 sprites/temperate.png 8bpp 234  130  15   9  -6  22 normal
+   -1 sprites/temperate.png 8bpp 266  130  16   9 -31   3 normal
+   -1 sprites/temperate.png 8bpp 298  130  15   9  -7  -8 normal
+   -1 sprites/temperate.png 8bpp 330  130   8   7  25  11 normal
+   -1 sprites/temperate.png 8bpp 346  130  10   5  -4  26 normal
+   -1 sprites/temperate.png 8bpp 364  130   8   7 -31   5 normal
+   -1 sprites/temperate.png 8bpp 380  130  12   6  -5  -8 normal
+   -1 * 7	 02 05 20 01 00 00 00
+
+   -1 * 4	 01 05 01 3C
+   -1 sprites/temperate.png 8bpp  10  210  38  19  -5   0 normal
+   -1 sprites/temperate.png 8bpp  58  210  38  18  -5  13 normal
+   -1 sprites/temperate.png 8bpp 106  210  38  18 -31  13 normal
+   -1 sprites/temperate.png 8bpp 154  210  38  19 -31   0 normal
+   -1 sprites/temperate.png 8bpp 202  210  19   9  14  11 normal
+   -1 sprites/temperate.png 8bpp 234  210  16   9  -7  22 normal
+   -1 sprites/temperate.png 8bpp 266  210  19   9 -31  11 normal
+   -1 sprites/temperate.png 8bpp 298  210  16   9  -7   0 normal
+   -1 sprites/temperate.png 8bpp 330  210   8   6  25  13 normal
+   -1 sprites/temperate.png 8bpp 346  210  12   4  -5  27 normal
+   -1 sprites/temperate.png 8bpp 364  210   8   6 -31  13 normal
+   -1 sprites/temperate.png 8bpp 380  210  12   5  -5   0 normal
+
+   -1 sprites/temperate.png 8bpp  10  240  40  11  -7   0 normal
+   -1 sprites/temperate.png 8bpp  58  240  39  18  -6   5 normal
+   -1 sprites/temperate.png 8bpp 106  240  38  11 -31  12 normal
+   -1 sprites/temperate.png 8bpp 154  240  39  18 -31   0 normal
+   -1 sprites/temperate.png 8bpp 202  240  20   6  13   5 normal
+   -1 sprites/temperate.png 8bpp 234  240  13   7  -6  16 normal
+   -1 sprites/temperate.png 8bpp 266  240  20   6 -31  12 normal
+   -1 sprites/temperate.png 8bpp 298  240  13   7  -5   0 normal
+   -1 sprites/temperate.png 8bpp 330  240   8   5  25   6 normal
+   -1 sprites/temperate.png 8bpp 346  240  12   3  -5  20 normal
+   -1 sprites/temperate.png 8bpp 364  240   8   4 -31  13 normal
+   -1 sprites/temperate.png 8bpp 380  240  15   4  -7   0 normal
+
+   -1 sprites/temperate.png 8bpp  10  270  38  20  -5  -8 normal
+   -1 sprites/temperate.png 8bpp  58  270  38  26  -5   5 normal
+   -1 sprites/temperate.png 8bpp 106  270  37  20 -31  11 normal
+   -1 sprites/temperate.png 8bpp 154  270  38  27 -31  -8 normal
+   -1 sprites/temperate.png 8bpp 202  270  16   9  17   3 normal
+   -1 sprites/temperate.png 8bpp 234  270  15   9  -7  22 normal
+   -1 sprites/temperate.png 8bpp 266  270  16   9 -31  11 normal
+   -1 sprites/temperate.png 8bpp 298  270  15   9  -6  -8 normal
+   -1 sprites/temperate.png 8bpp 330  270   8   7  25   5 normal
+   -1 sprites/temperate.png 8bpp 346  270  10   5  -4  27 normal
+   -1 sprites/temperate.png 8bpp 364  270   8   7 -31  11 normal
+   -1 sprites/temperate.png 8bpp 380  270  12   6  -5  -8 normal
+
+   -1 sprites/temperate.png 8bpp  10  300  39  18  -6   0 normal
+   -1 sprites/temperate.png 8bpp  58  300  38  11  -5  12 normal
+   -1 sprites/temperate.png 8bpp 106  300  39  18 -31   5 normal
+   -1 sprites/temperate.png 8bpp 154  300  40  11 -32   0 normal
+   -1 sprites/temperate.png 8bpp 202  300  20   6  13  12 normal
+   -1 sprites/temperate.png 8bpp 234  300  13   7  -5  16 normal
+   -1 sprites/temperate.png 8bpp 266  300  20   6 -31   5 normal
+   -1 sprites/temperate.png 8bpp 298  300  13   7  -6   0 normal
+   -1 sprites/temperate.png 8bpp 330  300   8   4  26  13 normal
+   -1 sprites/temperate.png 8bpp 346  300  12   3  -5  20 normal
+   -1 sprites/temperate.png 8bpp 364  300   8   5 -31   6 normal
+   -1 sprites/temperate.png 8bpp 380  300  15   4  -6   0 normal
+
+   -1 sprites/temperate.png 8bpp  10  330  38  27  -5  -8 normal
+   -1 sprites/temperate.png 8bpp  58  330  37  20  -4  11 normal
+   -1 sprites/temperate.png 8bpp 106  330  37  26 -31   5 normal
+   -1 sprites/temperate.png 8bpp 154  330  38  20 -31  -8 normal
+   -1 sprites/temperate.png 8bpp 202  330  16   9  17  11 normal
+   -1 sprites/temperate.png 8bpp 234  330  15   9  -6  22 normal
+   -1 sprites/temperate.png 8bpp 266  330  16   9 -31   3 normal
+   -1 sprites/temperate.png 8bpp 298  330  15   9  -7  -8 normal
+   -1 sprites/temperate.png 8bpp 330  330   8   7  25  11 normal
+   -1 sprites/temperate.png 8bpp 346  330  10   5  -4  26 normal
+   -1 sprites/temperate.png 8bpp 364  330   8   7 -31   5 normal
+   -1 sprites/temperate.png 8bpp 380  330  12   6  -5  -8 normal
+   -1 * 7	 02 05 21 01 00 00 00
+
+   -1 * 14	 02 05 22 81 80 00 FF 01 20 00 00 00 21 00
+   -1 * 6	 07 83 01 \7! 00 01
+   -1 * 7	 03 05 01 06 00 22 00
@@ -0,0 +1,146 @@
+//
+// $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 "Toyland river graphics by andythenorth (Andrew Parkhouse)"
+   -1 * 4	 01 05 01 3C
+   -1 sprites/toyland.png 8bpp  10   10  38  19  -5   0 normal
+   -1 sprites/toyland.png 8bpp  58   10  38  18  -5  13 normal
+   -1 sprites/toyland.png 8bpp 106   10  38  18 -31  13 normal
+   -1 sprites/toyland.png 8bpp 154   10  38  19 -31   0 normal
+   -1 sprites/toyland.png 8bpp 202   10  19   9  14  11 normal
+   -1 sprites/toyland.png 8bpp 234   10  16   9  -7  22 normal
+   -1 sprites/toyland.png 8bpp 266   10  19   9 -31  11 normal
+   -1 sprites/toyland.png 8bpp 298   10  16   9  -7   0 normal
+   -1 sprites/toyland.png 8bpp 330   10   8   6  25  13 normal
+   -1 sprites/toyland.png 8bpp 346   10  12   4  -5  27 normal
+   -1 sprites/toyland.png 8bpp 364   10   8   6 -31  13 normal
+   -1 sprites/toyland.png 8bpp 380   10  12   5  -5   0 normal
+
+   -1 sprites/toyland.png 8bpp  10   40  40  11  -7   0 normal
+   -1 sprites/toyland.png 8bpp  58   40  39  18  -6   5 normal
+   -1 sprites/toyland.png 8bpp 106   40  38  11 -31  12 normal
+   -1 sprites/toyland.png 8bpp 154   40  39  18 -31   0 normal
+   -1 sprites/toyland.png 8bpp 202   40  20   6  13   5 normal
+   -1 sprites/toyland.png 8bpp 234   40  13   7  -6  16 normal
+   -1 sprites/toyland.png 8bpp 266   40  20   6 -31  12 normal
+   -1 sprites/toyland.png 8bpp 298   40  13   7  -5   0 normal
+   -1 sprites/toyland.png 8bpp 330   40   8   5  25   6 normal
+   -1 sprites/toyland.png 8bpp 346   40  12   3  -5  20 normal
+   -1 sprites/toyland.png 8bpp 364   40   8   4 -31  13 normal
+   -1 sprites/toyland.png 8bpp 380   40  15   4  -7   0 normal
+
+   -1 sprites/toyland.png 8bpp  10   70  38  20  -5  -8 normal
+   -1 sprites/toyland.png 8bpp  58   70  38  26  -5   5 normal
+   -1 sprites/toyland.png 8bpp 106   70  37  20 -31  11 normal
+   -1 sprites/toyland.png 8bpp 154   70  38  27 -31  -8 normal
+   -1 sprites/toyland.png 8bpp 202   70  16   9  17   3 normal
+   -1 sprites/toyland.png 8bpp 234   70  15   9  -7  22 normal
+   -1 sprites/toyland.png 8bpp 266   70  16   9 -31  11 normal
+   -1 sprites/toyland.png 8bpp 298   70  15   9  -6  -8 normal
+   -1 sprites/toyland.png 8bpp 330   70   8   7  25   5 normal
+   -1 sprites/toyland.png 8bpp 346   70  10   5  -4  27 normal
+   -1 sprites/toyland.png 8bpp 364   70   8   7 -31  11 normal
+   -1 sprites/toyland.png 8bpp 380   70  12   6  -5  -8 normal
+
+   -1 sprites/toyland.png 8bpp  10  100  39  18  -6   0 normal
+   -1 sprites/toyland.png 8bpp  58  100  38  11  -5  12 normal
+   -1 sprites/toyland.png 8bpp 106  100  39  18 -31   5 normal
+   -1 sprites/toyland.png 8bpp 154  100  40  11 -32   0 normal
+   -1 sprites/toyland.png 8bpp 202  100  20   6  13  12 normal
+   -1 sprites/toyland.png 8bpp 234  100  13   7  -5  16 normal
+   -1 sprites/toyland.png 8bpp 266  100  20   6 -31   5 normal
+   -1 sprites/toyland.png 8bpp 298  100  13   7  -6   0 normal
+   -1 sprites/toyland.png 8bpp 330  100   8   4  26  13 normal
+   -1 sprites/toyland.png 8bpp 346  100  12   3  -5  20 normal
+   -1 sprites/toyland.png 8bpp 364  100   8   5 -31   6 normal
+   -1 sprites/toyland.png 8bpp 380  100  15   4  -6   0 normal
+
+   -1 sprites/toyland.png 8bpp  10  130  38  27  -5  -8 normal
+   -1 sprites/toyland.png 8bpp  58  130  37  20  -4  11 normal
+   -1 sprites/toyland.png 8bpp 106  130  37  26 -31   5 normal
+   -1 sprites/toyland.png 8bpp 154  130  38  20 -31  -8 normal
+   -1 sprites/toyland.png 8bpp 202  130  16   9  17  11 normal
+   -1 sprites/toyland.png 8bpp 234  130  15   9  -6  22 normal
+   -1 sprites/toyland.png 8bpp 266  130  16   9 -31   3 normal
+   -1 sprites/toyland.png 8bpp 298  130  15   9  -7  -8 normal
+   -1 sprites/toyland.png 8bpp 330  130   8   7  25  11 normal
+   -1 sprites/toyland.png 8bpp 346  130  10   5  -4  26 normal
+   -1 sprites/toyland.png 8bpp 364  130   8   7 -31   5 normal
+   -1 sprites/toyland.png 8bpp 380  130  12   6  -5  -8 normal
+   -1 * 7	 02 05 50 01 00 00 00
+
+   -1 * 4	 01 05 01 3C
+   -1 sprites/toyland.png 8bpp  10  210  38  19  -5   0 normal
+   -1 sprites/toyland.png 8bpp  58  210  38  18  -5  13 normal
+   -1 sprites/toyland.png 8bpp 106  210  38  18 -31  13 normal
+   -1 sprites/toyland.png 8bpp 154  210  38  19 -31   0 normal
+   -1 sprites/toyland.png 8bpp 202  210  19   9  14  11 normal
+   -1 sprites/toyland.png 8bpp 234  210  16   9  -7  22 normal
+   -1 sprites/toyland.png 8bpp 266  210  19   9 -31  11 normal
+   -1 sprites/toyland.png 8bpp 298  210  16   9  -7   0 normal
+   -1 sprites/toyland.png 8bpp 330  210   8   6  25  13 normal
+   -1 sprites/toyland.png 8bpp 346  210  12   4  -5  27 normal
+   -1 sprites/toyland.png 8bpp 364  210   8   6 -31  13 normal
+   -1 sprites/toyland.png 8bpp 380  210  12   5  -5   0 normal
+
+   -1 sprites/toyland.png 8bpp  10  240  40  11  -7   0 normal
+   -1 sprites/toyland.png 8bpp  58  240  39  18  -6   5 normal
+   -1 sprites/toyland.png 8bpp 106  240  38  11 -31  12 normal
+   -1 sprites/toyland.png 8bpp 154  240  39  18 -31   0 normal
+   -1 sprites/toyland.png 8bpp 202  240  20   6  13   5 normal
+   -1 sprites/toyland.png 8bpp 234  240  13   7  -6  16 normal
+   -1 sprites/toyland.png 8bpp 266  240  20   6 -31  12 normal
+   -1 sprites/toyland.png 8bpp 298  240  13   7  -5   0 normal
+   -1 sprites/toyland.png 8bpp 330  240   8   5  25   6 normal
+   -1 sprites/toyland.png 8bpp 346  240  12   3  -5  20 normal
+   -1 sprites/toyland.png 8bpp 364  240   8   4 -31  13 normal
+   -1 sprites/toyland.png 8bpp 380  240  15   4  -7   0 normal
+
+   -1 sprites/toyland.png 8bpp  10  270  38  20  -5  -8 normal
+   -1 sprites/toyland.png 8bpp  58  270  38  26  -5   5 normal
+   -1 sprites/toyland.png 8bpp 106  270  37  20 -31  11 normal
+   -1 sprites/toyland.png 8bpp 154  270  38  27 -31  -8 normal
+   -1 sprites/toyland.png 8bpp 202  270  16   9  17   3 normal
+   -1 sprites/toyland.png 8bpp 234  270  15   9  -7  22 normal
+   -1 sprites/toyland.png 8bpp 266  270  16   9 -31  11 normal
+   -1 sprites/toyland.png 8bpp 298  270  15   9  -6  -8 normal
+   -1 sprites/toyland.png 8bpp 330  270   8   7  25   5 normal
+   -1 sprites/toyland.png 8bpp 346  270  10   5  -4  27 normal
+   -1 sprites/toyland.png 8bpp 364  270   8   7 -31  11 normal
+   -1 sprites/toyland.png 8bpp 380  270  12   6  -5  -8 normal
+
+   -1 sprites/toyland.png 8bpp  10  300  39  18  -6   0 normal
+   -1 sprites/toyland.png 8bpp  58  300  38  11  -5  12 normal
+   -1 sprites/toyland.png 8bpp 106  300  39  18 -31   5 normal
+   -1 sprites/toyland.png 8bpp 154  300  40  11 -32   0 normal
+   -1 sprites/toyland.png 8bpp 202  300  20   6  13  12 normal
+   -1 sprites/toyland.png 8bpp 234  300  13   7  -5  16 normal
+   -1 sprites/toyland.png 8bpp 266  300  20   6 -31   5 normal
+   -1 sprites/toyland.png 8bpp 298  300  13   7  -6   0 normal
+   -1 sprites/toyland.png 8bpp 330  300   8   4  26  13 normal
+   -1 sprites/toyland.png 8bpp 346  300  12   3  -5  20 normal
+   -1 sprites/toyland.png 8bpp 364  300   8   5 -31   6 normal
+   -1 sprites/toyland.png 8bpp 380  300  15   4  -6   0 normal
+
+   -1 sprites/toyland.png 8bpp  10  330  38  27  -5  -8 normal
+   -1 sprites/toyland.png 8bpp  58  330  37  20  -4  11 normal
+   -1 sprites/toyland.png 8bpp 106  330  37  26 -31   5 normal
+   -1 sprites/toyland.png 8bpp 154  330  38  20 -31  -8 normal
+   -1 sprites/toyland.png 8bpp 202  330  16   9  17  11 normal
+   -1 sprites/toyland.png 8bpp 234  330  15   9  -6  22 normal
+   -1 sprites/toyland.png 8bpp 266  330  16   9 -31   3 normal
+   -1 sprites/toyland.png 8bpp 298  330  15   9  -7  -8 normal
+   -1 sprites/toyland.png 8bpp 330  330   8   7  25  11 normal
+   -1 sprites/toyland.png 8bpp 346  330  10   5  -4  26 normal
+   -1 sprites/toyland.png 8bpp 364  330   8   7 -31   5 normal
+   -1 sprites/toyland.png 8bpp 380  330  12   6  -5  -8 normal
+   -1 * 7	 02 05 51 01 00 00 00
+
+   -1 * 14	 02 05 52 81 80 00 FF 01 50 00 00 00 51 00
+   -1 * 6	 07 83 01 \7! 03 01
+   -1 * 7	 03 05 01 06 00 52 00
@@ -0,0 +1,282 @@
+//
+// $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 "Tropic river graphics by andythenorth (Andrew Parkhouse)"
+   -1 * 4	 01 05 01 3C
+   -1 sprites/tropic_desert.png 8bpp  10   10  38  19  -5   0 normal
+   -1 sprites/tropic_desert.png 8bpp  58   10  38  18  -5  13 normal
+   -1 sprites/tropic_desert.png 8bpp 106   10  38  18 -31  13 normal
+   -1 sprites/tropic_desert.png 8bpp 154   10  38  19 -31   0 normal
+   -1 sprites/tropic_desert.png 8bpp 202   10  19   9  14  11 normal
+   -1 sprites/tropic_desert.png 8bpp 234   10  16   9  -7  22 normal
+   -1 sprites/tropic_desert.png 8bpp 266   10  19   9 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 298   10  16   9  -7   0 normal
+   -1 sprites/tropic_desert.png 8bpp 330   10   8   6  25  13 normal
+   -1 sprites/tropic_desert.png 8bpp 346   10  12   4  -5  27 normal
+   -1 sprites/tropic_desert.png 8bpp 364   10   8   6 -31  13 normal
+   -1 sprites/tropic_desert.png 8bpp 380   10  12   5  -5   0 normal
+
+   -1 sprites/tropic_desert.png 8bpp  10   40  40  11  -7   0 normal
+   -1 sprites/tropic_desert.png 8bpp  58   40  39  18  -6   5 normal
+   -1 sprites/tropic_desert.png 8bpp 106   40  38  11 -31  12 normal
+   -1 sprites/tropic_desert.png 8bpp 154   40  39  18 -31   0 normal
+   -1 sprites/tropic_desert.png 8bpp 202   40  20   6  13   5 normal
+   -1 sprites/tropic_desert.png 8bpp 234   40  13   7  -6  16 normal
+   -1 sprites/tropic_desert.png 8bpp 266   40  20   6 -31  12 normal
+   -1 sprites/tropic_desert.png 8bpp 298   40  13   7  -5   0 normal
+   -1 sprites/tropic_desert.png 8bpp 330   40   8   5  25   6 normal
+   -1 sprites/tropic_desert.png 8bpp 346   40  12   3  -5  20 normal
+   -1 sprites/tropic_desert.png 8bpp 364   40   8   4 -31  13 normal
+   -1 sprites/tropic_desert.png 8bpp 380   40  15   4  -7   0 normal
+
+   -1 sprites/tropic_desert.png 8bpp  10   70  38  20  -5  -8 normal
+   -1 sprites/tropic_desert.png 8bpp  58   70  38  26  -5   5 normal
+   -1 sprites/tropic_desert.png 8bpp 106   70  37  20 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 154   70  38  27 -31  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 202   70  16   9  17   3 normal
+   -1 sprites/tropic_desert.png 8bpp 234   70  15   9  -7  22 normal
+   -1 sprites/tropic_desert.png 8bpp 266   70  16   9 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 298   70  15   9  -6  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 330   70   8   7  25   5 normal
+   -1 sprites/tropic_desert.png 8bpp 346   70  10   5  -4  27 normal
+   -1 sprites/tropic_desert.png 8bpp 364   70   8   7 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 380   70  12   6  -5  -8 normal
+
+   -1 sprites/tropic_desert.png 8bpp  10  100  39  18  -6   0 normal
+   -1 sprites/tropic_desert.png 8bpp  58  100  38  11  -5  12 normal
+   -1 sprites/tropic_desert.png 8bpp 106  100  39  18 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 154  100  40  11 -32   0 normal
+   -1 sprites/tropic_desert.png 8bpp 202  100  20   6  13  12 normal
+   -1 sprites/tropic_desert.png 8bpp 234  100  13   7  -5  16 normal
+   -1 sprites/tropic_desert.png 8bpp 266  100  20   6 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 298  100  13   7  -6   0 normal
+   -1 sprites/tropic_desert.png 8bpp 330  100   8   4  26  13 normal
+   -1 sprites/tropic_desert.png 8bpp 346  100  12   3  -5  20 normal
+   -1 sprites/tropic_desert.png 8bpp 364  100   8   5 -31   6 normal
+   -1 sprites/tropic_desert.png 8bpp 380  100  15   4  -6   0 normal
+
+   -1 sprites/tropic_desert.png 8bpp  10  130  38  27  -5  -8 normal
+   -1 sprites/tropic_desert.png 8bpp  58  130  37  20  -4  11 normal
+   -1 sprites/tropic_desert.png 8bpp 106  130  37  26 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 154  130  38  20 -31  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 202  130  16   9  17  11 normal
+   -1 sprites/tropic_desert.png 8bpp 234  130  15   9  -6  22 normal
+   -1 sprites/tropic_desert.png 8bpp 266  130  16   9 -31   3 normal
+   -1 sprites/tropic_desert.png 8bpp 298  130  15   9  -7  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 330  130   8   7  25  11 normal
+   -1 sprites/tropic_desert.png 8bpp 346  130  10   5  -4  26 normal
+   -1 sprites/tropic_desert.png 8bpp 364  130   8   7 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 380  130  12   6  -5  -8 normal
+   -1 * 7	 02 05 40 01 00 00 00
+
+   -1 * 4	 01 05 01 3C
+   -1 sprites/tropic_forest.png 8bpp  10   10  38  19  -5   0 normal
+   -1 sprites/tropic_forest.png 8bpp  58   10  38  18  -5  13 normal
+   -1 sprites/tropic_forest.png 8bpp 106   10  38  18 -31  13 normal
+   -1 sprites/tropic_forest.png 8bpp 154   10  38  19 -31   0 normal
+   -1 sprites/tropic_forest.png 8bpp 202   10  19   9  14  11 normal
+   -1 sprites/tropic_forest.png 8bpp 234   10  16   9  -7  22 normal
+   -1 sprites/tropic_forest.png 8bpp 266   10  19   9 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 298   10  16   9  -7   0 normal
+   -1 sprites/tropic_forest.png 8bpp 330   10   8   6  25  13 normal
+   -1 sprites/tropic_forest.png 8bpp 346   10  12   4  -5  27 normal
+   -1 sprites/tropic_forest.png 8bpp 364   10   8   6 -31  13 normal
+   -1 sprites/tropic_forest.png 8bpp 380   10  12   5  -5   0 normal
+
+   -1 sprites/tropic_forest.png 8bpp  10   40  40  11  -7   0 normal
+   -1 sprites/tropic_forest.png 8bpp  58   40  39  18  -6   5 normal
+   -1 sprites/tropic_forest.png 8bpp 106   40  38  11 -31  12 normal
+   -1 sprites/tropic_forest.png 8bpp 154   40  39  18 -31   0 normal
+   -1 sprites/tropic_forest.png 8bpp 202   40  20   6  13   5 normal
+   -1 sprites/tropic_forest.png 8bpp 234   40  13   7  -6  16 normal
+   -1 sprites/tropic_forest.png 8bpp 266   40  20   6 -31  12 normal
+   -1 sprites/tropic_forest.png 8bpp 298   40  13   7  -5   0 normal
+   -1 sprites/tropic_forest.png 8bpp 330   40   8   5  25   6 normal
+   -1 sprites/tropic_forest.png 8bpp 346   40  12   3  -5  20 normal
+   -1 sprites/tropic_forest.png 8bpp 364   40   8   4 -31  13 normal
+   -1 sprites/tropic_forest.png 8bpp 380   40  15   4  -7   0 normal
+
+   -1 sprites/tropic_forest.png 8bpp  10   70  38  20  -5  -8 normal
+   -1 sprites/tropic_forest.png 8bpp  58   70  38  26  -5   5 normal
+   -1 sprites/tropic_forest.png 8bpp 106   70  37  20 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 154   70  38  27 -31  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 202   70  16   9  17   3 normal
+   -1 sprites/tropic_forest.png 8bpp 234   70  15   9  -7  22 normal
+   -1 sprites/tropic_forest.png 8bpp 266   70  16   9 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 298   70  15   9  -6  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 330   70   8   7  25   5 normal
+   -1 sprites/tropic_forest.png 8bpp 346   70  10   5  -4  27 normal
+   -1 sprites/tropic_forest.png 8bpp 364   70   8   7 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 380   70  12   6  -5  -8 normal
+
+   -1 sprites/tropic_forest.png 8bpp  10  100  39  18  -6   0 normal
+   -1 sprites/tropic_forest.png 8bpp  58  100  38  11  -5  12 normal
+   -1 sprites/tropic_forest.png 8bpp 106  100  39  18 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 154  100  40  11 -32   0 normal
+   -1 sprites/tropic_forest.png 8bpp 202  100  20   6  13  12 normal
+   -1 sprites/tropic_forest.png 8bpp 234  100  13   7  -5  16 normal
+   -1 sprites/tropic_forest.png 8bpp 266  100  20   6 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 298  100  13   7  -6   0 normal
+   -1 sprites/tropic_forest.png 8bpp 330  100   8   4  26  13 normal
+   -1 sprites/tropic_forest.png 8bpp 346  100  12   3  -5  20 normal
+   -1 sprites/tropic_forest.png 8bpp 364  100   8   5 -31   6 normal
+   -1 sprites/tropic_forest.png 8bpp 380  100  15   4  -6   0 normal
+
+   -1 sprites/tropic_forest.png 8bpp  10  130  38  27  -5  -8 normal
+   -1 sprites/tropic_forest.png 8bpp  58  130  37  20  -4  11 normal
+   -1 sprites/tropic_forest.png 8bpp 106  130  37  26 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 154  130  38  20 -31  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 202  130  16   9  17  11 normal
+   -1 sprites/tropic_forest.png 8bpp 234  130  15   9  -6  22 normal
+   -1 sprites/tropic_forest.png 8bpp 266  130  16   9 -31   3 normal
+   -1 sprites/tropic_forest.png 8bpp 298  130  15   9  -7  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 330  130   8   7  25  11 normal
+   -1 sprites/tropic_forest.png 8bpp 346  130  10   5  -4  26 normal
+   -1 sprites/tropic_forest.png 8bpp 364  130   8   7 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 380  130  12   6  -5  -8 normal
+   -1 * 7	 02 05 41 01 00 00 00
+
+   -1 * 4	 01 05 01 3C
+   -1 sprites/tropic_desert.png 8bpp  10  210  38  19  -5   0 normal
+   -1 sprites/tropic_desert.png 8bpp  58  210  38  18  -5  13 normal
+   -1 sprites/tropic_desert.png 8bpp 106  210  38  18 -31  13 normal
+   -1 sprites/tropic_desert.png 8bpp 154  210  38  19 -31   0 normal
+   -1 sprites/tropic_desert.png 8bpp 202  210  19   9  14  11 normal
+   -1 sprites/tropic_desert.png 8bpp 234  210  16   9  -7  22 normal
+   -1 sprites/tropic_desert.png 8bpp 266  210  19   9 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 298  210  16   9  -7   0 normal
+   -1 sprites/tropic_desert.png 8bpp 330  210   8   6  25  13 normal
+   -1 sprites/tropic_desert.png 8bpp 346  210  12   4  -5  27 normal
+   -1 sprites/tropic_desert.png 8bpp 364  210   8   6 -31  13 normal
+   -1 sprites/tropic_desert.png 8bpp 380  210  12   5  -5   0 normal
+
+   -1 sprites/tropic_desert.png 8bpp  10  240  40  11  -7   0 normal
+   -1 sprites/tropic_desert.png 8bpp  58  240  39  18  -6   5 normal
+   -1 sprites/tropic_desert.png 8bpp 106  240  38  11 -31  12 normal
+   -1 sprites/tropic_desert.png 8bpp 154  240  39  18 -31   0 normal
+   -1 sprites/tropic_desert.png 8bpp 202  240  20   6  13   5 normal
+   -1 sprites/tropic_desert.png 8bpp 234  240  13   7  -6  16 normal
+   -1 sprites/tropic_desert.png 8bpp 266  240  20   6 -31  12 normal
+   -1 sprites/tropic_desert.png 8bpp 298  240  13   7  -5   0 normal
+   -1 sprites/tropic_desert.png 8bpp 330  240   8   5  25   6 normal
+   -1 sprites/tropic_desert.png 8bpp 346  240  12   3  -5  20 normal
+   -1 sprites/tropic_desert.png 8bpp 364  240   8   4 -31  13 normal
+   -1 sprites/tropic_desert.png 8bpp 380  240  15   4  -7   0 normal
+
+   -1 sprites/tropic_desert.png 8bpp  10  270  38  20  -5  -8 normal
+   -1 sprites/tropic_desert.png 8bpp  58  270  38  26  -5   5 normal
+   -1 sprites/tropic_desert.png 8bpp 106  270  37  20 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 154  270  38  27 -31  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 202  270  16   9  17   3 normal
+   -1 sprites/tropic_desert.png 8bpp 234  270  15   9  -7  22 normal
+   -1 sprites/tropic_desert.png 8bpp 266  270  16   9 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 298  270  15   9  -6  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 330  270   8   7  25   5 normal
+   -1 sprites/tropic_desert.png 8bpp 346  270  10   5  -4  27 normal
+   -1 sprites/tropic_desert.png 8bpp 364  270   8   7 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 380  270  12   6  -5  -8 normal
+
+   -1 sprites/tropic_desert.png 8bpp  10  300  39  18  -6   0 normal
+   -1 sprites/tropic_desert.png 8bpp  58  300  38  11  -5  12 normal
+   -1 sprites/tropic_desert.png 8bpp 106  300  39  18 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 154  300  40  11 -32   0 normal
+   -1 sprites/tropic_desert.png 8bpp 202  300  20   6  13  12 normal
+   -1 sprites/tropic_desert.png 8bpp 234  300  13   7  -5  16 normal
+   -1 sprites/tropic_desert.png 8bpp 266  300  20   6 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 298  300  13   7  -6   0 normal
+   -1 sprites/tropic_desert.png 8bpp 330  300   8   4  26  13 normal
+   -1 sprites/tropic_desert.png 8bpp 346  300  12   3  -5  20 normal
+   -1 sprites/tropic_desert.png 8bpp 364  300   8   5 -31   6 normal
+   -1 sprites/tropic_desert.png 8bpp 380  300  15   4  -6   0 normal
+
+   -1 sprites/tropic_desert.png 8bpp  10  330  38  27  -5  -8 normal
+   -1 sprites/tropic_desert.png 8bpp  58  330  37  20  -4  11 normal
+   -1 sprites/tropic_desert.png 8bpp 106  330  37  26 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 154  330  38  20 -31  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 202  330  16   9  17  11 normal
+   -1 sprites/tropic_desert.png 8bpp 234  330  15   9  -6  22 normal
+   -1 sprites/tropic_desert.png 8bpp 266  330  16   9 -31   3 normal
+   -1 sprites/tropic_desert.png 8bpp 298  330  15   9  -7  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 330  330   8   7  25  11 normal
+   -1 sprites/tropic_desert.png 8bpp 346  330  10   5  -4  26 normal
+   -1 sprites/tropic_desert.png 8bpp 364  330   8   7 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 380  330  12   6  -5  -8 normal
+   -1 * 7	 02 05 42 01 00 00 00
+
+   -1 * 4	 01 05 01 3C
+   -1 sprites/tropic_forest.png 8bpp  10  210  38  19  -5   0 normal
+   -1 sprites/tropic_forest.png 8bpp  58  210  38  18  -5  13 normal
+   -1 sprites/tropic_forest.png 8bpp 106  210  38  18 -31  13 normal
+   -1 sprites/tropic_forest.png 8bpp 154  210  38  19 -31   0 normal
+   -1 sprites/tropic_forest.png 8bpp 202  210  19   9  14  11 normal
+   -1 sprites/tropic_forest.png 8bpp 234  210  16   9  -7  22 normal
+   -1 sprites/tropic_forest.png 8bpp 266  210  19   9 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 298  210  16   9  -7   0 normal
+   -1 sprites/tropic_forest.png 8bpp 330  210   8   6  25  13 normal
+   -1 sprites/tropic_forest.png 8bpp 346  210  12   4  -5  27 normal
+   -1 sprites/tropic_forest.png 8bpp 364  210   8   6 -31  13 normal
+   -1 sprites/tropic_forest.png 8bpp 380  210  12   5  -5   0 normal
+
+   -1 sprites/tropic_forest.png 8bpp  10  240  40  11  -7   0 normal
+   -1 sprites/tropic_forest.png 8bpp  58  240  39  18  -6   5 normal
+   -1 sprites/tropic_forest.png 8bpp 106  240  38  11 -31  12 normal
+   -1 sprites/tropic_forest.png 8bpp 154  240  39  18 -31   0 normal
+   -1 sprites/tropic_forest.png 8bpp 202  240  20   6  13   5 normal
+   -1 sprites/tropic_forest.png 8bpp 234  240  13   7  -6  16 normal
+   -1 sprites/tropic_forest.png 8bpp 266  240  20   6 -31  12 normal
+   -1 sprites/tropic_forest.png 8bpp 298  240  13   7  -5   0 normal
+   -1 sprites/tropic_forest.png 8bpp 330  240   8   5  25   6 normal
+   -1 sprites/tropic_forest.png 8bpp 346  240  12   3  -5  20 normal
+   -1 sprites/tropic_forest.png 8bpp 364  240   8   4 -31  13 normal
+   -1 sprites/tropic_forest.png 8bpp 380  240  15   4  -7   0 normal
+
+   -1 sprites/tropic_forest.png 8bpp  10  270  38  20  -5  -8 normal
+   -1 sprites/tropic_forest.png 8bpp  58  270  38  26  -5   5 normal
+   -1 sprites/tropic_forest.png 8bpp 106  270  37  20 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 154  270  38  27 -31  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 202  270  16   9  17   3 normal
+   -1 sprites/tropic_forest.png 8bpp 234  270  15   9  -7  22 normal
+   -1 sprites/tropic_forest.png 8bpp 266  270  16   9 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 298  270  15   9  -6  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 330  270   8   7  25   5 normal
+   -1 sprites/tropic_forest.png 8bpp 346  270  10   5  -4  27 normal
+   -1 sprites/tropic_forest.png 8bpp 364  270   8   7 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 380  270  12   6  -5  -8 normal
+
+   -1 sprites/tropic_forest.png 8bpp  10  300  39  18  -6   0 normal
+   -1 sprites/tropic_forest.png 8bpp  58  300  38  11  -5  12 normal
+   -1 sprites/tropic_forest.png 8bpp 106  300  39  18 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 154  300  40  11 -32   0 normal
+   -1 sprites/tropic_forest.png 8bpp 202  300  20   6  13  12 normal
+   -1 sprites/tropic_forest.png 8bpp 234  300  13   7  -5  16 normal
+   -1 sprites/tropic_forest.png 8bpp 266  300  20   6 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 298  300  13   7  -6   0 normal
+   -1 sprites/tropic_forest.png 8bpp 330  300   8   4  26  13 normal
+   -1 sprites/tropic_forest.png 8bpp 346  300  12   3  -5  20 normal
+   -1 sprites/tropic_forest.png 8bpp 364  300   8   5 -31   6 normal
+   -1 sprites/tropic_forest.png 8bpp 380  300  15   4  -6   0 normal
+
+   -1 sprites/tropic_forest.png 8bpp  10  330  38  27  -5  -8 normal
+   -1 sprites/tropic_forest.png 8bpp  58  330  37  20  -4  11 normal
+   -1 sprites/tropic_forest.png 8bpp 106  330  37  26 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 154  330  38  20 -31  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 202  330  16   9  17  11 normal
+   -1 sprites/tropic_forest.png 8bpp 234  330  15   9  -6  22 normal
+   -1 sprites/tropic_forest.png 8bpp 266  330  16   9 -31   3 normal
+   -1 sprites/tropic_forest.png 8bpp 298  330  15   9  -7  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 330  330   8   7  25  11 normal
+   -1 sprites/tropic_forest.png 8bpp 346  330  10   5  -4  26 normal
+   -1 sprites/tropic_forest.png 8bpp 364  330   8   7 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 380  330  12   6  -5  -8 normal
+   -1 * 7	 02 05 43 01 00 00 00
+
+   -1 * 14	 02 05 44 81 81 00 FF 01 40 00 01 01 41 00
+   -1 * 14	 02 05 45 81 81 00 FF 01 42 00 01 01 43 00
+   -1 * 14	 02 05 46 81 80 00 FF 01 44 00 00 00 45 00
+   -1 * 6	 07 83 01 \7! 02 01
+   -1 * 7	 03 05 01 06 00 46 00
@@ -8,11 +8,11 @@
 //
   -1 * 0	 0C "Road stop graphics"
   -1 * 3	 05 11 08
-   -1 sprites/roadstops.png 34 8 09 23 13 5 -11
-   -1 sprites/roadstops.png 66 8 09 15 13 5 -2
-   -1 sprites/roadstops.png 98 8 09 19 21 -20 -7
-   -1 sprites/roadstops.png 130 8 09 17 22 -25 -4
-   -1 sprites/roadstops.png 162 8 09 25 32 -5 -9
-   -1 sprites/roadstops.png 210 8 09 26 28 -3 -12
-   -1 sprites/roadstops.png 258 8 09 25 29 -24 -12
-   -1 sprites/roadstops.png 306 8 09 25 32 -25 -9
+   -1 sprites/roadstops.png 8bpp  34    8  13  23   5 -11 normal
+   -1 sprites/roadstops.png 8bpp  66    8  13  15   5  -2 normal
+   -1 sprites/roadstops.png 8bpp  98    8  21  19 -20  -7 normal
+   -1 sprites/roadstops.png 8bpp 130    8  22  17 -25  -4 normal
+   -1 sprites/roadstops.png 8bpp 162    8  32  25  -5  -9 normal
+   -1 sprites/roadstops.png 8bpp 210    8  28  26  -3 -12 normal
+   -1 sprites/roadstops.png 8bpp 258    8  29  25 -24 -12 normal
+   -1 sprites/roadstops.png 8bpp 306    8  32  25 -25  -9 normal
@@ -5,71 +5,57 @@
 // 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/>.
-//
-
-//
-// -- NFO Renum 'settings' --
-// Do not make nforenum warn about the fact that we use an incorrect number of shores
-// @@WARNING DISABLE 60
-// -- End of NFO Renum 'settings' --
 //

   -1 * 6	 07 83 01 \7! 00 0C
   -1 * 54	 0C "Missing shore tile graphics for the temperate climate"
   -1 * 3	 05 0D 0A
-   -1 sprites/shore.png 82 8 09 15 64 -31 0
-   -1 sprites/shore.png 162 8 09 31 64 -31 -8
-   -1 sprites/shore.png 242 8 09 23 64 -31 0
-   -1 sprites/shore.png 322 8 09 47 64 -31 -16
-   -1 sprites/shore.png 402 8 09 31 64 -31 -8
-   -1 sprites/shore.png 482 8 09 39 64 -31 -8
-   -1 sprites/shore.png 562 8 09 31 64 -31 -8
-   -1 sprites/shore.png 642 8 09 31 64 -31 -8
-   -1 sprites/shore.png 722 8 09 32 64 -31 -1
-   -1 sprites/shore.png 2 72 09 31 64 -31 -8
+   -1 sprites/shore.png 8bpp  82    8  64  15 -31   0 normal
+   -1 sprites/shore.png 8bpp 162    8  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 242    8  64  23 -31   0 normal
+   -1 sprites/shore.png 8bpp 322    8  64  47 -31 -16 normal
+   -1 sprites/shore.png 8bpp 402    8  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 482    8  64  39 -31  -8 normal
+   -1 sprites/shore.png 8bpp 562    8  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 642    8  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 722    8  64  32 -31  -1 normal
+   -1 sprites/shore.png 8bpp   2   72  64  31 -31  -8 normal
   -1 * 6	 07 83 01 \7! 01 0C
   -1 * 55	 0C "Missing shore tile graphics for the sub-arctic climate"
   -1 * 3	 05 0D 0A
-   -1 sprites/shore.png 130 72 09 15 64 -31 0
-   -1 sprites/shore.png 210 72 09 31 64 -31 -8
-   -1 sprites/shore.png 290 72 09 23 64 -31 0
-   -1 sprites/shore.png 370 72 09 47 64 -31 -16
-   -1 sprites/shore.png 450 72 09 31 64 -31 -8
-   -1 sprites/shore.png 530 72 09 39 64 -31 -8
-   -1 sprites/shore.png 610 72 09 31 64 -31 -8
-   -1 sprites/shore.png 690 72 09 31 64 -31 -8
-   -1 sprites/shore.png 2 136 09 32 64 -31 -1
-   -1 sprites/shore.png 82 136 09 31 64 -31 -8
+   -1 sprites/shore.png 8bpp 130   72  64  15 -31   0 normal
+   -1 sprites/shore.png 8bpp 210   72  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 290   72  64  23 -31   0 normal
+   -1 sprites/shore.png 8bpp 370   72  64  47 -31 -16 normal
+   -1 sprites/shore.png 8bpp 450   72  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 530   72  64  39 -31  -8 normal
+   -1 sprites/shore.png 8bpp 610   72  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 690   72  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp   2  136  64  32 -31  -1 normal
+   -1 sprites/shore.png 8bpp  82  136  64  31 -31  -8 normal
   -1 * 6	 07 83 01 \7! 02 0C
   -1 * 57	 0C "Missing shore tile graphics for the sub-tropical climate"
   -1 * 3	 05 0D 0A
-   -1 sprites/shore.png 210 136 09 15 64 -31 0
-   -1 sprites/shore.png 290 136 09 31 64 -31 -8
-   -1 sprites/shore.png 370 136 09 23 64 -31 0
-   -1 sprites/shore.png 450 136 09 47 64 -31 -16
-   -1 sprites/shore.png 530 136 09 31 64 -31 -8
-   -1 sprites/shore.png 610 136 09 39 64 -31 -8
-   -1 sprites/shore.png 690 136 09 31 64 -31 -8
-   -1 sprites/shore.png 2 200 09 31 64 -31 -8
-   -1 sprites/shore.png 82 200 09 32 64 -31 -1
-   -1 sprites/shore.png 162 200 09 31 64 -31 -8
+   -1 sprites/shore.png 8bpp 210  136  64  15 -31   0 normal
+   -1 sprites/shore.png 8bpp 290  136  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 370  136  64  23 -31   0 normal
+   -1 sprites/shore.png 8bpp 450  136  64  47 -31 -16 normal
+   -1 sprites/shore.png 8bpp 530  136  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 610  136  64  39 -31  -8 normal
+   -1 sprites/shore.png 8bpp 690  136  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp   2  200  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp  82  200  64  32 -31  -1 normal
+   -1 sprites/shore.png 8bpp 162  200  64  31 -31  -8 normal
   -1 * 6	 07 83 01 \7! 03 0C
   -1 * 44	 0C "Missing shore tile graphics for the toyland climate"
   -1 * 3	 05 0D 0A
-   -1 sprites/shore.png 290 200 09 15 64 -31 0
-   -1 sprites/shore.png 370 200 09 31 64 -31 -8
-   -1 sprites/shore.png 450 200 09 23 64 -31 0
-   -1 sprites/shore.png 530 200 09 47 64 -31 -16
-   -1 sprites/shore.png 610 200 09 31 64 -31 -8
-   -1 sprites/shore.png 690 200 09 39 64 -31 -8
-   -1 sprites/shore.png 2 264 09 31 64 -31 -8
-   -1 sprites/shore.png 82 264 09 31 64 -31 -8
-   -1 sprites/shore.png 162 264 09 32 64 -31 -1
-   -1 sprites/shore.png 242 264 09 31 64 -31 -8
-
-//
-// -- NFO Renum 'settings' --
-// Reset warning about incorrect number of shores
-// @@WARNING ENABLE 60
-// -- End of NFO Renum 'settings' --
-//
+   -1 sprites/shore.png 8bpp 290  200  64  15 -31   0 normal
+   -1 sprites/shore.png 8bpp 370  200  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 450  200  64  23 -31   0 normal
+   -1 sprites/shore.png 8bpp 530  200  64  47 -31 -16 normal
+   -1 sprites/shore.png 8bpp 610  200  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 690  200  64  39 -31  -8 normal
+   -1 sprites/shore.png 8bpp   2  264  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp  82  264  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 162  264  64  32 -31  -1 normal
+   -1 sprites/shore.png 8bpp 242  264  64  31 -31  -8 normal
@@ -8,486 +8,486 @@
 //
   -1 * 0	 0C "Pre-signal, semaphore, and PBS graphics by Michael Blunck"
   -1 * 3	 05 04 F0
-   -1 sprites/signals.png 66 8 01 21 6 -2 -19
-   -1 sprites/signals.png 82 8 01 21 6 -2 -19
-   -1 sprites/signals.png 98 8 01 21 6 -2 -19
-   -1 sprites/signals.png 114 8 01 21 6 -2 -19
-   -1 sprites/signals.png 130 8 01 21 6 -2 -19
-   -1 sprites/signals.png 146 8 01 21 6 -2 -19
-   -1 sprites/signals.png 162 8 01 21 6 -2 -19
-   -1 sprites/signals.png 178 8 01 21 6 -2 -19
-   -1 sprites/signals.png 194 8 01 21 6 -2 -19
-   -1 sprites/signals.png 210 8 01 21 6 -2 -19
-   -1 sprites/signals.png 226 8 01 21 6 -2 -19
-   -1 sprites/signals.png 242 8 01 21 6 -2 -19
-   -1 sprites/signals.png 258 8 01 21 6 -2 -19
-   -1 sprites/signals.png 274 8 01 21 6 -2 -19
-   -1 sprites/signals.png 290 8 01 21 6 -2 -19
-   -1 sprites/signals.png 306 8 01 21 6 -2 -19
-   -1 sprites/signals.png 322 8 01 21 6 -2 -19
-   -1 sprites/signals.png 338 8 01 21 6 -2 -19
-   -1 sprites/signals.png 354 8 01 21 6 -2 -19
-   -1 sprites/signals.png 370 8 01 21 6 -2 -19
-   -1 sprites/signals.png 386 8 01 21 6 -2 -19
-   -1 sprites/signals.png 402 8 01 21 6 -2 -19
-   -1 sprites/signals.png 418 8 01 21 6 -2 -19
-   -1 sprites/signals.png 434 8 01 21 6 -2 -19
-   -1 sprites/signals.png 450 8 01 21 6 -2 -19
-   -1 sprites/signals.png 466 8 01 21 6 -2 -19
-   -1 sprites/signals.png 482 8 01 21 6 -2 -19
-   -1 sprites/signals.png 498 8 01 21 6 -2 -19
-   -1 sprites/signals.png 514 8 01 21 6 -2 -19
-   -1 sprites/signals.png 530 8 01 21 6 -2 -19
-   -1 sprites/signals.png 546 8 01 21 6 -2 -19
-   -1 sprites/signals.png 562 8 01 21 6 -2 -19
-   -1 sprites/signals.png 578 8 01 21 6 -2 -19
-   -1 sprites/signals.png 594 8 01 21 6 -2 -19
-   -1 sprites/signals.png 610 8 01 21 6 -2 -19
-   -1 sprites/signals.png 626 8 01 21 6 -2 -19
-   -1 sprites/signals.png 642 8 01 21 6 -2 -19
-   -1 sprites/signals.png 658 8 01 21 6 -2 -19
-   -1 sprites/signals.png 674 8 01 21 6 -2 -19
-   -1 sprites/signals.png 690 8 01 21 6 -2 -19
-   -1 sprites/signals.png 706 8 01 21 6 -2 -19
-   -1 sprites/signals.png 722 8 01 21 6 -2 -19
-   -1 sprites/signals.png 738 8 01 21 6 -2 -19
-   -1 sprites/signals.png 754 8 01 21 6 -2 -19
-   -1 sprites/signals.png 770 8 01 21 6 -2 -19
-   -1 sprites/signals.png 786 8 01 21 6 -2 -19
-   -1 sprites/signals.png 2 40 01 21 6 -2 -19
-   -1 sprites/signals.png 18 40 01 21 6 -2 -19
-   -1 sprites/signals.png 34 40 01 21 10 -6 -19
-   -1 sprites/signals.png 50 40 01 23 7 -3 -21
-   -1 sprites/signals.png 66 40 01 21 10 1 -19
-   -1 sprites/signals.png 82 40 01 21 9 1 -19
-   -1 sprites/signals.png 98 40 01 21 9 1 -19
-   -1 sprites/signals.png 114 40 01 23 6 1 -21
-   -1 sprites/signals.png 130 40 01 21 10 -7 -19
-   -1 sprites/signals.png 146 40 01 21 10 -7 -19
-   -1 sprites/signals.png 162 40 01 21 2 1 -19
-   -1 sprites/signals.png 178 40 01 24 2 1 -22
-   -1 sprites/signals.png 194 40 01 23 2 1 -21
-   -1 sprites/signals.png 210 40 01 26 2 1 -24
-   -1 sprites/signals.png 226 40 01 21 11 -7 -19
-   -1 sprites/signals.png 242 40 01 21 8 -4 -19
-   -1 sprites/signals.png 258 40 01 21 11 1 -19
-   -1 sprites/signals.png 274 40 01 21 8 1 -19
-   -1 sprites/signals.png 290 40 01 21 12 -6 -19
-   -1 sprites/signals.png 322 40 01 23 9 -3 -21
-   -1 sprites/signals.png 338 40 01 21 12 -1 -19
-   -1 sprites/signals.png 370 40 01 21 11 -1 -19
-   -1 sprites/signals.png 386 40 01 21 11 -1 -19
-   -1 sprites/signals.png 402 40 01 23 8 -1 -21
-   -1 sprites/signals.png 418 40 01 21 12 -7 -19
-   -1 sprites/signals.png 450 40 01 21 12 -7 -19
-   -1 sprites/signals.png 482 40 01 21 4 1 -19
-   -1 sprites/signals.png 498 40 01 24 4 1 -22
-   -1 sprites/signals.png 514 40 01 23 4 -1 -21
-   -1 sprites/signals.png 530 40 01 26 4 -1 -24
-   -1 sprites/signals.png 546 40 01 21 13 -7 -19
-   -1 sprites/signals.png 578 40 01 21 10 -4 -19
-   -1 sprites/signals.png 594 40 01 21 13 -1 -19
-   -1 sprites/signals.png 626 40 01 21 10 -1 -19
-   -1 sprites/signals.png 642 40 01 21 11 -6 -19
-   -1 sprites/signals.png 658 40 01 23 8 -3 -21
-   -1 sprites/signals.png 674 40 01 21 11 0 -19
-   -1 sprites/signals.png 690 40 01 21 10 0 -19
-   -1 sprites/signals.png 706 40 01 21 10 0 -19
-   -1 sprites/signals.png 722 40 01 23 7 0 -21
-   -1 sprites/signals.png 738 40 01 21 11 -7 -19
-   -1 sprites/signals.png 754 40 01 21 11 -7 -19
-   -1 sprites/signals.png 770 40 01 21 4 1 -19
-   -1 sprites/signals.png 786 40 01 24 4 1 -22
-   -1 sprites/signals.png 2 88 01 23 4 -1 -21
-   -1 sprites/signals.png 18 88 01 26 4 -1 -24
-   -1 sprites/signals.png 34 88 01 21 12 -7 -19
-   -1 sprites/signals.png 66 88 01 21 9 -4 -19
-   -1 sprites/signals.png 82 88 01 21 12 0 -19
-   -1 sprites/signals.png 114 88 01 21 9 0 -19
-   -1 sprites/signals.png 130 88 01 21 11 -6 -19
-   -1 sprites/signals.png 146 88 01 23 8 -3 -21
-   -1 sprites/signals.png 162 88 01 21 11 0 -19
-   -1 sprites/signals.png 178 88 01 21 10 0 -19
-   -1 sprites/signals.png 194 88 01 21 10 0 -19
-   -1 sprites/signals.png 210 88 01 23 7 0 -21
-   -1 sprites/signals.png 226 88 01 21 11 -7 -19
-   -1 sprites/signals.png 242 88 01 21 11 -7 -19
-   -1 sprites/signals.png 258 88 01 21 4 1 -19
-   -1 sprites/signals.png 274 88 01 24 4 1 -22
-   -1 sprites/signals.png 290 88 01 23 4 -1 -21
-   -1 sprites/signals.png 306 88 01 26 4 -1 -24
-   -1 sprites/signals.png 322 88 01 21 12 -7 -19
-   -1 sprites/signals.png 354 88 01 21 9 -4 -19
-   -1 sprites/signals.png 370 88 01 21 12 0 -19
-   -1 sprites/signals.png 402 88 01 21 9 0 -19
-   -1 sprites/signals.png 418 88 01 19 6 -2 -17
-   -1 sprites/signals.png 434 88 01 19 6 -2 -17
-   -1 sprites/signals.png 450 88 01 19 6 -2 -17
-   -1 sprites/signals.png 466 88 01 19 6 -2 -17
-   -1 sprites/signals.png 482 88 01 19 6 -2 -17
-   -1 sprites/signals.png 498 88 01 19 6 -2 -17
-   -1 sprites/signals.png 514 88 01 19 6 -2 -17
-   -1 sprites/signals.png 530 88 01 19 6 -2 -17
-   -1 sprites/signals.png 546 88 01 19 6 -2 -17
-   -1 sprites/signals.png 562 88 01 19 6 -2 -17
-   -1 sprites/signals.png 578 88 01 19 6 -2 -17
-   -1 sprites/signals.png 594 88 01 19 6 -2 -17
-   -1 sprites/signals.png 610 88 01 19 6 -2 -17
-   -1 sprites/signals.png 626 88 01 19 6 -2 -17
-   -1 sprites/signals.png 642 88 01 19 6 -2 -17
-   -1 sprites/signals.png 658 88 01 19 6 -2 -17
-   -1 sprites/signals.png 674 88 01 19 6 -2 -17
-   -1 sprites/signals.png 690 88 01 19 6 -2 -17
-   -1 sprites/signals.png 706 88 01 19 6 -2 -17
-   -1 sprites/signals.png 722 88 01 19 6 -2 -17
-   -1 sprites/signals.png 738 88 01 19 6 -2 -17
-   -1 sprites/signals.png 754 88 01 19 6 -2 -17
-   -1 sprites/signals.png 770 88 01 19 6 -2 -17
-   -1 sprites/signals.png 786 88 01 19 6 -2 -17
-   -1 sprites/signals.png 2 136 01 19 6 -2 -17
-   -1 sprites/signals.png 18 136 01 19 6 -2 -17
-   -1 sprites/signals.png 34 136 01 19 6 -2 -17
-   -1 sprites/signals.png 50 136 01 19 6 -2 -17
-   -1 sprites/signals.png 66 136 01 19 6 -2 -17
-   -1 sprites/signals.png 82 136 01 19 6 -2 -17
-   -1 sprites/signals.png 98 136 01 19 6 -2 -17
-   -1 sprites/signals.png 114 136 01 19 6 -2 -17
-   -1 sprites/signals.png 130 136 01 21 6 -2 -19
-   -1 sprites/signals.png 146 136 01 21 6 -2 -19
-   -1 sprites/signals.png 162 136 01 21 6 -2 -19
-   -1 sprites/signals.png 178 136 01 21 6 -2 -19
-   -1 sprites/signals.png 194 136 01 21 6 -2 -19
-   -1 sprites/signals.png 210 136 01 21 6 -2 -19
-   -1 sprites/signals.png 226 136 01 21 6 -2 -19
-   -1 sprites/signals.png 242 136 01 21 6 -2 -19
-   -1 sprites/signals.png 258 136 01 21 6 -2 -19
-   -1 sprites/signals.png 274 136 01 21 6 -2 -19
-   -1 sprites/signals.png 290 136 01 21 6 -2 -19
-   -1 sprites/signals.png 306 136 01 21 6 -2 -19
-   -1 sprites/signals.png 322 136 01 21 6 -2 -19
-   -1 sprites/signals.png 338 136 01 21 6 -2 -19
-   -1 sprites/signals.png 354 136 01 21 6 -2 -19
-   -1 sprites/signals.png 370 136 01 21 6 -2 -19
-   -1 sprites/signals.png 386 136 01 21 6 -2 -19
-   -1 sprites/signals.png 402 136 01 21 6 -2 -19
-   -1 sprites/signals.png 418 136 01 21 6 -2 -19
-   -1 sprites/signals.png 434 136 01 21 6 -2 -19
-   -1 sprites/signals.png 450 136 01 21 6 -2 -19
-   -1 sprites/signals.png 466 136 01 21 6 -2 -19
-   -1 sprites/signals.png 482 136 01 21 6 -2 -19
-   -1 sprites/signals.png 498 136 01 21 6 -2 -19
-   -1 sprites/signals.png 514 136 01 21 6 -2 -19
-   -1 sprites/signals.png 530 136 01 21 6 -2 -19
-   -1 sprites/signals.png 546 136 01 21 6 -2 -19
-   -1 sprites/signals.png 562 136 01 21 6 -2 -19
-   -1 sprites/signals.png 578 136 01 21 6 -2 -19
-   -1 sprites/signals.png 594 136 01 21 6 -2 -19
-   -1 sprites/signals.png 610 136 01 21 6 -2 -19
-   -1 sprites/signals.png 626 136 01 21 6 -2 -19
-   -1 sprites/signals.png 642 136 01 21 10 -6 -19
-   -1 sprites/signals.png 658 136 01 23 7 -3 -21
-   -1 sprites/signals.png 674 136 01 21 10 1 -19
-   -1 sprites/signals.png 690 136 01 21 9 1 -19
-   -1 sprites/signals.png 706 136 01 21 9 1 -19
-   -1 sprites/signals.png 722 136 01 23 6 1 -21
-   -1 sprites/signals.png 738 136 01 21 10 -7 -19
-   -1 sprites/signals.png 754 136 01 21 10 -7 -19
-   -1 sprites/signals.png 770 136 01 21 2 1 -19
-   -1 sprites/signals.png 786 136 01 24 2 1 -22
-   -1 sprites/signals.png 2 184 01 23 2 1 -21
-   -1 sprites/signals.png 18 184 01 26 2 1 -24
-   -1 sprites/signals.png 34 184 01 21 11 -7 -19
-   -1 sprites/signals.png 50 184 01 21 8 -4 -19
-   -1 sprites/signals.png 66 184 01 21 11 1 -19
-   -1 sprites/signals.png 82 184 01 21 8 1 -19
-   -1 sprites/signals.png 98 184 01 21 12 -6 -19
-   -1 sprites/signals.png 130 184 01 23 9 -3 -21
-   -1 sprites/signals.png 146 184 01 21 12 -1 -19
-   -1 sprites/signals.png 178 184 01 21 11 -1 -19
-   -1 sprites/signals.png 194 184 01 21 11 -1 -19
-   -1 sprites/signals.png 210 184 01 23 8 -1 -21
-   -1 sprites/signals.png 226 184 01 21 12 -7 -19
-   -1 sprites/signals.png 258 184 01 21 12 -7 -19
-   -1 sprites/signals.png 290 184 01 21 4 -1 -19
-   -1 sprites/signals.png 306 184 01 24 4 -1 -22
-   -1 sprites/signals.png 322 184 01 23 4 1 -21
-   -1 sprites/signals.png 338 184 01 26 4 1 -24
-   -1 sprites/signals.png 354 184 01 21 13 -7 -19
-   -1 sprites/signals.png 386 184 01 21 10 -4 -19
-   -1 sprites/signals.png 402 184 01 21 13 -1 -19
-   -1 sprites/signals.png 434 184 01 21 10 -1 -19
-   -1 sprites/signals.png 450 184 01 21 11 -6 -19
-   -1 sprites/signals.png 466 184 01 23 8 -3 -21
-   -1 sprites/signals.png 482 184 01 21 11 0 -19
-   -1 sprites/signals.png 498 184 01 21 10 0 -19
-   -1 sprites/signals.png 514 184 01 21 10 0 -19
-   -1 sprites/signals.png 530 184 01 23 7 0 -21
-   -1 sprites/signals.png 546 184 01 21 11 -7 -19
-   -1 sprites/signals.png 562 184 01 21 11 -7 -19
-   -1 sprites/signals.png 578 184 01 21 4 1 -19
-   -1 sprites/signals.png 594 184 01 24 4 1 -22
-   -1 sprites/signals.png 610 184 01 23 4 -1 -21
-   -1 sprites/signals.png 626 184 01 26 4 -1 -24
-   -1 sprites/signals.png 642 184 01 21 12 -7 -19
-   -1 sprites/signals.png 674 184 01 21 9 -4 -19
-   -1 sprites/signals.png 690 184 01 21 12 0 -19
-   -1 sprites/signals.png 722 184 01 21 9 0 -19
-   -1 sprites/signals.png 738 184 01 21 11 -6 -19
-   -1 sprites/signals.png 754 184 01 23 8 -3 -21
-   -1 sprites/signals.png 770 184 01 21 11 0 -19
-   -1 sprites/signals.png 786 184 01 21 10 0 -19
-   -1 sprites/signals.png 2 232 01 21 10 0 -19
-   -1 sprites/signals.png 18 232 01 23 7 0 -21
-   -1 sprites/signals.png 34 232 01 21 11 -7 -19
-   -1 sprites/signals.png 50 232 01 21 11 -7 -19
-   -1 sprites/signals.png 66 232 01 21 4 1 -19
-   -1 sprites/signals.png 82 232 01 24 4 1 -22
-   -1 sprites/signals.png 98 232 01 23 4 -1 -21
-   -1 sprites/signals.png 114 232 01 26 4 -1 -24
-   -1 sprites/signals.png 130 232 01 21 12 -7 -19
-   -1 sprites/signals.png 162 232 01 21 9 -4 -19
-   -1 sprites/signals.png 178 232 01 21 12 0 -19
-   -1 sprites/signals.png 210 232 01 21 9 0 -19
+   -1 sprites/signals.png 8bpp  66    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  82    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  98    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 114    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 130    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 146    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 162    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 178    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 194    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 210    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 226    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 242    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 258    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 274    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 290    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 306    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 322    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 338    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 354    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 370    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 386    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 402    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 418    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 434    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 450    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 466    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 482    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 498    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 514    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 530    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 546    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 562    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 578    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 594    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 610    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 626    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 642    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 658    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 674    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 690    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 706    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 722    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 738    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 754    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 770    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 786    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp   2   40   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  18   40   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  34   40  10  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp  50   40   7  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp  66   40  10  21   1 -19 normal
+   -1 sprites/signals.png 8bpp  82   40   9  21   1 -19 normal
+   -1 sprites/signals.png 8bpp  98   40   9  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 114   40   6  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 130   40  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 146   40  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 162   40   2  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 178   40   2  24   1 -22 normal
+   -1 sprites/signals.png 8bpp 194   40   2  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 210   40   2  26   1 -24 normal
+   -1 sprites/signals.png 8bpp 226   40  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 242   40   8  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp 258   40  11  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 274   40   8  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 290   40  12  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp 322   40   9  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp 338   40  12  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 370   40  11  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 386   40  11  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 402   40   8  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp 418   40  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 450   40  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 482   40   4  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 498   40   4  24   1 -22 normal
+   -1 sprites/signals.png 8bpp 514   40   4  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp 530   40   4  26  -1 -24 normal
+   -1 sprites/signals.png 8bpp 546   40  13  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 578   40  10  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp 594   40  13  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 626   40  10  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 642   40  11  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp 658   40   8  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp 674   40  11  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 690   40  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 706   40  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 722   40   7  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 738   40  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 754   40  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 770   40   4  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 786   40   4  24   1 -22 normal
+   -1 sprites/signals.png 8bpp   2   88   4  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp  18   88   4  26  -1 -24 normal
+   -1 sprites/signals.png 8bpp  34   88  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp  66   88   9  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp  82   88  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 114   88   9  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 130   88  11  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp 146   88   8  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp 162   88  11  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 178   88  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 194   88  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 210   88   7  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 226   88  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 242   88  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 258   88   4  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 274   88   4  24   1 -22 normal
+   -1 sprites/signals.png 8bpp 290   88   4  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp 306   88   4  26  -1 -24 normal
+   -1 sprites/signals.png 8bpp 322   88  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 354   88   9  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp 370   88  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 402   88   9  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 418   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 434   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 450   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 466   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 482   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 498   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 514   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 530   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 546   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 562   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 578   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 594   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 610   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 626   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 642   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 658   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 674   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 690   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 706   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 722   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 738   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 754   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 770   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 786   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp   2  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  18  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  34  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  50  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  66  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  82  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  98  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 114  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 130  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 146  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 162  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 178  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 194  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 210  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 226  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 242  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 258  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 274  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 290  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 306  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 322  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 338  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 354  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 370  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 386  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 402  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 418  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 434  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 450  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 466  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 482  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 498  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 514  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 530  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 546  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 562  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 578  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 594  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 610  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 626  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 642  136  10  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp 658  136   7  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp 674  136  10  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 690  136   9  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 706  136   9  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 722  136   6  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 738  136  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 754  136  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 770  136   2  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 786  136   2  24   1 -22 normal
+   -1 sprites/signals.png 8bpp   2  184   2  23   1 -21 normal
+   -1 sprites/signals.png 8bpp  18  184   2  26   1 -24 normal
+   -1 sprites/signals.png 8bpp  34  184  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp  50  184   8  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp  66  184  11  21   1 -19 normal
+   -1 sprites/signals.png 8bpp  82  184   8  21   1 -19 normal
+   -1 sprites/signals.png 8bpp  98  184  12  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp 130  184   9  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp 146  184  12  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 178  184  11  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 194  184  11  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 210  184   8  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp 226  184  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 258  184  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 290  184   4  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 306  184   4  24  -1 -22 normal
+   -1 sprites/signals.png 8bpp 322  184   4  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 338  184   4  26   1 -24 normal
+   -1 sprites/signals.png 8bpp 354  184  13  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 386  184  10  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp 402  184  13  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 434  184  10  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 450  184  11  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp 466  184   8  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp 482  184  11  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 498  184  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 514  184  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 530  184   7  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 546  184  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 562  184  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 578  184   4  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 594  184   4  24   1 -22 normal
+   -1 sprites/signals.png 8bpp 610  184   4  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp 626  184   4  26  -1 -24 normal
+   -1 sprites/signals.png 8bpp 642  184  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 674  184   9  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp 690  184  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 722  184   9  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 738  184  11  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp 754  184   8  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp 770  184  11  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 786  184  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp   2  232  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp  18  232   7  23   0 -21 normal
+   -1 sprites/signals.png 8bpp  34  232  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp  50  232  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp  66  232   4  21   1 -19 normal
+   -1 sprites/signals.png 8bpp  82  232   4  24   1 -22 normal
+   -1 sprites/signals.png 8bpp  98  232   4  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp 114  232   4  26  -1 -24 normal
+   -1 sprites/signals.png 8bpp 130  232  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 162  232   9  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp 178  232  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 210  232   9  21   0 -19 normal
   -1 * 6	 07 85 01 \70 3B F2
   -1 * 6	 07 86 01 \70 04 F1
   -1 * 3	 05 04 F0
-   -1 sprites/signals.png 274 232 01 21 6 -2 -19
-   -1 sprites/signals.png 290 232 01 21 6 -2 -19
-   -1 sprites/signals.png 306 232 01 21 6 -2 -19
-   -1 sprites/signals.png 322 232 01 21 6 -2 -19
-   -1 sprites/signals.png 338 232 01 21 6 -2 -19
-   -1 sprites/signals.png 354 232 01 21 6 -2 -19
-   -1 sprites/signals.png 370 232 01 21 6 -2 -19
-   -1 sprites/signals.png 386 232 01 21 6 -2 -19
-   -1 sprites/signals.png 402 232 01 21 6 -2 -19
-   -1 sprites/signals.png 418 232 01 21 6 -2 -19
-   -1 sprites/signals.png 434 232 01 21 6 -2 -19
-   -1 sprites/signals.png 450 232 01 21 6 -2 -19
-   -1 sprites/signals.png 466 232 01 21 6 -2 -19
-   -1 sprites/signals.png 482 232 01 21 6 -2 -19
-   -1 sprites/signals.png 498 232 01 21 6 -2 -19
-   -1 sprites/signals.png 514 232 01 21 6 -2 -19
-   -1 sprites/signals.png 530 232 01 21 6 -2 -19
-   -1 sprites/signals.png 546 232 01 21 6 -2 -19
-   -1 sprites/signals.png 562 232 01 21 6 -2 -19
-   -1 sprites/signals.png 578 232 01 21 6 -2 -19
-   -1 sprites/signals.png 594 232 01 21 6 -2 -19
-   -1 sprites/signals.png 610 232 01 21 6 -2 -19
-   -1 sprites/signals.png 626 232 01 21 6 -2 -19
-   -1 sprites/signals.png 642 232 01 21 6 -2 -19
-   -1 sprites/signals.png 658 232 01 21 6 -2 -19
-   -1 sprites/signals.png 674 232 01 21 6 -2 -19
-   -1 sprites/signals.png 690 232 01 21 6 -2 -19
-   -1 sprites/signals.png 706 232 01 21 6 -2 -19
-   -1 sprites/signals.png 722 232 01 21 6 -2 -19
-   -1 sprites/signals.png 738 232 01 21 6 -2 -19
-   -1 sprites/signals.png 754 232 01 21 6 -2 -19
-   -1 sprites/signals.png 770 232 01 21 6 -2 -19
-   -1 sprites/signals.png 786 232 01 21 6 -2 -19
-   -1 sprites/signals.png 2 280 01 21 6 -2 -19
-   -1 sprites/signals.png 18 280 01 21 6 -2 -19
-   -1 sprites/signals.png 34 280 01 21 6 -2 -19
-   -1 sprites/signals.png 50 280 01 21 6 -2 -19
-   -1 sprites/signals.png 66 280 01 21 6 -2 -19
-   -1 sprites/signals.png 82 280 01 21 6 -2 -19
-   -1 sprites/signals.png 98 280 01 21 6 -2 -19
-   -1 sprites/signals.png 114 280 01 21 6 -2 -19
-   -1 sprites/signals.png 130 280 01 21 6 -2 -19
-   -1 sprites/signals.png 146 280 01 21 6 -2 -19
-   -1 sprites/signals.png 162 280 01 21 6 -2 -19
-   -1 sprites/signals.png 178 280 01 21 6 -2 -19
-   -1 sprites/signals.png 194 280 01 21 6 -2 -19
-   -1 sprites/signals.png 210 280 01 21 6 -2 -19
-   -1 sprites/signals.png 226 280 01 21 6 -2 -19
-   -1 sprites/signals.png 242 280 01 21 10 -7 -19
-   -1 sprites/signals.png 258 280 01 23 10 -8 -21
-   -1 sprites/signals.png 274 280 01 23 10 -7 -21
-   -1 sprites/signals.png 290 280 01 26 7 -5 -24
-   -1 sprites/signals.png 306 280 01 21 10 -7 -19
-   -1 sprites/signals.png 322 280 01 23 10 -6 -21
-   -1 sprites/signals.png 338 280 01 23 10 1 -21
-   -1 sprites/signals.png 354 280 01 26 7 2 -24
-   -1 sprites/signals.png 370 280 01 23 3 0 -21
-   -1 sprites/signals.png 386 280 01 26 3 0 -24
-   -1 sprites/signals.png 402 280 01 21 3 0 -19
-   -1 sprites/signals.png 418 280 01 24 3 0 -22
-   -1 sprites/signals.png 434 280 01 21 12 0 -19
-   -1 sprites/signals.png 466 280 01 24 9 0 -22
-   -1 sprites/signals.png 482 280 01 21 12 -9 -19
-   -1 sprites/signals.png 514 280 01 24 9 -6 -22
-   -1 sprites/signals.png 530 280 01 21 12 -9 -19
-   -1 sprites/signals.png 562 280 01 23 11 -9 -21
-   -1 sprites/signals.png 578 280 01 23 11 -7 -21
-   -1 sprites/signals.png 594 280 01 26 9 -5 -24
-   -1 sprites/signals.png 610 280 01 21 12 -7 -19
-   -1 sprites/signals.png 642 280 01 23 11 -6 -21
-   -1 sprites/signals.png 658 280 01 23 11 0 -21
-   -1 sprites/signals.png 674 280 01 26 9 0 -24
-   -1 sprites/signals.png 690 280 01 23 5 0 -21
-   -1 sprites/signals.png 706 280 01 26 5 0 -24
-   -1 sprites/signals.png 722 280 01 21 5 -2 -19
-   -1 sprites/signals.png 738 280 01 24 5 -2 -22
-   -1 sprites/signals.png 754 280 01 21 13 -1 -19
-   -1 sprites/signals.png 786 280 01 24 10 -1 -22
-   -1 sprites/signals.png 2 328 01 21 13 -9 -19
-   -1 sprites/signals.png 34 328 01 24 10 -6 -22
-   -1 sprites/signals.png 50 328 01 21 11 -8 -19
-   -1 sprites/signals.png 66 328 01 23 10 -8 -21
-   -1 sprites/signals.png 82 328 01 23 10 -7 -21
-   -1 sprites/signals.png 98 328 01 26 8 -5 -24
-   -1 sprites/signals.png 114 328 01 21 11 -7 -19
-   -1 sprites/signals.png 130 328 01 23 10 -6 -21
-   -1 sprites/signals.png 146 328 01 23 10 1 -21
-   -1 sprites/signals.png 162 328 01 26 8 1 -24
-   -1 sprites/signals.png 178 328 01 23 5 0 -21
-   -1 sprites/signals.png 194 328 01 26 5 0 -24
-   -1 sprites/signals.png 210 328 01 21 5 -2 -19
-   -1 sprites/signals.png 226 328 01 24 5 -2 -22
-   -1 sprites/signals.png 242 328 01 21 12 0 -19
-   -1 sprites/signals.png 274 328 01 24 9 0 -22
-   -1 sprites/signals.png 290 328 01 21 12 -9 -19
-   -1 sprites/signals.png 322 328 01 24 9 -6 -22
-   -1 sprites/signals.png 338 328 01 21 11 -8 -19
-   -1 sprites/signals.png 354 328 01 23 10 -8 -21
-   -1 sprites/signals.png 370 328 01 23 10 -7 -21
-   -1 sprites/signals.png 386 328 01 26 8 -5 -24
-   -1 sprites/signals.png 402 328 01 21 11 -7 -19
-   -1 sprites/signals.png 418 328 01 23 10 -6 -21
-   -1 sprites/signals.png 434 328 01 23 10 1 -21
-   -1 sprites/signals.png 450 328 01 26 8 1 -24
-   -1 sprites/signals.png 466 328 01 23 5 0 -21
-   -1 sprites/signals.png 482 328 01 26 5 0 -24
-   -1 sprites/signals.png 498 328 01 21 5 -2 -19
-   -1 sprites/signals.png 514 328 01 24 5 -2 -22
-   -1 sprites/signals.png 530 328 01 21 12 0 -19
-   -1 sprites/signals.png 562 328 01 24 9 0 -22
-   -1 sprites/signals.png 578 328 01 21 12 -9 -19
-   -1 sprites/signals.png 610 328 01 24 9 -6 -22
-   -1 sprites/signals.png 626 328 01 19 6 -2 -17
-   -1 sprites/signals.png 642 328 01 19 6 -2 -17
-   -1 sprites/signals.png 658 328 01 19 6 -2 -17
-   -1 sprites/signals.png 674 328 01 19 6 -2 -17
-   -1 sprites/signals.png 690 328 01 19 6 -2 -17
-   -1 sprites/signals.png 706 328 01 19 6 -2 -17
-   -1 sprites/signals.png 722 328 01 19 6 -2 -17
-   -1 sprites/signals.png 738 328 01 19 6 -2 -17
-   -1 sprites/signals.png 754 328 01 19 6 -2 -17
-   -1 sprites/signals.png 770 328 01 19 6 -2 -17
-   -1 sprites/signals.png 786 328 01 19 6 -2 -17
-   -1 sprites/signals.png 2 376 01 19 6 -2 -17
-   -1 sprites/signals.png 18 376 01 19 6 -2 -17
-   -1 sprites/signals.png 34 376 01 19 6 -2 -17
-   -1 sprites/signals.png 50 376 01 19 6 -2 -17
-   -1 sprites/signals.png 66 376 01 19 6 -2 -17
-   -1 sprites/signals.png 82 376 01 19 6 -2 -17
-   -1 sprites/signals.png 98 376 01 19 6 -2 -17
-   -1 sprites/signals.png 114 376 01 19 6 -2 -17
-   -1 sprites/signals.png 130 376 01 19 6 -2 -17
-   -1 sprites/signals.png 146 376 01 19 6 -2 -17
-   -1 sprites/signals.png 162 376 01 19 6 -2 -17
-   -1 sprites/signals.png 178 376 01 19 6 -2 -17
-   -1 sprites/signals.png 194 376 01 19 6 -2 -17
-   -1 sprites/signals.png 210 376 01 19 6 -2 -17
-   -1 sprites/signals.png 226 376 01 19 6 -2 -17
-   -1 sprites/signals.png 242 376 01 19 6 -2 -17
-   -1 sprites/signals.png 258 376 01 19 6 -2 -17
-   -1 sprites/signals.png 274 376 01 19 6 -2 -17
-   -1 sprites/signals.png 290 376 01 19 6 -2 -17
-   -1 sprites/signals.png 306 376 01 19 6 -2 -17
-   -1 sprites/signals.png 322 376 01 19 6 -2 -17
-   -1 sprites/signals.png 338 376 01 21 6 -2 -19
-   -1 sprites/signals.png 354 376 01 21 6 -2 -19
-   -1 sprites/signals.png 370 376 01 21 6 -2 -19
-   -1 sprites/signals.png 386 376 01 21 6 -2 -19
-   -1 sprites/signals.png 402 376 01 21 6 -2 -19
-   -1 sprites/signals.png 418 376 01 21 6 -2 -19
-   -1 sprites/signals.png 434 376 01 21 6 -2 -19
-   -1 sprites/signals.png 450 376 01 21 6 -2 -19
-   -1 sprites/signals.png 466 376 01 21 6 -2 -19
-   -1 sprites/signals.png 482 376 01 21 6 -2 -19
-   -1 sprites/signals.png 498 376 01 21 6 -2 -19
-   -1 sprites/signals.png 514 376 01 21 6 -2 -19
-   -1 sprites/signals.png 530 376 01 21 6 -2 -19
-   -1 sprites/signals.png 546 376 01 21 6 -2 -19
-   -1 sprites/signals.png 562 376 01 21 6 -2 -19
-   -1 sprites/signals.png 578 376 01 21 6 -2 -19
-   -1 sprites/signals.png 594 376 01 21 6 -2 -19
-   -1 sprites/signals.png 610 376 01 21 6 -2 -19
-   -1 sprites/signals.png 626 376 01 21 6 -2 -19
-   -1 sprites/signals.png 642 376 01 21 6 -2 -19
-   -1 sprites/signals.png 658 376 01 21 6 -2 -19
-   -1 sprites/signals.png 674 376 01 21 6 -2 -19
-   -1 sprites/signals.png 690 376 01 21 6 -2 -19
-   -1 sprites/signals.png 706 376 01 21 6 -2 -19
-   -1 sprites/signals.png 722 376 01 21 6 -2 -19
-   -1 sprites/signals.png 738 376 01 21 6 -2 -19
-   -1 sprites/signals.png 754 376 01 21 6 -2 -19
-   -1 sprites/signals.png 770 376 01 21 6 -2 -19
-   -1 sprites/signals.png 786 376 01 21 6 -2 -19
-   -1 sprites/signals.png 2 408 01 21 6 -2 -19
-   -1 sprites/signals.png 18 408 01 21 6 -2 -19
-   -1 sprites/signals.png 34 408 01 21 6 -2 -19
-   -1 sprites/signals.png 50 408 01 21 10 -7 -19
-   -1 sprites/signals.png 66 408 01 23 10 -8 -21
-   -1 sprites/signals.png 82 408 01 23 10 -7 -21
-   -1 sprites/signals.png 98 408 01 26 7 -5 -24
-   -1 sprites/signals.png 114 408 01 21 10 -7 -19
-   -1 sprites/signals.png 130 408 01 23 10 -6 -21
-   -1 sprites/signals.png 146 408 01 23 10 1 -21
-   -1 sprites/signals.png 162 408 01 26 7 2 -24
-   -1 sprites/signals.png 178 408 01 23 3 0 -21
-   -1 sprites/signals.png 194 408 01 26 3 0 -24
-   -1 sprites/signals.png 210 408 01 21 3 0 -19
-   -1 sprites/signals.png 226 408 01 24 3 0 -22
-   -1 sprites/signals.png 242 408 01 21 12 0 -19
-   -1 sprites/signals.png 274 408 01 24 9 0 -22
-   -1 sprites/signals.png 290 408 01 21 12 -9 -19
-   -1 sprites/signals.png 322 408 01 24 9 -6 -22
-   -1 sprites/signals.png 338 408 01 21 12 -9 -19
-   -1 sprites/signals.png 370 408 01 23 11 -9 -21
-   -1 sprites/signals.png 386 408 01 23 11 -7 -21
-   -1 sprites/signals.png 402 408 01 26 9 -5 -24
-   -1 sprites/signals.png 418 408 01 21 12 -7 -19
-   -1 sprites/signals.png 450 408 01 23 11 -6 -21
-   -1 sprites/signals.png 466 408 01 23 11 0 -21
-   -1 sprites/signals.png 482 408 01 26 9 0 -24
-   -1 sprites/signals.png 498 408 01 23 5 -1 -21
-   -1 sprites/signals.png 514 408 01 26 5 -1 -24
-   -1 sprites/signals.png 530 408 01 21 5 -1 -19
-   -1 sprites/signals.png 546 408 01 24 5 -1 -22
-   -1 sprites/signals.png 562 408 01 21 13 -1 -19
-   -1 sprites/signals.png 594 408 01 24 10 -1 -22
-   -1 sprites/signals.png 610 408 01 21 13 -9 -19
-   -1 sprites/signals.png 642 408 01 24 10 -6 -22
-   -1 sprites/signals.png 658 408 01 21 11 -8 -19
-   -1 sprites/signals.png 674 408 01 23 10 -8 -21
-   -1 sprites/signals.png 690 408 01 23 10 -7 -21
-   -1 sprites/signals.png 706 408 01 26 8 -5 -24
-   -1 sprites/signals.png 722 408 01 21 11 -7 -19
-   -1 sprites/signals.png 738 408 01 23 10 -6 -21
-   -1 sprites/signals.png 754 408 01 23 10 1 -21
-   -1 sprites/signals.png 770 408 01 26 8 1 -24
-   -1 sprites/signals.png 786 408 01 23 5 0 -21
-   -1 sprites/signals.png 2 456 01 26 5 0 -24
-   -1 sprites/signals.png 18 456 01 21 5 -2 -19
-   -1 sprites/signals.png 34 456 01 24 5 -2 -22
-   -1 sprites/signals.png 50 456 01 21 12 0 -19
-   -1 sprites/signals.png 82 456 01 24 9 0 -22
-   -1 sprites/signals.png 98 456 01 21 12 -9 -19
-   -1 sprites/signals.png 130 456 01 24 9 -6 -22
-   -1 sprites/signals.png 146 456 01 21 11 -8 -19
-   -1 sprites/signals.png 162 456 01 23 10 -8 -21
-   -1 sprites/signals.png 178 456 01 23 10 -7 -21
-   -1 sprites/signals.png 194 456 01 26 8 -5 -24
-   -1 sprites/signals.png 210 456 01 21 11 -7 -19
-   -1 sprites/signals.png 226 456 01 23 10 -6 -21
-   -1 sprites/signals.png 242 456 01 23 10 1 -21
-   -1 sprites/signals.png 258 456 01 26 8 1 -24
-   -1 sprites/signals.png 274 456 01 23 5 0 -21
-   -1 sprites/signals.png 290 456 01 26 5 0 -24
-   -1 sprites/signals.png 306 456 01 21 5 -2 -19
-   -1 sprites/signals.png 322 456 01 24 5 -2 -22
-   -1 sprites/signals.png 338 456 01 21 12 0 -19
-   -1 sprites/signals.png 370 456 01 24 9 0 -22
-   -1 sprites/signals.png 386 456 01 21 12 -9 -19
-   -1 sprites/signals.png 418 456 01 24 9 -6 -22
+   -1 sprites/signals.png 8bpp 274  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 290  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 306  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 322  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 338  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 354  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 370  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 386  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 402  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 418  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 434  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 450  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 466  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 482  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 498  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 514  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 530  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 546  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 562  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 578  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 594  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 610  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 626  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 642  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 658  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 674  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 690  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 706  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 722  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 738  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 754  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 770  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 786  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp   2  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  18  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  34  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  50  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  66  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  82  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  98  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 114  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 130  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 146  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 162  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 178  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 194  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 210  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 226  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 242  280  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 258  280  10  23  -8 -21 normal
+   -1 sprites/signals.png 8bpp 274  280  10  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp 290  280   7  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 306  280  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 322  280  10  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 338  280  10  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 354  280   7  26   2 -24 normal
+   -1 sprites/signals.png 8bpp 370  280   3  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 386  280   3  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 402  280   3  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 418  280   3  24   0 -22 normal
+   -1 sprites/signals.png 8bpp 434  280  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 466  280   9  24   0 -22 normal
+   -1 sprites/signals.png 8bpp 482  280  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 514  280   9  24  -6 -22 normal
+   -1 sprites/signals.png 8bpp 530  280  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 562  280  11  23  -9 -21 normal
+   -1 sprites/signals.png 8bpp 578  280  11  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp 594  280   9  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 610  280  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 642  280  11  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 658  280  11  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 674  280   9  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 690  280   5  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 706  280   5  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 722  280   5  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 738  280   5  24  -2 -22 normal
+   -1 sprites/signals.png 8bpp 754  280  13  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 786  280  10  24  -1 -22 normal
+   -1 sprites/signals.png 8bpp   2  328  13  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp  34  328  10  24  -6 -22 normal
+   -1 sprites/signals.png 8bpp  50  328  11  21  -8 -19 normal
+   -1 sprites/signals.png 8bpp  66  328  10  23  -8 -21 normal
+   -1 sprites/signals.png 8bpp  82  328  10  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp  98  328   8  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 114  328  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 130  328  10  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 146  328  10  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 162  328   8  26   1 -24 normal
+   -1 sprites/signals.png 8bpp 178  328   5  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 194  328   5  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 210  328   5  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 226  328   5  24  -2 -22 normal
+   -1 sprites/signals.png 8bpp 242  328  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 274  328   9  24   0 -22 normal
+   -1 sprites/signals.png 8bpp 290  328  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 322  328   9  24  -6 -22 normal
+   -1 sprites/signals.png 8bpp 338  328  11  21  -8 -19 normal
+   -1 sprites/signals.png 8bpp 354  328  10  23  -8 -21 normal
+   -1 sprites/signals.png 8bpp 370  328  10  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp 386  328   8  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 402  328  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 418  328  10  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 434  328  10  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 450  328   8  26   1 -24 normal
+   -1 sprites/signals.png 8bpp 466  328   5  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 482  328   5  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 498  328   5  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 514  328   5  24  -2 -22 normal
+   -1 sprites/signals.png 8bpp 530  328  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 562  328   9  24   0 -22 normal
+   -1 sprites/signals.png 8bpp 578  328  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 610  328   9  24  -6 -22 normal
+   -1 sprites/signals.png 8bpp 626  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 642  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 658  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 674  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 690  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 706  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 722  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 738  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 754  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 770  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 786  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp   2  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  18  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  34  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  50  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  66  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  82  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  98  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 114  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 130  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 146  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 162  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 178  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 194  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 210  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 226  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 242  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 258  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 274  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 290  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 306  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 322  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 338  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 354  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 370  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 386  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 402  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 418  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 434  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 450  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 466  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 482  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 498  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 514  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 530  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 546  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 562  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 578  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 594  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 610  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 626  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 642  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 658  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 674  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 690  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 706  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 722  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 738  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 754  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 770  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 786  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp   2  408   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  18  408   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  34  408   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  50  408  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp  66  408  10  23  -8 -21 normal
+   -1 sprites/signals.png 8bpp  82  408  10  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp  98  408   7  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 114  408  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 130  408  10  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 146  408  10  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 162  408   7  26   2 -24 normal
+   -1 sprites/signals.png 8bpp 178  408   3  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 194  408   3  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 210  408   3  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 226  408   3  24   0 -22 normal
+   -1 sprites/signals.png 8bpp 242  408  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 274  408   9  24   0 -22 normal
+   -1 sprites/signals.png 8bpp 290  408  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 322  408   9  24  -6 -22 normal
+   -1 sprites/signals.png 8bpp 338  408  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 370  408  11  23  -9 -21 normal
+   -1 sprites/signals.png 8bpp 386  408  11  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp 402  408   9  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 418  408  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 450  408  11  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 466  408  11  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 482  408   9  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 498  408   5  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp 514  408   5  26  -1 -24 normal
+   -1 sprites/signals.png 8bpp 530  408   5  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 546  408   5  24  -1 -22 normal
+   -1 sprites/signals.png 8bpp 562  408  13  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 594  408  10  24  -1 -22 normal
+   -1 sprites/signals.png 8bpp 610  408  13  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 642  408  10  24  -6 -22 normal
+   -1 sprites/signals.png 8bpp 658  408  11  21  -8 -19 normal
+   -1 sprites/signals.png 8bpp 674  408  10  23  -8 -21 normal
+   -1 sprites/signals.png 8bpp 690  408  10  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp 706  408   8  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 722  408  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 738  408  10  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 754  408  10  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 770  408   8  26   1 -24 normal
+   -1 sprites/signals.png 8bpp 786  408   5  23   0 -21 normal
+   -1 sprites/signals.png 8bpp   2  456   5  26   0 -24 normal
+   -1 sprites/signals.png 8bpp  18  456   5  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  34  456   5  24  -2 -22 normal
+   -1 sprites/signals.png 8bpp  50  456  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp  82  456   9  24   0 -22 normal
+   -1 sprites/signals.png 8bpp  98  456  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 130  456   9  24  -6 -22 normal
+   -1 sprites/signals.png 8bpp 146  456  11  21  -8 -19 normal
+   -1 sprites/signals.png 8bpp 162  456  10  23  -8 -21 normal
+   -1 sprites/signals.png 8bpp 178  456  10  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp 194  456   8  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 210  456  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 226  456  10  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 242  456  10  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 258  456   8  26   1 -24 normal
+   -1 sprites/signals.png 8bpp 274  456   5  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 290  456   5  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 306  456   5  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 322  456   5  24  -2 -22 normal
+   -1 sprites/signals.png 8bpp 338  456  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 370  456   9  24   0 -22 normal
+   -1 sprites/signals.png 8bpp 386  456  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 418  456   9  24  -6 -22 normal
@@ -8,15 +8,15 @@
 //
   -1 * 0	 0C "Sloped tracks"
   -1 * 3	 05 0F 0C
-   -1 sprites/sloped_tracks.png 50 8 09 29 42 -19 -3
-   -1 sprites/sloped_tracks.png 98 8 09 13 41 -20 5
-   -1 sprites/sloped_tracks.png 146 8 09 14 42 -19 5
-   -1 sprites/sloped_tracks.png 194 8 09 29 42 -21 -3
-   -1 sprites/sloped_tracks.png 242 8 09 25 33 -15 -1
-   -1 sprites/sloped_tracks.png 290 8 09 10 33 -15 7
-   -1 sprites/sloped_tracks.png 338 8 09 10 34 -15 7
-   -1 sprites/sloped_tracks.png 386 8 09 25 34 -15 -1
-   -1 sprites/sloped_tracks.png 434 8 09 23 31 -13 -1
-   -1 sprites/sloped_tracks.png 482 8 09 10 32 -15 7
-   -1 sprites/sloped_tracks.png 530 8 09 10 31 -15 7
-   -1 sprites/sloped_tracks.png 578 8 09 23 31 -16 -1
+   -1 sprites/sloped_tracks.png 8bpp  50    8  42  29 -19  -3 normal
+   -1 sprites/sloped_tracks.png 8bpp  98    8  41  13 -20   5 normal
+   -1 sprites/sloped_tracks.png 8bpp 146    8  42  14 -19   5 normal
+   -1 sprites/sloped_tracks.png 8bpp 194    8  42  29 -21  -3 normal
+   -1 sprites/sloped_tracks.png 8bpp 242    8  33  25 -15  -1 normal
+   -1 sprites/sloped_tracks.png 8bpp 290    8  33  10 -15   7 normal
+   -1 sprites/sloped_tracks.png 8bpp 338    8  34  10 -15   7 normal
+   -1 sprites/sloped_tracks.png 8bpp 386    8  34  25 -15  -1 normal
+   -1 sprites/sloped_tracks.png 8bpp 434    8  31  23 -13  -1 normal
+   -1 sprites/sloped_tracks.png 8bpp 482    8  32  10 -15   7 normal
+   -1 sprites/sloped_tracks.png 8bpp 530    8  31  10 -15   7 normal
+   -1 sprites/sloped_tracks.png 8bpp 578    8  31  23 -16  -1 normal
@@ -8,116 +8,116 @@
 //
   -1 * 0	 0C "Tram track graphics by PikkaBird"
   -1 * 3	 05 0B 71
-   -1 sprites/tramtracks.png 18 8 09 13 20 0 4
-   -1 sprites/tramtracks.png 50 8 09 13 20 0 4
-   -1 sprites/tramtracks.png 82 8 03 36 64 -18 -8
-   -1 sprites/tramtracks.png 162 8 03 36 62 -16 -8
-   -1 sprites/tramtracks.png 242 8 09 31 64 -31 0
-   -1 sprites/tramtracks.png 322 8 09 31 64 -31 0
-   -1 sprites/tramtracks.png 402 8 09 31 64 -31 0
-   -1 sprites/tramtracks.png 482 8 09 31 64 -31 0
-   -1 sprites/tramtracks.png 562 8 09 31 64 -31 0
-   -1 sprites/tramtracks.png 642 8 09 31 64 -31 0
-   -1 sprites/tramtracks.png 722 8 09 31 64 -31 0
-   -1 sprites/tramtracks.png 2 56 09 31 64 -31 0
-   -1 sprites/tramtracks.png 82 56 09 31 64 -31 0
-   -1 sprites/tramtracks.png 162 56 09 31 64 -31 0
-   -1 sprites/tramtracks.png 242 56 09 31 64 -31 0
-   -1 sprites/tramtracks.png 322 56 09 39 64 -31 -8
-   -1 sprites/tramtracks.png 402 56 09 23 64 -31 0
-   -1 sprites/tramtracks.png 482 56 09 23 64 -31 0
-   -1 sprites/tramtracks.png 562 56 09 39 64 -31 -8
-   -1 sprites/tramtracks.png 642 56 09 31 64 -31 0
-   -1 sprites/tramtracks.png 722 56 09 31 64 -31 0
-   -1 sprites/tramtracks.png 2 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 82 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 162 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 242 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 322 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 402 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 482 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 562 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 642 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 722 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 2 168 09 31 64 -31 0
-   -1 sprites/tramtracks.png 82 168 09 31 64 -31 0
-   -1 sprites/tramtracks.png 162 168 09 31 64 -31 0
-   -1 sprites/tramtracks.png 242 168 09 31 64 -31 0
-   -1 sprites/tramtracks.png 322 168 09 31 64 -31 0
-   -1 sprites/tramtracks.png 402 168 09 31 64 -31 0
-   -1 sprites/tramtracks.png 482 168 09 31 64 -31 0
-   -1 sprites/tramtracks.png 562 168 09 39 64 -31 -8
-   -1 sprites/tramtracks.png 642 168 09 23 64 -31 0
-   -1 sprites/tramtracks.png 722 168 09 23 64 -31 0
-   -1 sprites/tramtracks.png 2 232 09 39 64 -31 -8
-   -1 sprites/tramtracks.png 82 232 09 31 64 -31 0
-   -1 sprites/tramtracks.png 162 232 09 31 64 -31 0
-   -1 sprites/tramtracks.png 242 232 09 31 64 -31 0
-   -1 sprites/tramtracks.png 322 232 09 31 64 -31 0
-   -1 sprites/tramtracks.png 402 232 09 31 64 -31 0
-   -1 sprites/tramtracks.png 482 232 09 31 64 -31 0
-   -1 sprites/tramtracks.png 562 232 09 20 20 0 0
-   -1 sprites/tramtracks.png 594 232 09 31 64 -31 0
-   -1 sprites/tramtracks.png 674 232 09 64 62 2 -49
-   -1 sprites/tramtracks.png 2 312 09 31 64 -31 0
-   -1 sprites/tramtracks.png 82 312 09 64 62 -62 -49
-   -1 sprites/tramtracks.png 162 312 09 64 62 -62 -49
-   -1 sprites/tramtracks.png 242 312 09 64 62 2 -49
-   -1 sprites/tramtracks.png 322 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 402 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 482 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 562 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 642 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 722 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 2 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 82 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 162 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 242 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 322 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 402 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 482 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 562 392 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 642 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 722 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 2 472 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 82 472 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 162 472 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 242 472 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 322 472 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 402 472 09 31 64 -31 0
-   -1 sprites/tramtracks.png 482 472 09 31 64 -31 0
-   -1 sprites/tramtracks.png 562 472 09 31 64 -31 0
-   -1 sprites/tramtracks.png 642 472 09 31 64 -31 0
-   -1 sprites/tramtracks.png 722 472 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 2 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 82 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 162 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 242 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 322 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 402 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 482 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 562 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 642 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 722 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 2 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 82 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 162 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 242 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 322 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 402 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 482 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 562 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 642 616 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 722 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 2 696 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 82 696 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 162 696 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 242 696 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 322 696 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 402 696 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 482 696 09 31 64 -31 0
-   -1 sprites/tramtracks.png 562 696 09 31 64 -31 0
-   -1 sprites/tramtracks.png 642 696 09 39 64 -31 -8
-   -1 sprites/tramtracks.png 722 696 09 23 64 -31 0
-   -1 sprites/tramtracks.png 2 776 09 23 64 -31 0
-   -1 sprites/tramtracks.png 82 776 09 39 64 -31 -8
+   -1 sprites/tramtracks.png 8bpp  18    8  20  13   0   4 normal
+   -1 sprites/tramtracks.png 8bpp  50    8  20  13   0   4 normal
+   -1 sprites/tramtracks.png 8bpp  82    8  64  36 -18  -8 normal
+   -1 sprites/tramtracks.png 8bpp 162    8  62  36 -16  -8 normal
+   -1 sprites/tramtracks.png 8bpp 242    8  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 322    8  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 402    8  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 482    8  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 562    8  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 642    8  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 722    8  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp   2   56  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp  82   56  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 162   56  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 242   56  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 322   56  64  39 -31  -8 normal
+   -1 sprites/tramtracks.png 8bpp 402   56  64  23 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 482   56  64  23 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 562   56  64  39 -31  -8 normal
+   -1 sprites/tramtracks.png 8bpp 642   56  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 722   56  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp   2  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp  82  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 162  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 242  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 322  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 402  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 482  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 562  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 642  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 722  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp   2  168  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp  82  168  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 162  168  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 242  168  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 322  168  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 402  168  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 482  168  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 562  168  64  39 -31  -8 normal
+   -1 sprites/tramtracks.png 8bpp 642  168  64  23 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 722  168  64  23 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp   2  232  64  39 -31  -8 normal
+   -1 sprites/tramtracks.png 8bpp  82  232  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 162  232  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 242  232  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 322  232  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 402  232  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 482  232  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 562  232  20  20   0   0 normal
+   -1 sprites/tramtracks.png 8bpp 594  232  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 674  232  62  64   2 -49 normal
+   -1 sprites/tramtracks.png 8bpp   2  312  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp  82  312  62  64 -62 -49 normal
+   -1 sprites/tramtracks.png 8bpp 162  312  62  64 -62 -49 normal
+   -1 sprites/tramtracks.png 8bpp 242  312  62  64   2 -49 normal
+   -1 sprites/tramtracks.png 8bpp 322  312  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 402  312  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 482  312  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 562  312  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 642  312  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 722  312  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp   2  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp  82  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 162  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 242  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 322  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 402  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 482  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 562  392  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp 642  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 722  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp   2  472  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp  82  472  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp 162  472  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 242  472  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 322  472  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp 402  472  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 482  472  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 562  472  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 642  472  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 722  472  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp   2  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp  82  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 162  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 242  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 322  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 402  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 482  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 562  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 642  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 722  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp   2  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp  82  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 162  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 242  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 322  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 402  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 482  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 562  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 642  616  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp 722  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp   2  696  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp  82  696  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 162  696  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp 242  696  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 322  696  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp 402  696  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 482  696  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 562  696  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 642  696  64  39 -31  -8 normal
+   -1 sprites/tramtracks.png 8bpp 722  696  64  23 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp   2  776  64  23 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp  82  776  64  39 -31  -8 normal
@@ -0,0 +1,74 @@
+//
+// $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 * 63	 0C "Tunnel portal overlays for railtypes by Snail (Jacopo Coletto)"
+
+// Tropical sprites.
+   -1 * 6	 07 83 01 \7! 02 11
+   -1 * 3	 05 17 10
+   -1 sprites/tunnel_portals.png 8bpp   5   88  35  33 -31  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp  43   88  40  37  -7 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp  86   88  35  21 -31   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 124   88  40  22  -7 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 168   88  35  21  -2   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 206   88  40  22 -31 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 249   88  35  33  -2  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp 287   88  40  37 -31 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp   5  170  35  33 -31  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp  43  170  40  37  -7 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp  86  170  35  21 -31   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 124  170  40  22  -7 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 168  170  35  21  -2   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 206  170  40  22 -31 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 249  170  35  33  -2  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp 287  170  40  37 -31 -38 normal
+
+// Temperate grass + snow sprites.
+   -1 * 6	 07 83 01 \7= 02 25
+   -1 * 3	 05 17 10
+   -1 sprites/tunnel_portals.png 8bpp   5    6  35  33 -31  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp  43    6  40  37  -7 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp  86    6  35  21 -31   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 124    6  40  22  -7 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 168    6  35  21  -2   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 206    6  40  22 -31 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 249    6  35  33  -2  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp 287    6  40  37 -31 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp   5  129  35  33 -31  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp  43  129  40  37  -7 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp  86  129  35  21 -31   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 124  129  40  22  -7 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 168  129  35  21  -2   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 206  129  40  22 -31 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 249  129  35  33  -2  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp 287  129  40  37 -31 -38 normal
+
+// Arctic grass sprites.
+   -1 * 6	 07 83 01 \7! 01 09
+   -1 * 4	 05 97 08 00
+   -1 sprites/tunnel_portals.png 8bpp   5   47  35  33 -31  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp  43   47  40  37  -7 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp  86   47  35  21 -31   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 124   47  40  22  -7 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 168   47  35  21  -2   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 206   47  40  22 -31 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 249   47  35  33  -2  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp 287   47  40  37 -31 -38 normal
+
+// Toyland sprites.
+   -1 * 6	 07 83 01 \7! 03 09
+   -1 * 4	 05 97 08 00
+   -1 sprites/tunnel_portals.png 8bpp   5  211  35  33 -31  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp  43  211  40  37  -7 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp  86  211  35  21 -31   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 124  211  40  22  -7 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 168  211  35  21  -2   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 206  211  40  22 -31 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 249  211  35  33  -2  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp 287  211  40  37 -31 -38 normal
@@ -0,0 +1,13 @@
+# $Id: openttd.desktop.translation.awk 19884 2010-05-22 19:59:37Z rubidium $
+
+# This file is part of OpenTTD.
+# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Awk script to automatically remove duplicate Comment[i]= lines
+#
+
+BEGIN { FS = "="; last = "" }
+{ if (last != $1) { print $0 }; last = $1 }
@@ -6,10 +6,10 @@
 # See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.

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

 /##isocode/ { lang = $2; next }
-/STR_DESKTOP_SHORTCUT_COMMENT/ { sub("^[^:]*:", "", $0); print "Comment[" lang "]=" $0; next}
+/STR_DESKTOP_SHORTCUT_COMMENT/ { sub("^[^:]*:", "", $0); print "Comment[" lang "]=" $0; sub("_.*", "", lang); print "Comment[" lang "]=" $0; next}
@@ -1,3 +1,183 @@
+openttd (1.3.0-beta2) unstable; urgency=low
+
+  * New upstream release 1.3.0-beta2
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 07 Feb 2013 00:00:00 +0100
+
+openttd (1.3.0-beta1) unstable; urgency=low
+
+  * New upstream release 1.3.0-beta1
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 24 Dec 2012 00:00:00 +0100
+
+openttd (1.2.3) unstable; urgency=low
+
+  * New upstream release 1.2.3
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 01 Nov 2012 00:00:00 +0200
+
+openttd (1.2.3~RC1) unstable; urgency=low
+
+  * New upstream release 1.2.3-RC1
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 17 Oct 2012 00:00:00 +0200
+
+openttd (1.2.2) unstable; urgency=low
+
+  * New upstream release 1.2.2
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 16 Aug 2012 20:00:00 +0200
+
+openttd (1.2.2~RC1) unstable; urgency=low
+
+  * New upstream release 1.2.2-RC1
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 01 Aug 2012 00:00:00 +0200
+
+openttd (1.2.1) unstable; urgency=low
+
+  * New upstream release 1.2.1
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 01 Jun 2012 00:00:00 +0200
+
+openttd (1.2.1~RC1) unstable; urgency=low
+
+  * New upstream release 1.2.1-RC1
+
+ -- 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
+
+ -- 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
+
+ -- 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
+
+ -- 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
+
+ -- 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
+
+ -- 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
+
+ -- 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
+
+ -- 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
+
+ -- 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
+
+ -- 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
+
+ -- 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
+
+ -- 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
+
+ -- 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
+
+ -- 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
+
+ -- 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
+
+ -- 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
+
+ -- 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
+
+ -- 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
+
+ -- 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
+
+ -- 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
+
+ -- 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
+
+ -- 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
+
+ -- 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
@@ -4,12 +4,12 @@ if "%2" == "" goto err

 echo Downloading NoSound...

-%1\wget http://binaries.openttd.org/installer/nosound-NOSOUND_VERSION.7z -O %2/data/nosound.7z
+%1\wget http://binaries.openttd.org/installer/nosound-NOSOUND_VERSION.7z -O %2/baseset/nosound.7z

 echo Extracting NoSound...

-%1\7za x -y -O%2/data %2/data/nosound.7z
-del %1\data\nosound.7z /n
+%1\7za x -y -O%2/baseset %2/baseset/nosound.7z
+del %1\baseset\nosound.7z /n

 echo NoSound has been installed.
 goto end
@@ -4,12 +4,12 @@ if "%2" == "" goto err

 echo Downloading OpenGFX...

-%1\wget http://binaries.openttd.org/installer/opengfx-OPENGFX_VERSION.7z -O %2/data/opengfx.7z
+%1\wget http://binaries.openttd.org/installer/opengfx-OPENGFX_VERSION.7z -O %2/baseset/opengfx.7z

 echo Extracting OpenGFX...

-%1\7za x -y -O%2/data %2/data/opengfx.7z
-del %1\data\opengfx.7z /n
+%1\7za x -y -O%2/baseset %2/baseset/opengfx.7z
+del %1\baseset\opengfx.7z /n

 echo OpenGFX has been installed.
 goto end
@@ -4,12 +4,12 @@ if "%2" == "" goto err

 echo Downloading OpenSFX...

-%1\wget http://binaries.openttd.org/installer/opensfx-OPENSFX_VERSION.7z -O %2/data/opensfx.7z
+%1\wget http://binaries.openttd.org/installer/opensfx-OPENSFX_VERSION.7z -O %2/baseset/opensfx.7z

 echo Extracting OpenSFX...

-%1\7za x -y -O%2/data %2/data/opensfx.7z
-del %1\data\opensfx.7z /n
+%1\7za x -y -O%2/baseset %2/baseset/opensfx.7z
+del %1\baseset\opensfx.7z /n

 echo OpenSFX has been installed.
 goto end
@@ -1,9 +1,9 @@
@echo off

-set OPENTTD_VERSION=1.1.0-beta5
+set OPENTTD_VERSION=1.3.0-beta2
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
-set OPENGFX_VERSION=0.7.0
+set OPENGFX_VERSION=1.2.0

 echo To make the installer, you must have the WarpIN compiler (wic) installed and in
 echo your path, as well as wget and unzip. This file will download the various DLLs
@@ -3,8 +3,8 @@ if "%1" == "" goto err

 echo Removing NoSound...

-del %1\data\nosound\*.* /n
-rmdir %1\data\nosound
+del %1\baseset\nosound\*.* /n
+rmdir %1\baseset\nosound

 echo NoSound has been removed.
 goto end
@@ -3,8 +3,8 @@ if "%1" == "" goto err

 echo Removing OpenGFX...

-del %1\data\opengfx\*.* /n
-rmdir %1\data\opengfx
+del %1\baseset\opengfx\*.* /n
+rmdir %1\baseset\opengfx

 echo OpenGFX has been removed.
 goto end
@@ -3,8 +3,8 @@ if "%1" == "" goto err

 echo Removing OpenSFX...

-del %1\data\opensfx\*.* /n
-rmdir %1\data\opensfx
+del %1\baseset\opensfx\*.* /n
+rmdir %1\baseset\opensfx

 echo OpenSFX has been removed.
 goto end
@@ -0,0 +1,6 @@
+# the man page is in the subpackage data
+addFilter("openttd.*: W: no-manual-page-for-binary openttd")
+# no other package depends on this package, so this should not matter
+addFilter("openttd.*: W: file-contains-date-and-time /usr/bin/openttd")
+addFilter("openttd.*: W: file-contains-current-date /usr/bin/openttd")
+
@@ -0,0 +1,100 @@
+-------------------------------------------------------------------
+Sun Mar  6 09:36:55 UTC 2011 - ammler@openttdcoop.org
+
+- upstream update 1.1.0-RC2
+  * Feature: XZ/LZMA2 savegame support. New default reduces
+    savegame size by 10 to 30% with slightly more CPU usage.
+    (requires xz-devel)
+  * Feature: Remote administration
+  * Feature: a lot improvements with GUI
+  * Feature: Customizable hotkeys
+  * Sources for openttd.grf are pngs (requires grfcodec >= 5.1)
+
+-------------------------------------------------------------------
+Sun Nov 21 11:11:38 UTC 2010 - ammler@openttdcoop.org
+
+- upstream update 1.0.5
+  * Fix: Reading (very) recently freed memory [CVE-2010-4168]
+
+-------------------------------------------------------------------
+Sun Oct 31 17:53:41 UTC 2010 - ammler@openttdcoop.org
+
+- upstream update 1.0.4
+  * build openttd.grf from source
+
+-------------------------------------------------------------------
+Tue Aug 10 20:16:03 UTC 2010 - ammler@openttdcoop.org
+
+- upstream update 1.0.3
+
+-------------------------------------------------------------------
+Wed Jun 23 11:42:59 UTC 2010 - Marcel Gmür <ammler@openttdcoop.org>
+
+- upstream update 1.0.2
+  * Feature: Translated desktop shortcut comments (r19884)
+  * many minor Bugfixes
+
+-------------------------------------------------------------------
+Sat May  1 15:59:32 UTC 2010 - Marcel Gmür <ammler@openttdcoop.org>
+
+- upstream update 1.0.1
+  * Fix: Leaking a file descriptor
+  * Fix a lot small bugs, like minor desync issues on Mulitplayer
+- no strip on make
+
+-------------------------------------------------------------------
+Thu Apr  1 08:53:54 UTC 2010 - Marcel Gmür <ammler@openttdcoop.org>
+
+- upstream update 1.0.0 (finally!)
+  * completely independend game but still working also
+    with ttd original gaphics, sounds and music
+- Add: Recommends openmsx
+- requires lzo2
+
+-------------------------------------------------------------------
+Fri Dec 18 2009 Marcel Gmür <ammler@openttdcoop.org> - 0.7.4
+
+- support for differen branches
+- easy support for dedicated branch
+- let openttd build system make the dektop file
+- split the package to data and gui
+- disable requires
+
+-------------------------------------------------------------------
+Thu Oct 01 2009 Marcel Gmür <ammler@openttdcoop.org> - 0.7.3
+
+- disable libicu for RHEL4
+
+-------------------------------------------------------------------
+Sat Sep 26 2009 Marcel Gmür <ammler@openttdcoop.org> - 0.7.2
+
+- no subfolder games for datadir
+- cleanup: no post and postun anymore
+- Recommends: opengfx (for suse and mandriva)
+- add SUSE support
+
+-------------------------------------------------------------------
+Mon Oct 20 2008 Benedikt Brüggemeier <skidd13@openttd.org>
+
+- Added libicu dependency
+
+-------------------------------------------------------------------
+Thu Sep 23 2008 Benedikt Brüggemeier <skidd13@openttd.org>
+
+- Merged both versions of the spec file
+
+-------------------------------------------------------------------
+Fri Aug 29 2008 Jonathan Coome <maedhros@openttd.org>
+
+- Rewrite spec file from scratch.
+
+-------------------------------------------------------------------
+Sat Aug 02 2008 Benedikt Brüggemeier <skidd13@openttd.org>
+
+- Updated spec file
+
+-------------------------------------------------------------------
+Thu Mar 27 2008 Denis Burlaka <burlaka@yandex.ru>
+
+- Universal spec file
+
@@ -1,202 +1,272 @@
-# $Id$
-#-------------------------------------------------------------------------------
-# spec file for the openttd rpm package
 #
-# Copyright (c) 2007-2011 The OpenTTD developers
+# spec file for package openttd
 #
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007-2012 The OpenTTD developers
 #
-# Note: for (at least) CentOS '#' comments end '\' continue command on new line.
-#       So place all '#' commented parameters of e.g. configure to the end.
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-#-------------------------------------------------------------------------------

-Name:          openttd
-Version:       1.1.0
-Release:       1%{?dist}
+Name:           openttd
+Version:        1.3.beta2
+Release:        0
+%define srcver  1.3.0-beta2
+Summary:        An open source reimplementation of Chris Sawyer's Transport Tycoon Deluxe
+License:        GPL-2.0
+Group:          Amusements/Games/Strategy/Other
+Url:            http://www.openttd.org

-Group:         Amusements/Games
-License:       GPLv2
-URL:           http://www.openttd.org
-Summary:       OpenTTD is an Open Source clone of Chris Sawyer's Transport Tycoon Deluxe
+Source:         http://binaries.openttd.org/releases/%{srcver}/%{name}-%{srcver}-source.tar.gz

-Source:        %{name}-%{version}-source.tar.bz2
-
-Requires:      fontconfig
-Requires:      SDL
-Requires:      zlib
-Requires:      xz-devel
-BuildRequires: gcc-c++
-BuildRequires: fontconfig-devel
-BuildRequires: libpng-devel
-BuildRequires: libicu-devel
-BuildRequires: SDL-devel
-BuildRequires: zlib-devel
-# vendor specific dependencies
-%if %{_vendor}=="alt"
-Requires:      freetype
-BuildRequires: freetype-devel
-%endif
-%if %{_vendor}=="redhat" || %{_vendor}=="fedora"
-Requires:      freetype
-BuildRequires: freetype-devel
-BuildRequires: desktop-file-utils
-%endif
-%if %{_vendor}=="suse" || %{_vendor}=="mandriva"
-Requires:      freetype2
-BuildRequires: freetype2-devel
-%endif
-%if %{_vendor}=="suse"
-BuildRequires: update-desktop-files
+%if 0%{?suse_version} || 0%{?mdkversion}
+Recommends:     %{name}-gui
 %endif

-# recommends works for suse (not sles9) and mandriva, only
-%if 0%{?suse_version} > 910  || %{_vendor}=="mandriva"
-Recommends:	opengfx
-# for 0.8.0
-#Recommends:	opensfx
+BuildRequires:  gcc-c++
+BuildRequires:  libpng-devel
+BuildRequires:  zlib-devel
+
+%if 0%{?suse_version} || 0%{?mdkversion}
+BuildRequires:  update-alternatives
+Requires:       update-alternatives
+%else
+BuildRequires:  chkconfig
+Requires:       chkconfig
 %endif

-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+%if 0%{?mdkversion}
+BuildRequires:  liblzma-devel
+BuildRequires:  liblzo-devel
+%else
+BuildRequires:  lzo-devel
+BuildRequires:  xz-devel
+%endif
+
+# OBS workaround: needed by libdrm
+%if 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600
+BuildRequires:  kernel
+%endif
+
+# for lzma detection
+%if 0%{?suse_version}
+BuildRequires:  pkg-config
+%endif
+
+# bulding openttd.grf is not required as it is a) part of source and
+# b) required only, if you want to use the original set
+%if 0%{?with_grfcodec}
+BuildRequires:  grfcodec
+%endif
+# Recommends would fit better but not well supported...
+Requires:       openttd-opengfx >= 0.4.2
+
+Obsoletes:      %{name}-data < %{version}
+Provides:       %{name}-data = %{version}
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 %description
 OpenTTD is a reimplementation of the Microprose game "Transport Tycoon Deluxe"
 with lots of new features and enhancements. To play the game you need either
-the original data from the game or install the recommend package OpenGFX.
+the original data from the game or install the recommend subackages OpenGFX for
+free graphics, OpenSFX for free sounds and OpenMSX for free music.

 OpenTTD is licensed under the GNU General Public License version 2.0. For more
 information, see the file 'COPYING' included with every release and source
 download of the game.

+%package gui
+Summary:        OpenTTD GUI/Client (requires SDL)
+Group:          Amusements/Games/Strategy/Other
+
+Requires:       %{name}
+Conflicts:      %{name}-dedicated
+
+BuildRequires:  SDL-devel
+BuildRequires:  fontconfig-devel
+
+%if 0%{?rhel_version} != 600
+BuildRequires:  libicu-devel
+%endif
+%if 0%{?rhel_version} || 0%{?fedora}
+BuildRequires:  freetype-devel
+%endif
+%if 0%{?suse_version} || 0%{?mdkversion}
+BuildRequires:  freetype2-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:  update-desktop-files
+%else
+BuildRequires:  desktop-file-utils
+Requires:       hicolor-icon-theme
+%endif
+
+%if 0%{?suse_version} || 0%{?mdkversion}
+Recommends:     openttd-openmsx
+Recommends:     openttd-opensfx
+%endif
+
+%description gui
+OpenTTD is a reimplementation of the Microprose game "Transport Tycoon Deluxe"
+with lots of new features and enhancements. To play the game you need either
+the original data from the game or install the recommend subackages OpenGFX for
+free graphics, OpenSFX for free sounds and OpenMSX for free music.
+
+This subpackage provides the binary which needs SDL.
+
+%package dedicated
+Summary:        OpenTTD Dedicated Server binary (without SDL)
+Group:          Amusements/Games/Strategy/Other
+
+Requires:       %{name}
+Conflicts:      %{name}-gui
+
+%description dedicated
+OpenTTD is a reimplementation of the Microprose game "Transport Tycoon Deluxe"
+with lots of new features and enhancements. To play the game you need either
+the original data from the game or the required package OpenGFX and OpenSFX.
+
+This subpackage provides the binary without dependency of SDL.
+
 %prep
-%setup -q
+%setup -qn openttd%{?branch:-%{branch}}-%{srcver}
+
+# we build the grfs from sources but validate the result with the existing data
+%if 0%{?with_grfcodec}
+md5sum bin/data/* > validate.data
+%endif

 %build
-# suse sle <10 has no support for makedepend
-%if 0%{?sles_version} == 9 || 0%{?sles_version} == 10
-%define 	do_makedepend	0
-%else
-%define 	do_makedepend	1
-%endif
+# first, we build the dedicated binary and copy it to dedicated/
 ./configure \
-	--prefix-dir="%{_prefix}" \
-	--binary-name="%{name}" \
-	--enable-strip \
-	--binary-dir="bin" \
-	--data-dir="share/%{name}" \
-	--with-makedepend="%{do_makedepend}" \
-#	--revision="%{ver}%{?prever:-%{prever}}" \
-#	--enable-debug=0 \
-#	--with-sdl \
-#	--with-zlib \
-#	--with-png \
-#	--with-freetype \
-#	--with-fontconfig \
-#	--with-icu \
-#	--menu_group="Game;" \
-#	--menu-name="OpenTTD" \
-#	--doc-dir="share\doc\%{name}" \
-#	--icon-dir="share/pixmaps" \
-#	--icon-theme-dir="share/icons/hicolor" \
-#	--man-dir="share/man/man6" \
-#	--menu-dir="share/applications"
+        --prefix-dir="%{_prefix}" \
+        --binary-dir="bin" \
+        --data-dir="share/%{name}" \
+        --enable-dedicated
+make %{?_smp_mflags} BUNDLE_DIR="dedicated" bundle
+
+# then, we build the common gui version which we install the usual way
+./configure \
+        --prefix-dir="%{_prefix}" \
+        --binary-name="%{name}" \
+        --binary-dir="bin" \
+        --data-dir="share/%{name}" \
+        --doc-dir="share/doc/%{name}" \
+        --menu-name="OpenTTD%{?branch: %{branch}}" \
+        --menu-group="Game;StrategyGame;"

 make %{?_smp_mflags}

 %install
-make install INSTALL_DIR="%{buildroot}"
+# install the dedicated binary
+install -D -m0755 dedicated/openttd %{buildroot}%{_bindir}/%{name}-dedicated
+# install the gui binary and rename to openttd-gui
+make install INSTALL_DIR=%{buildroot}
+mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-gui
+# we need a dummy target for /etc/alternatives/openttd
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+touch %{buildroot}%{_sysconfdir}/alternatives/%{name}
+ln -s -f /etc/alternatives/%{name} %{buildroot}%{_bindir}/%{name}

-# Validate menu entrys (vendor specific)
-%if %{_vendor} == "redhat" || %{_vendor}=="fedora"
-desktop-file-install \
-	--vendor="%{_vendor}" \
-	--remove-key Version \
-	--dir="%{buildroot}/%{_datadir}/applications/" \
-	"%{buildroot}/%{_datadir}/applications/%{name}.desktop" \
-#	--delete-original
+%if 0%{?suse_version}
+%suse_update_desktop_file -r %{name} Game StrategyGame
+%else
+%if 0%{?fedora} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
+        --add-category=StrategyGame \
+        media/openttd.desktop
 %endif
-%if %{_vendor}=="suse"
-%__cat > %{name}.desktop << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Name=OpenTTD
-Comment=OpenTTD - A clone of the Microprose game 'Transport Tycoon Deluxe'
-GenericName=OpenTTD
-Type=Application
-Terminal=false
-Exec=%{name}
-Icon=%{name}
-Categories=Game;StrategyGame;
-EOF
-%suse_update_desktop_file -i %{name} Game StrategyGame
 %endif

-%clean
-#rm -rf "%{buildroot}"
-
-%post
-# Update the icon cache (vendor specific)
-%if %{_vendor}=="mandriva"
-%update_icon_cache hicolor
+%if 0%{?with_grfcodec}
+%check
+md5sum -c validate.data
 %endif

-%if %{_vendor} == "redhat" || %{_vendor}=="fedora"
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+%post gui
+/usr/sbin/update-alternatives --install %{_bindir}/%{name} %{name} %{_bindir}/%{name}-gui 10
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%post dedicated
+/usr/sbin/update-alternatives --install %{_bindir}/%{name} %{name} %{_bindir}/%{name}-dedicated 0
+
+%preun gui
+if [ "$1" = 0 ] ; then
+    /usr/sbin/update-alternatives --remove %{name} %{_bindir}/%{name}-gui
 fi
-%endif

-%postun
-# Update the icon cache (vendor specific)
-%if %{_vendor}=="mandriva"
-%update_icon_cache hicolor
-%endif
-
-%if %{_vendor} == "redhat" || %{_vendor}=="fedora"
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+%preun dedicated
+if [ "$1" = 0 ] ; then
+    /usr/sbin/update-alternatives --remove %{name} %{_bindir}/%{name}-dedicated
 fi
-%endif

+%postun gui
+if [ "$1" -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans gui
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+# we need a file in the main package so it will be made
 %files
-%defattr(-, root, games, -)
+%defattr(-, root, root)
 %dir %{_datadir}/doc/%{name}
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/lang
-%dir %{_datadir}/%{name}/data
-%dir %{_datadir}/%{name}/gm
+%dir %{_datadir}/%{name}/baseset
 %dir %{_datadir}/%{name}/scripts
-%attr(755, root, games) %{_bindir}/%{name}
+%dir %{_datadir}/%{name}/ai
+%dir %{_datadir}/%{name}/game
 %{_datadir}/doc/%{name}/*
 %{_datadir}/%{name}/lang/*
-%{_datadir}/%{name}/data/*
+%{_datadir}/%{name}/baseset/*
 %{_datadir}/%{name}/scripts/*
-%{_datadir}/applications/*%{name}.desktop
-%{_datadir}/pixmaps/*
-%{_datadir}/icons/*
+%{_datadir}/%{name}/ai/*
+%{_datadir}/%{name}/game/*
 %doc %{_mandir}/man6/%{name}.6.*

+%files gui
+%defattr(-, root, root)
+%ghost %{_sysconfdir}/alternatives/%{name}
+%ghost %{_bindir}/%{name}
+%{_bindir}/%{name}-gui
+%dir %{_datadir}/icons/hicolor
+%dir %{_datadir}/icons/hicolor/16x16
+%dir %{_datadir}/icons/hicolor/16x16/apps
+%dir %{_datadir}/icons/hicolor/32x32
+%dir %{_datadir}/icons/hicolor/32x32/apps
+%dir %{_datadir}/icons/hicolor/48x48
+%dir %{_datadir}/icons/hicolor/48x48/apps
+%dir %{_datadir}/icons/hicolor/64x64
+%dir %{_datadir}/icons/hicolor/64x64/apps
+%dir %{_datadir}/icons/hicolor/128x128
+%dir %{_datadir}/icons/hicolor/128x128/apps
+%dir %{_datadir}/icons/hicolor/256x256
+%dir %{_datadir}/icons/hicolor/256x256/apps
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+%{_datadir}/pixmaps/%{name}.32.xpm
+
+%files dedicated
+%defattr(-, root, root)
+%ghost %{_bindir}/%{name}
+%ghost %{_sysconfdir}/alternatives/%{name}
+%{_bindir}/%{name}-dedicated
+
 %changelog
-* Sat Sep 26 2009 Marcel Gmür <ammler@openttdcoop.org> - 0.7.2
- no subfolder games for datadir
- cleanup: no post and postun anymore
- Recommends: opengfx (for suse and mandriva)
- add SUSE support
-
-* Mon Oct 20 2008 Benedikt Brüggemeier <skidd13@openttd.org>
- Added libicu dependency
-
-* Thu Sep 23 2008 Benedikt Brüggemeier <skidd13@openttd.org>
- Merged both versions of the spec file
-
-* Fri Aug 29 2008 Jonathan Coome <maedhros@openttd.org>
- Rewrite spec file from scratch.
-
-* Sat Aug 02 2008 Benedikt Brüggemeier <skidd13@openttd.org>
- Updated spec file
-
-* Thu Mar 27 2008 Denis Burlaka <burlaka@yandex.ru>
- Universal spec file
@@ -1,9 +1,9 @@
 # Version numbers to update
 !define APPV_MAJOR 1
-!define APPV_MINOR 1
+!define APPV_MINOR 3
 !define APPV_MAINT 0
-!define APPV_BUILD 4
-!define APPV_EXTRA "-beta5"
+!define APPV_BUILD 1
+!define APPV_EXTRA "-beta2"

 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"  ; Define application version
@@ -14,7 +14,7 @@
 !define APPURLLINK "http://www.openttd.org"
 !define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}"

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

@@ -57,6 +57,7 @@ Var CDDRIVE
 ; Modern interface settings
 !include "MUI2.nsh"
 !include "InstallOptions.nsh"
+!include "WinVer.nsh"

 !define MUI_ABORTWARNING
 !define MUI_WELCOMEPAGE_TITLE_3LINES
@@ -85,7 +86,7 @@ Page custom SelectCDEnter SelectCDExit ": TTD folder"
 !define MUI_FINISHPAGE_TITLE_3LINES
 !define MUI_FINISHPAGE_RUN_TEXT "Run ${APPNAMEANDVERSION} now!"
 !define MUI_FINISHPAGE_RUN "$INSTDIR\openttd.exe"
-!define MUI_FINISHPAGE_LINK "Visit the OpenTTD site for the latest news, FAQs and downloads"
+!define MUI_FINISHPAGE_LINK "Visit the OpenTTD site for more information"
 !define MUI_FINISHPAGE_LINK_LOCATION "${APPURLLINK}"
 !define MUI_FINISHPAGE_NOREBOOTSUPPORT
 !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\readme.txt"
@@ -123,16 +124,17 @@ Section "!OpenTTD" Section1
 	SetOutPath "$INSTDIR\ai\"
 	File ${PATH_ROOT}bin\ai\compat_*.nut

-	; Copy data files
-	SetOutPath "$INSTDIR\data\"
-	File ${PATH_ROOT}bin\data\*.grf
-	File ${PATH_ROOT}bin\data\*.obg
-	File ${PATH_ROOT}bin\data\*.obs
-	File ${PATH_ROOT}bin\data\opntitle.dat
+	; Copy Game Script files
+	SetOutPath "$INSTDIR\game\"
+	File ${PATH_ROOT}bin\game\compat_*.nut

-	; Copy the music base metadata files
-	SetOutPath "$INSTDIR\gm\"
-	File ${PATH_ROOT}bin\gm\*.obm
+	; Copy data files
+	SetOutPath "$INSTDIR\baseset\"
+	File ${PATH_ROOT}bin\baseset\*.grf
+	File ${PATH_ROOT}bin\baseset\*.obg
+	File ${PATH_ROOT}bin\baseset\*.obm
+	File ${PATH_ROOT}bin\baseset\*.obs
+	File ${PATH_ROOT}bin\baseset\opntitle.dat

 	; Copy the scripts
 	SetOutPath "$INSTDIR\scripts\"
@@ -145,9 +147,6 @@ Section "!OpenTTD" Section1
 	File ${PATH_ROOT}docs\multiplayer.txt
 	Push "$INSTDIR\docs\multiplayer.txt"
 	Call unix2dos
-	File ${PATH_ROOT}docs\32bpp.txt
-	Push "$INSTDIR\docs\32bpp.txt"
-	Call unix2dos

 	; Copy the rest of the stuff
 	SetOutPath "$INSTDIR\"
@@ -170,12 +169,30 @@ Section "!OpenTTD" Section1
 	File /oname=openttd.exe ${BINARY_DIR}\openttd.exe


-	; Delete old files from the main dir. they are now placed in data/ and lang/
+	; Delete old files from the main dir. they are now placed in baseset/ and lang/
 	Delete "$INSTDIR\*.lng"
 	Delete "$INSTDIR\*.grf"
 	Delete "$INSTDIR\sample.cat"
 	Delete "$INSTDIR\ttd.exe"
-
+	Delete "$INSTDIR\data\opntitle.dat"
+	Delete "$INSTDIR\data\2ccmap.grf"
+	Delete "$INSTDIR\data\airports.grf"
+	Delete "$INSTDIR\data\autorail.grf"
+	Delete "$INSTDIR\data\canalsw.grf"
+	Delete "$INSTDIR\data\dosdummy.grf"
+	Delete "$INSTDIR\data\elrailsw.grf"
+	Delete "$INSTDIR\data\nsignalsw.grf"
+	Delete "$INSTDIR\data\openttd.grf"
+	Delete "$INSTDIR\data\roadstops.grf"
+	Delete "$INSTDIR\data\trkfoundw.grf"
+	Delete "$INSTDIR\data\openttdd.grf"
+	Delete "$INSTDIR\data\openttdw.grf"
+	Delete "$INSTDIR\data\orig_win.obg"
+	Delete "$INSTDIR\data\orig_dos.obg"
+	Delete "$INSTDIR\data\orig_dos_de.obg"
+	Delete "$INSTDIR\data\orig_win.obs"
+	Delete "$INSTDIR\data\orig_dos.obs"
+	Delete "$INSTDIR\data\no_sound.obs"

 	; Create the Registry Entries
 	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Comments" "Visit ${APPURLLINK}"
@@ -201,7 +218,6 @@ Section "!OpenTTD" Section1
 	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Known-bugs.lnk" "$INSTDIR\known-bugs.txt"
 	CreateDirectory "$SMPROGRAMS\$SHORTCUTS\Docs"
 	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Docs\Multiplayer.lnk" "$INSTDIR\docs\multiplayer.txt"
-	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Docs\32bpp.lnk" "$INSTDIR\docs\32bpp.txt"
 	CreateDirectory "$SMPROGRAMS\$SHORTCUTS\Scripts"
 	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Scripts\Readme.lnk" "$INSTDIR\scripts\readme.txt"
 	!insertmacro MUI_STARTMENU_WRITE_END
@@ -223,17 +239,17 @@ SectionEnd
 Section "Download OpenGFX (free graphics set)" Section3
 	SetOverwrite try

-	NSISdl::download "http://binaries.openttd.org/installer/opengfx-${OPENGFX_BASE_VERSION}.7z" "$INSTDIR\data\opengfx.7z"
+	NSISdl::download "http://binaries.openttd.org/installer/opengfx-${OPENGFX_BASE_VERSION}.7z" "$INSTDIR\baseset\opengfx.7z"
 	Pop $R0 ;Get the return value
 	StrCmp $R0 "success" +3
 		MessageBox MB_OK "Downloading of OpenGFX failed"
 		Goto Done

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

-	Delete "$INSTDIR\data\opengfx.7z"
+	Delete "$INSTDIR\baseset\opengfx.7z"
 	SetOutPath "$INSTDIR\"
 Done:

@@ -244,17 +260,17 @@ SectionEnd
 Section "Download OpenSFX (free sound set)" Section4
 	SetOverwrite try

-	NSISdl::download "http://binaries.openttd.org/installer/opensfx-${OPENSFX_BASE_VERSION}.7z" "$INSTDIR\data\opensfx.7z"
+	NSISdl::download "http://binaries.openttd.org/installer/opensfx-${OPENSFX_BASE_VERSION}.7z" "$INSTDIR\baseset\opensfx.7z"
 	Pop $R0 ;Get the return value
 	StrCmp $R0 "success" +3
 		MessageBox MB_OK "Downloading of OpenSFX failed"
 		Goto Done

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

-	Delete "$INSTDIR\data\opensfx.7z"
+	Delete "$INSTDIR\baseset\opensfx.7z"
 	SetOutPath "$INSTDIR\"
 Done:

@@ -265,17 +281,17 @@ SectionEnd
 Section "Download OpenMSX (free music set)" Section5
 	SetOverwrite try

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

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

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

@@ -286,22 +302,21 @@ SectionEnd
 Section /o "Copy data from Transport Tycoon Deluxe CD-ROM" Section2
 	SetOverwrite try
 	; Let's copy the files with size approximation
-	SetOutPath "$INSTDIR\gm"
-	CopyFiles "$CDDRIVE\gm\*.gm" "$INSTDIR\gm\" 1028
-	SetOutPath "$INSTDIR\data\"
-	CopyFiles "$CDDRIVE\sample.cat" "$INSTDIR\data\sample.cat" 1566
+	SetOutPath "$INSTDIR\baseset"
+	CopyFiles "$CDDRIVE\gm\*.gm" "$INSTDIR\baseset\" 1028
+	CopyFiles "$CDDRIVE\sample.cat" "$INSTDIR\baseset\sample.cat" 1566
 	; Copy Windows files
-	CopyFiles "$CDDRIVE\trg1r.grf" "$INSTDIR\data\trg1r.grf" 2365
-	CopyFiles "$CDDRIVE\trgcr.grf" "$INSTDIR\data\trgcr.grf" 260
-	CopyFiles "$CDDRIVE\trghr.grf" "$INSTDIR\data\trghr.grf" 400
-	CopyFiles "$CDDRIVE\trgir.grf" "$INSTDIR\data\trgir.grf" 334
-	CopyFiles "$CDDRIVE\trgtr.grf" "$INSTDIR\data\trgtr.grf" 546
+	CopyFiles "$CDDRIVE\trg1r.grf" "$INSTDIR\baseset\trg1r.grf" 2365
+	CopyFiles "$CDDRIVE\trgcr.grf" "$INSTDIR\baseset\trgcr.grf" 260
+	CopyFiles "$CDDRIVE\trghr.grf" "$INSTDIR\baseset\trghr.grf" 400
+	CopyFiles "$CDDRIVE\trgir.grf" "$INSTDIR\baseset\trgir.grf" 334
+	CopyFiles "$CDDRIVE\trgtr.grf" "$INSTDIR\baseset\trgtr.grf" 546
 	; Copy DOS files
-	CopyFiles "$CDDRIVE\trg1.grf" "$INSTDIR\data\trg1.grf" 2365
-	CopyFiles "$CDDRIVE\trgc.grf" "$INSTDIR\data\trgc.grf" 260
-	CopyFiles "$CDDRIVE\trgh.grf" "$INSTDIR\data\trgh.grf" 400
-	CopyFiles "$CDDRIVE\trgi.grf" "$INSTDIR\data\trgi.grf" 334
-	CopyFiles "$CDDRIVE\trgt.grf" "$INSTDIR\data\trgt.grf" 546
+	CopyFiles "$CDDRIVE\trg1.grf" "$INSTDIR\baseset\trg1.grf" 2365
+	CopyFiles "$CDDRIVE\trgc.grf" "$INSTDIR\baseset\trgc.grf" 260
+	CopyFiles "$CDDRIVE\trgh.grf" "$INSTDIR\baseset\trgh.grf" 400
+	CopyFiles "$CDDRIVE\trgi.grf" "$INSTDIR\baseset\trgi.grf" 334
+	CopyFiles "$CDDRIVE\trgt.grf" "$INSTDIR\baseset\trgt.grf" 546
 	SetOutPath "$INSTDIR\"
 SectionEnd

@@ -387,46 +402,52 @@ Section "Uninstall"
 	; AI files
 	Delete "$INSTDIR\ai\compat_*.nut"

-	; Data files
-	Delete "$INSTDIR\data\opntitle.dat"
+	; Game Script files
+	Delete "$INSTDIR\game\compat_*.nut"

-	Delete "$INSTDIR\data\2ccmap.grf"
-	Delete "$INSTDIR\data\airports.grf"
-	Delete "$INSTDIR\data\autorail.grf"
-	Delete "$INSTDIR\data\canalsw.grf"
-	Delete "$INSTDIR\data\dosdummy.grf"
-	Delete "$INSTDIR\data\elrailsw.grf"
-	Delete "$INSTDIR\data\nsignalsw.grf"
-	Delete "$INSTDIR\data\openttd.grf"
-	Delete "$INSTDIR\data\roadstops.grf"
-	Delete "$INSTDIR\data\trkfoundw.grf"
-	Delete "$INSTDIR\data\openttdd.grf"
-	Delete "$INSTDIR\data\openttdw.grf"
-	Delete "$INSTDIR\data\orig_win.obg"
-	Delete "$INSTDIR\data\orig_dos.obg"
-	Delete "$INSTDIR\data\orig_dos_de.obg"
-	Delete "$INSTDIR\data\orig_win.obs"
-	Delete "$INSTDIR\data\orig_dos.obs"
-	Delete "$INSTDIR\data\no_sound.obs"
+	; Baseset files
+	Delete "$INSTDIR\baseset\opntitle.dat"
+	Delete "$INSTDIR\baseset\openttd.grf"
+	Delete "$INSTDIR\baseset\orig_win.obg"
+	Delete "$INSTDIR\baseset\orig_dos.obg"
+	Delete "$INSTDIR\baseset\orig_dos_de.obg"
+	Delete "$INSTDIR\baseset\orig_win.obs"
+	Delete "$INSTDIR\baseset\orig_dos.obs"
+	Delete "$INSTDIR\baseset\no_sound.obs"
+	Delete "$INSTDIR\baseset\sample.cat"
+	Delete "$INSTDIR\baseset\trg1r.grf"
+	Delete "$INSTDIR\baseset\trghr.grf"
+	Delete "$INSTDIR\baseset\trgtr.grf"
+	Delete "$INSTDIR\baseset\trgcr.grf"
+	Delete "$INSTDIR\baseset\trgir.grf"
+	Delete "$INSTDIR\baseset\trg1.grf"
+	Delete "$INSTDIR\baseset\trgh.grf"
+	Delete "$INSTDIR\baseset\trgt.grf"
+	Delete "$INSTDIR\baseset\trgc.grf"
+	Delete "$INSTDIR\baseset\trgi.grf"
+	Delete "$INSTDIR\baseset\*.gm"

 	Delete "$INSTDIR\data\sample.cat"
-	; Windows Data files
 	Delete "$INSTDIR\data\trg1r.grf"
 	Delete "$INSTDIR\data\trghr.grf"
 	Delete "$INSTDIR\data\trgtr.grf"
 	Delete "$INSTDIR\data\trgcr.grf"
 	Delete "$INSTDIR\data\trgir.grf"
-	; Dos Data files
 	Delete "$INSTDIR\data\trg1.grf"
 	Delete "$INSTDIR\data\trgh.grf"
 	Delete "$INSTDIR\data\trgt.grf"
 	Delete "$INSTDIR\data\trgc.grf"
 	Delete "$INSTDIR\data\trgi.grf"
-
-	; Music
 	Delete "$INSTDIR\gm\*.gm"

 	; Downloaded OpenGFX/OpenSFX/OpenMSX
+	Delete "$INSTDIR\baseset\opengfx\*"
+	RMDir  "$INSTDIR\baseset\opengfx"
+	Delete "$INSTDIR\baseset\opensfx\*"
+	RMDir  "$INSTDIR\baseset\opensfx"
+	Delete "$INSTDIR\baseset\openmsx\*"
+	RMDir  "$INSTDIR\baseset\openmsx"
+
 	Delete "$INSTDIR\data\opengfx\*"
 	RMDir  "$INSTDIR\data\opengfx"
 	Delete "$INSTDIR\data\opensfx\*"
@@ -446,6 +467,8 @@ Section "Uninstall"
 	; Base sets for music
 	Delete "$INSTDIR\gm\orig_win.obm"
 	Delete "$INSTDIR\gm\no_music.obm"
+	Delete "$INSTDIR\baseset\orig_win.obm"
+	Delete "$INSTDIR\baseset\no_music.obm"

 	; Remove remaining directories
 	RMDir "$SMPROGRAMS\$SHORTCUTS\Extras\"
@@ -453,7 +476,9 @@ Section "Uninstall"
 	RMDir "$SMPROGRAMS\$SHORTCUTS\Docs\"
 	RMDir "$SMPROGRAMS\$SHORTCUTS"
 	RMDir "$INSTDIR\ai"
+	RMDir "$INSTDIR\game"
 	RMDir "$INSTDIR\data"
+	RMDir "$INSTDIR\baseset"
 	RMDir "$INSTDIR\gm"
 	RMDir "$INSTDIR\lang"
 	RMDir "$INSTDIR\scripts"
@@ -518,17 +543,17 @@ hasCD:
 FunctionEnd

 ;-------------------------------------------------------------------------------
-; Determine windows version, returns "win9x" if Win9x/Me or "winnt" on the stack
+; Determine windows version, returns "win9x" if Win9x/Me/2000/XP SP2- or "winnt" for the rest on the stack
 Function GetWindowsVersion
 	ClearErrors
-	StrCpy $R0 "winnt"
-
-	GetVersion::WindowsPlatformId
-	Pop $R0
-	IntCmp $R0 2 WinNT 0
 	StrCpy $R0 "win9x"
-WinNT:
-	ClearErrors
+	${If} ${IsNT}
+		${If} ${IsWinXP}
+		${AndIf} ${AtLeastServicePack} 3
+		${OrIf} ${AtLeastWin2003}
+			StrCpy $R0 "winnt"
+		${EndIf}
+	${EndIf}
 	Push $R0
 FunctionEnd

@@ -540,12 +565,12 @@ Function CheckProcessorArchitecture
 	IntCmp $R0 64 Win64 0
 	ClearErrors
 	IntCmp ${APPBITS} 64 0 Done
-	MessageBox MB_OKCANCEL|MB_ICONSTOP "You are trying to install the 64-bit OpenTTD on a 32-bit operating system. This is not going to work. Please download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
+	MessageBox MB_YESNO|MB_ICONSTOP "You are trying to install the 64-bit OpenTTD on a 32-bit operating system. This is not going to work. Please download the correct version. Do you really want to continue?" IDYES Done IDNO Abort
 	GoTo Done
 Win64:
 	ClearErrors
 	IntCmp ${APPBITS} 64 Done 0
-	MessageBox MB_OKCANCEL|MB_ICONINFORMATION "You are trying to install the 32-bit OpenTTD on a 64-bit operating system. This is not advised, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
+	MessageBox MB_YESNO|MB_ICONINFORMATION "You are trying to install the 32-bit OpenTTD on a 64-bit operating system. This is not advised, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDYES Done IDNO Abort
 	GoTo Done
 Abort:
 	Quit
@@ -560,12 +585,12 @@ Function CheckWindowsVersion
 	StrCmp $R0 "win9x" 0 WinNT
 	ClearErrors
 	StrCmp ${APPARCH} "win9x" Done 0
-	MessageBox MB_OKCANCEL|MB_ICONSTOP "You are trying to install the Windows 2000, XP and Vista version on Windows 95, 98 or ME. This is will not work. Please download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
+	MessageBox MB_YESNO|MB_ICONSTOP "You are trying to install the Windows XP SP3, Vista and 7 version on Windows 95, 98, ME, 2000 and XP without SP3. This is will not work. Please download the correct version. Do you really want to continue?" IDYES Done IDNO Abort
 	GoTo Done
 WinNT:
 	ClearErrors
 	StrCmp ${APPARCH} "win9x" 0 Done
-	MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "You are trying to install the Windows 95, 98 and ME version on Windows 2000, XP or Vista. This is not advised, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
+	MessageBox MB_YESNO|MB_ICONEXCLAMATION "You are trying to install the Windows 95, 98, 2000 and XP without SP3 version on Windows XP SP3, Vista or 7. This is not advised, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDYES Done IDNO Abort
 Abort:
 	Quit
 Done:
@@ -674,8 +699,7 @@ WelcomeToSetup:
 	ReadRegStr $OLDVERSION HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "DisplayVersion"
 	; Gets the older version then displays it in a message box
 	MessageBox MB_OK|MB_ICONINFORMATION \
-		"Welcome to ${APPNAMEANDVERSION} Setup.$\n \
-		This will allow you to upgrade from version $OLDVERSION."
+		"Welcome to ${APPNAMEANDVERSION} Setup.$\nThis will allow you to upgrade from version $OLDVERSION."
 	SectionSetFlags ${Section2} 0x80 ; set bit 7
 	SectionSetFlags ${Section3} 0x80 ; set bit 7
 	SectionSetFlags ${Section4} 0x80 ; set bit 7
@@ -686,8 +710,7 @@ VersionsAreEqual:
 	ReadRegStr $UninstallString HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "UninstallString"
 	IfFileExists "$UninstallString" "" FinishCallback
 	MessageBox MB_YESNO|MB_ICONQUESTION \
-		"Setup detected ${APPNAMEANDVERSION} on your system. This is the same version that this program will install.$\n \
-		Are you trying to uninstall it?" \
+		"Setup detected ${APPNAMEANDVERSION} on your system. This is the same version that this program will install.$\nAre you trying to uninstall it?" \
 		IDYES DoUninstall IDNO FinishCallback
 DoUninstall: ; You have the same version as this installer.  This allows you to uninstall.
 	Exec "$UninstallString"
@@ -695,8 +718,7 @@ DoUninstall: ; You have the same version as this installer.  This allows you to

 InstallerIsOlder:
 	MessageBox MB_OK|MB_ICONSTOP \
-		"You have a newer version of ${APPNAME}.$\n \
-		Setup will now exit."
+		"You have a newer version of ${APPNAME}.$\nSetup will now exit."
 	Quit

 FinishCallback:
--- a/Show More
+++ b/Show More