(svn r21278) [1.0] -Prepare for 1.0.5

- Fix: Reading (very) recently freed memory (r21182)
- Fix: [Windows] Make sure to be upgraded openttd is not running when installing [FS#4212] (r21146)

.gitignore

@@ -4,14 +4,17 @@ bin/ai/*
 !bin/ai/compat*.nut
 !bin/ai/regression
 !bin/data
-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/data/*
+!bin/data/openttdd.grf
+!bin/data/openttdw.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/scripts
 bin/scripts/*
 !bin/scripts/*.example
@@ -20,7 +23,6 @@ bin/scripts/*
 bundle/*
 bundles/*
 docs/aidocs/*
-docs/gamedocs/*
 docs/source/*
 media/openttd.desktop
 media/openttd.desktop.install

.hgignore

@@ -1,7 +1,5 @@
 syntax: glob
 
-.svn
-bin/baseset/openttd.32.bmp
 bin/lang/*
 bin/openttd*
 bin/*.cfg
@@ -11,7 +9,6 @@ config.cache*
 config.log
 config.pwd
 docs/aidocs/*
-docs/gamedocs/*
 docs/source/*
 Makefile
 Makefile.am

Doxyfile

@@ -93,7 +93,7 @@ FILE_PATTERNS          = *.c \
 RECURSIVE              = YES
 EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = */3rdparty */.svn */script/api
+EXCLUDE_PATTERNS       = */3rdparty */.svn
 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 WITH_ZLIB WITH_LZO WITH_LZMA WITH_SDL WITH_PNG WITH_FONTCONFIG WITH_FREETYPE WITH_ICU UNICODE _UNICODE _GNU_SOURCE
+PREDEFINED             = ENABLE_NETWORK ENABLE_AI WITH_ZLIB WITH_LZO WITH_PNG WITH_FONTCONFIG WITH_FREETYPE WITH_ICU UNICODE _UNICODE
 EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------

Makefile.bundle.in

@@ -29,15 +29,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
-BASESET_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/baseset
-LANG_DIR    = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
-TTD_DIR     = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
+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
 else
-AI_DIR      = $(BUNDLE_DIR)/ai
-BASESET_DIR = $(BUNDLE_DIR)/baseset
-LANG_DIR    = $(BUNDLE_DIR)/lang
-TTD_DIR     = $(BUNDLE_DIR)
+AI_DIR   = $(BUNDLE_DIR)/ai
+DATA_DIR = $(BUNDLE_DIR)/data
+LANG_DIR = $(BUNDLE_DIR)/lang
+GM_DIR   = $(BUNDLE_DIR)/gm
+TTD_DIR  = $(BUNDLE_DIR)
 endif
 
 bundle: all
@@ -49,29 +51,30 @@ bundle: all
 	$(Q)mkdir -p "$(BUNDLE_DIR)/scripts"
 	$(Q)mkdir -p "$(TTD_DIR)"
 	$(Q)mkdir -p "$(AI_DIR)"
-	$(Q)mkdir -p "$(BASESET_DIR)"
+	$(Q)mkdir -p "$(DATA_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"                   "$(BASESET_DIR)"
-endif
-ifeq ($(OS),UNIX)
-	$(Q)cp "$(ROOT_DIR)/media/openttd.32.bmp" "$(BASESET_DIR)/"
+	$(Q)cp    "$(ROOT_DIR)/os/macosx/splash.png"                   "$(DATA_DIR)"
 endif
 	$(Q)cp "$(BIN_DIR)/$(TTD)"                "$(TTD_DIR)/"
 	$(Q)cp "$(BIN_DIR)/ai/"compat_*.nut       "$(AI_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)/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)/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/obg_format.txt"  "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/docs/obm_format.txt"  "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/docs/obs_format.txt"  "$(BUNDLE_DIR)/docs/"
 	$(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)/"
@@ -172,10 +175,13 @@ 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)/baseset"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/data"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/lang"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/gm"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/scripts"
+	$(Q)install -d "$(INSTALL_DOC_DIR)"
 ifeq ($(TTD), openttd.exe)
 	$(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)/${BINARY_NAME}.exe"
 else
@@ -183,20 +189,12 @@ 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)/baseset/"* "$(INSTALL_DATA_DIR)/baseset"
+	$(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)/scripts/"* "$(INSTALL_DATA_DIR)/scripts"
-ifndef DO_NOT_INSTALL_DOCS
-	$(Q)install -d "$(INSTALL_DOC_DIR)"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/readme.txt" "$(BUNDLE_DIR)/known-bugs.txt" "$(INSTALL_DOC_DIR)"
-endif
-ifndef DO_NOT_INSTALL_CHANGELOG
-	$(Q)install -d "$(INSTALL_DOC_DIR)"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/changelog.txt" "$(INSTALL_DOC_DIR)"
-endif
-ifndef DO_NOT_INSTALL_LICENSE
-	$(Q)install -d "$(INSTALL_DOC_DIR)"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(INSTALL_DOC_DIR)"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/"*.txt "$(INSTALL_DOC_DIR)"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/COPYING" "$(INSTALL_DOC_DIR)"
-endif
 	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.32.xpm" "$(INSTALL_ICON_DIR)/${BINARY_NAME}.32.xpm"
 ifdef ICON_THEME_DIR
 	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)"
@@ -216,11 +214,9 @@ else
 	$(Q)install -m 644 "$(BUNDLE_DIR)/media/"*.png "$(INSTALL_ICON_DIR)"
 endif
 ifdef MAN_DIR
-ifndef DO_NOT_INSTALL_MAN
 	$(Q)install -d "$(INSTALL_MAN_DIR)"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/man/openttd.6.gz" "$(INSTALL_MAN_DIR)/${BINARY_NAME}.6.gz"
 endif
-endif
 ifdef MENU_DIR
 	$(Q)install -d "$(INSTALL_MENU_DIR)"
 	$(Q)install -m 644 "$(ROOT_DIR)/media/openttd.desktop.install" "$(INSTALL_MENU_DIR)/${BINARY_NAME}.desktop"

Makefile.grf.in

@@ -20,7 +20,7 @@
 
 ROOT_DIR = !!ROOT_DIR!!
 GRF_DIR  = $(ROOT_DIR)/media/extra_grf
-BIN_DIR  = !!BIN_DIR!!/baseset
+BIN_DIR  = !!BIN_DIR!!/data
 OBJS_DIR = !!GRF_OBJS_DIR!!
 OS       = !!OS!!
 STAGE    = !!STAGE!!
@@ -34,39 +34,54 @@ else
 	E = @echo
 endif
 
-GRFCODEC := !!GRFCODEC!!
-NFORENUM := !!NFORENUM!!
+# 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")
 MD5SUM   := $(shell [ "$(OS)" = "OSX" ] && echo "md5 -r" || echo "md5sum")
 
 # Some "should not be changed" settings.
-NFO_FILES    := $(GRF_DIR)/*.nfo $(GRF_DIR)/rivers/*.nfo
-PNG_FILES    := $(GRF_DIR)/*.png $(GRF_DIR)/rivers/*.png
+NFO_FILES    := $(GRF_DIR)/*.nfo
+PCX_FILES    := $(GRF_DIR)/*.pcx
 
 # Build the GRF.
-ifdef GRFCODEC
-all: $(BIN_DIR)/openttd.grf
-else
-all:
-endif
+all: $(BIN_DIR)/openttdd.grf $(BIN_DIR)/openttdw.grf
 
 # Make sure the sprites directory exists.
 $(OBJS_DIR)/sprites:
 	$(Q)-mkdir "$@"
 
-# Generic
-$(BIN_DIR)/openttd.grf: $(OBJS_DIR)/openttd.grf
-	$(Q)cp $(OBJS_DIR)/openttd.grf $(BIN_DIR)/openttd.grf
-	$(E) '$(STAGE) Updating base graphics sets'
-	$(Q) for grf in $(BIN_DIR)/orig*.obg; do sed 's/^OPENTTD.GRF  = [0-9a-f]*$$/OPENTTD.GRF  = '`$(MD5SUM) $(BIN_DIR)/openttd.grf | sed 's@ .*@@'`'/' $$grf > $$grf.tmp && mv $$grf.tmp $$grf; done
+$(BIN_DIR)/openttdd.grf: $(PCX_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)/openttdd.grf && cp $(OBJS_DIR)/openttdd.grf $(BIN_DIR)/openttdd.grf) || ([ -e $(BIN_DIR)/openttdd.grf ] && touch $(BIN_DIR)/openttdd.grf && echo "no NFORenum and GRFCodec found, skipping rebuild of openttdd.grf...") || (echo "no NFORenum and GRFCodec found, but no openttdd.grf either. Install NFORenum and GRFCodec." && exit 1)
 
 # 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) -s $(OBJS_DIR)/sprites/openttd.nfo
-	$(E) '$(STAGE) Compiling openttd.grf'
-	$(Q) $(GRFCODEC) -s -e -p1 $(OBJS_DIR)/openttd.grf
+$(OBJS_DIR)/openttdd.grf: $(PCX_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites
+	$(E) '$(STAGE) Assembling openttdd.nfo'
+	$(Q)-cp $(PCX_FILES) $(OBJS_DIR)/sprites 2> /dev/null
+	$(Q) gcc -DDOS -I$(GRF_DIR) -C -E - < "$(GRF_DIR)/openttd.nfo" | sed -e '/^#/d' -e '/^$$/d' > $(OBJS_DIR)/sprites/openttdd.nfo
+	$(Q) $(NFORENUM) $(OBJS_DIR)/sprites/openttdd.nfo
+	$(E) '$(STAGE) Compiling openttdd.grf'
+	$(Q) $(GRFCODEC) -e -m1 $(OBJS_DIR)/openttdd.grf
+	$(Q) cp $(OBJS_DIR)/openttdd.grf $(BIN_DIR)/openttdd.grf
+	$(E) '$(STAGE) Updating base graphics sets for DOS graphics'
+	$(Q) for grf in $(BIN_DIR)/orig_dos*.obg; do sed 's/^OPENTTDD.GRF = [0-9a-f]*$$/OPENTTDD.GRF = '`$(MD5SUM) $(BIN_DIR)/openttdd.grf | sed 's@ .*@@'`'/' $$grf > $$grf.tmp && mv $$grf.tmp $$grf; done
+
+$(BIN_DIR)/openttdw.grf: $(PCX_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)/openttdw.grf && cp $(OBJS_DIR)/openttdw.grf $(BIN_DIR)/openttdw.grf) || ([ -e $(BIN_DIR)/openttdw.grf ] && touch $(BIN_DIR)/openttdw.grf && echo "no NFORenum and GRFCodec found, skipping rebuild of openttdw.grf...") || (echo "no NFORenum and GRFCodec found, but no openttdw.grf either. Install NFORenum and GRFCodec." && exit 1)
+
+$(OBJS_DIR)/openttdw.grf: $(PCX_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites
+	$(E) '$(STAGE) Assembling openttdw.nfo'
+	$(Q)-cp $(PCX_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/openttdw.nfo
+	$(Q) $(NFORENUM) $(OBJS_DIR)/sprites/openttdw.nfo
+	$(E) '$(STAGE) Compiling openttdw.grf'
+	$(Q) $(GRFCODEC) -e -p2 $(OBJS_DIR)/openttdw.grf
+	$(Q) cp $(OBJS_DIR)/openttdw.grf $(BIN_DIR)/openttdw.grf
+	$(E) '$(STAGE) Updating base graphics sets for Windows graphics'
+	$(Q) for grf in $(BIN_DIR)/orig_win.obg; do sed 's/^OPENTTDW.GRF = [0-9a-f]*$$/OPENTTDW.GRF = '`$(MD5SUM) $(BIN_DIR)/openttdw.grf | sed 's@ .*@@'`'/' $$grf > $$grf.tmp && mv $$grf.tmp $$grf; done
 
 # Clean up temporary files.
 clean:

Makefile.in

@@ -148,7 +148,7 @@ mrproper:
 distclean: mrproper
 
 maintainer-clean: distclean
-	$(Q)rm -f $(BIN_DIR)/baseset/openttd.grf
+	$(Q)rm -f $(BIN_DIR)/data/openttdd.grf $(BIN_DIR)/data/openttdw.grf
 
 depend:
 	@for dir in $(SRC_DIRS); do \

Makefile.lang.in

@@ -42,11 +42,7 @@ RES := $(shell mkdir -p $(BIN_DIR)/lang )
 
 all: table/strings.h $(LANGS)
 
-strgen_base.o: $(SRC_DIR)/strgen/strgen_base.cpp $(SRC_DIR)/strgen/strgen.h endian_host.h $(SRC_DIR)/table/control_codes.h $(SRC_DIR)/table/strgen_tables.h
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<
-
-strgen.o: $(SRC_DIR)/strgen/strgen.cpp $(SRC_DIR)/strgen/strgen.h endian_host.h $(SRC_DIR)/table/control_codes.h $(SRC_DIR)/table/strgen_tables.h
+strgen.o: $(SRC_DIR)/strgen/strgen.cpp 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 $@ $<
 
@@ -58,15 +54,11 @@ 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 $@ $<
 
-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) -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_base.o strgen.o getoptdata.o
+$(STRGEN): alloc_func.o string.o strgen.o
 	$(E) '$(STAGE) Compiling and Linking $@'
 	$(Q)$(CXX_BUILD) $(LDFLAGS_BUILD) $^ -o $@
 
@@ -93,7 +85,7 @@ depend:
 
 clean:
 	$(E) '$(STAGE) Cleaning up language files'
-	$(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)
+	$(Q)rm -f strgen.o string.o table/strings.h $(STRGEN) $(LANGS) $(LANGS:%=$(BIN_DIR)/lang/%) lang/english.* $(ENDIAN_TARGETS)
 
 mrproper: clean
 	$(Q)rm -rf $(BIN_DIR)/lang

Makefile.msvc

@@ -27,21 +27,9 @@ 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)/$(MODE)/$(TTD) $(BIN_DIR)/$(TTD)
+	$(Q)cp objs/$(TARGET)/Release/$(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

Makefile.setting.in

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

Makefile.src.in

@@ -23,7 +23,6 @@ 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!!
@@ -58,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) -I $(SETTING_OBJS_DIR)
-CFLAGS_MAKEDEP += -I $(SRC_OBJS_DIR) -I $(LANG_OBJS_DIR) -I $(SETTING_OBJS_DIR)
+CFLAGS += -I $(SRC_OBJS_DIR) -I $(LANG_OBJS_DIR)
+CFLAGS_MAKEDEP += -I $(SRC_OBJS_DIR) -I $(LANG_OBJS_DIR)
 ifdef SCRIPT_SRC_DIR
 	CFLAGS_MAKEDEP += -I $(SCRIPT_SRC_DIR)
 endif
@@ -113,7 +112,7 @@ REV_NR := 0
 endif
 
 # This helps to recompile if flags change
-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_COMPILER) 2>/dev/null`" != "$(CXXFLAGS) $(CFLAGS)" ]; then echo "$(CXXFLAGS) $(CFLAGS)" > $(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 )
 
@@ -146,7 +145,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) $(CFLAGS) $(CXXFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
+	$(Q)$(CXX_HOST) $(CXXFLAGS) $(CFLAGS) -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)'
@@ -170,7 +169,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) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) -o $@ $<
+	$(Q)$(CXX_BUILD) $(CXXFLAGS_BUILD) $(CFLAGS_BUILD) $(LDFLAGS_BUILD) -o $@ $<
 endif
 
 # Make sure that only 'make depend' ALWAYS triggers a recheck
@@ -238,7 +237,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) $(CFLAGS) $(CXXFLAGS) -c -o $@ $<
+	$(Q)$(CXX_HOST) $(CXXFLAGS) $(CFLAGS) -c -o $@ $<
 
 $(OBJS_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.mm=%.mm)'
@@ -249,13 +248,7 @@ $(OBJS_RC): %.o: $(SRC_DIR)/%.rc $(FILE_DEP)
 	$(Q)$(WINDRES) -o $@ -I `basename $<` $<
 
 $(BIN_DIR)/$(TTD): $(TTD)
-	$(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
+	$(Q)cp $< $@
 
 $(TTD): $(OBJS) $(CONFIG_CACHE_LINKER)
 	$(E) '$(STAGE) Linking $@'
@@ -263,17 +256,17 @@ ifeq ($(OS), PSP)
 	# Because of a bug in the PSP GCC tools, linking via CXX results
 	#  in total chaos and more problems then you can handle. So we need
 	#  CC to link OpenTTD for PSP
-	$(Q)+$(CC_HOST) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
+	$(Q)$(CC_HOST) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
 else
-	$(Q)+$(CXX_HOST) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
+	$(Q)$(CXX_HOST) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
 endif
 ifdef STRIP
 	$(Q)$(STRIP) $@
-endif
 ifeq ($(OS), DOS)
 	$(E) '$(STAGE) Adding CWSDPMI stub to $@'
 	$(Q)$(ROOT_DIR)/os/dos/make_dos_binary_selfcontained.sh $(SRC_OBJS_DIR)/$@
 endif
+endif
 
 # The targets to compile the endian-code
 
@@ -283,7 +276,7 @@ endian_target.h: $(ENDIAN_CHECK) $(CONFIG_CACHE_ENDIAN)
 
 $(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $< -o $@
+	$(Q)$(CXX_BUILD) $(CXXFLAGS_BUILD) $(CFLAGS_BUILD) $< -o $@
 
 # Revision files
 

bin/ai/compat_0.7.nut

@@ -258,95 +258,3 @@ class AIWaypointList extends _AIWaypointList {
 		::_AIWaypointList.constructor(AIWaypoint.WAYPOINT_RAIL);
 	}
 }
-
-AIRoad._BuildRoadStation <- AIRoad.BuildRoadStation;
-AIRoad.BuildRoadStation <- function(tile, front, road_veh_type, station_id)
-{
-	if (AIRoad.IsRoadStationTile(tile) && AICompany.IsMine(AITile.GetOwner(tile))) return false;
-
-	return AIRoad._BuildRoadStation(tile, front, road_veh_type, station_id);
-}
-
-AIRoad._BuildDriveThroughRoadStation <- AIRoad.BuildDriveThroughRoadStation;
-AIRoad.BuildDriveThroughRoadStation <- function(tile, front, road_veh_type, station_id)
-{
-	if (AIRoad.IsRoadStationTile(tile) && AICompany.IsMine(AITile.GetOwner(tile))) return false;
-
-	return AIRoad._BuildDriveThroughRoadStation(tile, front, road_veh_type, station_id);
-}
-
-AIBridgeList.HasNext <-
-AIBridgeList_Length.HasNext <-
-AICargoList.HasNext <-
-AICargoList_IndustryAccepting.HasNext <-
-AICargoList_IndustryProducing.HasNext <-
-AIDepotList.HasNext <-
-AIEngineList.HasNext <-
-AIGroupList.HasNext <-
-AIIndustryList.HasNext <-
-AIIndustryList_CargoAccepting.HasNext <-
-AIIndustryList_CargoProducing.HasNext <-
-AIIndustryTypeList.HasNext <-
-AIList.HasNext <-
-AIRailTypeList.HasNext <-
-AISignList.HasNext <-
-AIStationList.HasNext <-
-AIStationList_Vehicle.HasNext <-
-AISubsidyList.HasNext <-
-AITileList.HasNext <-
-AITileList_IndustryAccepting.HasNext <-
-AITileList_IndustryProducing.HasNext <-
-AITileList_StationType.HasNext <-
-AITownList.HasNext <-
-AIVehicleList.HasNext <-
-AIVehicleList_DefaultGroup.HasNext <-
-AIVehicleList_Group.HasNext <-
-AIVehicleList_SharedOrders.HasNext <-
-AIVehicleList_Station.HasNext <-
-AIWaypointList.HasNext <-
-AIWaypointList_Vehicle.HasNext <-
-function()
-{
-	return !this.IsEnd();
-}
-
-AIIndustry._IsCargoAccepted <- AIIndustry.IsCargoAccepted;
-AIIndustry.IsCargoAccepted <- function(industry_id, cargo_id)
-{
-	return AIIndustry._IsCargoAccepted(industry_id, cargo_id) != AIIndustry.CAS_NOT_ACCEPTED;
-}
-
-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;

bin/ai/compat_1.0.nut

@@ -6,99 +6,3 @@
  * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
-
-AILog.Info("1.0 API compatability in effect.");
-
-AIRoad._BuildRoadStation <- AIRoad.BuildRoadStation;
-AIRoad.BuildRoadStation <- function(tile, front, road_veh_type, station_id)
-{
-	if (AIRoad.IsRoadStationTile(tile) && AICompany.IsMine(AITile.GetOwner(tile))) return false;
-
-	return AIRoad._BuildRoadStation(tile, front, road_veh_type, station_id);
-}
-
-AIRoad._BuildDriveThroughRoadStation <- AIRoad.BuildDriveThroughRoadStation;
-AIRoad.BuildDriveThroughRoadStation <- function(tile, front, road_veh_type, station_id)
-{
-	if (AIRoad.IsRoadStationTile(tile) && AICompany.IsMine(AITile.GetOwner(tile))) return false;
-
-	return AIRoad._BuildDriveThroughRoadStation(tile, front, road_veh_type, station_id);
-}
-
-AIBridgeList.HasNext <-
-AIBridgeList_Length.HasNext <-
-AICargoList.HasNext <-
-AICargoList_IndustryAccepting.HasNext <-
-AICargoList_IndustryProducing.HasNext <-
-AIDepotList.HasNext <-
-AIEngineList.HasNext <-
-AIGroupList.HasNext <-
-AIIndustryList.HasNext <-
-AIIndustryList_CargoAccepting.HasNext <-
-AIIndustryList_CargoProducing.HasNext <-
-AIIndustryTypeList.HasNext <-
-AIList.HasNext <-
-AIRailTypeList.HasNext <-
-AISignList.HasNext <-
-AIStationList.HasNext <-
-AIStationList_Vehicle.HasNext <-
-AISubsidyList.HasNext <-
-AITileList.HasNext <-
-AITileList_IndustryAccepting.HasNext <-
-AITileList_IndustryProducing.HasNext <-
-AITileList_StationType.HasNext <-
-AITownList.HasNext <-
-AIVehicleList.HasNext <-
-AIVehicleList_DefaultGroup.HasNext <-
-AIVehicleList_Depot.HasNext <-
-AIVehicleList_Group.HasNext <-
-AIVehicleList_SharedOrders.HasNext <-
-AIVehicleList_Station.HasNext <-
-AIWaypointList.HasNext <-
-AIWaypointList_Vehicle.HasNext <-
-function()
-{
-	return !this.IsEnd();
-}
-
-AIIndustry._IsCargoAccepted <- AIIndustry.IsCargoAccepted;
-AIIndustry.IsCargoAccepted <- function(industry_id, cargo_id)
-{
-	return AIIndustry._IsCargoAccepted(industry_id, cargo_id) != AIIndustry.CAS_NOT_ACCEPTED;
-}
-
-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;

bin/ai/compat_1.1.nut

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

bin/ai/regression/regression.cfg

@@ -15,6 +15,3 @@ regression =
 [vehicle]
 road_side = right
 plane_speed = 2
-
-[construction]
-max_bridge_length = 100

bin/ai/regression/regression.nut

@@ -10,11 +10,9 @@ 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"));
@@ -37,7 +35,7 @@ function Regression::TestInit()
 	list.AddItem(35, 40);
 	list.AddItem(40, 40);
 
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		list.RemoveItem(i - 10);
 		list.RemoveItem(i - 5);
 		list.RemoveItem(i);
@@ -50,17 +48,17 @@ function Regression::TestInit()
 	list.AddItem(40, 40);
 
 	print("");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		list.SetValue(i, 2);
 		print("   " + i);
 	}
 	print("");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("   " + i);
 	}
 
 	list = AIList();
-	list.Sort(AIList.SORT_BY_VALUE, AIList.SORT_ASCENDING);
+	list.Sort(AIAbstractList.SORT_BY_VALUE, AIAbstractList.SORT_ASCENDING);
 	print("");
 	print(" Value Ascending");
 	list.AddItem( 5, 10);
@@ -72,7 +70,7 @@ function Regression::TestInit()
 	list.AddItem(35, 40);
 	list.AddItem(40, 40);
 
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		list.RemoveItem(i + 10);
 		list.RemoveItem(i + 5);
 		list.RemoveItem(i);
@@ -85,17 +83,17 @@ function Regression::TestInit()
 	list.AddItem(40, 40);
 
 	print("");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		list.SetValue(i, 50);
 		print("   " + i);
 	}
 	print("");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("   " + i);
 	}
 
 	list = AIList();
-	list.Sort(AIList.SORT_BY_ITEM, AIList.SORT_DESCENDING);
+	list.Sort(AIAbstractList.SORT_BY_ITEM, AIAbstractList.SORT_DESCENDING);
 	print("");
 	print(" Item Descending");
 	list.AddItem( 5, 10);
@@ -107,7 +105,7 @@ function Regression::TestInit()
 	list.AddItem(35, 40);
 	list.AddItem(40, 40);
 
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		list.RemoveItem(i - 10);
 		list.RemoveItem(i - 5);
 		list.RemoveItem(i);
@@ -120,17 +118,17 @@ function Regression::TestInit()
 	list.AddItem(40, 40);
 
 	print("");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		list.SetValue(i, 2);
 		print("   " + i);
 	}
 	print("");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("   " + i);
 	}
 
 	list = AIList();
-	list.Sort(AIList.SORT_BY_ITEM, AIList.SORT_ASCENDING);
+	list.Sort(AIAbstractList.SORT_BY_ITEM, AIAbstractList.SORT_ASCENDING);
 	print("");
 	print(" Item Ascending");
 	list.AddItem( 5, 10);
@@ -142,7 +140,7 @@ function Regression::TestInit()
 	list.AddItem(35, 40);
 	list.AddItem(40, 40);
 
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		list.RemoveItem(i + 10);
 		list.RemoveItem(i + 5);
 		list.RemoveItem(i);
@@ -155,12 +153,12 @@ function Regression::TestInit()
 	list.AddItem(40, 40);
 
 	print("");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		list.SetValue(i, 50);
 		print("   " + i);
 	}
 	print("");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("   " + i);
 	}
 
@@ -168,8 +166,6 @@ function Regression::TestInit()
 	foreach (idx, val in list) {
 		print("   " + idx);
 	}
-
-	print(" Ops:      " + this.GetOpsTillSuspend());
 }
 
 function Regression::Std()
@@ -287,22 +283,22 @@ function Regression::BridgeList()
 	print("  Count():             " + list.Count());
 	list.Valuate(AIBridge.GetMaxSpeed);
 	print("  MaxSpeed ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIBridge.GetPrice, 5);
 	print("  Price ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIBridge.GetMaxLength);
 	print("  MaxLength ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIBridge.GetMinLength);
 	print("  MinLength ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
@@ -313,12 +309,12 @@ function Regression::BridgeList()
 	print("  Count():             " + list.Count());
 	list.Valuate(AIBridge.GetMaxSpeed);
 	print("  MaxSpeed ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIBridge.GetPrice, 14);
 	print("  Price ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 }
@@ -351,13 +347,13 @@ function Regression::CargoList()
 	print("  Count():            " + list.Count());
 	list.Valuate(AICargo.IsFreight);
 	print("  IsFreight ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
 	list.Valuate(AICargo.GetCargoIncome, 100, 100);
 	print("  CargoIncomes(100, 100) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
@@ -366,7 +362,7 @@ function Regression::CargoList()
 	print("--CargoList_IndustryAccepting--");
 	print("  Count():            " + list.Count());
 	print("  ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i);
 	}
 
@@ -375,7 +371,7 @@ function Regression::CargoList()
 	print("--CargoList_IndustryProducing--");
 	print("  Count():            " + list.Count());
 	print("  ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i);
 	}
 }
@@ -398,57 +394,50 @@ 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("  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));
-	}
+	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));
 }
 
 function Regression::Engine()
@@ -490,27 +479,27 @@ function Regression::EngineList()
 	print("  Count():             " + list.Count());
 	list.Valuate(AIEngine.GetCargoType);
 	print("  CargoType ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIEngine.GetCapacity);
 	print("  Capacity ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIEngine.GetReliability);
 	print("  Reliability ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIEngine.GetMaxSpeed);
 	print("  MaxSpeed ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIEngine.GetPrice);
 	print("  Price ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 }
@@ -596,8 +585,8 @@ function Regression::Industry()
 	print("--Industry--");
 	print("  GetIndustryCount():  " + AIIndustry.GetIndustryCount());
 	local list = AIIndustryList();
-	list.Sort(AIList.SORT_BY_ITEM, AIList.SORT_ASCENDING);
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	list.Sort(AIAbstractList.SORT_BY_ITEM, AIAbstractList.SORT_ASCENDING);
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		if (AIIndustry.IsValidIndustry(i)) j++;
 		print("  Industry " + i);
 		print("    IsValidIndustry(): " + AIIndustry.IsValidIndustry(i));
@@ -606,7 +595,7 @@ function Regression::Industry()
 		print("    IsCargoAccepted(): " + AIIndustry.IsCargoAccepted(i, 1));
 
 		local cargo_list = AICargoList();
-		for (local j = cargo_list.Begin(); !cargo_list.IsEnd(); j = cargo_list.Next()) {
+		for (local j = cargo_list.Begin(); cargo_list.HasNext(); j = cargo_list.Next()) {
 			if (AIIndustry.IsCargoAccepted(i, j) || AIIndustry.GetLastMonthProduction(i,j) >= 0) {
 				print("	   GetLastMonthProduction():  " + AIIndustry.GetLastMonthProduction(i, j));
 				print("	   GetLastMonthTransported(): " + AIIndustry.GetLastMonthTransported(i, j));
@@ -616,8 +605,6 @@ function Regression::Industry()
 	}
 	print("  Valid Industries:    " + j);
 	print("  GetIndustryCount():  " + AIIndustry.GetIndustryCount());
-	print("  GetIndustryID():     " + AIIndustry.GetIndustryID(19694));
-	print("  GetIndustryID():     " + AIIndustry.GetIndustryID(19695));
 }
 
 function Regression::IndustryList()
@@ -629,27 +616,27 @@ function Regression::IndustryList()
 	print("  Count():             " + list.Count());
 	list.Valuate(AIIndustry.GetLocation);
 	print("  Location ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIIndustry.GetDistanceManhattanToTile, 30000);
 	print("  DistanceManhattanToTile(30000) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIIndustry.GetDistanceSquareToTile, 30000);
 	print("  DistanceSquareToTile(30000) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIIndustry.GetAmountOfStationsAround);
 	print("  GetAmountOfStationsAround(30000) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIIndustry.IsCargoAccepted, 1);
 	print("  CargoAccepted(1) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
@@ -658,7 +645,7 @@ function Regression::IndustryList()
 	print("  Count():             " + list.Count());
 	list.Valuate(AIIndustry.GetLocation);
 	print("  Location ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
@@ -667,7 +654,7 @@ function Regression::IndustryList()
 	print("  Count():             " + list.Count());
 	list.Valuate(AIIndustry.GetLocation);
 	print("  Location ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 }
@@ -681,7 +668,7 @@ function Regression::IndustryTypeList()
 	print("  Count():             " + list.Count());
 	list.Valuate(AIIndustry.GetLocation);
 	print("  Location ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    Id:                      " + i);
 		print("    IsRawIndustry():         " + AIIndustryType.IsRawIndustry(i));
 		print("    ProductionCanIncrease(): " + AIIndustryType.ProductionCanIncrease(i));
@@ -715,50 +702,50 @@ function Regression::List()
 	}
 	list.RemoveItem(1050);
 	list.RemoveItem(1150);
-	list.SetValue(1051, 12);
+	list.ChangeItem(1051, 12);
 	print("  Count():       " + list.Count());
 	print("  HasItem(1050): " + list.HasItem(1050));
 	print("  HasItem(1051): " + list.HasItem(1051));
 	print("  IsEmpty():     " + list.IsEmpty());
-	list.Sort(AIList.SORT_BY_ITEM, AIList.SORT_ASCENDING);
+	list.Sort(AIAbstractList.SORT_BY_ITEM, AIAbstractList.SORT_ASCENDING);
 	print("  List Dump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(CustomValuator);
 	print("  Custom ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(function (a) { return a * 42; });
 	print("  Custom ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIBase.RandItem);
 	print("  Randomize ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
 	list.KeepTop(10);
 	print("  KeepTop(10):");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.KeepBottom(8);
 	print("  KeepBottom(8):");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.RemoveBottom(2);
 	print("  RemoveBottom(2):");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.RemoveTop(2);
 	print("  RemoveTop(2):");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
@@ -767,13 +754,13 @@ function Regression::List()
 	list2.AddItem(1004, 0);
 	list.RemoveList(list2);
 	print("  RemoveList({1003, 1004}):");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list2.AddItem(1005, 0);
 	list.KeepList(list2);
 	print("  KeepList({1003, 1004, 1005}):");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list2.Clear();
@@ -783,7 +770,7 @@ function Regression::List()
 	list2.AddItem(1005, 1005);
 	list.AddList(list2);
 	print("  AddList({1005, 4000, 4001, 4002}):");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list[4000] = 50;
@@ -804,27 +791,27 @@ function Regression::List()
 	}
 
 	local it = list.Begin();
-	print("    " + it + " => " + list.GetValue(it) + "  (" + !list.IsEnd() + ")");
+	print("    " + it + " => " + list.GetValue(it) + "  (" + list.HasNext() + ")");
 	list.Sort(list.SORT_BY_VALUE, list.SORT_ASCENDING);
 	it = list.Next();
-	print("    " + it + " => " + list.GetValue(it) + "  (" + !list.IsEnd() + ")");
+	print("    " + it + " => " + list.GetValue(it) + "  (" + list.HasNext() + ")");
 
 	it = list.Begin();
-	print("    " + it + " => " + list.GetValue(it) + "  (" + !list.IsEnd() + ")");
+	print("    " + it + " => " + list.GetValue(it) + "  (" + list.HasNext() + ")");
 
 	list.SetValue(it + 1, -5);
 	it = list.Next();
-	print("    " + it + " => " + list.GetValue(it) + "  (" + !list.IsEnd() + ")");
+	print("    " + it + " => " + list.GetValue(it) + "  (" + list.HasNext() + ")");
 
 	list.RemoveValue(list.GetValue(it) + 1);
 	it = list.Next();
-	print("    " + it + " => " + list.GetValue(it) + "  (" + !list.IsEnd() + ")");
+	print("    " + it + " => " + list.GetValue(it) + "  (" + list.HasNext() + ")");
 
 	list.RemoveAboveValue(list.GetValue(it));
 	it = list.Next();
-	print("    " + it + " => " + list.GetValue(it) + "  (" + !list.IsEnd() + ")");
+	print("    " + it + " => " + list.GetValue(it) + "  (" + list.HasNext() + ")");
 
-	while (!list.IsEnd()) {
+	while (list.HasNext()) {
 		it = list.Next();
 		print("    " + it + " => " + list.GetValue(it));
 	}
@@ -892,11 +879,11 @@ function Regression::Marine()
 	print("--AIWaypointList(BUOY)--");
 	print("  Count():             " + list.Count());
 	print("  Location ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + AIWaypoint.GetLocation(i));
 	}
 	print("  HasWaypointType:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + AIWaypoint.HasWaypointType(i, AIWaypoint.WAYPOINT_RAIL) + "  " + AIWaypoint.HasWaypointType(i, AIWaypoint.WAYPOINT_BUOY) + "  " + AIWaypoint.HasWaypointType(i, AIWaypoint.WAYPOINT_ANY));
 	}
 	print("");
@@ -979,37 +966,37 @@ function Regression::Order()
 	print("  Count():             " + list.Count());
 	list.Valuate(AIStation.GetLocation);
 	print("  Location ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIStation.GetCargoWaiting, 0);
 	print("  CargoWaiting(0) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIStation.GetCargoWaiting, 1);
 	print("  CargoWaiting(1) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIStation.GetCargoRating, 1);
 	print("  CargoRating(1) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIStation.GetDistanceManhattanToTile, 30000);
 	print("  DistanceManhattanToTile(30000) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIStation.GetDistanceSquareToTile, 30000);
 	print("  DistanceSquareToTile(30000) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIStation.IsWithinTownInfluence, 0);
 	print("  IsWithinTownInfluence(0) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
@@ -1020,7 +1007,7 @@ function Regression::Order()
 	print("  Count():             " + list.Count());
 	list.Valuate(AIVehicle.GetLocation);
 	print("  Location ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	print("  foreach():");
@@ -1037,9 +1024,8 @@ function Regression::RailTypeList()
 	print("--RailTypeList--");
 	print("  Count():             " + list.Count());
 	print("  ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    RailType:                " + i);
-		print("    GetName():               " + AIRail.GetName(i));
 		print("    IsRailTypeAvailable():   " + AIRail.IsRailTypeAvailable(i));
 		print("    GetMaxSpeed():           " + AIRail.GetMaxSpeed(i));
 	}
@@ -1074,7 +1060,7 @@ function Regression::Rail()
 	print("      Count():                     " + list.Count());
 	list.Valuate(AITile.GetDistanceManhattanToTile, 0);
 	print("      Depot distance from (0,0) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("        " + i + " => " + list.GetValue(i));
 	}
 	print("    RemoveDepot():                 " + AITile.DemolishTile(33411));
@@ -1152,7 +1138,7 @@ function Regression::Road()
 	print("      Count():                     " + list.Count());
 	list.Valuate(AITile.GetDistanceManhattanToTile, 0);
 	print("      Depot distance from (0,0) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("        " + i + " => " + list.GetValue(i));
 	}
 	print("    RemoveRoadDepot():             " + AIRoad.RemoveRoadDepot(33411));
@@ -1210,8 +1196,8 @@ function Regression::Sign()
 	print("  RemoveSign(" + sign_id + "):                       " + AISign.RemoveSign(sign_id));
 	print("");
 	local list = AISignList();
-	list.Sort(AIList.SORT_BY_ITEM, AIList.SORT_ASCENDING);
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	list.Sort(AIAbstractList.SORT_BY_ITEM, AIAbstractList.SORT_ASCENDING);
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		j++;
 		print("  Sign " + i);
 		print("    IsValidSign():   " + AISign.IsValidSign(i));
@@ -1261,17 +1247,17 @@ function Regression::Station()
 	print("  Count():             " + list.Count());
 	list.Valuate(AIStation.GetLocation);
 	print("  Location ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIStation.GetCargoWaiting, 0);
 	print("  CargoWaiting(0) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIStation.GetCargoWaiting, 1);
 	print("  CargoWaiting(1) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 }
@@ -1312,7 +1298,7 @@ function Regression::TileList()
 	print("  Slope():             done");
 	print("  Count():             " + list.Count());
 	print("  ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 		print("    " + i + " => " + AITile.GetComplementSlope(list.GetValue(i)));
 		print("    " + i + " => " + AITile.IsSteepSlope(list.GetValue(i)));
@@ -1330,7 +1316,7 @@ function Regression::TileList()
 	print("  Height():            done");
 	print("  Count():             " + list.Count());
 	print("  ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
@@ -1338,7 +1324,7 @@ function Regression::TileList()
 	print("  CornerHeight(North): done");
 	print("  Count():             " + list.Count());
 	print("  ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
@@ -1346,7 +1332,7 @@ function Regression::TileList()
 	print("  MinHeight():         done");
 	print("  Count():             " + list.Count());
 	print("  ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
@@ -1354,7 +1340,7 @@ function Regression::TileList()
 	print("  MaxHeight():         done");
 	print("  Count():             " + list.Count());
 	print("  ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
@@ -1364,7 +1350,7 @@ function Regression::TileList()
 	print("  KeepValue(0):        done");
 	print("  Count():             " + list.Count());
 	print("  ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
@@ -1378,35 +1364,27 @@ function Regression::TileList()
 
 	list.Valuate(AITile.IsBuildableRectangle, 3, 3);
 	print("  BuildableRectangle(3, 3) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AITile.GetDistanceManhattanToTile, 30000);
 	print("  DistanceManhattanToTile(30000) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AITile.GetDistanceSquareToTile, 30000);
 	print("  DistanceSquareToTile(30000) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); 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()) {
+	for (local i = list.Begin(); list.HasNext(); 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()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
@@ -1416,7 +1394,7 @@ function Regression::TileList()
 	print("  KeepAboveValue(10):  done");
 	print("  Count():             " + list.Count());
 	print("  ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
@@ -1426,7 +1404,7 @@ function Regression::TileList()
 	print("  KeepValue(1):        done");
 	print("  Count():             " + list.Count());
 	print("  ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
@@ -1436,7 +1414,7 @@ function Regression::TileList()
 	print("  KeepValue(1):        done");
 	print("  Count():             " + list.Count());
 	print("  ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
@@ -1445,7 +1423,7 @@ function Regression::TileList()
 	print("  Water():             done");
 	print("  Count():             " + list.Count());
 	print("  ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
@@ -1455,7 +1433,7 @@ function Regression::TileList()
 	print("  Count():             " + list.Count());
 	list.Valuate(AITile.GetCargoAcceptance, 3, 1, 1, 3);
 	print("  Location ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
@@ -1465,7 +1443,7 @@ function Regression::TileList()
 	print("  Count():             " + list.Count());
 	list.Valuate(AITile.GetCargoProduction, 7, 1, 1, 3);
 	print("  Location ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
@@ -1474,7 +1452,7 @@ function Regression::TileList()
 	print("--TileList_StationType--");
 	print("  Count():             " + list.Count());
 	print("  Location ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 }
@@ -1487,8 +1465,8 @@ function Regression::Town()
 	print("--Town--");
 	print("  GetTownCount():    " + AITown.GetTownCount());
 	local list = AITownList();
-	list.Sort(AIList.SORT_BY_ITEM, AIList.SORT_ASCENDING);
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	list.Sort(AIAbstractList.SORT_BY_ITEM, AIAbstractList.SORT_ASCENDING);
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		if (AITown.IsValidTown(i)) j++;
 		print("  Town " + i);
 		print("    IsValidTown():   " + AITown.IsValidTown(i));
@@ -1497,7 +1475,6 @@ function Regression::Town()
 		print("    GetLocation():   " + AITown.GetLocation(i));
 		print("    GetHouseCount(): " + AITown.GetHouseCount(i));
 		print("    GetRating():     " + AITown.GetRating(i, AICompany.COMPANY_SELF));
-		print("    IsCity():        " + AITown.IsCity(i));
 	}
 	print("  Valid Towns:       " + j);
 	print("  GetTownCount():    " + AITown.GetTownCount());
@@ -1512,27 +1489,27 @@ function Regression::TownList()
 	print("  Count():             " + list.Count());
 	list.Valuate(AITown.GetLocation);
 	print("  Location ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AITown.GetDistanceManhattanToTile, 30000);
 	print("  DistanceManhattanToTile(30000) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AITown.GetDistanceSquareToTile, 30000);
 	print("  DistanceSquareToTile(30000) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AITown.IsWithinTownInfluence, AITown.GetLocation(0));
 	print("  IsWithinTownInfluence(" + AITown.GetLocation(0) + ") ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AITown.GetAllowedNoise);
 	print("  GetAllowedNoise() ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AITown.GetPopulation);
@@ -1540,7 +1517,7 @@ function Regression::TownList()
 	print("  KeepAboveValue(500): done");
 	print("  Count():             " + list.Count());
 	print("  Population ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
@@ -1689,77 +1666,77 @@ function Regression::Vehicle()
 	print("  Count():             " + list.Count());
 	list.Valuate(AIVehicle.GetLocation);
 	print("  Location ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIVehicle.GetEngineType);
 	print("  EngineType ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIVehicle.GetUnitNumber);
 	print("  UnitNumber ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIVehicle.GetAge);
 	print("  Age ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIVehicle.GetMaxAge);
 	print("  MaxAge ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIVehicle.GetAgeLeft);
 	print("  AgeLeft ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIVehicle.GetCurrentSpeed);
 	print("  CurrentSpeed ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIVehicle.GetRunningCost);
 	print("  RunningCost ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIVehicle.GetProfitThisYear);
 	print("  ProfitThisYear ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIVehicle.GetProfitLastYear);
 	print("  ProfitLastYear ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIVehicle.GetCurrentValue);
 	print("  CurrentValue ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIVehicle.GetVehicleType);
 	print("  VehicleType ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIVehicle.GetRoadType);
 	print("  RoadType ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIVehicle.GetCapacity, 10);
 	print("  VehicleType ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 	list.Valuate(AIVehicle.GetCargoLoad, 10);
 	print("  VehicleType ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
 	}
 }
@@ -1867,13 +1844,13 @@ function Regression::Start()
 		print("  GetNextEvent:          " + (e == null ? "null" : "instance"));
 		print("    GetEventType:        " + e.GetEventType());
 		switch (e.GetEventType()) {
-			case AIEvent.ET_SUBSIDY_OFFER: {
+			case AIEvent.AI_ET_SUBSIDY_OFFER: {
 				local c = AIEventSubsidyOffer.Convert(e);
 				print("      EventName:         SubsidyOffer");
 				PrintSubsidy(c.GetSubsidyID());
 			} break;
 
-			case AIEvent.ET_VEHICLE_WAITING_IN_DEPOT: {
+			case AIEvent.AI_ET_VEHICLE_WAITING_IN_DEPOT: {
 				local c = AIEventVehicleWaitingInDepot.Convert(e);
 				print("      EventName:         VehicleWaitingInDepot");
 				print("      VehicleID:         " + c.GetVehicleID());

bin/ai/regression/regression_info.nut

@@ -6,7 +6,7 @@ class Regression extends AIInfo {
 	function GetShortName()   { return "REGR"; }
 	function GetDescription() { return "This runs regression-tests on all commands. On the same map the result should always be the same."; }
 	function GetVersion()     { return 1; }
-	function GetAPIVersion()  { return "1.2"; }
+	function GetAPIVersion()  { return "1.0"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
 }

bin/ai/regression/run.sh

@@ -25,10 +25,9 @@ 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 script=2 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; }' > tmp.regression
+	./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav -d ai=2 2>&1 | awk '{ gsub("0x(\\(nil\\)|0+)", "0x00000000", $0); gsub("^dbg: \\[ai\\]", "", $0); gsub("^ ", "ERROR: ", $0); gsub("ERROR: \\[1\\] ", "", $0); gsub("\\[P\\] ", "", $0); print $0; }' > tmp.regression
 fi
 
-ret=0
 if [ -z "$gdb" ]; then
 	res="`diff -ub ai/regression/regression.txt tmp.regression`"
 	if [ -z "$res" ]; then
@@ -36,7 +35,6 @@ if [ -z "$gdb" ]; then
 	else
 		echo "Regression test failed! Difference:"
 		echo "$res"
-		ret=1
 	fi
 	echo ""
 	echo "Regression test done"
@@ -51,5 +49,3 @@ fi
 if [ "$1" != "-k" ]; then
 	rm -f tmp.regression
 fi
-
-exit $ret

bin/data/orig_dos.obg

@@ -47,7 +47,7 @@ logos        = TRGI.GRF
 arctic       = TRGC.GRF
 tropical     = TRGH.GRF
 toyland      = TRGT.GRF
-extra        = OPENTTD.GRF
+extra        = OPENTTDD.GRF
 
 [md5s]
 TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
@@ -55,8 +55,8 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF  = 42d0ea63159d5ef2971429c2402eb2ca
+OPENTTDD.GRF = 177d3eeda710bb6f1b93955fdd3754fa
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTD.GRF  = This file was part of your OpenTTD installation.
+OPENTTDD.GRF = This file was part of your OpenTTD installation.

bin/data/orig_dos_de.obg

@@ -47,7 +47,7 @@ logos        = TRGI.GRF
 arctic       = TRGC.GRF
 tropical     = TRGH.GRF
 toyland      = TRGT.GRF
-extra        = OPENTTD.GRF
+extra        = OPENTTDD.GRF
 
 [md5s]
 TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
@@ -55,8 +55,8 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTD.GRF  = 42d0ea63159d5ef2971429c2402eb2ca
+OPENTTDD.GRF = 177d3eeda710bb6f1b93955fdd3754fa
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTD.GRF  = This file was part of your OpenTTD installation.
+OPENTTDD.GRF = This file was part of your OpenTTD installation.

bin/data/orig_win.obg

@@ -47,7 +47,7 @@ logos        = TRGIR.GRF
 arctic       = TRGCR.GRF
 tropical     = TRGHR.GRF
 toyland      = TRGTR.GRF
-extra        = OPENTTD.GRF
+extra        = OPENTTDW.GRF
 
 [md5s]
 TRG1R.GRF    = b04ce593d8c5016e07473a743d7d3358
@@ -55,8 +55,8 @@ TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
 TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
 TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
 TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTD.GRF  = 42d0ea63159d5ef2971429c2402eb2ca
+OPENTTDW.GRF = 7f67abbead5b77b86c375d4f9a7b1a29
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTD.GRF  = This file was part of your OpenTTD installation.
+OPENTTDW.GRF = This file was part of your OpenTTD installation.

configure

@@ -48,7 +48,6 @@ 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"
@@ -83,7 +82,6 @@ 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@"
@@ -163,11 +161,10 @@ 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 $ROOT_DIR/Makefile.setting.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"
 
 generate_main
 generate_lang
-generate_settings
 generate_grf
 generate_src
 

docs/32bpp.txt

@@ -1,24 +1,15 @@
 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
----- ----------
+The Format
+----------
+
 32bpp images are stored in PNG. They should go in:
   data/sprites/<grfname>/<SpriteID>.png
 
@@ -42,3 +33,4 @@ 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.
+

docs/HOWTO_compile_lang_files.txt

@@ -1,17 +1,5 @@
-OpenTTD and strgen
-Last updated:    2009-06-30
-------------------------------------------------------------------------
-
-
-Table of contents
------------------
-1.0) strgen usage
- * 1.1) Examples
- * 1.2) strgen command switches
-
-
-1.0) strgen usage
----- ------------
+STRGEN USAGE
+------------
 This guide is only interesting for people who want to alter something
 themselves without access to translator.openttd.org. Please note that
 your compiled language file will only be compatible with the OpenTTD version
@@ -26,8 +14,8 @@ strgen takes as argument a txt file and translates it to a lng file, allowing
 it to be used inside OpenTTD. strgen needs the master language file
 english.txt to work. Below are some examples of strgen usage.
 
-1.1) Examples
----- --------
+EXAMPLES
+--------
 Example 1:
 if you are in the root of your working copy (svn code), you should type
 strgen/strgen -s lang lang/english.txt
@@ -47,8 +35,8 @@ resulting language file to go to /tmp. Use
 You can interchange english.txt to whichever language you want to generate a
 .lng file for.
 
-1.2) strgen command switches
----- -----------------------
+STRGEN COMMAND SWITCHES
+-----------------------
 -v | --version
 strgen will tell what svn revision it was last modified
 

docs/admin_network.txt

@@ -1,211 +0,0 @@
-OpenTTD's admin network
-Last updated:    2011-01-20
-------------------------------------------------------------------------
-
-
-Table of contents
------------------
-1.0) Preface
-2.0) Joining the network
-3.0) Asking for updates
- * 3.1) Polling manually
-4.0) Sending rcon commands
-5.0) Sending chat
- * 5.1) Receiving chat
-6.0) Disconnecting
-7.0) Certain packet information
-
-
-1.0) Preface
----- -------
-  The admin network provides a dedicated network protocol designed for other
-  applications to communicate with OpenTTD. Connected applications can execute
-  console commands remotely (rcon commands) with no further authentication.
-  Furthermore information about clients and companies can be provided.
-
-  Admin applications remain connected when starting a new game or loading a saved
-  game in contrast to normal OpenTTD clients that get disconnected.
-
-  This document describes the admin network and its protocol.
-
-  Please refer to the mentioned enums in src/network/core/tcp_admin.h
-
-  Please also note that further improvements to the admin protocol can mean that
-  more packet types will be sent by the server. For forward compatibility it is
-  therefore wise to ignore unknown packets. Future improvements might also add
-  additional data to packets. This data should be ignored. Data will never be
-  removed from packets in later versions, except the possibility that complete
-  packets are dropped in favour of a new packet.
-  This though will be reflected in the protocol version as announced in the
-  ADMIN_PACKET_SERVER_PROTOCOL in section 2.0).
-
-  A reference implementation in Java for a client connecting to the admin interface
-  can be found at: http://dev.openttdcoop.org/projects/joan
-
-
-2.0) Joining the network
----- -------------------
-  Create a TCP connection to the server on port 3977. The application is
-  expected to authenticate within 10 seconds.
-
-  To authenticate send a ADMIN_PACKET_ADMIN_JOIN packet.
-
-  The server will reply with ADMIN_PACKET_SERVER_PROTOCOL followed directly by
-  ADMIN_PACKET_SERVER_WELCOME.
-
-  ADMIN_PACKET_SERVER_PROTOCOL contains details about the protocol version.
-  It is the job of your application to check this number and decide whether
-  it will remain connected or not.
-  Furthermore, this packet holds details on every AdminUpdateType and the
-  supported AdminFrequencyTypes (bitwise representation).
-
-  ADMIN_PACKET_SERVER_WELCOME contains details on the server and the map,
-  e.g. if the server is dedicated, its NetworkLanguage, size of the Map, etc.
-
-  Once you have received ADMIN_PACKET_SERVER_WELCOME you are connected and
-  authorized to do your thing.
-  The server will not provide any game related updates unless you ask for them.
-  There are four packets the server will none the less send, if applicable:
-    - ADMIN_PACKET_SERVER_ERROR
-    - ADMIN_PACKET_SERVER_WELCOME
-    - ADMIN_PACKET_SERVER_NEWGAME
-    - ADMIN_PACKET_SERVER_SHUTDOWN
-
-  However, ADMIN_PACKET_SERVER_WELCOME only after a ADMIN_PACKET_SERVER_NEWGAME
-
-
-3.0) Asking for updates
----- ------------------
-  Asking for updates is done with ADMIN_PACKET_ADMIN_UPDATE_FREQUENCY.
-  With this packet you define which update you wish to receive at which
-  frequency.
-
-  Note: not every update type supports every frequency. If in doubt, you can
-  verify against the data received in ADMIN_PACKET_SERVER_PROTOCOL.
-
-  The server will not confirm your registered update. However, asking for an
-  invalid AdminUpdateType or a not supported AdminUpdateFrequency you will be
-  disconnected from the server with NETWORK_ERROR_ILLEGAL_PACKET.
-
-  Additional debug information can be found with a debug level of net=3.
-
-  ADMIN_UPDATE_DATE results in the server sending:
-    - ADMIN_PACKET_SERVER_DATE
-
-  ADMIN_UPDATE_CLIENT_INFO results in the server sending:
-    - ADMIN_PACKET_SERVER_CLIENT_JOIN
-    - ADMIN_PACKET_SERVER_CLIENT_INFO
-    - ADMIN_PACKET_SERVER_CLIENT_UPDATE
-    - ADMIN_PACKET_SERVER_CLIENT_QUIT
-    - ADMIN_PACKET_SERVER_CLIENT_ERROR
-
-  ADMIN_UPDATE_COMPANY_INFO results in the server sending:
-    - ADMIN_PACKET_SERVER_COMPANY_NEW
-    - ADMIN_PACKET_SERVER_COMPANY_INFO
-    - ADMIN_PACKET_SERVER_COMPANY_UPDATE
-    - ADMIN_PACKET_SERVER_COMPANY_REMOVE
-
-  ADMIN_UPDATE_COMPANY_ECONOMY results in the server sending:
-    - ADMIN_PACKET_SERVER_COMPANY_ECONOMY
-
-  ADMIN_UPDATE_COMPANY_STATS results in the server sending:
-    - ADMIN_PACKET_SERVER_COMPANY_STATS
-
-  ADMIN_UPDATE_CHAT results in the server sending:
-    - ADMIN_PACKET_SERVER_CHAT
-
-  ADMIN_UPDATE_CONSOLE results in the server sending:
-    - ADMIN_PACKET_SERVER_CONSOLE
-
-
-  ADMIN_UPDATE_CMD_LOGGING results in the server sending:
-    - ADMIN_PACKET_SERVER_CMD_LOGGING
-
-3.1) Polling manually
----- ----------------
-  Certain AdminUpdateTypes can also be polled:
-    - ADMIN_UPDATE_DATE
-    - ADMIN_UPDATE_CLIENT_INFO
-    - ADMIN_UPDATE_COMPANY_INFO
-    - ADMIN_UPDATE_COMPANY_ECONOMY
-    - ADMIN_UPDATE_COMPANY_STATS
-    - ADMIN_UPDATE_CMD_NAMES
-
-  ADMIN_UPDATE_CLIENT_INFO and ADMIN_UPDATE_COMPANY_INFO accept an additional
-  parameter. This parameter is used to specify a certain client or company.
-  Setting this parameter to UINT32_MAX (0xFFFFFFFF) will tell the server you
-  want to receive updates for all clients or companies.
-
-  Not supported AdminUpdateType in the poll will result in the server
-  disconnecting the application with NETWORK_ERROR_ILLEGAL_PACKET.
-
-  Additional debug information can be found with a debug level of net=3.
-
-
-4.0) Sending rcon commands
----- ---------------------
-  Rcon runs separate from the ADMIN_UPDATE_CONSOLE AdminUpdateType. Requesting
-  the execution of a remote console command is done with the packet
-  ADMIN_PACKET_ADMIN_RCON.
-
-  Note: No additional authentication is required for rcon commands.
-
-  The server will reply with a ADMIN_PACKET_SERVER_RCON packet. Applications
-  will not receive the answer twice if they have asked for the AdminUpdateType
-  ADMIN_UPDATE_CONSOLE, as the result is not printed on the servers console
-  (just like clients rcon commands).
-
-  Furthermore, sending a 'say' command (or any similar command) will not
-  be sent back into the admin network.
-  Chat from the server itself will only be sent to the admin network when it
-  was not sent from the admin network.
-
-
-5.0) Sending chat
----- ------------
-  Sending a ADMIN_PACKET_ADMIN_CHAT results in chat originating from the server.
-
-  Currently four types of chat are supported:
-    - NETWORK_ACTION_CHAT
-    - NETWORK_ACTION_CHAT_CLIENT
-    - NETWORK_ACTION_CHAT_COMPANY
-    - NETWORK_ACTION_SERVER_MESSAGE
-
-  NETWORK_ACTION_SERVER_MESSAGE can be sent to a single client or company
-  using the respective DestType and ID.
-  This is a message prefixed with the 3 stars, e.g. *** foo has joined the game
-
-5.1) Receiving chat
----- -------------
-  Register ADMIN_UPDATE_CHAT at ADMIN_FREQUENCY_AUTOMATIC to receive chat.
-  The application will be able to receive all chat the server can see.
-
-  The configuration option network.server_admin_chat specifies whether
-  private chat for to the server is distributed into the admin network.
-
-
-6.0) Disconnecting
----- -------------
-  It is a kind thing to say good bye before leaving. Do this by sending the
-  ADMIN_PACKET_ADMIN_QUIT packet.
-
-
-7.0) Certain packet information
----- --------------------------
-  All ADMIN_PACKET_SERVER_* packets have an enum value greater 100.
-
-  ADMIN_PACKET_SERVER_WELCOME
-    Either directly follows ADMIN_PACKET_SERVER_PROTOCOL or is sent
-    after a new game has been started or a map loaded, i.e. also
-    after ADMIN_PACKET_SERVER_NEWGAME.
-
-  ADMIN_PACKET_SERVER_CLIENT_JOIN and ADMIN_PACKET_SERVER_COMPANY_NEW
-    These packets directly follow their respective INFO packets. If you receive
-    a CLIENT_JOIN / COMPANY_NEW packet without having received the INFO packet
-    it may be a good idea to POLL for the specific ID.
-
-  ADMIN_PACKET_SERVER_CMD_NAMES and ADMIN_PACKET_SERVER_CMD_LOGGING
-    Data provided with these packets is not stable and will not be
-    treated as such. Do not rely on IDs or names to be constant
-    across different versions / revisions of OpenTTD.
-    Data provided in this packet is for logging purposes only.

docs/landscape.html

@@ -4,90 +4,64 @@
 <head>
  <meta name="Author" content="Marcin Grzegorczyk">
  <meta name="Description" content="Structure of OpenTTD (OTTD) landscape arrays">
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  <title>OpenTTD Landscape Internals</title>
 </head>
 
 <body>
 
  <h3><a name="Landscape">Landscape</a></h3>
- <p>
-  For a graphical representation of the tile-layout have a look at
-  <a href="landscape_grid.html">Landscape grid</a> page.
- </p>
  <p>Eight attributes (counting &quot;<span style="font-weight: bold;">type_height</span>&quot;) hold the informations about a tile.<BR>
   These attributes are referred to as
-  &quot;<span style="font-weight: bold;">type_height</span>",
-  &quot;<span style="font-weight: bold;">m1</span>&quot;, &quot;<span style="font-weight: bold;">m2</span>&quot;,
-  &quot;<span style="font-weight: bold;">m3</span>&quot;, &quot;<span style="font-weight: bold;">m4</span>&quot;,
-  &quot;<span style="font-weight: bold;">m5</span>&quot;, &quot;<span style="font-weight: bold;">m6</span>&quot;
-  and "<span style="font-weight: bold;">m7</span>".<br>
+  "<span style="font-weight: bold;">type_height</span>",
+  "<span style="font-weight: bold;">m1</span>", "<span style="font-weight: bold;">m2</span>",
+  "<span style="font-weight: bold;">m3</span>", "<span style="font-weight: bold;">m4</span>",
+  "<span style="font-weight: bold;">m5</span>", "<span style="font-weight: bold;">m6</span>"
+  and "<span style="font-weight: bold;">m7</span>".<BR>
   The most important value is the class of a tile, stored in the upper 4 bits
   of the <span style="font-weight: bold;">type_height</span> attribute. The lower 4 bits are used to encode the height and
   slope data.
  </p>
 
- Frequently repeating patterns:
+ Special Attribute : <span style="font-weight: bold;">m6</span>. There are 4 bits of it that are used accross multiple tile classes<br>
  <ul>
-  <li><span style="font-weight: bold;">m1</span>
-   <ul>
-    <li>
-     <a name="WaterClass"></a>
-      Bits 6..5:
-     <table border="1" style="width: 30em;">
-      <tr bgcolor="#CCCCCC"><td colspan="2">The type of water that is on a tile.
-      <tr><td style="width: 5em;"><tt>00</tt></td><td align=left>Sea</td></tr>
-      <tr><td><tt>01</tt></td><td align=left>Canal</td></tr>
-      <tr><td><tt>02</tt></td><td align=left>River</td></tr>
-      <tr><td><tt>03</tt></td><td align=left>Invalid, i.e. no water on this tile</td></tr>
-     </table>
-     Some tiles, such as houses, reuse these bits of other purposes.
-    </li>
-    <li>
-     <a name="OwnershipInfo"></a>
-     Bits 4..0:
-     <table border="1" style="width: 30em;">
-      <tr bgcolor="#CCCCCC"><td colspan="2">The owner of a tile can be either companies (human or AI) or "Game entities".
-      <tr><td style="width: 5em;"><tt>00..0E</tt></td><td align=left>Normal companies</td></tr>
-      <tr><td><tt>0F</tt></td><td align=left>a town owns the tile</td></tr>
-      <tr><td><tt>10</tt></td><td align=left>nobody owns the tile</td></tr>
-      <tr><td><tt>11</tt></td><td align=left>"water" owns the tile</td></tr>
-      <tr><td><tt>FF</tt></td><td align=left>spectator in MP or in scenario editor</td></tr>
-     </table>
-     Some tiles, such as houses and industries, reuse these bits of other purposes.
-    </li>
-   </ul>
+  <li>
+   <a name = "bridge_direction">
+   Bits 7..6 :
+   <table border="1">
+    <tr bgcolor="#CCCCCC"><td colspan="2">Presence and direction of bridge above,<br>for tiles that support this.</td></tr>
+    <tr><td><tt>00</tt>&nbsp; </td><td>no bridge</td></tr>
+    <tr><td><tt>01</tt>&nbsp; </td><td>Axis X (North-East)</td></tr>
+    <tr><td><tt>02</tt>&nbsp; </td><td>Axis Y (South-West)</td></tr>
+   </table>
   </li>
-  <li><span style="font-weight: bold;">m6</span>
-   <ul>
-    <li>
-     <a name="bridge_direction"></a>
-     Bits 7..6:
-     <table border="1" style="width: 30em;">
-      <tr bgcolor="#CCCCCC"><td colspan="2">Presence and direction of bridge above, for tiles that support this.</td></tr>
-      <tr><td style="width: 5em;"><tt>00</tt></td><td>no bridge</td></tr>
-      <tr><td><tt>01</tt></td><td>Axis X (North-East)</td></tr>
-      <tr><td><tt>02</tt></td><td>Axis Y (South-West)</td></tr>
-     </table>
-     Some tiles, such as houses do not support bridges over them and use these bits for other purposes.
-    </li>
-    <li>
-     <a name="tropic_zone"></a>
-     Bits 1..0:
-     <table border="1" style="width: 30em;">
-      <tr bgcolor="#CCCCCC"><td colspan="2">Only meaningfull in tropic climate. It contains the definition of the available zones</td></tr>
-      <tr><td style="width: 5em;"><tt>00</tt></td><td>normal</td></tr>
-      <tr><td><tt>01</tt></td><td>desert</td></tr>
-      <tr><td><tt>02</tt></td><td>rain forest</td></tr>
-     </table>
-     In any other climate these 2 bits are theoretically free of use, however using them does not seem useful.
-    </li>
-   </ul>
-  </li>
-  <li><span style="font-weight: bold;">m7:</span><br>
-   Animation frame/state. Used for houses, industries, objects and stations.
+  <li>
+   <a name = "tropic_zone">
+   Bits 1..0 :
+   <table border="1">
+    <tr bgcolor="#CCCCCC"><td colspan="2">Only meaningfull in tropic climate.<br>It contains the definition of the available zones</td></tr>
+    <tr><td><tt>00</tt>&nbsp; </td><td>normal</td></tr>
+    <tr><td><tt>01</tt>&nbsp; </td><td>desert</td></tr>
+    <tr><td><tt>02</tt>&nbsp; </td><td>rain forest</td></tr>
+   </table>
+   In any other climate, those 2 bits are free of use.
   </li>
  </ul>
+ <p>
+  For a graphical representation of the tile-layout have a look at
+  <a href="landscape_grid.html">Landscape grid</a> page.
+ </p>
+
+  The <a name="OwnershipInfo">owner of a tile</a>, as frequently associated with attribute m1,
+  can be either companies (human or AI) or "Game entities".
+  They are identified using:
+  <table border="1">
+   <tr><td><tt>00..0E</tt>&nbsp; </td><td align=left>Normal companies</td></tr>
+   <tr><td><tt>0F</tt>&nbsp; </td><td align=left>a town owns the tile</td></tr>
+   <tr><td><tt>10</tt>&nbsp; </td><td align=left>nobody owns the tile</td></tr>
+   <tr><td><tt>11</tt>&nbsp; </td><td align=left>"water" owns the tile</td></tr>
+   <tr><td><tt>FF</tt>&nbsp; </td><td align=left>spectator in MP or in scenario editor</td></tr>
+  </table>
 
  <p>OTTD's class-specific periodic tile processing routine is called once every +256 ticks for each tile.</p>
 
@@ -104,9 +78,8 @@
    <td valign=top nowrap>&nbsp;</td>
    <td>
     <ul>
-     <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the tile (normally <tt>10</tt>)</li>
+     <li>m1: <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>
@@ -197,7 +170,6 @@
       </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>
@@ -211,7 +183,7 @@
    <td valign=top nowrap>&nbsp;</td>
    <td>
     <ul>
-     <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the tile</li>
+     <li>m1: <a href="#OwnershipInfo">owner</a> of the tile</li>
      <li>m2: see signals</li>
      <li>m3 bits 7..4: see signals</li>
      <li>m3 bits 3..0 = <a name="TrackType">track type</a>:
@@ -576,7 +548,7 @@
        <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of road type 1 (tram); OWNER_NONE (<tt>10</tt>) is stored as OWNER_TOWN (<tt>0F</tt>)
        <li>m5 bit 6 clear: road
         <ul>
-         <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
+         <li>m1: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
          <li>m7 bits 3..0: counter for the roadworks</li>
          <li>m5 bits 3..0: road layout road type 0 (normal road): bit set = road piece present:
           <table>
@@ -615,7 +587,7 @@
        </li>
        <li>m5 bit 6 set: level crossing
         <ul>
-         <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the railway track</li>
+         <li>m1: <a href="#OwnershipInfo">owner</a> of the railway track</li>
          <li>m3 bits 3..0: <a href="#TrackType">railway track type</a></li>
          <li>m5 bit 0: direction
           <table>
@@ -638,7 +610,7 @@
      </li>
      <li>m5 bit 7 set, bit 6 clear: road depot
       <ul>
-       <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the depot</li>
+       <li>m1: <a href="#OwnershipInfo">owner</a> of the depot</li>
        <li>m2: Depot index</li>
        <li>m5 bits 3..0: exit towards:
         <table>
@@ -697,7 +669,7 @@
        </li>
       </ul>
      <li>m3 bit 6 : bit 8 of house type (m4), allowing 512 different types.</li>
-     <li>m3 bit 5 : free</li>
+     <li>m3 bit 5 : bit 6 of current animation frame (see m6)</li>
      <li>m3 bits 4..0 : triggers activated <a href="#newhouses">(newhouses)</a></li>
      <li>m4 : <a href="landscape_externals.html">town building type</a> (with m3[6] bit)</li>
      <li>m5 : see m3 bit 7</li>
@@ -705,7 +677,7 @@
       <ul>
        <li>If <a href="#newhouses">newhouses</a> is activated
         <ul>
-         <li>bits 7..2 : Periodic processing time remaining</li>
+         <li>bits 7..2 : Current animation frame (bits 5..0); bit 6 in m3</li>
         </ul>
        </li>
        <li>Standard behaviour
@@ -720,7 +692,7 @@
       <ul>
        <li>If <a href="#newhouses">newhouses</a> is activated
         <ul>
-         <li>Current animation frame</li>
+         <li>Periodic processing time remaining</li>
         </ul>
        </li>
        <li>Standard behaviour (only for houses type 04 and 05)
@@ -736,7 +708,7 @@
       </ul>
      </li>
     </ul>
-    <small><a name="newhouses"></a>Newhouses is the name englobing a newGRF feature developped by TTDPatch devs (mainly Csaboka).<br>
+    <small><a name="newhouses">Newhouses is the name englobing a newGRF feature developped by TTDPatch devs (mainly Csaboka).<br>
     It allows the replacement of the properties as well as the graphics of houses in the game.<br>
     To distinguish between the standard behaviour and the newGRF one, HouseID (m4 + m3[6]) is tested for anything above 110.<br>
     110 is the count of standard houses. So above 110 means there is a new definition of at least one house</small>
@@ -751,7 +723,7 @@
    <td valign=top nowrap>&nbsp;</td>
    <td>
     <ul>
-     <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> (normally <tt>10</tt>)</li>
+     <li>m1: <a href="#OwnershipInfo">owner</a> (normally <tt>10</tt>)</li>
      <li>m2 bits 8..6: ground
       <table>
 
@@ -818,6 +790,8 @@
       </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">
@@ -848,12 +822,12 @@
    <td valign=top nowrap>&nbsp;</td>
    <td>
     <ul>
-     <li>m1 bits 6..5: water class for buoys, water part of docks and for airport tiles</li>
-     <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the station</li>
+     <li>m1: <a href="#OwnershipInfo">owner</a> of the station</li>
      <li>m2: index into the array of stations</li>
-     <li>m3 bits 7..4: persistent random data for railway stations/waypoints and airports)</li>
+     <li>m3 bits 7..4: persistent random data for newstations (railway stations/waypoints)</li>
      <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of tram tracks (road stop)</li>
      <li>m3 bits 3..0: <a href="#TrackType">track type</a> for railway stations/waypoints</li>
+     <li>m3 bits 1..0: water class for buoys and water part of docks</li>
      <li>m4: custom station id; 0 means standard graphics</li>
      <li>m5: graphics index (range from 0..255 for each station type):
       <table>
@@ -897,7 +871,7 @@
        </tr>
 
        <tr>
-        <td nowrap valign=top><tt>00</tt>..<tt>FF</tt></td>
+        <td nowrap valign=top><tt>00</tt>..<tt>8F</tt></td>
         <td align=left>all airports</td>
        </tr>
 
@@ -972,7 +946,7 @@
      <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
      <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road (road stops)</li>
      <li>m7 bits 7..6: present road types (road stops)</li>
-     <li>m7: animation frame (railway stations/waypoints, airports)</li>
+     <li>m7: animation frame (railway stations/waypoints)</li>
     </ul>
    </td>
   </tr>
@@ -985,9 +959,9 @@
    <td valign=top nowrap>&nbsp;</td>
    <td>
     <ul>
-     <li>m1 bits 6..5 : Water class (sea, canal or river)
-     <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> (for sea, rivers, and coasts normally <tt>11</tt>)</li>
+     <li>m1: <a href="#OwnershipInfo">owner</a> (for sea, rivers, and coasts normally <tt>11</tt>)</li>
      <li>m2: Depot index (for depots only)</li>
+     <li>m3 bits 1..0 : Water class (sea, canal or river)
      <li>m4: Random data for canal or river tiles</li>
      <li>m5: tile type:
       <table>
@@ -1116,7 +1090,7 @@
       </ul>
      </li>
      <li>m2: index into the array of industries</li>
-     <li>m3: random bits (NewGRF)</li>
+     <li>m3: animation state</li>
      <li>m4: animation loop</li>
      <li>m5: type (plus m6 bit 2):<br>
       <small>(note: this is not the same as the industry type, which is stored in the array of industries)</small>
@@ -1133,7 +1107,7 @@
           <tr>
            <td nowrap valign=top><tt>01</tt>&nbsp; </td>
            <td align=left>wheel tower when animated<br>
-            animation state in m7 bits 5..0; m7 bit 6 set = sound already generated</td>
+            animation state in m3 bits 5..0; m3 bit 6 set = sound already generated</td>
           </tr>
          </table>
         </td>
@@ -1149,7 +1123,7 @@
           </tr>
           <tr>
            <td nowrap valign=top><tt>0A</tt>&nbsp; </td>
-           <td align=left>transformer; animation progress in m7(valid range <tt>0</tt>..<tt>7</tt>)</td>
+           <td align=left>transformer; animation progress in m3(valid range <tt>0</tt>..<tt>7</tt>)</td>
           </tr>
          </table>
         </td>
@@ -1192,7 +1166,7 @@
           </tr>
           <tr>
            <td nowrap valign=top><tt>1E</tt>..<tt>20</tt>&nbsp; </td>
-           <td align=left>various stages of animation; progress of animation in m7</td>
+           <td align=left>various stages of animation; progress of animation in m3</td>
           </tr>
          </table>
         </td>
@@ -1223,7 +1197,7 @@
           </tr>
           <tr>
            <td nowrap valign=top><tt>30</tt>&nbsp; </td>
-           <td align=left>wheel tower when animated; animation state in m7 bits 5..0; m7 bit 6 set = sound already generated</td>
+           <td align=left>wheel tower when animated; animation state in m3 bits 5..0; m3 bit 6 set = sound already generated</td>
           </tr>
           <tr>
            <td nowrap valign=top><tt>31</tt>&nbsp; </td>
@@ -1263,7 +1237,7 @@
           </tr>
           <tr>
            <td nowrap valign=top><tt>58</tt>&nbsp; </td>
-           <td align=left>wheel tower when animated; animation state in m7 bits 5..0; m7 bit 6 set = sound already generated</td>
+           <td align=left>wheel tower when animated; animation state in m3 bits 5..0; m3 bit 6 set = sound already generated</td>
           </tr>
          </table></td>
        </tr>
@@ -1358,7 +1332,7 @@
          <table>
           <tr>
            <td nowrap valign=top><tt>8F</tt>&nbsp; </td>
-           <td align=left>Animated part; animation state in m7 (valid range <tt>00</tt>..<tt>31</tt>)<br>
+           <td align=left>Animated part; animation state in m3 (valid range <tt>00</tt>..<tt>31</tt>)<br>
                         Tile animation is started (m4 zeroed) on the periodic processing.<br>
                         While the animation is in progress, m4 holds the number
                         of animation cycles that have already taken place.<br>
@@ -1388,7 +1362,7 @@
           </tr>
           <tr>
            <td nowrap valign=top><tt>A2</tt>&nbsp; </td>
-           <td align=left>bubble capture facility; animation state in m7 (valid range <tt>00</tt>..<tt>27</tt>)</td>
+           <td align=left>bubble capture facility; animation state in m3 (valid range <tt>00</tt>..<tt>27</tt>)</td>
           </tr>
          </table>
         </td>
@@ -1426,7 +1400,7 @@
      <li>m6 bits 5..3: random triggers (NewGRF)</li>
      <li>m6 bit 2: bit 8 of type (see m5)</li>
      <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
-     <li>m7: animation frame</li>
+     <li>m7: random bits (NewGRF)</li>
     </ul>
    </td>
   </tr>
@@ -1439,7 +1413,7 @@
    <td valign=top nowrap>&nbsp;</td>
    <td>
     <ul>
-     <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a></li>
+     <li>m1: <a href="#OwnershipInfo">owner</a></li>
      <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of tram</li>
      <li>m3 bits 3..0: <a href="#TrackType">track type</a> for railway</li>
      <li>m5 bit 4: pbs reservation state for railway</li>
@@ -1551,7 +1525,6 @@
         <td><tt>2</tt>&nbsp;</td>
         <td>water</td>
        </tr>
-      </table>
      </li>
      <li>m5 bits 1..0: direction onto the bridge / out of the tunnel
       <table>
@@ -1587,16 +1560,16 @@
 
   <tr bgcolor="#CCCCCC">
    <td valign=top nowrap><strong><a name="ClassA"><tt> A</tt></a></strong></td>
-   <td><strong><tt>Objects</tt></strong></td>
+   <td><strong><tt>Unmovables</tt></strong></td>
   </tr>
   <tr>
    <td valign=top nowrap>&nbsp;</td>
    <td>
     <ul>
-     <li>m1 bits 6..5 : Water class (sea, canal, river or land)
-     <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the object (for lighthouses and transmitters normally <tt>10</tt>)</li>
-     <li>m2: index into the array of objects
-     <li>m3: random bits
+     <li>m1: <a href="#OwnershipInfo">owner</a> of the object (for lighthouses and transmitters normally <tt>10</tt>)</li>
+     <li>m2: see company statue
+     <li>m3 bits 4..2: size of HQ
+     <li>m3 bits 1..0: section identification of the HQ
      <li>m5: tile type:
       <table>
        <tr>
@@ -1612,6 +1585,10 @@
        <tr>
         <td nowrap valign=top><tt>02</tt>&nbsp; </td>
         <td align=left>company statue
+         <ul>
+          <li>m2: TownID on which the statue is built in</li>
+         </ul>
+        </td>
        </tr>
 
        <tr>
@@ -1627,7 +1604,6 @@
      </li>
      <li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
      <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
-     <li>m7: animation counter
     </ul>
    </td>
   </tr>

docs/landscape_externals.html

@@ -4,7 +4,7 @@
 <head>
  <meta name="Author" content="Marcin Grzegorczyk">
  <meta name="Description" content="Structure of OpenTTD (OTTD) landscape arrays">
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  <title>OpenTTD Landscape externals</title>
 </head>
 

docs/landscape_grid.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type">
   <meta name="Description" content="Structure of OpenTTD (OTTD) landscape arrays #2">
   <title>OpenTTD Landscape Internals - #2</title>
   <style type="text/css">
@@ -66,30 +66,30 @@ the array so you can quickly see what is used and what is not.
       <td rowspan="2">0</td>
       <td class="caption">ground</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOO</span><span class="option">~ ~~~~</span></td>
+      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits">XXXX <span class="free">OOOO</span></td>
+      <td class="bits"><span class="free">OOO</span>X <span class="free">OOOO</span></td>
       <td class="bits">XXXX XX<span class="free">OO</span></td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XX<span class="free">O</span>X XXXX</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">farmland</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
+      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
+      <td class="bits"><span class="free">OOO</span>X XXXX</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">XX<span class="free">O</span>X XXXX</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td rowspan=3>1</td>
       <td class="caption">rail</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOO</span>X XXXX</td>
+      <td class="bits"><span class="option">~~~</span>X XXXX</td>
       <td class="bits"><span class="free">OOOO</span> XXXX <span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO</span> XXXX</td>
       <td class="bits"><span class="free">OOOO</span> XXXX</td>
@@ -123,7 +123,7 @@ the array so you can quickly see what is used and what is not.
       <td rowspan=3>2</td>
       <td class="caption">road</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOO</span>X XXXX</td>
+      <td class="bits"><span class="option">~~~</span>X XXXX</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
@@ -159,7 +159,7 @@ the array so you can quickly see what is used and what is not.
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits">XX<span class="free">O</span><span class="option">~ ~~</span>XX</td>
+      <td class="bits">XXX<span class="option">~ ~~</span>XX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXX<span class="abuse">X XXXX</span></td>
       <td class="bits"><span class="abuse">XXXX XX</span>XX</td>
@@ -169,10 +169,10 @@ the array so you can quickly see what is used and what is not.
       <td>4</td>
       <td class="caption">trees</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOO</span><span class="option">~ ~~~~</span></td>
+      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
       <td class="bits"><span class="free">OOOO OOO</span>X XXXX XXXX</td>
       <td class="bits"><span class="option">~~</span>XX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XXXX XX<span class="free">OO</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>
@@ -181,7 +181,7 @@ the array so you can quickly see what is used and what is not.
       <td rowspan=7>5</td>
       <td class="caption">rail station</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">O</span>XXX XXXX</td>
+      <td class="bits"><span class="option">~~~</span>X XXXX</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
@@ -216,7 +216,7 @@ the array so you can quickly see what is used and what is not.
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="option">~~~~ ~</span>XXX</td>
       <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
@@ -227,18 +227,18 @@ the array so you can quickly see what is used and what is not.
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">XXXX <span class="free">OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
-      <td class="bits">XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">buoy</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="option">~~~~ ~~~~</span></td>
       <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
@@ -259,9 +259,9 @@ the array so you can quickly see what is used and what is not.
       <td rowspan=3>6</td>
       <td class="caption">sea, shore</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">O</span>XXX XXXX</td>
+      <td class="bits"><span class="option">~~~</span>X XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">X<span class="option">~~</span>X XXXX</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
@@ -272,7 +272,7 @@ 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"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OO</span>XX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">-inherit-</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
@@ -283,7 +283,7 @@ 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">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">-inherit-</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
@@ -293,7 +293,8 @@ the array so you can quickly see what is used and what is not.
       <td>8</td>
       <td class="caption">industry</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXX<span class="free">O</span> <span class="abuse">XXXX</span></td>
+      <td class="bits">XXX<span class="free">O</span> <span class="abuse">
+        XXXX</span></td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
@@ -305,7 +306,7 @@ the array so you can quickly see what is used and what is not.
       <td rowspan=2>9</td>
       <td class="caption">tunnel entrance</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOO</span>X XXXX</td>
+      <td class="bits"><span class="option">~~~</span>X XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
@@ -326,15 +327,26 @@ the array so you can quickly see what is used and what is not.
     </tr>
     <tr>
       <td rowspan=2>A</td>
-      <td class="caption">objects</td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">O</span>XXX XXXX</td>
-      <td class="bits">XXXX XXXX XXXX XXXX</td>
+      <td class="caption">unmovables</td>
       <td class="bits">XXXX XXXX</td>
+      <td class="bits"><span class="option">~~~</span>X XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOO</span>X XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits">XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
+    </tr>
+    <tr>
+      <td class="caption">company statue</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">XXXX XXXX XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
   </tbody>
 </table>

docs/multiplayer.txt

@@ -1,219 +1,121 @@
-Multiplayer manual for OpenTTD
-Last updated:    2011-02-16
-------------------------------------------------------------------------
+Multiplayer Manual for OpenTTD (0.3.5)
+=======================================
 
+1. Starting a Server
+---------------------
 
-Table of contents
------------------
-1.0) Starting a server
-2.0) Connecting to a server
- * 2.1) Connecting to a server over the console
-3.0) Playing internet games
-4.0) Tips for servers
- * 4.1) Imposing landscaping limits
-5.0) Some useful things
-6.0) Troubleshooting
-
-
-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
- - Select the type of game ('LAN/Internet' or 'Internet (advertise)'. With the
-   last one other people are able to see you online. Else they need your IP and
-   port to join)
+ - Select the type of game ('LAN/Internet' or 'Internet (advertise)'. With the last one
+    other people are able to see you online. Else they need your IP and port to join)
  - Click "start game", "load game" or "load scenario"
  - Start playing
 
 
-2.0) Connecting to a server
----- ----------------------
+2. Connecting to a Server
+--------------------------
+
  - Click "multiplayer" on the startup screen
 
- - If you want to connect to any network game in your LAN click on 'LAN', then
-   on 'Find Server'
- - If you want to see which servers all online on the Internet, click on
-   'Internet' and 'Find Server'
+ - If you want to connect to any network game in your LAN click on 'LAN', then on
+    'Find Server'
+ - If you want to see which servers all online on the Internet, click on 'Internet'
+    and 'Find Server'
 
  - If there were more than one server
    - select one in the list below the buttons
    - click on 'join game'
 
- - If you want to play and you have the ip or hostname of the game server you
-   want connect to.
+ - If you want to play and you have the ip or hostname of the game server you want connect to.
    - click add server
    - type in the ip address or hostname
    - if you want to add a port use :<port>
 
  - Now you can select a company and press: "Join company", to help that company
  - Or you can press "Spectate game", to spectate the game
- - Or you can press "New company", and start your own company (if there are
-   slots free)
+ - Or you can press "New company", and start your own company (if there are slots free)
 
  - You see a progressbar how far you are with joining the server.
 
  - Happy playing
 
-2.1) Connecting to a server over the console
----- ---------------------------------------
+
+3. Connecting to a Server over the Console
+-------------------------------------------
+
  - Open the console and type in the following command:
-    connect <ip/host>:<port>#<company-no>
+
+    connect <ip/host>:<port>#<player-no>
 
 
-3.0) Playing internet games
----- ----------------------
- - Servers with a red dot behind it have a different version then you have. You
-   will not be able to join those servers.
+4. Playing Internet-Games
+--------------------------
 
- - Servers with a yellow dot behind it have NewGRFs that you do not have. You
-   will not be able to join those servers. However, via "NewGRF Settings" and
-   "Find missing content online" you might be able to download the needed
-   NewGRFs after which you can join the server.
+ - Since OpenTTD 0.3.5 the network protocol has been rewritten and is very stable, even over slow connections.
 
- - It can happen that a connection is that slow, or you have that many clients
-   connected to your server, that your clients start to loose their connection.
-   Some things you can do about it:
-   - [network] frame_freq:
-     change it in console with: 'set network.frame_freq <number>'
-     the number should be between the 0 and 10, not much higher. It indicates
-     the delay between clicking and showing up. The higher, the more you notice
-     it, but the less bandwidth you use.
+ - Servers with a red dot behind it have a different version then you have. You will not be able to join those servers.
+
+ - Servers with a yellow dot behind it have NewGRFs that you do not have. You will not be able to join those servers.
+
+ - It can happen that a connection is that slow, or you have that many clients connected to your server, that your clients start to loose their connection. Some things you can do about it:
+
+   - net_frame_freq:
+      change it in console with: net_frame_freq = <number>
+     the number should be between the 0 and 10, not much higher. It indicates the delay between clicking and showing up. The higher, the more you notice it, but the less bandwidth you use.
      A good value for Internet-games is 2 or 3.
 
-   - [network] sync_freq:
-     change it in console with: 'set network.sync_freq <number>'
-     the number should be between the 50 and 1000, not much lower, not much
-     higer. It indicates the time between sync-frames. A sync-frame is a frame
-     which checks if all clients are still in sync. When the value it too high,
-     clients can desync in 1960, but the server detects it in 1970. Not really
-     handy. The lower the value, the more bandwidth it uses.
+   - net_sync_freq:
+      change it in console with: net_sync_freq = <number>
+     the number should be between the 50 and 1000, not much lower, not much higer. It indicates the time between sync-frames. A sync-frame is a frame which checks if all clients are still in sync. When the value it too high, clients can desync in 1960, but the server detects it in 1970. Not really handy. The lower the value, the more bandwidth it uses.
 
-   NB: changing frame_freq has more effect on the bandwidth then sync_freq.
+   NB: changing net_frame_freq has more effect on the bandwidth then net_sync_freq. You should never change net_sync_freq!
 
 
-4.0) Tips for servers
----- ----------------
- - You can launch a dedicated server by adding -D as parameter.
- - In UNIX like systems, you can fork your dedicated server by adding -f as
-   parameter.
+5. Tips for servers
+--------------------
 
- - You can automaticly clean companies that do not have a client connected to
-   them, for, let's say, 3 years. You can do this via: 'set autoclean_companies'
-   and 'set autoclean_protected' and 'set autoclean_unprotected'. Unprotected
-   removes a password from a company when it is not used for more then the
-   defined amount of months. 'set autoclean_novehicles' can be used to remove
-   companies without any vehicles quickly.
+ - You can launch a dedicated server by adding -D as parameter
+ - In UNIX like systems, you can fork your dedicated server by adding -f as parameter
 
+ - You can automaticly clean companies that do not have a client connected to them, for, let's say,
+      3 years. You can do this via: 'set autoclean_companies' and 'set autoclean_protected' and
+      'set autoclean_unprotected'. Unprotected removes a password from a company when it is
+      not used for more then the defined amount of months.
  - You can also do this manually via the console: 'reset_company'.
+    Both ways, the company will go bankrupt.
 
- - You can let your server automaticly restart a map when, let's say, year 2030
-   is reached. See 'set restart_game_date' for detail.
+ - You can let your server automaticly restart a map when, let's say, year 2030 is reached.
+    See 'set restart_game_date' for detail.
+ - If you want to be on the server-list, enable Advertising. To do this, select 'Internet (advertise)'
+    in the Start Server menu, or type in console: 'set server_advertise 1'.
 
- - If you want to be on the server-list, enable Advertising. To do this, select
-   'Internet (advertise)' in the Start Server menu, or type in console:
-   'set server_advertise 1'.
+ - You can protect your server with a password via the console: 'set server_pw', or via the
+    Start Server menu.
 
- - You can protect your server with a password via the console: 'set server_pw',
-   or via the Start Server menu.
-
- - When you have many clients connected to your server via Internet, watch your
-   bandwidth (if you have any limit on it, set by your ISP). One client uses
-   about 1.5 kilobytes per second up and down. To decrease this amount, setting
-   'frame_freq' to 1 will reduce it to roughly 1 kilobyte per second per client.
-
- - OpenTTD's default settings for maximum number of clients, and amount of data
-   from clients to process are chosen to not influence the normal playing of
-   people, but to prevent or at least make it less likely that someone can
-   perform a (distributed) denial-of-service attack on your server by causing
-   an out-of-memory event by flooding the server with data to send to all
-   clients. The major factor in this is the maximum number of clients; with
-   32 clients "only" sending one chat message causes 1024 messages to be
-   distributed in total, with 64 clients that already quadruples to 4096. Given
-   that upstream bandwidth is usually the limiting factor, a queue of packets
-   that need to be sent will be created.
-   To prevent clients from exploiting this "explosion" of packets to send we
-   limit the number of incoming data, resulting in effectively limiting the
-   amount of data that OpenTTD will send to the clients. Even with the default
-   limits it is possible to generate about 70.000 packets per second, or about
-   7 megabit per second of traffic.
-   Given that OpenTTD kicks clients after they have not reacted within about 9
-   seconds from sending a frame update packet it would be possible that OpenTTD
-   keeps about 600.000 packets in memory, using about 50 megabytes of memory.
-   Given that OpenTTD allows short bursts of packets, you can have slightly
-   more packets in memory in case of a distributed denial of service attack.
-   When increasing the amount of incoming data, or the maximum number of
-   clients the amount of memory OpenTTD needs in case of a distributed denial
-   of service attack is linearly related to the amount of incoming data and
-   quadratic to the amount of clients. In short, a rule of thumb for, the
-   maximum memory usage for packets is:
-       #max_clients * #max_clients * bytes_per_frame * 10 KiB.
-
-4.1) Imposing landscaping limits
----- ---------------------------
- - You can impose limits on companies by the following 4 settings:
-   - terraform_per_64k_frames
-   - terraform_frame_burst
-   - clear_per_64k_frames
-   - clear_frame_burst
-
- - Explaining 'per_64K_frames' and 'burst'
-    - 'burst' defines 3 things, the maximum limit, the limit of a single action,
-      and the initial value for the limit assigned to a new company.
-      This setting is fairly simple and requires no math.
-
-      A value of 1 means a single tile can be affected by a single action.
-      This results in having to click 400 times when wanting to cover an area
-      of 20 x 20 tiles.
-
-      The default value 4096 covers an area of 64 x 64 tiles.
-
-    - 'per_64k_frames' defines the number of tiles added to each companies limit
-      per frame (however not past the possible maximum value,the 'burst').
-      64k rather resembles the exact number of 65536 frames. So setting this
-      variable to 65536 means: 65536 / 65536 = 1 tile per frame.
-      As a day consists of 74 frames, a company's limit is increased by 74
-      tiles during the course of a single day (2.22 seconds).
-
-      To achieve a 1 tile per day increase the following calculation is needed:
-      1 / 74 (frames per day) * 65536 (per_64k_frames) = 885.62...
-      after rounding: a value of 886 means adding a bit over 1 tile per day.
-
-      There is still enough space to scale this value downwards:
-      decreasing this value to 127 results in a bit over 1 tile added to the
-      allowance per week (7 days).
-
-      To create a setup in which a company gets an initial allowance only,
-      set the value to 0 - no increase of the allowance per frame.
-
- - Even though construction actions include a clear tile action, they are not
-   affected by the above settings.
+ - When you have many clients connected to your server via Internet, watch your bandwidth (if
+    you have any limit on it, set by your ISP). 1 client uses +/- 3 kb/s up and down. To decrease
+    this amount, set 'net_frame_freq' to 1 for example. This will reduce it to 1.5 kb/s per client.
 
 
-5.0) Some useful things
----- ------------------
- - You can protect your company so nobody else can join uninvited. To do this,
-   set a password in your Company Screen
+6. Some useful things
+----------------------
 
- - You can give other players some money via the ClientList (under the 'head'
-   in the mainbar).
+ - You can protect your company so nobody else can join uninvited. To do this, check your Company Screen
+
+ - You can give other players some money via the ClientList (under the 'head' in the mainbar).
 
  - You can chat with other players via ENTER or via SHIFT+T or via the ClientList
 
  - Servers can now kick players, so don't make them use it!
 
+ - From 0.3.5, desyncs should not happen anymore
 
-6.0) Troubleshooting
----- ---------------
- - My advertising server does not show up in list at servers.openttd.org
-     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.
+ - From 0.3.5, patch-settings are also synced. You can now play without deleting openttd.cfg, and with, for example, extra large trains enabled.
+
+7. Troubleshooting
+------------------
+
+ - My advertised server does not show up in the 'advertised server list' (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 the OpenTTD ports 3979 (both TCP and UDP) to the computer that is hosting the game.

docs/obg_format.txt

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

docs/openttd.6

@@ -1,6 +1,6 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd May 31, 2011
+.Dd Apr 01, 2010
 .Dt OPENTTD 6
 .Sh NAME
 .Nm openttd
@@ -14,6 +14,7 @@
 .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
@@ -21,7 +22,6 @@
 .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,6 +61,10 @@ 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
@@ -84,8 +88,6 @@ 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

findversion.sh

@@ -66,19 +66,20 @@ fi
 # Find out some dirs
 cd `dirname "$0"`
 ROOT_DIR=`pwd`
+SRC_DIR=src
 
 # Determine if we are using a modified version
 # Assume the dir is not modified
 MODIFIED="0"
 if [ -d "$ROOT_DIR/.svn" ]; then
 	# We are an svn checkout
-	if [ -n "`svnversion | grep 'M'`" ]; then
+	if [ -n "`svnversion \"$SRC_DIR\" | grep 'M'`" ]; then
 		MODIFIED="2"
 	fi
 	# Find the revision like: rXXXXM-branch
-	BRANCH=`LC_ALL=C svn info | "$AWK" '/^URL:.*branches/ { split($2, a, "/"); for(i in a) if (a[i]=="branches") { print a[i+1]; break } }'`
-	TAG=`LC_ALL=C svn info | "$AWK" '/^URL:.*tags/ { split($2, a, "/"); for(i in a) if (a[i]=="tags") { print a[i+1]; break } }'`
-	REV_NR=`LC_ALL=C svn info | "$AWK" '/^Last Changed Rev:/ { print $4 }'`
+	BRANCH=`LC_ALL=C svn info "$SRC_DIR" | "$AWK" '/^URL:.*branches/ { split($2, a, "/"); for(i in a) if (a[i]=="branches") { print a[i+1]; break } }'`
+	TAG=`LC_ALL=C svn info "$SRC_DIR" | "$AWK" '/^URL:.*tags/ { split($2, a, "/"); for(i in a) if (a[i]=="tags") { print a[i+1]; break } }'`
+	REV_NR=`LC_ALL=C svn info "$SRC_DIR" | "$AWK" '/^Last Changed Rev:/ { print $4 }'`
 	if [ -n "$TAG" ]; then
 		REV=$TAG
 	else
@@ -86,46 +87,22 @@ if [ -d "$ROOT_DIR/.svn" ]; then
 	fi
 elif [ -d "$ROOT_DIR/.git" ]; then
 	# We are a git checkout
-	# Refresh the index to make sure file stat info is in sync, then look for modifications
-	git update-index --refresh >/dev/null
-	if [ -n "`git diff-index HEAD`" ]; then
+	if [ -n "`git diff-index HEAD \"$SRC_DIR\"`" ]; then
 		MODIFIED="2"
 	fi
 	HASH=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null`
 	REV="g`echo $HASH | cut -c1-8`"
-	BRANCH="`git symbolic-ref -q HEAD 2>/dev/null | sed 's@.*/@@;s@^master$@@'`"
-	REV_NR=`LC_ALL=C git log --pretty=format:%s --grep="^(svn r[0-9]*)" -1 | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
-	if [ -z "$REV_NR" ]; 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 | sed 's@\^0$@@'`"
-	if [ -n "$TAG" ]; then
-		BRANCH=""
-		REV="$TAG"
-	fi
+	BRANCH=`git branch|grep '[*]' | sed 's@\* @@;s@^master$@@'`
+	REV_NR=`LC_ALL=C git log --pretty=format:%s "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
 elif [ -d "$ROOT_DIR/.hg" ]; then
 	# We are a hg checkout
-	if [ -n "`hg status | grep -v '^?'`" ]; then
+	if [ -n "`hg status \"$SRC_DIR\" | grep -v '^?'`" ]; then
 		MODIFIED="2"
 	fi
-	HASH=`LC_ALL=C hg id -i | cut -c1-12`
+	HASH=`LC_ALL=C hg parents --template="{node}"`
 	REV="h`echo $HASH | cut -c1-8`"
-	BRANCH="`hg branch | sed 's@^default$@@'`"
-	TAG="`hg id -t | grep -v 'tip$'`"
-	if [ -n "$TAG" ]; then
-		BRANCH=""
-		REV="$TAG"
-	fi
-	REV_NR=`LC_ALL=C hg log -f -k "(svn r" -l 1 --template "{desc|firstline}\n" | grep "^(svn r[0-9]*)" | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
-	if [ -z "$REV_NR" ]; then
-		# No rev? Maybe it is a custom hgsubversion clone
-		REV_NR=`LC_ALL=C hg parent --template="{svnrev}"`
-	fi
-elif [ -f "$ROOT_DIR/.ottdrev" ]; then
-	# We are an exported source bundle
-	cat $ROOT_DIR/.ottdrev
-	exit
+	BRANCH=`hg branch | sed 's@^default$@@'`
+	REV_NR=`LC_ALL=C hg log -r $HASH:0 -k "svn" -l 1 --template "{desc}\n" "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
 else
 	# We don't know
 	MODIFIED="1"

known-bugs.txt

@@ -1,18 +1,18 @@
 OpenTTD's known bugs
-Last updated:    2012-01-07
-Release version: 1.2.0-beta2
+Last updated:    2010-11-20
+Release version: 1.0.5
 ------------------------------------------------------------------------
 
 
-Table of contents
------------------
-1.0) About
-2.0) Known bugs in this release
- * 2.1) Known bugs that will not be solved
+Table of Contents:
+------------------
+1) About
+2) Known bugs in the this stable release
+3) Known bugs that will not be solved
 
 
-1.0) About
----- -----
+1) About:
+-- ------
 All bugs listed below are marked as known. Please do not submit any bugs
 that are the same as these. If you do, do not act surprised, because
 we WILL flame you!!
@@ -22,12 +22,12 @@ specifics, we welcome you to report them. React to the given bug indicated
 by the number below on http://bugs.openttd.org.
 
 
-2.0) Known bugs in this release
----- --------------------------
-The following bugs are known to exist in this release and we intend to
-fix them. Some bugs are known but are not fixable or fixing them would
-cause further problems. Those bugs can be found in the "Known bugs that
-will not be solved" section.
+2) Known bugs in this stable release:
+-- ----------------------------------
+The following bugs are known to exist in this stable release and
+we intend to fix them. Some bugs are known but are not fixable or
+fixing them would cause further problems. Those bugs can be found
+in the "Known bugs that will not be solved" section.
 
 The bugs in this section all refer to a ticket in our bug tracking system
 that you can find at: http://bugs.openttd.org
@@ -39,15 +39,25 @@ officially supporting Mac OS X again. For now it remains unsupported and
 we only apply bug fixes provided by the community but we are unable to fix
 these bugs ourselves.
 
-- 4857	[OSX] No support for detecting mono space font
-- 4847	[OSX] No support for bootstrap downloading of base graphics
-- 4744  [OSX] Crash when switching to full screen with OS X Lion
-- 4689  [OSX] Crash when hiding window after coming from full screen
-- 4420  [OSX] OS' mouse pointer still shows
-- 2484  [OSX] Cannot enter CJK characters
+- 4189	Idle clients are not notified of connection loss
+- 4130	Road vehicle cannot find a nearest depot skips that order
+- 4001	[OSX] SETX[Y] not ignored in SetFallbackFont
+- 3952	Console command rescan_ai does not remove AIs
+- 3935	Under some circumstances two road vehicles can leave road stop simultaniously
+- 3816	Console text does not always fit at 640x480
+- 3714	Some corrupted savegames can cause crashes
+- 3651	[OSX] Crash when selecting full screen
+- 3648	[OSX] Crash when selecting music
+- 3637	Second highest competing station gets penalised twice
+- 3546	Ignoring signals might crash trains
+- 3447	[OSX] SDL port is unuseable
+- 2782	[OSX] Port hopelessly outdated
+- 2585	[OSX] OS' mouse pointer showing
+- 2484	[OSX] Cannot enter CJK characters
 
-2.1) Known bugs that will not be solved
----- ----------------------------------
+
+3) Known bugs that will not be solved:
+-- -----------------------------------
 This section lists all known bugs that we do not intend to fix and the
 reasons why we think that fixing them is infeasible. We might make some
 minor improvements that reduce the scope of these bugs, but we will not
@@ -216,15 +226,6 @@ OpenTTD not properly resizing with SDL on X [FS#3305]
 	and GNOME's. With the XFCE's and LXDE's window managers the resize
 	event is sent when the user releases the mouse.
 
-Incorrect colours, crashes upon exit, debug warnings and smears upon
-window resizing with SDL on Mac OS X [FS#3447]
-	Video handling with (lib)SDL under Mac OS X is known to fail on some
-	versions of Mac OS X with some hardware configurations. Some of the
-	problems happen only under some circumstances whereas others are
-	always present.
-	We suggest that the SDL video/sound backend is not used for OpenTTD
-	in combinations with Mac OS X.
-
 Train crashes entering same junction from block and path signals [FS#3928]
 	When a train has reserved a path from a path signal to a two way
 	block signal and the reservation passes a path signal through the
@@ -267,149 +268,6 @@ 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 still use the "win32" music driver as default are
+	The reason we do not use the "win32" music driver as default are
 	described in the "Long delay between switching music/song" section
 	of this document.
-
-Pre- and exit signals are not dragged [FS#4378]
-	Unlike all other signal types, the entry- and exit signals are not
-	dragged but instead normal signals are placed on subsequent track
-	sections. This is done on purpose as this is the usually more con-
-	venient solution. There are little to no occasions where more than
-	one entry or exit signal in a row are useful. This is different
-	for all other signal types where several in a row can serve one
-	purpose or another.
-
-Station build date is incorrect [FS#4415]
-	The tile query tool will show the date of the last (re)construction
-	at the station and not the date of the first construction. This is
-	due to compatability reasons with NewGRFs and the fact that it is
-	wrong to say that the station is built in a particular year when it
-	was completely destroyed/rebuilt later on.
-	The tile query tool can be fixed by changing the "Build date" text
-	to "Date at which the last (re)construction took place" but this is
-	deemed too specific and long for that window.
-
-Can't change volume inside OpenTTD [FS#4416]
-	Some backends do not provide a means to change the volume of sound
-	effects or music. The mixing of music and sound is left to external
-	libraries/the operating system we can't handle the volume control
-	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.

media/extra_grf/2ccmapd.nfo

@@ -6,9 +6,7 @@
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 //
-// This is the DOS 2CC translation map which OpenTTD translates if needed upon loading.
-//
-   -1 * 0	 0C "2CC map"
+   -1 * 0	 0C "2CC map - DOS"
    -1 * 0	 05 0A FF 00 01
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
@@ -79,7 +77,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 58 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 60 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -133,7 +131,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 20 21 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 35 36 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -142,7 +140,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 04 05 06 07 08 09 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 58 6A 20 21 28 F5 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -151,7 +149,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 08 09 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 28 F5 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -223,7 +221,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 58 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 60 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -277,7 +275,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 20 21 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 35 36 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -286,7 +284,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 04 05 06 07 08 09 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 58 6A 20 21 28 F5 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -295,7 +293,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 08 09 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 28 F5 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -367,7 +365,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 58 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 60 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -421,7 +419,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 20 21 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 35 36 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -430,7 +428,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 04 05 06 07 08 09 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 58 6A 20 21 28 F5 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -439,7 +437,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 08 09 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 28 F5 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -511,7 +509,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 58 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 60 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -565,7 +563,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 20 21 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 35 36 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -574,7 +572,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 04 05 06 07 08 09 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 58 6A 20 21 28 F5 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -583,7 +581,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 08 09 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 28 F5 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -655,7 +653,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 58 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 60 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -709,7 +707,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 20 21 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 35 36 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -718,7 +716,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 04 05 06 07 08 09 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 58 6A 20 21 28 F5 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -727,7 +725,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 08 09 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 28 F5 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -799,7 +797,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 58 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 60 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -853,7 +851,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 20 21 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 35 36 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -862,7 +860,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 04 05 06 07 08 09 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 58 6A 20 21 28 F5 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -871,7 +869,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 08 09 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 28 F5 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -943,7 +941,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 58 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 60 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -997,7 +995,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 20 21 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 35 36 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1006,7 +1004,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 04 05 06 07 08 09 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 58 6A 20 21 28 F5 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1015,12 +1013,12 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 08 09 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 28 F5 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 60 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1029,7 +1027,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 60 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1038,7 +1036,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 60 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1047,7 +1045,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 60 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1056,7 +1054,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 60 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1065,7 +1063,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 60 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1074,7 +1072,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 60 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1083,16 +1081,16 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 60 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 58 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 60 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 60 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1101,7 +1099,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 60 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1110,7 +1108,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 60 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1119,7 +1117,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 60 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1128,7 +1126,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 60 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1137,29 +1135,29 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 60 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 20 21 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 35 36 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 60 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 04 05 06 07 08 09 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 58 6A 20 21 28 F5 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 60 59 5A 5B 5C 5D 5E 5F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 08 09 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 28 F5 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1231,7 +1229,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 58 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 60 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1285,7 +1283,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 20 21 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 35 36 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1294,7 +1292,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 04 05 06 07 08 09 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 58 6A 20 21 28 F5 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1303,7 +1301,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 08 09 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 28 F5 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1375,7 +1373,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 58 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 60 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1429,7 +1427,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 20 21 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 35 36 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1438,7 +1436,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 04 05 06 07 08 09 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 58 6A 20 21 28 F5 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1447,7 +1445,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 08 09 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 28 F5 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1519,7 +1517,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 58 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 60 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1573,7 +1571,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 20 21 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 35 36 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1582,7 +1580,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 04 05 06 07 08 09 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 58 6A 20 21 28 F5 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1591,7 +1589,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 08 09 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 28 F5 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1663,7 +1661,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 58 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 60 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1717,7 +1715,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 20 21 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 35 36 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1726,7 +1724,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 04 05 06 07 08 09 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 58 6A 20 21 28 F5 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1735,7 +1733,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 08 09 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 28 F5 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1807,7 +1805,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 58 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 60 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1861,7 +1859,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 20 21 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 35 36 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1870,7 +1868,7 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 04 05 06 07 08 09 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 58 6A 20 21 28 F5 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
@@ -1879,12 +1877,12 @@
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 08 09 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 28 F5 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 20 21 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 35 36 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1893,7 +1891,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 20 21 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 35 36 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1902,7 +1900,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 20 21 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 35 36 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1911,7 +1909,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 20 21 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 35 36 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1920,7 +1918,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 20 21 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 35 36 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1929,7 +1927,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 20 21 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 35 36 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1938,7 +1936,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 20 21 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 35 36 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1947,16 +1945,16 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 20 21 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 35 36 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 58 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 60 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 20 21 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 35 36 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1965,7 +1963,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 20 21 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 35 36 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1974,7 +1972,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 20 21 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 35 36 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1983,7 +1981,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 20 21 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 35 36 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -1992,7 +1990,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 20 21 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 35 36 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2001,34 +1999,34 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 20 21 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 35 36 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 20 21 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 35 36 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 20 21 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 35 36 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 04 05 06 07 08 09 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 58 6A 20 21 28 F5 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 20 21 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 35 36 22 23 24 25 26 27 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 08 09 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 28 F5 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 04 05 06 07 08 09 0A 0B 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 6A 20 21 28 F5 0A 0B 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2037,7 +2035,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 04 05 06 07 08 09 0A 0B 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 6A 20 21 28 F5 0A 0B 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2046,7 +2044,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 04 05 06 07 08 09 0A 0B 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 6A 20 21 28 F5 0A 0B 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2055,7 +2053,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 04 05 06 07 08 09 0A 0B 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 6A 20 21 28 F5 0A 0B 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2064,7 +2062,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 04 05 06 07 08 09 0A 0B 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 6A 20 21 28 F5 0A 0B 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2073,7 +2071,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 04 05 06 07 08 09 0A 0B 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 6A 20 21 28 F5 0A 0B 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2082,7 +2080,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 04 05 06 07 08 09 0A 0B 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 6A 20 21 28 F5 0A 0B 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2091,16 +2089,16 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 04 05 06 07 08 09 0A 0B 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 6A 20 21 28 F5 0A 0B 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 58 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 60 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 04 05 06 07 08 09 0A 0B 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 6A 20 21 28 F5 0A 0B 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2109,7 +2107,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 04 05 06 07 08 09 0A 0B 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 6A 20 21 28 F5 0A 0B 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2118,7 +2116,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 04 05 06 07 08 09 0A 0B 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 6A 20 21 28 F5 0A 0B 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2127,7 +2125,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 04 05 06 07 08 09 0A 0B 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 6A 20 21 28 F5 0A 0B 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2136,7 +2134,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 04 05 06 07 08 09 0A 0B 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 6A 20 21 28 F5 0A 0B 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2145,34 +2143,34 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 04 05 06 07 08 09 0A 0B 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 6A 20 21 28 F5 0A 0B 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 20 21 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 35 36 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 04 05 06 07 08 09 0A 0B 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 6A 20 21 28 F5 0A 0B 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 04 05 06 07 08 09 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 58 6A 20 21 28 F5 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 04 05 06 07 08 09 0A 0B 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 58 6A 20 21 28 F5 0A 0B 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 08 09 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 28 F5 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 08 09 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 28 F5 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2181,7 +2179,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 08 09 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 28 F5 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2190,7 +2188,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 08 09 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 28 F5 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2199,7 +2197,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 08 09 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 28 F5 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2208,7 +2206,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 08 09 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 28 F5 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2217,7 +2215,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 08 09 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 28 F5 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2226,7 +2224,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 08 09 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 28 F5 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2235,16 +2233,16 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 08 09 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 28 F5 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 58 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 60 59 5A 5B 5C 5D 5E 5F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 08 09 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 28 F5 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2253,7 +2251,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 08 09 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 28 F5 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2262,7 +2260,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 08 09 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 28 F5 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2271,7 +2269,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 08 09 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 28 F5 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2280,7 +2278,7 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 08 09 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 28 F5 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
@@ -2289,28 +2287,28 @@
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 08 09 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 28 F5 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 20 21 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 35 36 22 23 24 25 26 27 CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 08 09 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 28 F5 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 04 05 06 07 08 09 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 58 6A 20 21 28 F5 0A 0B CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF
    -1 * 0	 00 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E
 	 1F 20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F 30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E
-	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 08 09 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
+	 3F 40 41 42 43 44 45 46 47 48 49 4A 4B 4C 4D 4E 4F 28 F5 0A 0B 0C 0D 0E 0F 58 59 5A 5B 5C 5D 5E
 	 5F 60 61 62 63 64 65 66 67 68 69 6A 6B 6C 6D 6E 6F 70 71 72 73 74 75 76 77 78 79 7A 7B 7C 7D 7E
 	 7F 80 81 82 83 84 85 86 87 88 89 8A 8B 8C 8D 8E 8F 90 91 92 93 94 95 96 97 98 99 9A 9B 9C 9D 9E
 	 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE
-	 BF C0 C1 C2 C3 C4 C5 08 09 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
+	 BF C0 C1 C2 C3 C4 C5 28 F5 0A 0B 0C 0D 0E 0F CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE
 	 DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE
 	 FF

media/extra_grf/airports.nfo

@@ -7,19 +7,19 @@
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 //
    -1 * 0	 0C "Extra 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 * 0	 05 10 0F
+   -1 sprites/airports.pcx 18 8 09 31 64 -31 0
+   -1 sprites/airports.pcx 98 8 09 31 64 -31 0
+   -1 sprites/airports.pcx 178 8 09 31 64 -31 0
+   -1 sprites/airports.pcx 258 8 09 31 64 -31 0
+   -1 sprites/airports.pcx 338 8 09 31 64 -31 0
+   -1 sprites/airports.pcx 418 8 09 31 64 -31 0
+   -1 sprites/airports.pcx 498 8 09 55 64 -2 -38
+   -1 sprites/airports.pcx 578 8 09 17 18 16 -1
+   -1 sprites/airports.pcx 610 8 09 55 64 -2 -38
+   -1 sprites/airports.pcx 690 8 09 17 18 -30 1
+   -1 sprites/airports.pcx 722 8 09 55 64 -2 -38
+   -1 sprites/airports.pcx 2 88 09 55 64 -2 -38
+   -1 sprites/airports.pcx 82 88 09 31 64 -31 0
+   -1 sprites/airports.pcx 162 88 09 31 64 -31 0
+   -1 sprites/airports.pcx 242 88 09 31 64 -31 0

media/extra_grf/aqueduct.nfo

@@ -6,26 +6,13 @@
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 //
-   -1 * 0	 0C "Aqueduct graphics by Jonathan G. Rennison / PaulC"
-// temperate aqueduct
-   -1 * 6	 07 83 01 \7! 00 09
+   -1 * 0	 0C "Aqueduct graphics by Jonathan G. Rennison"
    -1 * 3	 05 12 08
-   -1 sprites/aqueduct.png  34  8 09 32 61 -30 -9
-   -1 sprites/aqueduct.png 114  8 09 31 62 -29 -9
-   -1 sprites/aqueduct.png 194  8 09 32 61 -30 -9
-   -1 sprites/aqueduct.png 274  8 09 31 62 -29 -9
-   -1 sprites/aqueduct.png 354  8 09 32 61 -30 -4
-   -1 sprites/aqueduct.png 434  8 09 31 62 -29 -4
-   -1 sprites/aqueduct.png 514  8 09 23 33 -31  0
-   -1 sprites/aqueduct.png 562  8 09 23 33   0  1
-// non-temperate aqueduct
-   -1 * 6	 07 83 01 \7= 00 09
-   -1 * 3	 05 12 08
-   -1 sprites/aqueduct.png  34 48 09 32 61 -30 -9
-   -1 sprites/aqueduct.png 114 48 09 31 62 -29 -9
-   -1 sprites/aqueduct.png 194 48 09 32 61 -30 -9
-   -1 sprites/aqueduct.png 274 48 09 31 62 -29 -9
-   -1 sprites/aqueduct.png 354 48 09 32 61 -30 -4
-   -1 sprites/aqueduct.png 434 48 09 31 62 -29 -4
-   -1 sprites/aqueduct.png 514 48 09 23 33 -31  0
-   -1 sprites/aqueduct.png 562 48 09 23 33   0  1
+   -1 sprites/aqueduct.pcx 34 8 09 33 64 -34 -10
+   -1 sprites/aqueduct.pcx 114 8 09 33 66 -37 -9
+   -1 sprites/aqueduct.pcx 194 8 09 33 64 -34 -10
+   -1 sprites/aqueduct.pcx 274 8 09 33 66 -37 -9
+   -1 sprites/aqueduct.pcx 354 8 09 33 64 -34 -5
+   -1 sprites/aqueduct.pcx 434 8 09 33 66 -37 -4
+   -1 sprites/aqueduct.pcx 514 8 09 23 33 -31 0
+   -1 sprites/aqueduct.pcx 562 8 09 23 33 0 1

media/extra_grf/autorail.nfo

@@ -7,59 +7,59 @@
 // 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 "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 * 0	 05 13 37
+   -1 sprites/autorail.pcx 18 8 09 31 64 -31 7
+   -1 sprites/autorail.pcx 98 8 09 31 64 -31 -1
+   -1 sprites/autorail.pcx 178 8 09 39 64 -31 -1
+   -1 sprites/autorail.pcx 258 8 09 47 64 -31 -9
+   -1 sprites/autorail.pcx 338 8 09 31 64 -31 -5
+   -1 sprites/autorail.pcx 418 8 09 23 64 -31 7
+   -1 sprites/autorail.pcx 498 8 09 18 64 -31 4
+   -1 sprites/autorail.pcx 578 8 09 31 64 -31 -1
+   -1 sprites/autorail.pcx 658 8 09 31 64 -31 7
+   -1 sprites/autorail.pcx 2 72 09 31 64 -31 -1
+   -1 sprites/autorail.pcx 82 72 09 23 64 -31 7
+   -1 sprites/autorail.pcx 162 72 09 18 64 -31 4
+   -1 sprites/autorail.pcx 242 72 09 31 64 -31 -1
+   -1 sprites/autorail.pcx 322 72 09 39 64 -31 -1
+   -1 sprites/autorail.pcx 402 72 09 47 64 -31 -9
+   -1 sprites/autorail.pcx 482 72 09 31 64 -31 -5
+   -1 sprites/autorail.pcx 562 72 09 31 64 -31 7
+   -1 sprites/autorail.pcx 642 72 09 31 64 -31 -1
+   -1 sprites/autorail.pcx 722 72 09 47 64 -31 -9
+   -1 sprites/autorail.pcx 2 136 09 26 64 -31 4
+   -1 sprites/autorail.pcx 82 136 09 23 64 -31 4
+   -1 sprites/autorail.pcx 162 136 09 31 64 -31 -3
+   -1 sprites/autorail.pcx 242 136 09 26 64 -31 4
+   -1 sprites/autorail.pcx 322 136 09 23 64 -31 4
+   -1 sprites/autorail.pcx 402 136 09 31 64 -31 -3
+   -1 sprites/autorail.pcx 482 136 09 31 64 -31 7
+   -1 sprites/autorail.pcx 562 136 09 31 64 -31 -1
+   -1 sprites/autorail.pcx 642 136 09 15 64 -31 7
+   -1 sprites/autorail.pcx 722 136 09 31 64 -31 7
+   -1 sprites/autorail.pcx 2 184 09 39 64 -31 -1
+   -1 sprites/autorail.pcx 82 184 09 31 64 -31 -1
+   -1 sprites/autorail.pcx 162 184 09 31 64 -31 7
+   -1 sprites/autorail.pcx 242 184 09 39 64 -31 -1
+   -1 sprites/autorail.pcx 322 184 09 31 64 -31 -1
+   -1 sprites/autorail.pcx 402 184 09 31 64 -31 7
+   -1 sprites/autorail.pcx 482 184 09 31 64 -31 -1
+   -1 sprites/autorail.pcx 562 184 09 31 64 -31 -1
+   -1 sprites/autorail.pcx 642 184 09 31 64 -31 -1
+   -1 sprites/autorail.pcx 722 184 09 23 64 -31 7
+   -1 sprites/autorail.pcx 2 248 09 15 64 -31 7
+   -1 sprites/autorail.pcx 82 248 09 39 64 -31 -1
+   -1 sprites/autorail.pcx 162 248 09 47 64 -31 -9
+   -1 sprites/autorail.pcx 242 248 09 31 64 -31 7
+   -1 sprites/autorail.pcx 322 248 09 31 64 -31 -1
+   -1 sprites/autorail.pcx 402 248 09 31 64 -31 -1
+   -1 sprites/autorail.pcx 482 248 09 31 64 -31 -1
+   -1 sprites/autorail.pcx 562 248 09 23 64 -31 7
+   -1 sprites/autorail.pcx 642 248 09 15 64 -31 7
+   -1 sprites/autorail.pcx 722 248 09 39 64 -31 -1
+   -1 sprites/autorail.pcx 2 312 09 47 64 -31 -9
+   -1 sprites/autorail.pcx 82 312 09 31 64 -31 -1
+   -1 sprites/autorail.pcx 162 312 09 31 64 -31 -1
+   -1 sprites/autorail.pcx 242 312 09 23 64 -31 7
+   -1 sprites/autorail.pcx 322 312 09 31 64 -31 7
+   -1 sprites/autorail.pcx 402 312 09 31 64 -31 7

media/extra_grf/canals.nfo

@@ -6,166 +6,70 @@
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 //
-   -1 * 0	 0C "Canal graphics by George / PaulC"
-   -1 * 3	 05 08 41
-// Canal slopes
-   -1 sprites/canal_locks.png 66 8 09 23 64 -31 0
-   -1 sprites/canal_locks.png 146 8 09 39 64 -31 -8
-   -1 sprites/canal_locks.png 226 8 09 23 64 -31 0
-   -1 sprites/canal_locks.png 306 8 09 39 64 -31 -8
-// Lock sides
-   -1 sprites/canal_locks.png 386 8 09 26 40 -7 -12
-   -1 sprites/canal_locks.png 434 8 09 33 42 -31 -13
-   -1 sprites/canal_locks.png 482 8 09 25 40 -31 -12
-   -1 sprites/canal_locks.png 530 8 09 34 42 -9 -14
-   -1 sprites/canal_locks.png 578 8 09 27 32 -1 -17
-   -1 sprites/canal_locks.png 626 8 09 35 32 -29 -17
-   -1 sprites/canal_locks.png 674 8 09 27 32 -29 -17
-   -1 sprites/canal_locks.png 722 8 09 35 32 -1 -17
-   -1 sprites/canal_locks.png 2 72 09 44 40 -7 -24
-   -1 sprites/canal_locks.png 50 72 09 33 42 -31 -13
-   -1 sprites/canal_locks.png 98 72 09 32 40 -31 -12
-   -1 sprites/canal_locks.png 146 72 09 31 41 -8 -12
-   -1 sprites/canal_locks.png 194 72 09 32 34 -1 -13
-   -1 sprites/canal_locks.png 242 72 09 34 38 -35 -17
-   -1 sprites/canal_locks.png 290 72 09 44 34 -29 -26
-   -1 sprites/canal_locks.png 338 72 09 34 38 -1 -17
-   -1 sprites/canal_locks.png 386 72 09 24 42 -9 -4
-   -1 sprites/canal_locks.png 434 72 09 24 43 -31 -4
-   -1 sprites/canal_locks.png 482 72 09 24 53 -31 -4
-   -1 sprites/canal_locks.png 546 72 09 37 43 -10 -16
-   -1 sprites/canal_locks.png 594 72 09 26 38 -1 -9
-   -1 sprites/canal_locks.png 642 72 09 37 34 -29 -18
-   -1 sprites/canal_locks.png 690 72 09 26 38 -35 -9
-   -1 sprites/canal_locks.png 738 72 09 23 32 -1 -5
-   -1 sprites/canal_locks.png 2 136 09 26 40 -7 -12
-   -1 sprites/canal_locks.png 50 136 09 33 42 -31 -13
-   -1 sprites/canal_locks.png 98 136 09 25 40 -31 -12
-   -1 sprites/canal_locks.png 146 136 09 34 42 -9 -14
-   -1 sprites/canal_locks.png 194 136 09 27 32 -1 -17
-   -1 sprites/canal_locks.png 242 136 09 35 32 -29 -17
-   -1 sprites/canal_locks.png 290 136 09 27 32 -29 -17
-   -1 sprites/canal_locks.png 338 136 09 35 32 -1 -17
-   -1 sprites/canal_locks.png 386 136 09 32 40 -7 -12
-   -1 sprites/canal_locks.png 434 136 09 33 42 -31 -13
-   -1 sprites/canal_locks.png 482 136 09 32 40 -31 -12
-   -1 sprites/canal_locks.png 530 136 09 31 41 -8 -12
-   -1 sprites/canal_locks.png 578 136 09 32 34 -1 -13
-   -1 sprites/canal_locks.png 626 136 09 34 38 -35 -17
-   -1 sprites/canal_locks.png 674 136 09 32 34 -29 -14
-   -1 sprites/canal_locks.png 722 136 09 34 38 -1 -17
-   -1 sprites/canal_locks.png 2 184 09 24 42 -9 -4
-   -1 sprites/canal_locks.png 50 184 09 24 43 -31 -4
-   -1 sprites/canal_locks.png 98 184 09 24 53 -31 -4
-   -1 sprites/canal_locks.png 162 184 09 25 43 -10 -4
-   -1 sprites/canal_locks.png 210 184 09 26 38 -1 -9
-   -1 sprites/canal_locks.png 258 184 09 25 34 -29 -6
-   -1 sprites/canal_locks.png 306 184 09 26 38 -35 -9
-   -1 sprites/canal_locks.png 354 184 09 23 32 -1 -5
-// Canal edges (temperate)
-   -1 sprites/canals.png  30  10 09 22 45 -11 -1
-   -1 sprites/canals.png  94  10 09 21 41  -8 10
-   -1 sprites/canals.png 142  10 09 21 42 -31 10
-   -1 sprites/canals.png 190  10 09 22 43 -31 -1
-   -1 sprites/canals.png 238  10 09 22 22  11  4
-   -1 sprites/canals.png 270  10 09 16 24 -11 15
-   -1 sprites/canals.png 302  10 09 23 23 -31  4
-   -1 sprites/canals.png 334  10 09 18 24 -11 -1
-   -1 sprites/canals.png 366  10 09 11 12  21 10
-   -1 sprites/canals.png 398  10 09 10 19  -8 21
-   -1 sprites/canals.png 430  10 09 10 11 -31 10
-   -1 sprites/canals.png 446  10 09 16 24 -11 -6
-// Canal icon
-   -1 sprites/canal_locks.png 50 232 09 20 20 0 0
-
-// Differentiation for the climates starts here
-
-// Canal edges (arctic snowy)
-   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png  30  40 09 22 45 -11 -1
-   -1 sprites/canals.png  94  40 09 21 41  -8 10
-   -1 sprites/canals.png 142  40 09 21 42 -31 10
-   -1 sprites/canals.png 190  40 09 22 43 -31 -1
-   -1 sprites/canals.png 238  40 09 22 22  11  4
-   -1 sprites/canals.png 270  40 09 16 24 -11 15
-   -1 sprites/canals.png 302  40 09 23 23 -31  4
-   -1 sprites/canals.png 334  40 09 18 24 -11 -1
-   -1 sprites/canals.png 366  40 09 11 12  21 10
-   -1 sprites/canals.png 398  40 09 10 19  -8 21
-   -1 sprites/canals.png 430  40 09 10 11 -31 10
-   -1 sprites/canals.png 446  40 09 16 24 -11 -6
-   -1 * 7        02 05 10 01 00 00 00
-
-// Canal edges (arctic normal)
-   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png  30  70 09 22 45 -11 -1
-   -1 sprites/canals.png  94  70 09 21 41  -8 10
-   -1 sprites/canals.png 142  70 09 21 42 -31 10
-   -1 sprites/canals.png 190  70 09 22 43 -31 -1
-   -1 sprites/canals.png 238  70 09 22 22  11  4
-   -1 sprites/canals.png 270  70 09 16 24 -11 15
-   -1 sprites/canals.png 302  70 09 23 23 -31  4
-   -1 sprites/canals.png 334  70 09 18 24 -11 -1
-   -1 sprites/canals.png 366  70 09 11 12  21 10
-   -1 sprites/canals.png 398  70 09 10 19  -8 21
-   -1 sprites/canals.png 430  70 09 10 11 -31 10
-   -1 sprites/canals.png 446  70 09 16 24 -11 -6
-   -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  30 100 09 22 45 -11 -1
-   -1 sprites/canals.png  94 100 09 21 41  -8 10
-   -1 sprites/canals.png 142 100 09 21 42 -31 10
-   -1 sprites/canals.png 190 100 09 22 43 -31 -1
-   -1 sprites/canals.png 238 100 09 22 22  11  4
-   -1 sprites/canals.png 270 100 09 16 24 -11 15
-   -1 sprites/canals.png 302 100 09 23 23 -31  4
-   -1 sprites/canals.png 334 100 09 18 24 -11 -1
-   -1 sprites/canals.png 366 100 09 11 12  21 10
-   -1 sprites/canals.png 398 100 09 10 19  -8 21
-   -1 sprites/canals.png 430 100 09 10 11 -31 10
-   -1 sprites/canals.png 446 100 09 16 24 -11 -6
-   -1 * 7        02 05 13 01 00 00 00
-
-// Canal edges (tropic rainforest)
-   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png  30 130 09 22 45 -11 -1
-   -1 sprites/canals.png  94 130 09 21 41  -8 10
-   -1 sprites/canals.png 142 130 09 21 42 -31 10
-   -1 sprites/canals.png 190 130 09 22 43 -31 -1
-   -1 sprites/canals.png 238 130 09 22 22  11  4
-   -1 sprites/canals.png 270 130 09 16 24 -11 15
-   -1 sprites/canals.png 302 130 09 23 23 -31  4
-   -1 sprites/canals.png 334 130 09 18 24 -11 -1
-   -1 sprites/canals.png 366 130 09 11 12  21 10
-   -1 sprites/canals.png 398 130 09 10 19  -8 21
-   -1 sprites/canals.png 430 130 09 10 11 -31 10
-   -1 sprites/canals.png 446 130 09 16 24 -11 -6
-   -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  30 160 09 22 45 -11 -1
-   -1 sprites/canals.png  94 160 09 21 41  -8 10
-   -1 sprites/canals.png 142 160 09 21 42 -31 10
-   -1 sprites/canals.png 190 160 09 22 43 -31 -1
-   -1 sprites/canals.png 238 160 09 22 22  11  4
-   -1 sprites/canals.png 270 160 09 16 24 -11 15
-   -1 sprites/canals.png 302 160 09 23 23 -31  4
-   -1 sprites/canals.png 334 160 09 18 24 -11 -1
-   -1 sprites/canals.png 366 160 09 11 12  21 10
-   -1 sprites/canals.png 398 160 09 10 19  -8 21
-   -1 sprites/canals.png 430 160 09 10 11 -31 10
-   -1 sprites/canals.png 446 160 09 16 24 -11 -6
-   -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
+   -1 * 0	 0C "Canal graphics by George"
+   -1 * 0	 05 08 41
+   -1 sprites/canals.pcx 98 8 09 23 64 -31 0
+   -1 sprites/canals.pcx 178 8 09 39 64 -31 -8
+   -1 sprites/canals.pcx 258 8 09 23 64 -31 0
+   -1 sprites/canals.pcx 338 8 09 39 64 -31 -8
+   -1 sprites/canals.pcx 418 8 09 59 64 -31 -36
+   -1 sprites/canals.pcx 498 8 09 65 64 -31 -34
+   -1 sprites/canals.pcx 578 8 09 59 64 -31 -36
+   -1 sprites/canals.pcx 658 8 09 59 64 -31 -28
+   -1 sprites/canals.pcx 2 88 09 62 64 -1 -51
+   -1 sprites/canals.pcx 82 88 09 62 64 -61 -43
+   -1 sprites/canals.pcx 162 88 09 62 64 -61 -51
+   -1 sprites/canals.pcx 242 88 09 62 64 -1 -43
+   -1 sprites/canals.pcx 322 88 09 59 64 -31 -28
+   -1 sprites/canals.pcx 402 88 09 65 66 -33 -34
+   -1 sprites/canals.pcx 482 88 09 59 64 -31 -28
+   -1 sprites/canals.pcx 562 88 09 59 64 -31 -28
+   -1 sprites/canals.pcx 642 88 09 62 64 -1 -43
+   -1 sprites/canals.pcx 722 88 09 60 64 -61 -43
+   -1 sprites/canals.pcx 2 168 09 62 66 -61 -43
+   -1 sprites/canals.pcx 82 168 09 60 64 -1 -43
+   -1 sprites/canals.pcx 162 168 09 59 64 -31 -28
+   -1 sprites/canals.pcx 242 168 09 59 64 -31 -28
+   -1 sprites/canals.pcx 322 168 09 59 64 -31 -28
+   -1 sprites/canals.pcx 402 168 09 59 64 -31 -28
+   -1 sprites/canals.pcx 482 168 09 60 64 -1 -43
+   -1 sprites/canals.pcx 562 168 09 62 68 -61 -43
+   -1 sprites/canals.pcx 642 168 09 60 64 -61 -43
+   -1 sprites/canals.pcx 722 168 09 62 64 -1 -43
+   -1 sprites/canals.pcx 2 248 09 59 64 -31 -36
+   -1 sprites/canals.pcx 82 248 09 65 64 -31 -34
+   -1 sprites/canals.pcx 162 248 09 59 64 -31 -36
+   -1 sprites/canals.pcx 242 248 09 59 64 -31 -28
+   -1 sprites/canals.pcx 322 248 09 62 64 -1 -51
+   -1 sprites/canals.pcx 402 248 09 62 64 -61 -43
+   -1 sprites/canals.pcx 482 248 09 62 64 -61 -51
+   -1 sprites/canals.pcx 562 248 09 62 64 -1 -43
+   -1 sprites/canals.pcx 642 248 09 59 64 -31 -28
+   -1 sprites/canals.pcx 722 248 09 65 66 -33 -34
+   -1 sprites/canals.pcx 2 328 09 59 64 -31 -28
+   -1 sprites/canals.pcx 82 328 09 59 64 -31 -28
+   -1 sprites/canals.pcx 162 328 09 62 64 -1 -43
+   -1 sprites/canals.pcx 242 328 09 60 64 -61 -43
+   -1 sprites/canals.pcx 322 328 09 62 66 -61 -43
+   -1 sprites/canals.pcx 402 328 09 60 64 -1 -43
+   -1 sprites/canals.pcx 482 328 09 59 64 -31 -28
+   -1 sprites/canals.pcx 562 328 09 59 64 -31 -28
+   -1 sprites/canals.pcx 642 328 09 59 64 -31 -28
+   -1 sprites/canals.pcx 722 328 09 59 64 -31 -28
+   -1 sprites/canals.pcx 2 408 09 60 64 -1 -43
+   -1 sprites/canals.pcx 82 408 09 62 68 -61 -43
+   -1 sprites/canals.pcx 162 408 09 60 64 -61 -43
+   -1 sprites/canals.pcx 242 408 09 62 64 -1 -43
+   -1 sprites/canals.pcx 322 408 09 37 70 -31 -6
+   -1 sprites/canals.pcx 402 408 09 37 70 -31 0
+   -1 sprites/canals.pcx 482 408 09 37 70 -37 0
+   -1 sprites/canals.pcx 562 408 09 37 70 -37 -6
+   -1 sprites/canals.pcx 642 408 09 31 64 -31 0
+   -1 sprites/canals.pcx 722 408 09 31 64 -31 0
+   -1 sprites/canals.pcx 2 488 09 31 64 -31 0
+   -1 sprites/canals.pcx 82 488 09 37 64 -31 -6
+   -1 sprites/canals.pcx 162 488 09 31 64 -31 0
+   -1 sprites/canals.pcx 242 488 09 31 64 -31 0
+   -1 sprites/canals.pcx 322 488 09 31 64 -31 0
+   -1 sprites/canals.pcx 402 488 09 37 64 -31 -6
+   -1 sprites/canals.pcx 482 488 09 20 20 0 0

media/extra_grf/elrails.nfo

@@ -7,52 +7,52 @@
 // 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 "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 * 0	 05 05 30
+   -1 sprites/elrails.pcx 66 8 01 16 32 -29 -2
+   -1 sprites/elrails.pcx 114 8 01 16 32 -1 -2
+   -1 sprites/elrails.pcx 162 8 01 1 32 -1 -2
+   -1 sprites/elrails.pcx 210 8 01 16 1 0 -3
+   -1 sprites/elrails.pcx 226 8 01 24 32 -29 -2
+   -1 sprites/elrails.pcx 274 8 01 9 32 -1 6
+   -1 sprites/elrails.pcx 322 8 01 9 32 -29 6
+   -1 sprites/elrails.pcx 370 8 01 24 32 -1 -2
+   -1 sprites/elrails.pcx 418 8 01 16 32 -29 -2
+   -1 sprites/elrails.pcx 466 8 01 16 32 -1 -2
+   -1 sprites/elrails.pcx 514 8 01 1 32 -1 -2
+   -1 sprites/elrails.pcx 562 8 01 16 1 0 -3
+   -1 sprites/elrails.pcx 578 8 01 24 32 -29 -2
+   -1 sprites/elrails.pcx 626 8 01 9 32 -1 6
+   -1 sprites/elrails.pcx 674 8 01 9 32 -29 6
+   -1 sprites/elrails.pcx 722 8 01 24 32 -1 -2
+   -1 sprites/elrails.pcx 2 56 01 16 32 -29 -2
+   -1 sprites/elrails.pcx 50 56 01 16 32 -1 -2
+   -1 sprites/elrails.pcx 98 56 01 1 32 -1 -2
+   -1 sprites/elrails.pcx 146 56 01 16 1 0 -3
+   -1 sprites/elrails.pcx 162 56 01 24 32 -29 -2
+   -1 sprites/elrails.pcx 210 56 01 9 32 -1 6
+   -1 sprites/elrails.pcx 258 56 01 9 32 -29 6
+   -1 sprites/elrails.pcx 306 56 01 24 32 -1 -2
+   -1 sprites/elrails.pcx 354 56 01 8 16 -29 6
+   -1 sprites/elrails.pcx 386 56 01 8 16 -1 -2
+   -1 sprites/elrails.pcx 418 56 01 8 16 -13 -2
+   -1 sprites/elrails.pcx 450 56 01 8 16 15 6
+   -1 sprites/elrails.pcx 482 56 01 16 8 -7 -14
+   -1 sprites/elrails.pcx 498 56 01 18 8 0 -17
+   -1 sprites/elrails.pcx 514 56 01 16 8 0 -14
+   -1 sprites/elrails.pcx 530 56 01 18 8 -7 -17
+   -1 sprites/elrails.pcx 546 56 01 16 2 0 -15
+   -1 sprites/elrails.pcx 562 56 01 18 2 0 -16
+   -1 sprites/elrails.pcx 578 56 01 16 8 0 -15
+   -1 sprites/elrails.pcx 594 56 01 16 8 -7 -15
+   -1 sprites/elrails.pcx 610 56 09 16 13 4 2
+   -1 sprites/elrails.pcx 642 56 09 16 20 0 2
+   -1 sprites/elrails.pcx 674 56 09 16 20 0 2
+   -1 sprites/elrails.pcx 706 56 09 16 20 0 2
+   -1 sprites/elrails.pcx 738 56 03 30 38 -3 -14
+   -1 sprites/elrails.pcx 2 104 03 44 72 -16 -8
+   -1 sprites/elrails.pcx 82 104 03 35 44 -21 -2
+   -1 sprites/elrails.pcx 146 104 03 44 72 -16 -35
+   -1 sprites/elrails.pcx 226 104 09 19 20 0 1
+   -1 sprites/elrails.pcx 258 104 03 32 32 0 0
+   -1 sprites/elrails.pcx 306 104 01 22 12 -9 -18
+   -1 sprites/elrails.pcx 338 104 01 22 12 -1 -18

media/extra_grf/fix_graphics.nfo

@@ -6,371 +6,130 @@
 // 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 "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 * 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 * 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
-// Show correct graphics for various 3rd generation trucks
+   -1 sprites/fix_graphics.pcx 82 8 09 16 22 -6 -7
+   -1 sprites/fix_graphics.pcx 114 8 09 16 22 -14 -7
+   -1 sprites/fix_graphics.pcx 146 8 09 16 22 -6 -7
+   -1 sprites/fix_graphics.pcx 178 8 09 16 22 -14 -7
+// Different grahpics for lots of 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
-// Fix clipping on the 2nd generation paper truck
+   -1 sprites/fix_graphics.pcx 226 8 01 18 8 -3 -10
+   -1 sprites/fix_graphics.pcx 242 8 09 16 20 -14 -7
+   -1 sprites/fix_graphics.pcx 274 8 01 12 28 -14 -6
+   -1 sprites/fix_graphics.pcx 322 8 09 16 20 -6 -7
+   -1 sprites/fix_graphics.pcx 354 8 01 18 8 -3 -10
+   -1 sprites/fix_graphics.pcx 370 8 09 16 20 -14 -7
+   -1 sprites/fix_graphics.pcx 402 8 01 12 28 -14 -6
+   -1 sprites/fix_graphics.pcx 450 8 09 16 20 -6 -7
+   -1 sprites/fix_graphics.pcx 482 8 01 18 8 -3 -10
+   -1 sprites/fix_graphics.pcx 498 8 09 16 20 -14 -7
+   -1 sprites/fix_graphics.pcx 530 8 01 12 28 -14 -6
+   -1 sprites/fix_graphics.pcx 578 8 09 16 20 -6 -7
+   -1 sprites/fix_graphics.pcx 610 8 01 18 8 -3 -10
+   -1 sprites/fix_graphics.pcx 626 8 09 16 20 -14 -7
+   -1 sprites/fix_graphics.pcx 658 8 01 12 28 -14 -6
+   -1 sprites/fix_graphics.pcx 706 8 09 16 20 -6 -7
+   -1 sprites/fix_graphics.pcx 738 8 01 18 8 -3 -10
+   -1 sprites/fix_graphics.pcx 754 8 09 16 22 -14 -7
+   -1 sprites/fix_graphics.pcx 2 40 01 12 28 -14 -6
+   -1 sprites/fix_graphics.pcx 50 40 09 16 22 -6 -7
+   -1 sprites/fix_graphics.pcx 82 40 01 18 8 -3 -10
+   -1 sprites/fix_graphics.pcx 98 40 09 16 22 -14 -7
+   -1 sprites/fix_graphics.pcx 130 40 01 12 28 -14 -6
+   -1 sprites/fix_graphics.pcx 178 40 09 16 22 -6 -7
+   -1 sprites/fix_graphics.pcx 210 40 01 18 8 -3 -10
+   -1 sprites/fix_graphics.pcx 226 40 09 16 22 -14 -7
+   -1 sprites/fix_graphics.pcx 258 40 01 12 28 -14 -6
+   -1 sprites/fix_graphics.pcx 306 40 09 16 22 -6 -7
+   -1 sprites/fix_graphics.pcx 338 40 01 18 8 -3 -10
+   -1 sprites/fix_graphics.pcx 354 40 09 16 22 -14 -7
+   -1 sprites/fix_graphics.pcx 386 40 01 12 28 -14 -6
+   -1 sprites/fix_graphics.pcx 434 40 09 16 22 -6 -7
+   -1 sprites/fix_graphics.pcx 466 40 01 18 8 -3 -10
+   -1 sprites/fix_graphics.pcx 482 40 09 16 20 -14 -7
+   -1 sprites/fix_graphics.pcx 514 40 01 12 28 -14 -6
+   -1 sprites/fix_graphics.pcx 562 40 09 16 20 -6 -7
+   -1 sprites/fix_graphics.pcx 594 40 01 18 8 -3 -10
+   -1 sprites/fix_graphics.pcx 610 40 09 16 20 -14 -7
+   -1 sprites/fix_graphics.pcx 642 40 01 12 28 -14 -6
+   -1 sprites/fix_graphics.pcx 690 40 09 16 20 -6 -7
+// Different grahpics for same 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
-// Fix clipping on the 1st generation paper truck
+   -1 sprites/fix_graphics.pcx 738 40 09 16 22 -14 -7
+   -1 sprites/fix_graphics.pcx 770 40 09 16 22 -6 -7
+   -1 sprites/fix_graphics.pcx 2 72 09 16 22 -14 -7
+   -1 sprites/fix_graphics.pcx 34 72 09 16 22 -6 -7
+// Different grahpics for same 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
-// Fix clipping on the 3rd generation paper truck
+   -1 sprites/fix_graphics.pcx 82 72 09 16 22 -14 -7
+   -1 sprites/fix_graphics.pcx 114 72 09 17 22 -5 -7
+   -1 sprites/fix_graphics.pcx 146 72 09 17 22 -14 -8
+   -1 sprites/fix_graphics.pcx 178 72 09 16 22 -6 -7
+// Different grahpics for same paper truck (truck #2)
    -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
-
-// 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 18 296 09 16 20 -14 -7
-
-// Non-toyland specific
-   -1 * 6	 07 83 01 \7= 03 08
-// Fix offsets for the monorail bridge heads
+   -1 sprites/fix_graphics.pcx 226 72 09 16 22 -14 -7
+   -1 sprites/fix_graphics.pcx 258 72 09 16 22 -6 -7
+   -1 sprites/fix_graphics.pcx 290 72 09 16 22 -14 -7
+   -1 sprites/fix_graphics.pcx 322 72 09 16 22 -6 -7
+// Misaligned 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
-// Fix offsets for the maglev bridge heads
-   -1 * 8	 0A 02 01 12 11 02 14 11
-   -1 sprites/fix_graphics.png 322 486 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 386 486 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 450 486 09 21 49 -24 3
-
-// 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 610 630 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 674 630 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 738 630 09 21 49 -24 3
-// Fix offsets for the toyland maglev bridge heads
-   -1 * 8	 0A 02 01 12 11 02 14 11
-   -1 sprites/fix_graphics.png 18 678 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 82 678 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 146 678 09 21 49 -24 3
-// Fix colours for toyland maglev junction overlays
-   -1 * 5	 0A 01 06 91 04
-   -1 sprites/fix_graphics.png 338 630 09 16 30 -14 8
-   -1 sprites/fix_graphics.png 386 630 09 16 30 -14 8
-   -1 sprites/fix_graphics.png 434 630 01 7 40 -19 4
-   -1 sprites/fix_graphics.png 482 630 01 7 40 -19 20
-   -1 sprites/fix_graphics.png 530 630 01 19 12 11 6
-   -1 sprites/fix_graphics.png 562 630 01 19 12 -21 6
-
-// Fix transparency of cinema
+   -1 sprites/fix_graphics.pcx 370 72 09 35 48 -23 -7
+   -1 sprites/fix_graphics.pcx 434 72 09 35 48 -23 -7
+   -1 sprites/fix_graphics.pcx 498 72 09 21 49 -24 3
+// Improperly cut 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
-
-// Fix misaligned undergrounds for temperate monorail
+   -1 sprites/fix_graphics.pcx 578 72 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 658 72 09 47 50 -28 -20
+// 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
-
-// Fix misaligned undergrounds for arctic monorail
+   -1 sprites/fix_graphics.pcx 2 136 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 82 136 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 162 136 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 242 136 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 322 136 09 31 64 -31 0
+// 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
-
-// Fix misaligned undergrounds for tropical/desert monorail/maglev
+   -1 sprites/fix_graphics.pcx 434 136 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 514 136 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 594 136 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 674 136 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 2 184 09 31 64 -31 0
+// 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
-
-// Fix misaligned X crossing for snow-covered monorail
+   -1 sprites/fix_graphics.pcx 114 184 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 194 184 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 274 184 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 354 184 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 434 184 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 514 184 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 594 184 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 674 184 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 2 232 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 82 232 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 162 232 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 242 232 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 322 232 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 402 232 09 31 64 -31 0
+   -1 sprites/fix_graphics.pcx 482 232 09 31 64 -31 0
+// Misaligned monorail snowed X crossing
    -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
-
-// Fix offsets for the tropical house
+   -1 sprites/fix_graphics.pcx 594 232 09 31 64 -31 0
+// Floating tropical house
+   -1 * 6	 07 83 01 \7! 02 02
    -1 * 5	 0A 01 01 FF 11
-   -1 sprites/fix_graphics.png 706 232 09 47 64 -31 -16
-
+   -1 sprites/fix_graphics.pcx 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.pcx 776 232 09 16 20 -14 -7
 // 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.pcx 776 250 01 10 9 0 0
 
-// Non-toyland specific
-   -1 * 6	 07 83 01 \7= 03 0A
-// 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
-// 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
-
-// Toyland specific
-   -1 * 6	 07 83 01 \7! 03 0A
-// 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
-// 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
-
-// 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 2 330 09 40 32 -30 -26
-   -1 sprites/fix_graphics.png 52 330 09 50 44 -42 -26
-   -1 sprites/fix_graphics.png 116 330 09 45 46 -42 -21
-   -1 sprites/fix_graphics.png 180 330 09 45 46 -2 -20
-   -1 sprites/fix_graphics.png 244 330 09 50 44 0 -25
-   -1 sprites/fix_graphics.png 308 330 09 41 32 0 -25
-// start rail bridge
-   -1 * 5	 0A 01 01 \w2569
-   -1 sprites/fix_graphics.png 350 330 09 29 52 -25 -4
-// start rail + road bridge
-   -1 * 5	 0A 01 02 \w2574
-   -1 sprites/fix_graphics.png 420 330 09 29 50 -25 -4
-   -1 sprites/fix_graphics.png 489 330 09 29 52 -25 -4
-// start road + monorail bridge
-   -1 * 5	 0A 01 02 \w2580
-   -1 sprites/fix_graphics.png 559 330 09 29 50 -25 -4
-   -1 sprites/fix_graphics.png 629 330 09 29 52 -25 -4
-// start monrail + maglev bridge
-   -1 * 5	 0A 01 02 \w2586
-   -1 sprites/fix_graphics.png 699 330 09 29 50 -25 -4
-   -1 sprites/fix_graphics.png 489 283 09 29 52 -25 -4
-// start maglev bridge
-   -1 * 5	 0A 01 01 \w2592
-   -1 sprites/fix_graphics.png 559 283 09 29 50 -25 -4
-// GUI sprite
-   -1 * 5	 0A 01 01 \w2600
-   -1 sprites/fix_graphics.png 433 298 09 15 40 0 5
-
-// 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 2 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 162 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 322 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 402 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 482 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 562 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 642 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 722 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 162 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 322 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 402 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 482 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 562 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 642 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 722 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 486 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 486 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 162 486 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 486 09 31 64 -31 0
-
-// Fix transparency of steel mill
-   -1 * 5	 0A 01 06 46 08
-   -1 sprites/fix_graphics.png 162 870 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 870 09 51 64 -31 -21
-   -1 sprites/fix_graphics.png 322 870 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 402 870 09 58 49 -29 -29
-   -1 sprites/fix_graphics.png 466 870 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 546 870 09 42 45 -18 -12
-   -1 * 5	 0A 01 0A 4D 08
-   -1 sprites/fix_graphics.png 610 486 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 690 486 09 61 59 -31 -33
-   -1 sprites/fix_graphics.png 2 566 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 566 09 50 51 -25 -21
-   -1 sprites/fix_graphics.png 606 870 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 686 870 09 46 64 -31 -16
-   -1 sprites/fix_graphics.png 2 945 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 945 09 51 50 -29 -21
-   -1 sprites/fix_graphics.png 146 945 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 226 945 09 42 47 -18 -12
-   -1 * 5	 0A 01 04 58 08
-   -1 sprites/fix_graphics.png 162 566 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 566 09 52 59 -31 -24
-   -1 sprites/fix_graphics.png 306 566 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 386 566 09 44 51 -25 -15
-
-// Fix transparency of oil well
-   -1 * 5	 0A 01 07 7D 08
-   -1 sprites/fix_graphics.png 2 630 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 482 566 09 50 31 -11 -28
-   -1 sprites/fix_graphics.png 530 566 09 47 31 -11 -25
-   -1 sprites/fix_graphics.png 578 566 09 47 31 -11 -25
-   -1 sprites/fix_graphics.png 626 566 09 47 31 -11 -25
-   -1 sprites/fix_graphics.png 674 566 09 49 31 -11 -27
-   -1 sprites/fix_graphics.png 722 566 09 52 31 -11 -30
-   -1 * 6	 07 83 01 \7! 01 02
-   -1 * 5	 0A 01 01 7D 08
-   -1 sprites/fix_graphics.png 114 630 09 31 64 -31 0
-   -1 * 6	 07 83 01 \7! 02 02
-   -1 * 5	 0A 01 01 7D 08
-   -1 sprites/fix_graphics.png 226 630 09 31 64 -31 0
-
-// 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 242 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 322 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 402 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 482 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 562 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 642 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 722 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 726 09 31 64 -31 0
-
-// 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 194 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 274 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 354 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 434 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 514 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 594 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 674 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 774 09 31 64 -31 0
-
-// 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 194 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 274 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 354 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 434 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 514 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 594 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 674 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 822 09 31 64 -31 0
-
-// 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 194 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 274 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 354 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 434 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 514 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 594 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 674 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 870 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 870 09 31 64 -31 0
-
-// Wrong, non-translated colours in arctic buildings
-   -1 * 8	 0A 02 01 1F 06 01 DB 11
-   -1 sprites/fix_graphics.png 305 945 09 29 59 -29 -12
-   -1 sprites/fix_graphics.png 369 945 09 29 59 -29 -12
-   -1 * 8	 0A 02 01 76 11 01 E6 11
-   -1 sprites/fix_graphics.png 449 945 09 69 64 -31 -38
-   -1 sprites/fix_graphics.png 529 945 09 69 64 -31 -38
-   -1 * 8	 0A 02 02 7E 11 01 E1 11
-   -1 sprites/fix_graphics.png 625 945 03 75 54 -25 -47
-   -1 sprites/fix_graphics.png 2 1037 09 75 54 -25 -47
-   -1 sprites/fix_graphics.png 66 1037 09 75 54 -25 -47
-
-// Fix buoy in-game; don't show black outline
-   -1 * 4        01 05 01 \b1
-   -1 sprites/fix_graphics.png 575 490 09 11 7 7 4
-   -1 * 7        02 05 17 01 00 00 00
-   -1 * 7        03 05 01 08 00 17 00

media/extra_grf/flags.nfo

@@ -7,40 +7,40 @@
 // 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 "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 * 0	 05 14 24
+   -1 sprites/flags.pcx 18 8 09 8 11 0 0
+   -1 sprites/flags.pcx 34 8 09 8 11 0 0
+   -1 sprites/flags.pcx 50 8 09 8 11 0 0
+   -1 sprites/flags.pcx 66 8 09 8 11 0 0
+   -1 sprites/flags.pcx 82 8 09 8 11 0 0
+   -1 sprites/flags.pcx 98 8 09 8 11 0 0
+   -1 sprites/flags.pcx 114 8 09 8 11 0 0
+   -1 sprites/flags.pcx 130 8 09 8 11 0 0
+   -1 sprites/flags.pcx 146 8 09 8 11 0 0
+   -1 sprites/flags.pcx 162 8 09 8 11 0 0
+   -1 sprites/flags.pcx 178 8 09 8 11 0 0
+   -1 sprites/flags.pcx 194 8 09 8 11 0 0
+   -1 sprites/flags.pcx 210 8 09 8 11 0 0
+   -1 sprites/flags.pcx 226 8 09 8 11 0 0
+   -1 sprites/flags.pcx 242 8 09 8 11 0 0
+   -1 sprites/flags.pcx 258 8 09 8 11 0 0
+   -1 sprites/flags.pcx 274 8 09 8 11 0 0
+   -1 sprites/flags.pcx 290 8 09 8 11 0 0
+   -1 sprites/flags.pcx 306 8 09 8 11 0 0
+   -1 sprites/flags.pcx 322 8 09 8 11 0 0
+   -1 sprites/flags.pcx 338 8 09 8 11 0 0
+   -1 sprites/flags.pcx 354 8 09 8 11 0 0
+   -1 sprites/flags.pcx 370 8 09 8 11 0 0
+   -1 sprites/flags.pcx 386 8 09 8 11 0 0
+   -1 sprites/flags.pcx 402 8 09 8 11 0 0
+   -1 sprites/flags.pcx 418 8 09 8 11 0 0
+   -1 sprites/flags.pcx 434 8 09 8 11 0 0
+   -1 sprites/flags.pcx 450 8 09 8 11 0 0
+   -1 sprites/flags.pcx 466 8 09 8 11 0 0
+   -1 sprites/flags.pcx 482 8 09 8 11 0 0
+   -1 sprites/flags.pcx 498 8 09 8 11 0 0
+   -1 sprites/flags.pcx 514 8 09 8 11 0 0
+   -1 sprites/flags.pcx 530 8 09 8 11 0 0
+   -1 sprites/flags.pcx 546 8 09 8 11 0 0
+   -1 sprites/flags.pcx 562 8 09 8 11 0 0
+   -1 sprites/flags.pcx 578 8 09 8 11 0 0

media/extra_grf/foundations.nfo

@@ -7,371 +7,371 @@
 // 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 "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 * 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 * 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 * 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 * 0	 07 83 01 \7! 00 5B
+   -1 * 0	 05 06 5A
+   -1 sprites/foundations.pcx 98 8 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 178 8 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 258 8 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 338 8 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 418 8 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 498 8 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 578 8 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 658 8 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 2 72 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 82 72 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 162 72 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 242 72 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 322 72 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 402 72 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 482 72 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 562 72 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 642 72 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 722 72 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 2 136 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 82 136 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 162 136 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 242 136 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 322 136 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 402 136 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 482 136 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 562 136 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 642 136 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 722 136 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 2 200 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 82 200 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 162 200 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 242 200 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 322 200 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 402 200 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 482 200 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 562 200 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 642 200 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 722 200 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 2 264 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 82 264 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 162 264 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 242 264 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 322 264 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 402 264 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 482 264 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 562 264 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 642 264 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 722 264 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 2 328 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 82 328 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 162 328 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 242 328 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 322 328 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 402 328 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 482 328 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 562 328 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 642 328 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 722 328 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 2 392 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 82 392 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 162 392 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 242 392 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 322 392 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 402 392 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 482 392 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 562 392 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 642 392 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 722 392 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 2 456 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 82 456 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 162 456 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 242 456 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 322 456 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 402 456 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 482 456 09 40 64 -15 -17
+   -1 sprites/foundations.pcx 562 456 09 33 64 -31 -25
+   -1 sprites/foundations.pcx 642 456 09 40 64 -47 -17
+   -1 sprites/foundations.pcx 722 456 09 33 64 -31 -9
+   -1 sprites/foundations.pcx 2 520 09 40 64 -15 -17
+   -1 sprites/foundations.pcx 82 520 09 33 64 -31 -25
+   -1 sprites/foundations.pcx 162 520 09 40 64 -47 -17
+   -1 sprites/foundations.pcx 242 520 09 33 64 -31 -9
+   -1 sprites/foundations.pcx 322 520 09 40 64 -15 -17
+   -1 sprites/foundations.pcx 402 520 09 33 64 -31 -25
+   -1 sprites/foundations.pcx 482 520 09 40 64 -47 -17
+   -1 sprites/foundations.pcx 562 520 09 33 64 -31 -9
+   -1 sprites/foundations.pcx 642 520 09 40 64 -15 -17
+   -1 sprites/foundations.pcx 722 520 09 33 64 -31 -25
+   -1 sprites/foundations.pcx 2 584 09 40 64 -47 -17
+   -1 sprites/foundations.pcx 82 584 09 33 64 -31 -9
+   -1 * 0	 07 83 01 \7! 01 5B
+   -1 * 0	 05 06 5A
+   -1 sprites/foundations.pcx 194 584 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 274 584 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 354 584 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 434 584 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 514 584 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 594 584 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 674 584 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 2 648 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 82 648 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 162 648 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 242 648 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 322 648 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 402 648 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 482 648 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 562 648 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 642 648 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 722 648 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 2 712 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 82 712 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 162 712 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 242 712 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 322 712 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 402 712 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 482 712 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 562 712 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 642 712 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 722 712 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 2 776 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 82 776 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 162 776 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 242 776 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 322 776 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 402 776 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 482 776 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 562 776 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 642 776 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 722 776 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 2 840 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 82 840 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 162 840 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 242 840 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 322 840 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 402 840 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 482 840 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 562 840 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 642 840 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 722 840 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 2 904 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 82 904 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 162 904 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 242 904 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 322 904 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 402 904 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 482 904 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 562 904 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 642 904 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 722 904 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 2 968 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 82 968 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 162 968 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 242 968 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 322 968 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 402 968 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 482 968 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 562 968 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 642 968 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 722 968 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 2 1032 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 82 1032 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 162 1032 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 242 1032 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 322 1032 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 402 1032 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 482 1032 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 562 1032 09 40 64 -15 -17
+   -1 sprites/foundations.pcx 642 1032 09 33 64 -31 -25
+   -1 sprites/foundations.pcx 722 1032 09 40 64 -47 -17
+   -1 sprites/foundations.pcx 2 1096 09 33 64 -31 -9
+   -1 sprites/foundations.pcx 82 1096 09 40 64 -15 -17
+   -1 sprites/foundations.pcx 162 1096 09 33 64 -31 -25
+   -1 sprites/foundations.pcx 242 1096 09 40 64 -47 -17
+   -1 sprites/foundations.pcx 322 1096 09 33 64 -31 -9
+   -1 sprites/foundations.pcx 402 1096 09 40 64 -15 -17
+   -1 sprites/foundations.pcx 482 1096 09 33 64 -31 -25
+   -1 sprites/foundations.pcx 562 1096 09 40 64 -47 -17
+   -1 sprites/foundations.pcx 642 1096 09 33 64 -31 -9
+   -1 sprites/foundations.pcx 722 1096 09 40 64 -15 -17
+   -1 sprites/foundations.pcx 2 1160 09 33 64 -31 -25
+   -1 sprites/foundations.pcx 82 1160 09 40 64 -47 -17
+   -1 sprites/foundations.pcx 162 1160 09 33 64 -31 -9
+   -1 * 0	 07 83 01 \7! 02 5B
+   -1 * 0	 05 06 5A
+   -1 sprites/foundations.pcx 274 1160 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 354 1160 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 434 1160 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 514 1160 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 594 1160 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 674 1160 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 2 1224 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 82 1224 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 162 1224 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 242 1224 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 322 1224 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 402 1224 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 482 1224 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 562 1224 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 642 1224 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 722 1224 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 2 1288 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 82 1288 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 162 1288 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 242 1288 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 322 1288 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 402 1288 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 482 1288 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 562 1288 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 642 1288 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 722 1288 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 2 1352 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 82 1352 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 162 1352 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 242 1352 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 322 1352 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 402 1352 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 482 1352 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 562 1352 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 642 1352 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 722 1352 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 2 1416 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 82 1416 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 162 1416 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 242 1416 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 322 1416 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 402 1416 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 482 1416 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 562 1416 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 642 1416 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 722 1416 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 2 1480 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 82 1480 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 162 1480 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 242 1480 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 322 1480 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 402 1480 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 482 1480 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 562 1480 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 642 1480 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 722 1480 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 2 1544 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 82 1544 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 162 1544 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 242 1544 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 322 1544 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 402 1544 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 482 1544 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 562 1544 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 642 1544 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 722 1544 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 2 1608 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 82 1608 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 162 1608 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 242 1608 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 322 1608 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 402 1608 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 482 1608 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 562 1608 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 642 1608 09 40 64 -15 -17
+   -1 sprites/foundations.pcx 722 1608 09 33 64 -31 -25
+   -1 sprites/foundations.pcx 2 1672 09 40 64 -47 -17
+   -1 sprites/foundations.pcx 82 1672 09 33 64 -31 -9
+   -1 sprites/foundations.pcx 162 1672 09 40 64 -15 -17
+   -1 sprites/foundations.pcx 242 1672 09 33 64 -31 -25
+   -1 sprites/foundations.pcx 322 1672 09 40 64 -47 -17
+   -1 sprites/foundations.pcx 402 1672 09 33 64 -31 -9
+   -1 sprites/foundations.pcx 482 1672 09 40 64 -15 -17
+   -1 sprites/foundations.pcx 562 1672 09 33 64 -31 -25
+   -1 sprites/foundations.pcx 642 1672 09 40 64 -47 -17
+   -1 sprites/foundations.pcx 722 1672 09 33 64 -31 -9
+   -1 sprites/foundations.pcx 2 1736 09 40 64 -15 -17
+   -1 sprites/foundations.pcx 82 1736 09 33 64 -31 -25
+   -1 sprites/foundations.pcx 162 1736 09 40 64 -47 -17
+   -1 sprites/foundations.pcx 242 1736 09 33 64 -31 -9
+   -1 * 0	 07 83 01 \7! 03 5B
+   -1 * 0	 05 06 5A
+   -1 sprites/foundations.pcx 354 1736 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 434 1736 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 514 1736 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 594 1736 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 674 1736 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 2 1800 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 82 1800 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 162 1800 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 242 1800 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 322 1800 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 402 1800 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 482 1800 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 562 1800 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 642 1800 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 722 1800 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 2 1864 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 82 1864 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 162 1864 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 242 1864 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 322 1864 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 402 1864 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 482 1864 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 562 1864 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 642 1864 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 722 1864 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 2 1928 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 82 1928 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 162 1928 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 242 1928 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 322 1928 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 402 1928 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 482 1928 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 562 1928 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 642 1928 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 722 1928 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 2 1992 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 82 1992 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 162 1992 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 242 1992 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 322 1992 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 402 1992 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 482 1992 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 562 1992 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 642 1992 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 722 1992 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 2 2056 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 82 2056 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 162 2056 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 242 2056 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 322 2056 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 402 2056 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 482 2056 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 562 2056 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 642 2056 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 722 2056 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 2 2120 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 82 2120 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 162 2120 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 242 2120 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 322 2120 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 402 2120 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 482 2120 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 562 2120 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 642 2120 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 722 2120 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 2 2184 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 82 2184 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 162 2184 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 242 2184 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 322 2184 09 32 64 -31 -9
+   -1 sprites/foundations.pcx 402 2184 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 482 2184 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 562 2184 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 642 2184 09 40 64 -31 -9
+   -1 sprites/foundations.pcx 722 2184 09 40 64 -15 -17
+   -1 sprites/foundations.pcx 2 2248 09 33 64 -31 -25
+   -1 sprites/foundations.pcx 82 2248 09 40 64 -47 -17
+   -1 sprites/foundations.pcx 162 2248 09 33 64 -31 -9
+   -1 sprites/foundations.pcx 242 2248 09 40 64 -15 -17
+   -1 sprites/foundations.pcx 322 2248 09 33 64 -31 -25
+   -1 sprites/foundations.pcx 402 2248 09 40 64 -47 -17
+   -1 sprites/foundations.pcx 482 2248 09 33 64 -31 -9
+   -1 sprites/foundations.pcx 562 2248 09 40 64 -15 -17
+   -1 sprites/foundations.pcx 642 2248 09 33 64 -31 -25
+   -1 sprites/foundations.pcx 722 2248 09 40 64 -47 -17
+   -1 sprites/foundations.pcx 2 2312 09 33 64 -31 -9
+   -1 sprites/foundations.pcx 82 2312 09 40 64 -15 -17
+   -1 sprites/foundations.pcx 162 2312 09 33 64 -31 -25
+   -1 sprites/foundations.pcx 242 2312 09 40 64 -47 -17
+   -1 sprites/foundations.pcx 322 2312 09 33 64 -31 -9

media/extra_grf/mono.nfo

@@ -1,240 +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 "Monospaced characters (Liberation Mono)"
-   -1 * 0 12 01 03 60 20 00
-   -1 sprites/mono.png  10  30 01 13 7 0 0
-   -1 sprites/mono.png  25  30 01 13 7 0 0
-   -1 sprites/mono.png  40  30 01 13 7 0 0
-   -1 sprites/mono.png  55  30 01 13 7 0 0
-   -1 sprites/mono.png  70  30 01 13 7 0 0
-   -1 sprites/mono.png  85  30 01 13 7 0 0
-   -1 sprites/mono.png 100  30 01 13 7 0 0
-   -1 sprites/mono.png 115  30 01 13 7 0 0
-   -1 sprites/mono.png 130  30 01 13 7 0 0
-   -1 sprites/mono.png 145  30 01 13 7 0 0
-   -1 sprites/mono.png 160  30 01 13 7 0 0
-   -1 sprites/mono.png 175  30 01 13 7 0 0
-   -1 sprites/mono.png 190  30 01 13 7 0 0
-   -1 sprites/mono.png 205  30 01 13 7 0 0
-   -1 sprites/mono.png 220  30 01 13 7 0 0
-   -1 sprites/mono.png 235  30 01 13 7 0 0
-   -1 sprites/mono.png 250  30 01 13 7 0 0
-   -1 sprites/mono.png 265  30 01 13 7 0 0
-   -1 sprites/mono.png 280  30 01 13 7 0 0
-   -1 sprites/mono.png 295  30 01 13 7 0 0
-   -1 sprites/mono.png 310  30 01 13 7 0 0
-   -1 sprites/mono.png 325  30 01 13 7 0 0
-   -1 sprites/mono.png 340  30 01 13 7 0 0
-   -1 sprites/mono.png 355  30 01 13 7 0 0
-   -1 sprites/mono.png 370  30 01 13 7 0 0
-   -1 sprites/mono.png 385  30 01 13 7 0 0
-   -1 sprites/mono.png 400  30 01 13 7 0 0
-   -1 sprites/mono.png 415  30 01 13 7 0 0
-   -1 sprites/mono.png 430  30 01 13 7 0 0
-   -1 sprites/mono.png 445  30 01 13 7 0 0
-   -1 sprites/mono.png 460  30 01 13 7 0 0
-   -1 sprites/mono.png 475  30 01 13 7 0 0
-   -1 sprites/mono.png  10  50 01 13 7 0 0
-   -1 sprites/mono.png  25  50 01 13 7 0 0
-   -1 sprites/mono.png  40  50 01 13 7 0 0
-   -1 sprites/mono.png  55  50 01 13 7 0 0
-   -1 sprites/mono.png  70  50 01 13 7 0 0
-   -1 sprites/mono.png  85  50 01 13 7 0 0
-   -1 sprites/mono.png 100  50 01 13 7 0 0
-   -1 sprites/mono.png 115  50 01 13 7 0 0
-   -1 sprites/mono.png 130  50 01 13 7 0 0
-   -1 sprites/mono.png 145  50 01 13 7 0 0
-   -1 sprites/mono.png 160  50 01 13 7 0 0
-   -1 sprites/mono.png 175  50 01 13 7 0 0
-   -1 sprites/mono.png 190  50 01 13 7 0 0
-   -1 sprites/mono.png 205  50 01 13 7 0 0
-   -1 sprites/mono.png 220  50 01 13 7 0 0
-   -1 sprites/mono.png 235  50 01 13 7 0 0
-   -1 sprites/mono.png 250  50 01 13 7 0 0
-   -1 sprites/mono.png 265  50 01 13 7 0 0
-   -1 sprites/mono.png 280  50 01 13 7 0 0
-   -1 sprites/mono.png 295  50 01 13 7 0 0
-   -1 sprites/mono.png 310  50 01 13 7 0 0
-   -1 sprites/mono.png 325  50 01 13 7 0 0
-   -1 sprites/mono.png 340  50 01 13 7 0 0
-   -1 sprites/mono.png 355  50 01 13 7 0 0
-   -1 sprites/mono.png 370  50 01 13 7 0 0
-   -1 sprites/mono.png 385  50 01 13 7 0 0
-   -1 sprites/mono.png 400  50 01 13 7 0 0
-   -1 sprites/mono.png 415  50 01 13 7 0 0
-   -1 sprites/mono.png 430  50 01 13 7 0 0
-   -1 sprites/mono.png 445  50 01 13 7 0 0
-   -1 sprites/mono.png 460  50 01 13 7 0 0
-   -1 sprites/mono.png 475  50 01 13 7 0 0
-   -1 sprites/mono.png  10  70 01 13 7 0 0
-   -1 sprites/mono.png  25  70 01 13 7 0 0
-   -1 sprites/mono.png  40  70 01 13 7 0 0
-   -1 sprites/mono.png  55  70 01 13 7 0 0
-   -1 sprites/mono.png  70  70 01 13 7 0 0
-   -1 sprites/mono.png  85  70 01 13 7 0 0
-   -1 sprites/mono.png 100  70 01 13 7 0 0
-   -1 sprites/mono.png 115  70 01 13 7 0 0
-   -1 sprites/mono.png 130  70 01 13 7 0 0
-   -1 sprites/mono.png 145  70 01 13 7 0 0
-   -1 sprites/mono.png 160  70 01 13 7 0 0
-   -1 sprites/mono.png 175  70 01 13 7 0 0
-   -1 sprites/mono.png 190  70 01 13 7 0 0
-   -1 sprites/mono.png 205  70 01 13 7 0 0
-   -1 sprites/mono.png 220  70 01 13 7 0 0
-   -1 sprites/mono.png 235  70 01 13 7 0 0
-   -1 sprites/mono.png 250  70 01 13 7 0 0
-   -1 sprites/mono.png 265  70 01 13 7 0 0
-   -1 sprites/mono.png 280  70 01 13 7 0 0
-   -1 sprites/mono.png 295  70 01 13 7 0 0
-   -1 sprites/mono.png 310  70 01 13 7 0 0
-   -1 sprites/mono.png 325  70 01 13 7 0 0
-   -1 sprites/mono.png 340  70 01 13 7 0 0
-   -1 sprites/mono.png 355  70 01 13 7 0 0
-   -1 sprites/mono.png 370  70 01 13 7 0 0
-   -1 sprites/mono.png 385  70 01 13 7 0 0
-   -1 sprites/mono.png 400  70 01 13 7 0 0
-   -1 sprites/mono.png 415  70 01 13 7 0 0
-   -1 sprites/mono.png 430  70 01 13 7 0 0
-   -1 sprites/mono.png 445  70 01 13 7 0 0
-   -1 sprites/mono.png 460  70 01 13 7 0 0
-   -1 sprites/mono.png 475  70 01 13 7 0 0
-
-   -1 * 0 12 01 03 80 80 00
-   -1 sprites/mono.png  10  90 01 13 7 0 0
-   -1 sprites/mono.png  25  90 01 13 7 0 0
-   -1 sprites/mono.png  40  90 01 13 7 0 0
-   -1 sprites/mono.png  55  90 01 13 7 0 0
-   -1 sprites/mono.png  70  90 01 13 7 0 0
-   -1 sprites/mono.png  85  90 01 13 7 0 0
-   -1 sprites/mono.png 100  90 01 13 7 0 0
-   -1 sprites/mono.png 115  90 01 13 7 0 0
-   -1 sprites/mono.png 130  90 01 13 7 0 0
-   -1 sprites/mono.png 145  90 01 13 7 0 0
-   -1 sprites/mono.png 160  90 01 13 7 0 0
-   -1 sprites/mono.png 175  90 01 13 7 0 0
-   -1 sprites/mono.png 190  90 01 13 7 0 0
-   -1 sprites/mono.png 205  90 01 13 7 0 0
-   -1 sprites/mono.png 220  90 01 13 7 0 0
-   -1 sprites/mono.png 235  90 01 13 7 0 0
-   -1 sprites/mono.png 250  90 01 13 7 0 0
-   -1 sprites/mono.png 265  90 01 13 7 0 0
-   -1 sprites/mono.png 280  90 01 13 7 0 0
-   -1 sprites/mono.png 295  90 01 13 7 0 0
-   -1 sprites/mono.png 310  90 01 13 7 0 0
-   -1 sprites/mono.png 325  90 01 13 7 0 0
-   -1 sprites/mono.png 340  90 01 13 7 0 0
-   -1 sprites/mono.png 355  90 01 13 7 0 0
-   -1 sprites/mono.png 370  90 01 13 7 0 0
-   -1 sprites/mono.png 385  90 01 13 7 0 0
-   -1 sprites/mono.png 400  90 01 13 7 0 0
-   -1 sprites/mono.png 415  90 01 13 7 0 0
-   -1 sprites/mono.png 430  90 01 13 7 0 0
-   -1 sprites/mono.png 445  90 01 13 7 0 0
-   -1 sprites/mono.png 460  90 01 13 7 0 0
-   -1 sprites/mono.png 475  90 01 13 7 0 0
-   -1 sprites/mono.png  10 110 01 13 7 0 0
-   -1 sprites/mono.png  25 110 01 13 7 0 0
-   -1 sprites/mono.png  40 110 01 13 7 0 0
-   -1 sprites/mono.png  55 110 01 13 7 0 0
-   -1 sprites/mono.png  70 110 01 13 7 0 0
-   -1 sprites/mono.png  85 110 01 13 7 0 0
-   -1 sprites/mono.png 100 110 01 13 7 0 0
-   -1 sprites/mono.png 115 110 01 13 7 0 0
-   -1 sprites/mono.png 130 110 01 13 7 0 0
-   -1 sprites/mono.png 145 110 01 13 7 0 0
-   -1 sprites/mono.png 160 110 01 13 7 0 0
-   -1 sprites/mono.png 175 110 01 13 7 0 0
-   -1 sprites/mono.png 190 110 01 13 7 0 0
-   -1 sprites/mono.png 205 110 01 13 7 0 0
-   -1 sprites/mono.png 220 110 01 13 7 0 0
-   -1 sprites/mono.png 235 110 01 13 7 0 0
-   -1 sprites/mono.png 250 110 01 13 7 0 0
-   -1 sprites/mono.png 265 110 01 13 7 0 0
-   -1 sprites/mono.png 280 110 01 13 7 0 0
-   -1 sprites/mono.png 295 110 01 13 7 0 0
-   -1 sprites/mono.png 310 110 01 13 7 0 0
-   -1 sprites/mono.png 325 110 01 13 7 0 0
-   -1 sprites/mono.png 340 110 01 13 7 0 0
-   -1 sprites/mono.png 355 110 01 13 7 0 0
-   -1 sprites/mono.png 370 110 01 13 7 0 0
-   -1 sprites/mono.png 385 110 01 13 7 0 0
-   -1 sprites/mono.png 400 110 01 13 7 0 0
-   -1 sprites/mono.png 415 110 01 13 7 0 0
-   -1 sprites/mono.png 430 110 01 13 7 0 0
-   -1 sprites/mono.png 445 110 01 13 7 0 0
-   -1 sprites/mono.png 460 110 01 13 7 0 0
-   -1 sprites/mono.png 475 110 01 13 7 0 0
-   -1 sprites/mono.png  10 130 01 13 7 0 0
-   -1 sprites/mono.png  25 130 01 13 7 0 0
-   -1 sprites/mono.png  40 130 01 13 7 0 0
-   -1 sprites/mono.png  55 130 01 13 7 0 0
-   -1 sprites/mono.png  70 130 01 13 7 0 0
-   -1 sprites/mono.png  85 130 01 13 7 0 0
-   -1 sprites/mono.png 100 130 01 13 7 0 0
-   -1 sprites/mono.png 115 130 01 13 7 0 0
-   -1 sprites/mono.png 130 130 01 13 7 0 0
-   -1 sprites/mono.png 145 130 01 13 7 0 0
-   -1 sprites/mono.png 160 130 01 13 7 0 0
-   -1 sprites/mono.png 175 130 01 13 7 0 0
-   -1 sprites/mono.png 190 130 01 13 7 0 0
-   -1 sprites/mono.png 205 130 01 13 7 0 0
-   -1 sprites/mono.png 220 130 01 13 7 0 0
-   -1 sprites/mono.png 235 130 01 13 7 0 0
-   -1 sprites/mono.png 250 130 01 13 7 0 0
-   -1 sprites/mono.png 265 130 01 13 7 0 0
-   -1 sprites/mono.png 280 130 01 13 7 0 0
-   -1 sprites/mono.png 295 130 01 13 7 0 0
-   -1 sprites/mono.png 310 130 01 13 7 0 0
-   -1 sprites/mono.png 325 130 01 13 7 0 0
-   -1 sprites/mono.png 340 130 01 13 7 0 0
-   -1 sprites/mono.png 355 130 01 13 7 0 0
-   -1 sprites/mono.png 370 130 01 13 7 0 0
-   -1 sprites/mono.png 385 130 01 13 7 0 0
-   -1 sprites/mono.png 400 130 01 13 7 0 0
-   -1 sprites/mono.png 415 130 01 13 7 0 0
-   -1 sprites/mono.png 430 130 01 13 7 0 0
-   -1 sprites/mono.png 445 130 01 13 7 0 0
-   -1 sprites/mono.png 460 130 01 13 7 0 0
-   -1 sprites/mono.png 475 130 01 13 7 0 0
-   -1 sprites/mono.png  10 150 01 13 7 0 0
-   -1 sprites/mono.png  25 150 01 13 7 0 0
-   -1 sprites/mono.png  40 150 01 13 7 0 0
-   -1 sprites/mono.png  55 150 01 13 7 0 0
-   -1 sprites/mono.png  70 150 01 13 7 0 0
-   -1 sprites/mono.png  85 150 01 13 7 0 0
-   -1 sprites/mono.png 100 150 01 13 7 0 0
-   -1 sprites/mono.png 115 150 01 13 7 0 0
-   -1 sprites/mono.png 130 150 01 13 7 0 0
-   -1 sprites/mono.png 145 150 01 13 7 0 0
-   -1 sprites/mono.png 160 150 01 13 7 0 0
-   -1 sprites/mono.png 175 150 01 13 7 0 0
-   -1 sprites/mono.png 190 150 01 13 7 0 0
-   -1 sprites/mono.png 205 150 01 13 7 0 0
-   -1 sprites/mono.png 220 150 01 13 7 0 0
-   -1 sprites/mono.png 235 150 01 13 7 0 0
-   -1 sprites/mono.png 250 150 01 13 7 0 0
-   -1 sprites/mono.png 265 150 01 13 7 0 0
-   -1 sprites/mono.png 280 150 01 13 7 0 0
-   -1 sprites/mono.png 295 150 01 13 7 0 0
-   -1 sprites/mono.png 310 150 01 13 7 0 0
-   -1 sprites/mono.png 325 150 01 13 7 0 0
-   -1 sprites/mono.png 340 150 01 13 7 0 0
-   -1 sprites/mono.png 355 150 01 13 7 0 0
-   -1 sprites/mono.png 370 150 01 13 7 0 0
-   -1 sprites/mono.png 385 150 01 13 7 0 0
-   -1 sprites/mono.png 400 150 01 13 7 0 0
-   -1 sprites/mono.png 415 150 01 13 7 0 0
-   -1 sprites/mono.png 430 150 01 13 7 0 0
-   -1 sprites/mono.png 445 150 01 13 7 0 0
-   -1 sprites/mono.png 460 150 01 13 7 0 0
-   -1 sprites/mono.png 475 150 01 13 7 0 0
-
-//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 370 230 01 13 7 0 0

media/extra_grf/oneway.nfo

@@ -7,10 +7,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/>.
 //
    -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 * 0	 05 09 06
+   -1 sprites/oneway.pcx 18 8 01 16 24 -12 -8
+   -1 sprites/oneway.pcx 50 8 01 16 24 -12 -8
+   -1 sprites/oneway.pcx 82 8 01 16 24 -12 -8
+   -1 sprites/oneway.pcx 114 8 01 16 24 -12 -8
+   -1 sprites/oneway.pcx 146 8 01 16 24 -12 -8
+   -1 sprites/oneway.pcx 178 8 01 16 24 -12 -8

media/extra_grf/openttd.nfo

@@ -1,6 +1,6 @@
 // Automatically generated by GRFCODEC. Do not modify!
 // (Info version 7)
-// Format: spritenum.pngfile xpos ypos compression ysize xsize xrel yrel
+// Format: spritenum pcxfile xpos ypos compression ysize xsize xrel yrel
 //
 // $Id$
 //
@@ -44,49 +44,67 @@
    -1 * 0	 07 A1 04 \7= FF FF FF FF 02
 
 // Real version check.
-   -1 * 0	 07 A1 04 \7> \w20304 01 01 03
+   -1 * 0	 07 A1 04 \7> \w11432 00 06 03
 
 // If the version check is supported, the string is translateable via OpenTTD
 // itself. Use it!.
 
-   -1 * 0	 0B 03 7F 06 "1.1 (or trunk r20304)" 00
+   -1 * 0	 0B 03 7F 06 "0.6 (or trunk r11432)" 00
 
 // Some OTTD versions before r11130 did support Action B, so use the English
 // phrase there
-   -1 * 0	 0B 03 7F FF "Requires OpenTTD version 1.1 (or trunk r20304) or better." 00
+   -1 * 0	 0B 03 7F FF "Requires OpenTTD version 0.6 (or trunk r11432) or better." 00
 
 // Final fallback. No Action B support, just skip to the end of the file.
    -1 * 0	 07 A1 04 \7= FF FF FF FF 00
 
-// We are a DOS paletted NewGRF, so tell OpenTTD that. Then it can actually
-// do the right thing. Yay for that feature as that means no duplicate NewGRF!
-   -1 * 0	 14
-             "C" "INFO"
-                 "B" "PALS" \w1 "D"
-                 00
-             00
 
-// GRF ID, must start with FF so it gets ignored
-   -1 * 0	 08 08 FF "OTT"
+//
+// Check DOS vs Windows version.
+//
+#ifdef DOS
+   -1 * 0	 07 8D 01 \7= 00 01
+   -1 * 0	 0B 03 7F 01 "DOS" 00
+#else
+   -1 * 0	 07 8D 01 \7= 01 01
+   -1 * 0	 0B 03 7F 01 "Windows" 00
+#endif
+
+// Dos and Windows graphic files have a different GRF ID.
+   -1 * 0	 08 07 FF "OT"
+#ifdef DOS
+             "D"
+#else
+             "W"
+#endif
 
 // Name of the GRF
-             "OpenTTD's base graphics " 00
+             "OpenTTD's base graphics "
+#ifdef DOS
+             "(DOS)"
+#else
+             "(Windows)"
+#endif
+             00
 
 // Description of the GRF.
-             "License: GNU General Public License version 2" 0D
+             "License: GPL version 2 (source: svn://svn.openttd.org/extra/ottd_grf)" 0D
              "Marcin Grzegorczyk: non-halftile foundations" 0D
              "Michael Blunck: catenary, signals" 0D
              "George: canals" 0D
              "David Dallaston: tram tracks" 0D
              "Jonathan G. Rennison: aqueducts" 0D
              "Bilbo, Jasper Vries: font" 0D
-             "Andrew Parkhouse: rivers" 0D
              "OpenTTD developers: other graphics" 00
 
 //
 // The real data of the GRF is acquired from several subfiles.
 //
-#include "2ccmap.nfo"
+#ifdef DOS
+# include "2ccmapd.nfo"
+#else
+# include "2ccmapw.nfo"
+#endif
 #include "signals.nfo"
 #include "elrails.nfo"
 #include "foundations.nfo"
@@ -101,12 +119,6 @@
 #include "autorail.nfo"
 #include "flags.nfo"
 #include "openttdgui.nfo"
-#include "airport_preview.nfo"
 #include "chars.nfo"
-#include "mono.nfo"
+#include "overrides.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"

media/extra_grf/openttdgui.nfo

@@ -13,169 +13,161 @@
 // -- End of NFO Renum 'settings' --
 //
    -1 * 0	 0C "OpenTTD GUI graphics"
-   -1 * 3	 05 15 A2
-   -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
-   -1 sprites/openttdgui.png 215 440 09 10 9 0 0
-   -1 sprites/openttdgui.png 232 440 09 10 8 0 0
+   -1 * 0	 05 15 9A
+   -1 sprites/openttdgui.pcx 18 8 09 31 64 -31 7
+   -1 sprites/openttdgui.pcx 98 8 09 31 64 -31 7
+   -1 sprites/openttdgui.pcx 178 8 09 31 64 -31 7
+   -1 sprites/openttdgui.pcx 258 8 09 31 64 -31 7
+   -1 sprites/openttdgui.pcx 338 8 09 31 64 -31 -1
+   -1 sprites/openttdgui.pcx 418 8 09 39 64 -31 -1
+   -1 sprites/openttdgui.pcx 498 8 09 31 64 -31 -1
+   -1 sprites/openttdgui.pcx 578 8 09 23 64 -31 7
+   -1 sprites/openttdgui.pcx 658 8 09 31 64 -31 7
+   -1 sprites/openttdgui.pcx 2 72 09 23 64 -31 7
+   -1 sprites/openttdgui.pcx 82 72 09 31 64 -31 7
+   -1 sprites/openttdgui.pcx 162 72 09 39 64 -31 -1
+   -1 sprites/openttdgui.pcx 242 72 01 26 23 0 0
+   -1 sprites/openttdgui.pcx 274 72 09 26 24 0 0
+   -1 sprites/openttdgui.pcx 306 72 01 8 4 28 16
+   -1 sprites/openttdgui.pcx 322 72 01 9 4 0 1
+   -1 sprites/openttdgui.pcx 338 72 09 23 32 0 1
+   -1 sprites/openttdgui.pcx 386 72 01 8 4 -31 15
+   -1 sprites/openttdgui.pcx 402 72 01 9 4 -3 0
+   -1 sprites/openttdgui.pcx 418 72 09 23 32 -31 0
+   -1 sprites/openttdgui.pcx 466 72 01 8 4 28 16
+   -1 sprites/openttdgui.pcx 482 72 01 9 4 0 1
+   -1 sprites/openttdgui.pcx 498 72 09 23 32 0 1
+   -1 sprites/openttdgui.pcx 546 72 01 8 4 -31 15
+   -1 sprites/openttdgui.pcx 562 72 01 9 4 -3 0
+   -1 sprites/openttdgui.pcx 578 72 09 23 32 -31 0
+   -1 sprites/openttdgui.pcx 626 72 01 8 4 28 16
+   -1 sprites/openttdgui.pcx 642 72 01 9 4 0 1
+   -1 sprites/openttdgui.pcx 658 72 09 23 32 0 1
+   -1 sprites/openttdgui.pcx 706 72 01 8 4 -31 15
+   -1 sprites/openttdgui.pcx 722 72 01 9 4 -3 0
+   -1 sprites/openttdgui.pcx 738 72 09 23 32 -31 0
+   -1 sprites/openttdgui.pcx 786 72 01 8 4 28 16
+   -1 sprites/openttdgui.pcx 2 136 01 9 4 0 1
+   -1 sprites/openttdgui.pcx 18 136 09 23 32 0 1
+   -1 sprites/openttdgui.pcx 66 136 01 8 4 -31 15
+   -1 sprites/openttdgui.pcx 82 136 01 9 4 -3 0
+   -1 sprites/openttdgui.pcx 98 136 09 23 32 -31 0
+   -1 sprites/openttdgui.pcx 146 136 09 10 10 0 0
+   -1 sprites/openttdgui.pcx 162 136 01 8 8 0 0
+   -1 sprites/openttdgui.pcx 178 136 09 9 7 0 0
+   -1 sprites/openttdgui.pcx 194 136 01 7 9 0 0
+   -1 sprites/openttdgui.pcx 210 136 01 7 9 0 0
+   -1 sprites/openttdgui.pcx 226 136 01 10 10 0 0
+   -1 sprites/openttdgui.pcx 242 136 09 7 7 0 0
+   -1 sprites/openttdgui.pcx 258 136 09 4 7 1 2
+   -1 sprites/openttdgui.pcx 274 136 09 4 7 1 2
+   -1 sprites/openttdgui.pcx 290 136 09 7 4 1 1
+   -1 sprites/openttdgui.pcx 306 136 09 7 4 2 1
+   -1 sprites/openttdgui.pcx 322 136 01 8 8 1 1
+   -1 sprites/openttdgui.pcx 338 136 01 9 9 0 0
+   -1 sprites/openttdgui.pcx 354 136 01 8 7 0 0
+   -1 sprites/openttdgui.pcx 370 136 01 8 8 0 0
+   -1 sprites/openttdgui.pcx 386 136 09 13 20 0 4
+   -1 sprites/openttdgui.pcx 418 136 03 36 56 0 0
+   -1 sprites/openttdgui.pcx 482 136 01 20 20 0 0
+   -1 sprites/openttdgui.pcx 514 136 01 32 32 0 0
+   -1 sprites/openttdgui.pcx 562 136 09 16 20 0 3
+   -1 sprites/openttdgui.pcx 594 136 03 43 56 0 0
+   -1 sprites/openttdgui.pcx 658 136 01 19 20 0 1
+   -1 sprites/openttdgui.pcx 690 136 01 32 32 0 0
+   -1 sprites/openttdgui.pcx 738 136 01 20 20 0 0
+   -1 sprites/openttdgui.pcx 2 200 01 31 31 1 1
+   -1 sprites/openttdgui.pcx 50 200 09 15 20 0 3
+   -1 sprites/openttdgui.pcx 82 200 03 36 56 0 0
+   -1 sprites/openttdgui.pcx 146 200 01 20 20 0 0
+   -1 sprites/openttdgui.pcx 178 200 01 32 32 0 0
+   -1 sprites/openttdgui.pcx 226 200 01 20 20 0 0
+   -1 sprites/openttdgui.pcx 258 200 01 32 32 0 0
+   -1 sprites/openttdgui.pcx 306 200 09 11 19 0 6
+   -1 sprites/openttdgui.pcx 338 200 03 36 56 0 0
+   -1 sprites/openttdgui.pcx 402 200 01 20 20 0 0
+   -1 sprites/openttdgui.pcx 434 200 01 32 32 0 0
+   -1 sprites/openttdgui.pcx 482 200 01 20 20 0 0
+   -1 sprites/openttdgui.pcx 514 200 01 32 32 0 0
+   -1 sprites/openttdgui.pcx 562 200 09 20 20 0 0
+   -1 sprites/openttdgui.pcx 594 200 09 20 20 0 0
+   -1 sprites/openttdgui.pcx 626 200 03 32 52 0 0
+   -1 sprites/openttdgui.pcx 690 200 09 33 29 -27 -16
+   -1 sprites/openttdgui.pcx 738 200 09 39 35 -29 -29
+   -1 sprites/openttdgui.pcx 2 264 09 34 29 1 -17
+   -1 sprites/openttdgui.pcx 50 264 09 39 34 -3 -28
+   -1 sprites/openttdgui.pcx 98 264 09 13 20 0 4
+   -1 sprites/openttdgui.pcx 130 264 03 36 56 0 0
+   -1 sprites/openttdgui.pcx 194 264 09 13 20 0 4
+   -1 sprites/openttdgui.pcx 226 264 03 36 56 0 0
+   -1 sprites/openttdgui.pcx 290 264 01 18 39 -9 -9
+   -1 sprites/openttdgui.pcx 338 264 01 44 72 -16 -35
+   -1 sprites/openttdgui.pcx 418 264 01 20 20 0 0
+   -1 sprites/openttdgui.pcx 450 264 01 44 72 -16 -35
+   -1 sprites/openttdgui.pcx 530 264 09 18 18 1 1
+   -1 sprites/openttdgui.pcx 562 264 01 20 20 0 0
+   -1 sprites/openttdgui.pcx 594 264 01 32 32 0 0
+   -1 sprites/openttdgui.pcx 642 264 01 18 18 0 0
+   -1 sprites/openttdgui.pcx 674 264 01 18 18 0 0
+   -1 sprites/openttdgui.pcx 706 264 01 18 18 0 0
+   -1 sprites/openttdgui.pcx 738 264 01 18 18 0 0
+   -1 sprites/openttdgui.pcx 770 264 01 18 18 0 0
+   -1 sprites/openttdgui.pcx 2 328 01 18 18 0 0
+   -1 sprites/openttdgui.pcx 34 328 01 18 18 0 0
+   -1 sprites/openttdgui.pcx 66 328 01 18 18 0 0
+   -1 sprites/openttdgui.pcx 98 328 01 18 18 0 0
+   -1 sprites/openttdgui.pcx 130 328 01 18 18 0 0
+   -1 sprites/openttdgui.pcx 162 328 01 18 18 0 0
+   -1 sprites/openttdgui.pcx 194 328 01 18 18 0 0
+   -1 sprites/openttdgui.pcx 226 328 01 18 18 0 0
+   -1 sprites/openttdgui.pcx 258 328 09 16 16 0 0
+   -1 sprites/openttdgui.pcx 290 328 01 16 16 0 0
+   -1 sprites/openttdgui.pcx 322 328 01 16 16 0 0
+   -1 sprites/openttdgui.pcx 354 328 01 16 16 0 0
+   -1 sprites/openttdgui.pcx 386 328 09 31 35 0 0
+   -1 sprites/openttdgui.pcx 434 328 01 30 33 0 0
+   -1 sprites/openttdgui.pcx 482 328 01 33 36 0 0
+   -1 sprites/openttdgui.pcx 530 328 01 33 37 0 0
+   -1 sprites/openttdgui.pcx 578 328 09 18 18 0 0
+   -1 sprites/openttdgui.pcx 610 328 09 18 18 0 0
+   -1 sprites/openttdgui.pcx 642 328 09 18 18 0 0
+   -1 sprites/openttdgui.pcx 674 328 09 18 18 0 0
+   -1 sprites/openttdgui.pcx 706 328 09 18 18 0 0
+   -1 sprites/openttdgui.pcx 738 328 09 18 18 0 0
+   -1 sprites/openttdgui.pcx 770 328 09 18 18 0 0
+   -1 sprites/openttdgui.pcx 2 376 09 18 18 0 0
+   -1 sprites/openttdgui.pcx 34 376 09 18 18 0 0
+   -1 sprites/openttdgui.pcx 66 376 09 18 18 0 0
+   -1 sprites/openttdgui.pcx 98 376 09 18 18 0 0
+   -1 sprites/openttdgui.pcx 130 376 09 18 18 0 0
+   -1 sprites/openttdgui.pcx 162 376 09 18 18 0 0
+   -1 sprites/openttdgui.pcx 194 376 09 18 18 0 0
+   -1 sprites/openttdgui.pcx 226 376 09 18 18 0 0
+   -1 sprites/openttdgui.pcx 258 376 09 18 18 0 0
+   -1 sprites/openttdgui.pcx 290 376 09 18 18 0 0
+   -1 sprites/openttdgui.pcx 322 376 09 18 18 0 0
+   -1 sprites/openttdgui.pcx 354 376 09 18 18 0 0
+   -1 sprites/openttdgui.pcx 386 376 09 18 18 0 0
+   -1 sprites/openttdgui.pcx 417 376 01 20 20 0 0
+   -1 sprites/openttdgui.pcx 447 376 01 22 19 0 0
+   -1 sprites/openttdgui.pcx 482 376 01 20 20 0 0
+   -1 sprites/openttdgui.pcx 514 376 01 44 54 -16 -35
+   -1 sprites/openttdgui.pcx 578 376 01 7 7 3 4
+   -1 sprites/openttdgui.pcx 594 376 01 7 7 3 4
+   -1 sprites/openttdgui.pcx 610 376 01 9 10 2 3
+   -1 sprites/openttdgui.pcx 626 376 01 9 10 2 3
+   -1 sprites/openttdgui.pcx 642 376 01 7 11 2 1
+   -1 sprites/openttdgui.pcx 658 376 01 9 9 3 3
+   -1 sprites/openttdgui.pcx 672 376 09 20 20 0 0
+   -1 sprites/openttdgui.pcx 700 376 09 20 20 0 0
+   -1 sprites/openttdgui.pcx 726 376 09 32 32 0 0
+   -1 sprites/openttdgui.pcx 764 376 09 10 10 0 0
+   -1 sprites/openttdgui.pcx 780 376 09 10 10 0 0
+   -1 sprites/openttdgui.pcx 4 430 09 7 7 0 0
+   -1 sprites/openttdgui.pcx 20 430 09 13 14 4 4
+   -1 sprites/openttdgui.pcx 38 430 09 8 7 0 0
+   -1 sprites/openttdgui.pcx 52 430 09 8 7 0 0
+   -1 sprites/openttdgui.pcx 65 430 09 8 7 0 0
 
 // -- NFO Renum 'settings' --
 // Undo disabling the warning

media/extra_grf/overrides.nfo

@@ -6,14 +6,8 @@
 // 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 "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 * 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

media/extra_grf/rivers/arctic.nfo

@@ -1,282 +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 "Arctic river graphics by andythenorth (Andrew Parkhouse)"
-   -1 * 4	 01 05 01 3C
-   -1 sprites/arctic_snowy.png  10  10 09 19 38  -5  0
-   -1 sprites/arctic_snowy.png  58  10 09 18 38  -5 13
-   -1 sprites/arctic_snowy.png 106  10 09 18 38 -31 13
-   -1 sprites/arctic_snowy.png 154  10 09 19 38 -31  0
-   -1 sprites/arctic_snowy.png 202  10 09  9 19  14 11
-   -1 sprites/arctic_snowy.png 234  10 09  9 16  -7 22
-   -1 sprites/arctic_snowy.png 266  10 09  9 19 -31 11
-   -1 sprites/arctic_snowy.png 298  10 09  9 16  -7  0
-   -1 sprites/arctic_snowy.png 330  10 09  6  8  25 13
-   -1 sprites/arctic_snowy.png 346  10 09  4 12  -5 27
-   -1 sprites/arctic_snowy.png 364  10 09  6  8 -31 13
-   -1 sprites/arctic_snowy.png 380  10 09  5 12  -5  0
-
-   -1 sprites/arctic_snowy.png  10  40 09 11 40  -7  0
-   -1 sprites/arctic_snowy.png  58  40 09 18 39  -6  5
-   -1 sprites/arctic_snowy.png 106  40 09 11 38 -31 12
-   -1 sprites/arctic_snowy.png 154  40 09 18 39 -31  0
-   -1 sprites/arctic_snowy.png 202  40 09  6 20  13  5
-   -1 sprites/arctic_snowy.png 234  40 09  7 13  -6 16
-   -1 sprites/arctic_snowy.png 266  40 09  6 20 -31 12
-   -1 sprites/arctic_snowy.png 298  40 09  7 13  -5  0
-   -1 sprites/arctic_snowy.png 330  40 09  5  8  25  6
-   -1 sprites/arctic_snowy.png 346  40 09  3 12  -5 20
-   -1 sprites/arctic_snowy.png 364  40 09  4  8 -31 13
-   -1 sprites/arctic_snowy.png 380  40 09  4 15  -7  0
-
-   -1 sprites/arctic_snowy.png  10  70 09 20 38  -5 -8
-   -1 sprites/arctic_snowy.png  58  70 09 26 38  -5  5
-   -1 sprites/arctic_snowy.png 106  70 09 20 37 -31 11
-   -1 sprites/arctic_snowy.png 154  70 09 27 38 -31 -8
-   -1 sprites/arctic_snowy.png 202  70 09  9 16  17  3
-   -1 sprites/arctic_snowy.png 234  70 09  9 15  -7 22
-   -1 sprites/arctic_snowy.png 266  70 09  9 16 -31 11
-   -1 sprites/arctic_snowy.png 298  70 09  9 15  -6 -8
-   -1 sprites/arctic_snowy.png 330  70 09  7  8  25  5
-   -1 sprites/arctic_snowy.png 346  70 09  5 10  -4 27
-   -1 sprites/arctic_snowy.png 364  70 09  7  8 -31 11
-   -1 sprites/arctic_snowy.png 380  70 09  6 12  -5 -8
-
-   -1 sprites/arctic_snowy.png  10 100 09 18 39  -6  0
-   -1 sprites/arctic_snowy.png  58 100 09 11 38  -5 12
-   -1 sprites/arctic_snowy.png 106 100 09 18 39 -31  5
-   -1 sprites/arctic_snowy.png 154 100 09 11 40 -32  0
-   -1 sprites/arctic_snowy.png 202 100 09  6 20  13 12
-   -1 sprites/arctic_snowy.png 234 100 09  7 13  -5 16
-   -1 sprites/arctic_snowy.png 266 100 09  6 20 -31  5
-   -1 sprites/arctic_snowy.png 298 100 09  7 13  -6  0
-   -1 sprites/arctic_snowy.png 330 100 09  4  8  26 13
-   -1 sprites/arctic_snowy.png 346 100 09  3 12  -5 20
-   -1 sprites/arctic_snowy.png 364 100 09  5  8 -31  6
-   -1 sprites/arctic_snowy.png 380 100 09  4 15  -6  0
-
-   -1 sprites/arctic_snowy.png  10 130 09 27 38  -5 -8
-   -1 sprites/arctic_snowy.png  58 130 09 20 37  -4 11
-   -1 sprites/arctic_snowy.png 106 130 09 26 37 -31  5
-   -1 sprites/arctic_snowy.png 154 130 09 20 38 -31 -8
-   -1 sprites/arctic_snowy.png 202 130 09  9 16  17 11
-   -1 sprites/arctic_snowy.png 234 130 09  9 15  -6 22
-   -1 sprites/arctic_snowy.png 266 130 09  9 16 -31  3
-   -1 sprites/arctic_snowy.png 298 130 09  9 15  -7 -8
-   -1 sprites/arctic_snowy.png 330 130 09  7  8  25 11
-   -1 sprites/arctic_snowy.png 346 130 09  5 10  -4 26
-   -1 sprites/arctic_snowy.png 364 130 09  7  8 -31  5
-   -1 sprites/arctic_snowy.png 380 130 09  6 12  -5 -8
-   -1 * 7	 02 05 30 01 00 00 00
-
-   -1 * 4	 01 05 01 3C
-   -1 sprites/arctic_brown.png  10  10 09 19 38  -5  0
-   -1 sprites/arctic_brown.png  58  10 09 18 38  -5 13
-   -1 sprites/arctic_brown.png 106  10 09 18 38 -31 13
-   -1 sprites/arctic_brown.png 154  10 09 19 38 -31  0
-   -1 sprites/arctic_brown.png 202  10 09  9 19  14 11
-   -1 sprites/arctic_brown.png 234  10 09  9 16  -7 22
-   -1 sprites/arctic_brown.png 266  10 09  9 19 -31 11
-   -1 sprites/arctic_brown.png 298  10 09  9 16  -7  0
-   -1 sprites/arctic_brown.png 330  10 09  6  8  25 13
-   -1 sprites/arctic_brown.png 346  10 09  4 12  -5 27
-   -1 sprites/arctic_brown.png 364  10 09  6  8 -31 13
-   -1 sprites/arctic_brown.png 380  10 09  5 12  -5  0
-
-   -1 sprites/arctic_brown.png  10  40 09 11 40  -7  0
-   -1 sprites/arctic_brown.png  58  40 09 18 39  -6  5
-   -1 sprites/arctic_brown.png 106  40 09 11 38 -31 12
-   -1 sprites/arctic_brown.png 154  40 09 18 39 -31  0
-   -1 sprites/arctic_brown.png 202  40 09  6 20  13  5
-   -1 sprites/arctic_brown.png 234  40 09  7 13  -6 16
-   -1 sprites/arctic_brown.png 266  40 09  6 20 -31 12
-   -1 sprites/arctic_brown.png 298  40 09  7 13  -5  0
-   -1 sprites/arctic_brown.png 330  40 09  5  8  25  6
-   -1 sprites/arctic_brown.png 346  40 09  3 12  -5 20
-   -1 sprites/arctic_brown.png 364  40 09  4  8 -31 13
-   -1 sprites/arctic_brown.png 380  40 09  4 15  -7  0
-
-   -1 sprites/arctic_brown.png  10  70 09 20 38  -5 -8
-   -1 sprites/arctic_brown.png  58  70 09 26 38  -5  5
-   -1 sprites/arctic_brown.png 106  70 09 20 37 -31 11
-   -1 sprites/arctic_brown.png 154  70 09 27 38 -31 -8
-   -1 sprites/arctic_brown.png 202  70 09  9 16  17  3
-   -1 sprites/arctic_brown.png 234  70 09  9 15  -7 22
-   -1 sprites/arctic_brown.png 266  70 09  9 16 -31 11
-   -1 sprites/arctic_brown.png 298  70 09  9 15  -6 -8
-   -1 sprites/arctic_brown.png 330  70 09  7  8  25  5
-   -1 sprites/arctic_brown.png 346  70 09  5 10  -4 27
-   -1 sprites/arctic_brown.png 364  70 09  7  8 -31 11
-   -1 sprites/arctic_brown.png 380  70 09  6 12  -5 -8
-
-   -1 sprites/arctic_brown.png  10 100 09 18 39  -6  0
-   -1 sprites/arctic_brown.png  58 100 09 11 38  -5 12
-   -1 sprites/arctic_brown.png 106 100 09 18 39 -31  5
-   -1 sprites/arctic_brown.png 154 100 09 11 40 -32  0
-   -1 sprites/arctic_brown.png 202 100 09  6 20  13 12
-   -1 sprites/arctic_brown.png 234 100 09  7 13  -5 16
-   -1 sprites/arctic_brown.png 266 100 09  6 20 -31  5
-   -1 sprites/arctic_brown.png 298 100 09  7 13  -6  0
-   -1 sprites/arctic_brown.png 330 100 09  4  8  26 13
-   -1 sprites/arctic_brown.png 346 100 09  3 12  -5 20
-   -1 sprites/arctic_brown.png 364 100 09  5  8 -31  6
-   -1 sprites/arctic_brown.png 380 100 09  4 15  -6  0
-
-   -1 sprites/arctic_brown.png  10 130 09 27 38  -5 -8
-   -1 sprites/arctic_brown.png  58 130 09 20 37  -4 11
-   -1 sprites/arctic_brown.png 106 130 09 26 37 -31  5
-   -1 sprites/arctic_brown.png 154 130 09 20 38 -31 -8
-   -1 sprites/arctic_brown.png 202 130 09  9 16  17 11
-   -1 sprites/arctic_brown.png 234 130 09  9 15  -6 22
-   -1 sprites/arctic_brown.png 266 130 09  9 16 -31  3
-   -1 sprites/arctic_brown.png 298 130 09  9 15  -7 -8
-   -1 sprites/arctic_brown.png 330 130 09  7  8  25 11
-   -1 sprites/arctic_brown.png 346 130 09  5 10  -4 26
-   -1 sprites/arctic_brown.png 364 130 09  7  8 -31  5
-   -1 sprites/arctic_brown.png 380 130 09  6 12  -5 -8
-   -1 * 7	 02 05 31 01 00 00 00
-
-   -1 * 4	 01 05 01 3C
-   -1 sprites/arctic_snowy.png  10 210 09 19 38  -5  0
-   -1 sprites/arctic_snowy.png  58 210 09 18 38  -5 13
-   -1 sprites/arctic_snowy.png 106 210 09 18 38 -31 13
-   -1 sprites/arctic_snowy.png 154 210 09 19 38 -31  0
-   -1 sprites/arctic_snowy.png 202 210 09  9 19  14 11
-   -1 sprites/arctic_snowy.png 234 210 09  9 16  -7 22
-   -1 sprites/arctic_snowy.png 266 210 09  9 19 -31 11
-   -1 sprites/arctic_snowy.png 298 210 09  9 16  -7  0
-   -1 sprites/arctic_snowy.png 330 210 09  6  8  25 13
-   -1 sprites/arctic_snowy.png 346 210 09  4 12  -5 27
-   -1 sprites/arctic_snowy.png 364 210 09  6  8 -31 13
-   -1 sprites/arctic_snowy.png 380 210 09  5 12  -5  0
-
-   -1 sprites/arctic_snowy.png  10 240 09 11 40  -7  0
-   -1 sprites/arctic_snowy.png  58 240 09 18 39  -6  5
-   -1 sprites/arctic_snowy.png 106 240 09 11 38 -31 12
-   -1 sprites/arctic_snowy.png 154 240 09 18 39 -31  0
-   -1 sprites/arctic_snowy.png 202 240 09  6 20  13  5
-   -1 sprites/arctic_snowy.png 234 240 09  7 13  -6 16
-   -1 sprites/arctic_snowy.png 266 240 09  6 20 -31 12
-   -1 sprites/arctic_snowy.png 298 240 09  7 13  -5  0
-   -1 sprites/arctic_snowy.png 330 240 09  5  8  25  6
-   -1 sprites/arctic_snowy.png 346 240 09  3 12  -5 20
-   -1 sprites/arctic_snowy.png 364 240 09  4  8 -31 13
-   -1 sprites/arctic_snowy.png 380 240 09  4 15  -7  0
-
-   -1 sprites/arctic_snowy.png  10 270 09 20 38  -5 -8
-   -1 sprites/arctic_snowy.png  58 270 09 26 38  -5  5
-   -1 sprites/arctic_snowy.png 106 270 09 20 37 -31 11
-   -1 sprites/arctic_snowy.png 154 270 09 27 38 -31 -8
-   -1 sprites/arctic_snowy.png 202 270 09  9 16  17  3
-   -1 sprites/arctic_snowy.png 234 270 09  9 15  -7 22
-   -1 sprites/arctic_snowy.png 266 270 09  9 16 -31 11
-   -1 sprites/arctic_snowy.png 298 270 09  9 15  -6 -8
-   -1 sprites/arctic_snowy.png 330 270 09  7  8  25  5
-   -1 sprites/arctic_snowy.png 346 270 09  5 10  -4 27
-   -1 sprites/arctic_snowy.png 364 270 09  7  8 -31 11
-   -1 sprites/arctic_snowy.png 380 270 09  6 12  -5 -8
-
-   -1 sprites/arctic_snowy.png  10 300 09 18 39  -6  0
-   -1 sprites/arctic_snowy.png  58 300 09 11 38  -5 12
-   -1 sprites/arctic_snowy.png 106 300 09 18 39 -31  5
-   -1 sprites/arctic_snowy.png 154 300 09 11 40 -32  0
-   -1 sprites/arctic_snowy.png 202 300 09  6 20  13 12
-   -1 sprites/arctic_snowy.png 234 300 09  7 13  -5 16
-   -1 sprites/arctic_snowy.png 266 300 09  6 20 -31  5
-   -1 sprites/arctic_snowy.png 298 300 09  7 13  -6  0
-   -1 sprites/arctic_snowy.png 330 300 09  4  8  26 13
-   -1 sprites/arctic_snowy.png 346 300 09  3 12  -5 20
-   -1 sprites/arctic_snowy.png 364 300 09  5  8 -31  6
-   -1 sprites/arctic_snowy.png 380 300 09  4 15  -6  0
-
-   -1 sprites/arctic_snowy.png  10 330 09 27 38  -5 -8
-   -1 sprites/arctic_snowy.png  58 330 09 20 37  -4 11
-   -1 sprites/arctic_snowy.png 106 330 09 26 37 -31  5
-   -1 sprites/arctic_snowy.png 154 330 09 20 38 -31 -8
-   -1 sprites/arctic_snowy.png 202 330 09  9 16  17 11
-   -1 sprites/arctic_snowy.png 234 330 09  9 15  -6 22
-   -1 sprites/arctic_snowy.png 266 330 09  9 16 -31  3
-   -1 sprites/arctic_snowy.png 298 330 09  9 15  -7 -8
-   -1 sprites/arctic_snowy.png 330 330 09  7  8  25 11
-   -1 sprites/arctic_snowy.png 346 330 09  5 10  -4 26
-   -1 sprites/arctic_snowy.png 364 330 09  7  8 -31  5
-   -1 sprites/arctic_snowy.png 380 330 09  6 12  -5 -8
-   -1 * 7	 02 05 32 01 00 00 00
-
-   -1 * 4	 01 05 01 3C
-   -1 sprites/arctic_brown.png  10 210 09 19 38  -5  0
-   -1 sprites/arctic_brown.png  58 210 09 18 38  -5 13
-   -1 sprites/arctic_brown.png 106 210 09 18 38 -31 13
-   -1 sprites/arctic_brown.png 154 210 09 19 38 -31  0
-   -1 sprites/arctic_brown.png 202 210 09  9 19  14 11
-   -1 sprites/arctic_brown.png 234 210 09  9 16  -7 22
-   -1 sprites/arctic_brown.png 266 210 09  9 19 -31 11
-   -1 sprites/arctic_brown.png 298 210 09  9 16  -7  0
-   -1 sprites/arctic_brown.png 330 210 09  6  8  25 13
-   -1 sprites/arctic_brown.png 346 210 09  4 12  -5 27
-   -1 sprites/arctic_brown.png 364 210 09  6  8 -31 13
-   -1 sprites/arctic_brown.png 380 210 09  5 12  -5  0
-
-   -1 sprites/arctic_brown.png  10 240 09 11 40  -7  0
-   -1 sprites/arctic_brown.png  58 240 09 18 39  -6  5
-   -1 sprites/arctic_brown.png 106 240 09 11 38 -31 12
-   -1 sprites/arctic_brown.png 154 240 09 18 39 -31  0
-   -1 sprites/arctic_brown.png 202 240 09  6 20  13  5
-   -1 sprites/arctic_brown.png 234 240 09  7 13  -6 16
-   -1 sprites/arctic_brown.png 266 240 09  6 20 -31 12
-   -1 sprites/arctic_brown.png 298 240 09  7 13  -5  0
-   -1 sprites/arctic_brown.png 330 240 09  5  8  25  6
-   -1 sprites/arctic_brown.png 346 240 09  3 12  -5 20
-   -1 sprites/arctic_brown.png 364 240 09  4  8 -31 13
-   -1 sprites/arctic_brown.png 380 240 09  4 15  -7  0
-
-   -1 sprites/arctic_brown.png  10 270 09 20 38  -5 -8
-   -1 sprites/arctic_brown.png  58 270 09 26 38  -5  5
-   -1 sprites/arctic_brown.png 106 270 09 20 37 -31 11
-   -1 sprites/arctic_brown.png 154 270 09 27 38 -31 -8
-   -1 sprites/arctic_brown.png 202 270 09  9 16  17  3
-   -1 sprites/arctic_brown.png 234 270 09  9 15  -7 22
-   -1 sprites/arctic_brown.png 266 270 09  9 16 -31 11
-   -1 sprites/arctic_brown.png 298 270 09  9 15  -6 -8
-   -1 sprites/arctic_brown.png 330 270 09  7  8  25  5
-   -1 sprites/arctic_brown.png 346 270 09  5 10  -4 27
-   -1 sprites/arctic_brown.png 364 270 09  7  8 -31 11
-   -1 sprites/arctic_brown.png 380 270 09  6 12  -5 -8
-
-   -1 sprites/arctic_brown.png  10 300 09 18 39  -6  0
-   -1 sprites/arctic_brown.png  58 300 09 11 38  -5 12
-   -1 sprites/arctic_brown.png 106 300 09 18 39 -31  5
-   -1 sprites/arctic_brown.png 154 300 09 11 40 -32  0
-   -1 sprites/arctic_brown.png 202 300 09  6 20  13 12
-   -1 sprites/arctic_brown.png 234 300 09  7 13  -5 16
-   -1 sprites/arctic_brown.png 266 300 09  6 20 -31  5
-   -1 sprites/arctic_brown.png 298 300 09  7 13  -6  0
-   -1 sprites/arctic_brown.png 330 300 09  4  8  26 13
-   -1 sprites/arctic_brown.png 346 300 09  3 12  -5 20
-   -1 sprites/arctic_brown.png 364 300 09  5  8 -31  6
-   -1 sprites/arctic_brown.png 380 300 09  4 15  -6  0
-
-   -1 sprites/arctic_brown.png  10 330 09 27 38  -5 -8
-   -1 sprites/arctic_brown.png  58 330 09 20 37  -4 11
-   -1 sprites/arctic_brown.png 106 330 09 26 37 -31  5
-   -1 sprites/arctic_brown.png 154 330 09 20 38 -31 -8
-   -1 sprites/arctic_brown.png 202 330 09  9 16  17 11
-   -1 sprites/arctic_brown.png 234 330 09  9 15  -6 22
-   -1 sprites/arctic_brown.png 266 330 09  9 16 -31  3
-   -1 sprites/arctic_brown.png 298 330 09  9 15  -7 -8
-   -1 sprites/arctic_brown.png 330 330 09  7  8  25 11
-   -1 sprites/arctic_brown.png 346 330 09  5 10  -4 26
-   -1 sprites/arctic_brown.png 364 330 09  7  8 -31  5
-   -1 sprites/arctic_brown.png 380 330 09  6 12  -5 -8
-   -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

media/extra_grf/rivers/rapids.nfo

@@ -1,139 +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 "Rapid graphics"
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10  10 09 23 64 -31  0
-   -1 sprites/rapids.png  90  10 09 39 64 -31 -8
-   -1 sprites/rapids.png 170  10 09 23 64 -31  0
-   -1 sprites/rapids.png 250  10 09 39 64 -31 -8
-   -1 * 7	 02 05 00 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10  60 09 23 64 -31  0
-   -1 sprites/rapids.png  90  60 09 39 64 -31 -8
-   -1 sprites/rapids.png 170  60 09 23 64 -31  0
-   -1 sprites/rapids.png 250  60 09 39 64 -31 -8
-   -1 * 7	 02 05 01 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 110 09 23 64 -31  0
-   -1 sprites/rapids.png  90 110 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 110 09 23 64 -31  0
-   -1 sprites/rapids.png 250 110 09 39 64 -31 -8
-   -1 * 7	 02 05 02 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 160 09 23 64 -31  0
-   -1 sprites/rapids.png  90 160 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 160 09 23 64 -31  0
-   -1 sprites/rapids.png 250 160 09 39 64 -31 -8
-   -1 * 7	 02 05 03 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 210 09 23 64 -31  0
-   -1 sprites/rapids.png  90 210 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 210 09 23 64 -31  0
-   -1 sprites/rapids.png 250 210 09 39 64 -31 -8
-   -1 * 7	 02 05 04 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 260 09 23 64 -31  0
-   -1 sprites/rapids.png  90 260 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 260 09 23 64 -31  0
-   -1 sprites/rapids.png 250 260 09 39 64 -31 -8
-   -1 * 7	 02 05 05 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 310 09 23 64 -31  0
-   -1 sprites/rapids.png  90 310 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 310 09 23 64 -31  0
-   -1 sprites/rapids.png 250 310 09 39 64 -31 -8
-   -1 * 7	 02 05 06 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 360 09 23 64 -31  0
-   -1 sprites/rapids.png  90 360 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 360 09 23 64 -31  0
-   -1 sprites/rapids.png 250 360 09 39 64 -31 -8
-   -1 * 7	 02 05 07 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 410 09 23 64 -31  0
-   -1 sprites/rapids.png  90 410 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 410 09 23 64 -31  0
-   -1 sprites/rapids.png 250 410 09 39 64 -31 -8
-   -1 * 7	 02 05 08 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 460 09 23 64 -31  0
-   -1 sprites/rapids.png  90 460 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 460 09 23 64 -31  0
-   -1 sprites/rapids.png 250 460 09 39 64 -31 -8
-   -1 * 7	 02 05 09 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 510 09 23 64 -31  0
-   -1 sprites/rapids.png  90 510 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 510 09 23 64 -31  0
-   -1 sprites/rapids.png 250 510 09 39 64 -31 -8
-   -1 * 7	 02 05 0A 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 560 09 23 64 -31  0
-   -1 sprites/rapids.png  90 560 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 560 09 23 64 -31  0
-   -1 sprites/rapids.png 250 560 09 39 64 -31 -8
-   -1 * 7	 02 05 0B 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 610 09 23 64 -31  0
-   -1 sprites/rapids.png  90 610 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 610 09 23 64 -31  0
-   -1 sprites/rapids.png 250 610 09 39 64 -31 -8
-   -1 * 7	 02 05 0C 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 660 09 23 64 -31  0
-   -1 sprites/rapids.png  90 660 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 660 09 23 64 -31  0
-   -1 sprites/rapids.png 250 660 09 39 64 -31 -8
-   -1 * 7	 02 05 0D 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 710 09 23 64 -31  0
-   -1 sprites/rapids.png  90 710 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 710 09 23 64 -31  0
-   -1 sprites/rapids.png 250 710 09 39 64 -31 -8
-   -1 * 7	 02 05 0E 01 00 00 00
-
-   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 760 09 23 64 -31  0
-   -1 sprites/rapids.png  90 760 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 760 09 23 64 -31  0
-   -1 sprites/rapids.png 250 760 09 39 64 -31 -8
-   -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

media/extra_grf/rivers/temperate.nfo

@@ -1,146 +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 "Temperate river graphics by andythenorth (Andrew Parkhouse)"
-   -1 * 4	 01 05 01 3C
-   -1 sprites/temperate.png  10  10 09 19 38  -5  0
-   -1 sprites/temperate.png  58  10 09 18 38  -5 13
-   -1 sprites/temperate.png 106  10 09 18 38 -31 13
-   -1 sprites/temperate.png 154  10 09 19 38 -31  0
-   -1 sprites/temperate.png 202  10 09  9 19  14 11
-   -1 sprites/temperate.png 234  10 09  9 16  -7 22
-   -1 sprites/temperate.png 266  10 09  9 19 -31 11
-   -1 sprites/temperate.png 298  10 09  9 16  -7  0
-   -1 sprites/temperate.png 330  10 09  6  8  25 13
-   -1 sprites/temperate.png 346  10 09  4 12  -5 27
-   -1 sprites/temperate.png 364  10 09  6  8 -31 13
-   -1 sprites/temperate.png 380  10 09  5 12  -5  0
-
-   -1 sprites/temperate.png  10  40 09 11 40  -7  0
-   -1 sprites/temperate.png  58  40 09 18 39  -6  5
-   -1 sprites/temperate.png 106  40 09 11 38 -31 12
-   -1 sprites/temperate.png 154  40 09 18 39 -31  0
-   -1 sprites/temperate.png 202  40 09  6 20  13  5
-   -1 sprites/temperate.png 234  40 09  7 13  -6 16
-   -1 sprites/temperate.png 266  40 09  6 20 -31 12
-   -1 sprites/temperate.png 298  40 09  7 13  -5  0
-   -1 sprites/temperate.png 330  40 09  5  8  25  6
-   -1 sprites/temperate.png 346  40 09  3 12  -5 20
-   -1 sprites/temperate.png 364  40 09  4  8 -31 13
-   -1 sprites/temperate.png 380  40 09  4 15  -7  0
-
-   -1 sprites/temperate.png  10  70 09 20 38  -5 -8
-   -1 sprites/temperate.png  58  70 09 26 38  -5  5
-   -1 sprites/temperate.png 106  70 09 20 37 -31 11
-   -1 sprites/temperate.png 154  70 09 27 38 -31 -8
-   -1 sprites/temperate.png 202  70 09  9 16  17  3
-   -1 sprites/temperate.png 234  70 09  9 15  -7 22
-   -1 sprites/temperate.png 266  70 09  9 16 -31 11
-   -1 sprites/temperate.png 298  70 09  9 15  -6 -8
-   -1 sprites/temperate.png 330  70 09  7  8  25  5
-   -1 sprites/temperate.png 346  70 09  5 10  -4 27
-   -1 sprites/temperate.png 364  70 09  7  8 -31 11
-   -1 sprites/temperate.png 380  70 09  6 12  -5 -8
-
-   -1 sprites/temperate.png  10 100 09 18 39  -6  0
-   -1 sprites/temperate.png  58 100 09 11 38  -5 12
-   -1 sprites/temperate.png 106 100 09 18 39 -31  5
-   -1 sprites/temperate.png 154 100 09 11 40 -32  0
-   -1 sprites/temperate.png 202 100 09  6 20  13 12
-   -1 sprites/temperate.png 234 100 09  7 13  -5 16
-   -1 sprites/temperate.png 266 100 09  6 20 -31  5
-   -1 sprites/temperate.png 298 100 09  7 13  -6  0
-   -1 sprites/temperate.png 330 100 09  4  8  26 13
-   -1 sprites/temperate.png 346 100 09  3 12  -5 20
-   -1 sprites/temperate.png 364 100 09  5  8 -31  6
-   -1 sprites/temperate.png 380 100 09  4 15  -6  0
-
-   -1 sprites/temperate.png  10 130 09 27 38  -5 -8
-   -1 sprites/temperate.png  58 130 09 20 37  -4 11
-   -1 sprites/temperate.png 106 130 09 26 37 -31  5
-   -1 sprites/temperate.png 154 130 09 20 38 -31 -8
-   -1 sprites/temperate.png 202 130 09  9 16  17 11
-   -1 sprites/temperate.png 234 130 09  9 15  -6 22
-   -1 sprites/temperate.png 266 130 09  9 16 -31  3
-   -1 sprites/temperate.png 298 130 09  9 15  -7 -8
-   -1 sprites/temperate.png 330 130 09  7  8  25 11
-   -1 sprites/temperate.png 346 130 09  5 10  -4 26
-   -1 sprites/temperate.png 364 130 09  7  8 -31  5
-   -1 sprites/temperate.png 380 130 09  6 12  -5 -8
-   -1 * 7	 02 05 20 01 00 00 00
-
-   -1 * 4	 01 05 01 3C
-   -1 sprites/temperate.png  10 210 09 19 38  -5  0
-   -1 sprites/temperate.png  58 210 09 18 38  -5 13
-   -1 sprites/temperate.png 106 210 09 18 38 -31 13
-   -1 sprites/temperate.png 154 210 09 19 38 -31  0
-   -1 sprites/temperate.png 202 210 09  9 19  14 11
-   -1 sprites/temperate.png 234 210 09  9 16  -7 22
-   -1 sprites/temperate.png 266 210 09  9 19 -31 11
-   -1 sprites/temperate.png 298 210 09  9 16  -7  0
-   -1 sprites/temperate.png 330 210 09  6  8  25 13
-   -1 sprites/temperate.png 346 210 09  4 12  -5 27
-   -1 sprites/temperate.png 364 210 09  6  8 -31 13
-   -1 sprites/temperate.png 380 210 09  5 12  -5  0
-
-   -1 sprites/temperate.png  10 240 09 11 40  -7  0
-   -1 sprites/temperate.png  58 240 09 18 39  -6  5
-   -1 sprites/temperate.png 106 240 09 11 38 -31 12
-   -1 sprites/temperate.png 154 240 09 18 39 -31  0
-   -1 sprites/temperate.png 202 240 09  6 20  13  5
-   -1 sprites/temperate.png 234 240 09  7 13  -6 16
-   -1 sprites/temperate.png 266 240 09  6 20 -31 12
-   -1 sprites/temperate.png 298 240 09  7 13  -5  0
-   -1 sprites/temperate.png 330 240 09  5  8  25  6
-   -1 sprites/temperate.png 346 240 09  3 12  -5 20
-   -1 sprites/temperate.png 364 240 09  4  8 -31 13
-   -1 sprites/temperate.png 380 240 09  4 15  -7  0
-
-   -1 sprites/temperate.png  10 270 09 20 38  -5 -8
-   -1 sprites/temperate.png  58 270 09 26 38  -5  5
-   -1 sprites/temperate.png 106 270 09 20 37 -31 11
-   -1 sprites/temperate.png 154 270 09 27 38 -31 -8
-   -1 sprites/temperate.png 202 270 09  9 16  17  3
-   -1 sprites/temperate.png 234 270 09  9 15  -7 22
-   -1 sprites/temperate.png 266 270 09  9 16 -31 11
-   -1 sprites/temperate.png 298 270 09  9 15  -6 -8
-   -1 sprites/temperate.png 330 270 09  7  8  25  5
-   -1 sprites/temperate.png 346 270 09  5 10  -4 27
-   -1 sprites/temperate.png 364 270 09  7  8 -31 11
-   -1 sprites/temperate.png 380 270 09  6 12  -5 -8
-
-   -1 sprites/temperate.png  10 300 09 18 39  -6  0
-   -1 sprites/temperate.png  58 300 09 11 38  -5 12
-   -1 sprites/temperate.png 106 300 09 18 39 -31  5
-   -1 sprites/temperate.png 154 300 09 11 40 -32  0
-   -1 sprites/temperate.png 202 300 09  6 20  13 12
-   -1 sprites/temperate.png 234 300 09  7 13  -5 16
-   -1 sprites/temperate.png 266 300 09  6 20 -31  5
-   -1 sprites/temperate.png 298 300 09  7 13  -6  0
-   -1 sprites/temperate.png 330 300 09  4  8  26 13
-   -1 sprites/temperate.png 346 300 09  3 12  -5 20
-   -1 sprites/temperate.png 364 300 09  5  8 -31  6
-   -1 sprites/temperate.png 380 300 09  4 15  -6  0
-
-   -1 sprites/temperate.png  10 330 09 27 38  -5 -8
-   -1 sprites/temperate.png  58 330 09 20 37  -4 11
-   -1 sprites/temperate.png 106 330 09 26 37 -31  5
-   -1 sprites/temperate.png 154 330 09 20 38 -31 -8
-   -1 sprites/temperate.png 202 330 09  9 16  17 11
-   -1 sprites/temperate.png 234 330 09  9 15  -6 22
-   -1 sprites/temperate.png 266 330 09  9 16 -31  3
-   -1 sprites/temperate.png 298 330 09  9 15  -7 -8
-   -1 sprites/temperate.png 330 330 09  7  8  25 11
-   -1 sprites/temperate.png 346 330 09  5 10  -4 26
-   -1 sprites/temperate.png 364 330 09  7  8 -31  5
-   -1 sprites/temperate.png 380 330 09  6 12  -5 -8
-   -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

media/extra_grf/rivers/toyland.nfo

@@ -1,146 +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 "Toyland river graphics by andythenorth (Andrew Parkhouse)"
-   -1 * 4	 01 05 01 3C
-   -1 sprites/toyland.png  10  10 09 19 38  -5  0
-   -1 sprites/toyland.png  58  10 09 18 38  -5 13
-   -1 sprites/toyland.png 106  10 09 18 38 -31 13
-   -1 sprites/toyland.png 154  10 09 19 38 -31  0
-   -1 sprites/toyland.png 202  10 09  9 19  14 11
-   -1 sprites/toyland.png 234  10 09  9 16  -7 22
-   -1 sprites/toyland.png 266  10 09  9 19 -31 11
-   -1 sprites/toyland.png 298  10 09  9 16  -7  0
-   -1 sprites/toyland.png 330  10 09  6  8  25 13
-   -1 sprites/toyland.png 346  10 09  4 12  -5 27
-   -1 sprites/toyland.png 364  10 09  6  8 -31 13
-   -1 sprites/toyland.png 380  10 09  5 12  -5  0
-
-   -1 sprites/toyland.png  10  40 09 11 40  -7  0
-   -1 sprites/toyland.png  58  40 09 18 39  -6  5
-   -1 sprites/toyland.png 106  40 09 11 38 -31 12
-   -1 sprites/toyland.png 154  40 09 18 39 -31  0
-   -1 sprites/toyland.png 202  40 09  6 20  13  5
-   -1 sprites/toyland.png 234  40 09  7 13  -6 16
-   -1 sprites/toyland.png 266  40 09  6 20 -31 12
-   -1 sprites/toyland.png 298  40 09  7 13  -5  0
-   -1 sprites/toyland.png 330  40 09  5  8  25  6
-   -1 sprites/toyland.png 346  40 09  3 12  -5 20
-   -1 sprites/toyland.png 364  40 09  4  8 -31 13
-   -1 sprites/toyland.png 380  40 09  4 15  -7  0
-
-   -1 sprites/toyland.png  10  70 09 20 38  -5 -8
-   -1 sprites/toyland.png  58  70 09 26 38  -5  5
-   -1 sprites/toyland.png 106  70 09 20 37 -31 11
-   -1 sprites/toyland.png 154  70 09 27 38 -31 -8
-   -1 sprites/toyland.png 202  70 09  9 16  17  3
-   -1 sprites/toyland.png 234  70 09  9 15  -7 22
-   -1 sprites/toyland.png 266  70 09  9 16 -31 11
-   -1 sprites/toyland.png 298  70 09  9 15  -6 -8
-   -1 sprites/toyland.png 330  70 09  7  8  25  5
-   -1 sprites/toyland.png 346  70 09  5 10  -4 27
-   -1 sprites/toyland.png 364  70 09  7  8 -31 11
-   -1 sprites/toyland.png 380  70 09  6 12  -5 -8
-
-   -1 sprites/toyland.png  10 100 09 18 39  -6  0
-   -1 sprites/toyland.png  58 100 09 11 38  -5 12
-   -1 sprites/toyland.png 106 100 09 18 39 -31  5
-   -1 sprites/toyland.png 154 100 09 11 40 -32  0
-   -1 sprites/toyland.png 202 100 09  6 20  13 12
-   -1 sprites/toyland.png 234 100 09  7 13  -5 16
-   -1 sprites/toyland.png 266 100 09  6 20 -31  5
-   -1 sprites/toyland.png 298 100 09  7 13  -6  0
-   -1 sprites/toyland.png 330 100 09  4  8  26 13
-   -1 sprites/toyland.png 346 100 09  3 12  -5 20
-   -1 sprites/toyland.png 364 100 09  5  8 -31  6
-   -1 sprites/toyland.png 380 100 09  4 15  -6  0
-
-   -1 sprites/toyland.png  10 130 09 27 38  -5 -8
-   -1 sprites/toyland.png  58 130 09 20 37  -4 11
-   -1 sprites/toyland.png 106 130 09 26 37 -31  5
-   -1 sprites/toyland.png 154 130 09 20 38 -31 -8
-   -1 sprites/toyland.png 202 130 09  9 16  17 11
-   -1 sprites/toyland.png 234 130 09  9 15  -6 22
-   -1 sprites/toyland.png 266 130 09  9 16 -31  3
-   -1 sprites/toyland.png 298 130 09  9 15  -7 -8
-   -1 sprites/toyland.png 330 130 09  7  8  25 11
-   -1 sprites/toyland.png 346 130 09  5 10  -4 26
-   -1 sprites/toyland.png 364 130 09  7  8 -31  5
-   -1 sprites/toyland.png 380 130 09  6 12  -5 -8
-   -1 * 7	 02 05 50 01 00 00 00
-
-   -1 * 4	 01 05 01 3C
-   -1 sprites/toyland.png  10 210 09 19 38  -5  0
-   -1 sprites/toyland.png  58 210 09 18 38  -5 13
-   -1 sprites/toyland.png 106 210 09 18 38 -31 13
-   -1 sprites/toyland.png 154 210 09 19 38 -31  0
-   -1 sprites/toyland.png 202 210 09  9 19  14 11
-   -1 sprites/toyland.png 234 210 09  9 16  -7 22
-   -1 sprites/toyland.png 266 210 09  9 19 -31 11
-   -1 sprites/toyland.png 298 210 09  9 16  -7  0
-   -1 sprites/toyland.png 330 210 09  6  8  25 13
-   -1 sprites/toyland.png 346 210 09  4 12  -5 27
-   -1 sprites/toyland.png 364 210 09  6  8 -31 13
-   -1 sprites/toyland.png 380 210 09  5 12  -5  0
-
-   -1 sprites/toyland.png  10 240 09 11 40  -7  0
-   -1 sprites/toyland.png  58 240 09 18 39  -6  5
-   -1 sprites/toyland.png 106 240 09 11 38 -31 12
-   -1 sprites/toyland.png 154 240 09 18 39 -31  0
-   -1 sprites/toyland.png 202 240 09  6 20  13  5
-   -1 sprites/toyland.png 234 240 09  7 13  -6 16
-   -1 sprites/toyland.png 266 240 09  6 20 -31 12
-   -1 sprites/toyland.png 298 240 09  7 13  -5  0
-   -1 sprites/toyland.png 330 240 09  5  8  25  6
-   -1 sprites/toyland.png 346 240 09  3 12  -5 20
-   -1 sprites/toyland.png 364 240 09  4  8 -31 13
-   -1 sprites/toyland.png 380 240 09  4 15  -7  0
-
-   -1 sprites/toyland.png  10 270 09 20 38  -5 -8
-   -1 sprites/toyland.png  58 270 09 26 38  -5  5
-   -1 sprites/toyland.png 106 270 09 20 37 -31 11
-   -1 sprites/toyland.png 154 270 09 27 38 -31 -8
-   -1 sprites/toyland.png 202 270 09  9 16  17  3
-   -1 sprites/toyland.png 234 270 09  9 15  -7 22
-   -1 sprites/toyland.png 266 270 09  9 16 -31 11
-   -1 sprites/toyland.png 298 270 09  9 15  -6 -8
-   -1 sprites/toyland.png 330 270 09  7  8  25  5
-   -1 sprites/toyland.png 346 270 09  5 10  -4 27
-   -1 sprites/toyland.png 364 270 09  7  8 -31 11
-   -1 sprites/toyland.png 380 270 09  6 12  -5 -8
-
-   -1 sprites/toyland.png  10 300 09 18 39  -6  0
-   -1 sprites/toyland.png  58 300 09 11 38  -5 12
-   -1 sprites/toyland.png 106 300 09 18 39 -31  5
-   -1 sprites/toyland.png 154 300 09 11 40 -32  0
-   -1 sprites/toyland.png 202 300 09  6 20  13 12
-   -1 sprites/toyland.png 234 300 09  7 13  -5 16
-   -1 sprites/toyland.png 266 300 09  6 20 -31  5
-   -1 sprites/toyland.png 298 300 09  7 13  -6  0
-   -1 sprites/toyland.png 330 300 09  4  8  26 13
-   -1 sprites/toyland.png 346 300 09  3 12  -5 20
-   -1 sprites/toyland.png 364 300 09  5  8 -31  6
-   -1 sprites/toyland.png 380 300 09  4 15  -6  0
-
-   -1 sprites/toyland.png  10 330 09 27 38  -5 -8
-   -1 sprites/toyland.png  58 330 09 20 37  -4 11
-   -1 sprites/toyland.png 106 330 09 26 37 -31  5
-   -1 sprites/toyland.png 154 330 09 20 38 -31 -8
-   -1 sprites/toyland.png 202 330 09  9 16  17 11
-   -1 sprites/toyland.png 234 330 09  9 15  -6 22
-   -1 sprites/toyland.png 266 330 09  9 16 -31  3
-   -1 sprites/toyland.png 298 330 09  9 15  -7 -8
-   -1 sprites/toyland.png 330 330 09  7  8  25 11
-   -1 sprites/toyland.png 346 330 09  5 10  -4 26
-   -1 sprites/toyland.png 364 330 09  7  8 -31  5
-   -1 sprites/toyland.png 380 330 09  6 12  -5 -8
-   -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