(svn r11613) -Release: 0.6.0-beta2.

The second beta with quite a lot of bugfixes since beta1 and a few smaller features.
2025-08-14 10:09:11 +00:00 · 2007-12-09 21:37:46 +00:00
1222 changed files with 234969 additions and 434071 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,46 +0,0 @@
-bin/*
-!bin/ai
-bin/ai/*
-!bin/ai/compat*.nut
-!bin/ai/regression
-!bin/data
-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
-!bin/scripts/readme.txt
-
-bundle/*
-bundles/*
-docs/aidocs/*
-docs/source/*
-media/openttd.desktop
-media/openttd.desktop.install
-objs/*
-projects/Debug
-projects/Release
-projects/*.ncb
-projects/*.suo
-projects/*.sdf
-projects/*.opensdf
-projects/*.vcproj.*.user
-projects/*.vcxproj.user
-src/rev.cpp
-src/os/windows/ottdres.rc
-
-/Makefile*
-!/Makefile.msvc
-/config.*
-!/config.lib
-!*.in
-*.tmp
--- a/.hgignore
+++ b/.hgignore
@@ -1,26 +0,0 @@
-syntax: glob
-
-bin/lang/*
-bin/openttd*
-bin/*.cfg
-bundle/*
-bundles/*
-config.cache*
-config.log
-config.pwd
-docs/aidocs/*
-docs/source/*
-Makefile
-Makefile.am
-Makefile.bundle
-media/openttd.desktop
-media/openttd.desktop.install
-objs/*
-projects/*.ncb
-projects/*.suo
-projects/*.sdf
-projects/*.opensdf
-projects/*.vcproj.*.user
-projects/*.vcxproj.user
-src/rev.cpp
-src/os/windows/ottdres.rc
--- a/12
+++ b/12
@@ -0,0 +1,12 @@
+/* $Id$ */
+
+KNOWN BUGS / PROBLEMS:
+
+bridges:
+- Clearing tiles which may not have a bridge above can cause random bridge pieces to appear, which leads to crash in the long run
+
+electrified rails:
+Normal and elrail depots look the same. Use 'X' (transparent buildings)
+   to distinguish between them
+Missing curors / icons for construction (currently using the conventional ones)
+
--- a/23
+++ b/23
@@ -1,14 +1,7 @@
-# $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/>.
-
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = OpenTTD
+PROJECT_NAME           = openttd
 OUTPUT_DIRECTORY       = docs/source/
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
@@ -33,6 +26,7 @@ STRIP_FROM_INC_PATH    =
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
 MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
 INHERIT_DOCS           = YES
 DISTRIBUTE_GROUP_DOC   = NO
 TAB_SIZE               = 2
@@ -82,18 +76,19 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = ./src/
+INPUT                  = ./
 FILE_PATTERNS          = *.c \
                         *.cc \
                         *.cxx \
                         *.cpp \
                         *.c++ \
                         *.h \
-                         *.hpp
+                         *.hpp \
+                         table/*.h
 RECURSIVE              = YES
 EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = */3rdparty */.svn
+EXCLUDE_PATTERNS       =
 EXAMPLE_PATH           =
 EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = NO
@@ -163,7 +158,7 @@ RTF_EXTENSIONS_FILE    =
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
-GENERATE_MAN           = NO
+GENERATE_MAN           = YES
 MAN_OUTPUT             = man
 MAN_EXTENSION          = .3
 MAN_LINKS              = NO
@@ -195,8 +190,8 @@ EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           =
 INCLUDE_FILE_PATTERNS  =
-PREDEFINED             = ENABLE_NETWORK ENABLE_AI WITH_ZLIB WITH_LZO WITH_PNG WITH_FONTCONFIG WITH_FREETYPE WITH_ICU UNICODE _UNICODE
-EXPAND_AS_DEFINED      =
+PREDEFINED             =
+EXPAND_AS_DEFINED      = DEF_COMMAND
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
@@ -1,224 +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/>.
-
-#
-# Creation of bundles
-#
-
-# The revision is needed for the bundle name and creating an OSX application bundle.
-ifdef REVISION
-REV := $(REVISION)
-else
-# Detect the revision
-VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh")
-REV      := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
-endif
-
-# Make sure we have something in REV
-ifeq ($(REV),)
-REV := norev000
-endif
-
-ifndef BUNDLE_NAME
-BUNDLE_NAME = openttd-custom-$(REV)-$(OS)
-endif
-
-# An OSX application bundle needs the data files, lang files and openttd executable in a different location.
-ifdef OSXAPP
-AI_DIR   = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/ai
-DATA_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/data
-LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
-GM_DIR   = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/gm
-TTD_DIR  = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
-else
-AI_DIR   = $(BUNDLE_DIR)/ai
-DATA_DIR = $(BUNDLE_DIR)/data
-LANG_DIR = $(BUNDLE_DIR)/lang
-GM_DIR   = $(BUNDLE_DIR)/gm
-TTD_DIR  = $(BUNDLE_DIR)
-endif
-
-bundle: all
-	@echo '[BUNDLE] Constructing bundle'
-	$(Q)rm -rf   "$(BUNDLE_DIR)"
-	$(Q)mkdir -p "$(BUNDLE_DIR)"
-	$(Q)mkdir -p "$(BUNDLE_DIR)/docs"
-	$(Q)mkdir -p "$(BUNDLE_DIR)/media"
-	$(Q)mkdir -p "$(BUNDLE_DIR)/scripts"
-	$(Q)mkdir -p "$(TTD_DIR)"
-	$(Q)mkdir -p "$(AI_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"                   "$(DATA_DIR)"
-endif
-	$(Q)cp "$(BIN_DIR)/$(TTD)"                "$(TTD_DIR)/"
-	$(Q)cp "$(BIN_DIR)/ai/"compat_*.nut       "$(AI_DIR)/"
-	$(Q)cp "$(BIN_DIR)/data/"*.grf            "$(DATA_DIR)/"
-	$(Q)cp "$(BIN_DIR)/data/"*.obg            "$(DATA_DIR)/"
-	$(Q)cp "$(BIN_DIR)/data/"*.obs            "$(DATA_DIR)/"
-	$(Q)cp "$(BIN_DIR)/data/opntitle.dat"     "$(DATA_DIR)/"
-	$(Q)cp "$(BIN_DIR)/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)/"
-ifdef MAN_DIR
-	$(Q)mkdir -p "$(BUNDLE_DIR)/man/"
-	$(Q)cp "$(ROOT_DIR)/docs/openttd.6"       "$(BUNDLE_DIR)/man/"
-	$(Q)gzip -9 "$(BUNDLE_DIR)/man/openttd.6"
-endif
-	$(Q)cp "$(ROOT_DIR)/media/openttd.32.xpm" "$(BUNDLE_DIR)/media/"
-	$(Q)cp "$(ROOT_DIR)/media/openttd."*.png  "$(BUNDLE_DIR)/media/"
-	$(Q)cp "$(BIN_DIR)/scripts/"*             "$(BUNDLE_DIR)/scripts/"
-ifdef MENU_DIR
-	$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
-	$(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | $(SORT) >> "$(BUNDLE_DIR)/media/openttd.desktop"
-	$(Q)sed s/=openttd/=$(BINARY_NAME)/g "$(BUNDLE_DIR)/media/openttd.desktop" > "$(ROOT_DIR)/media/openttd.desktop.install"
-endif
-ifeq ($(TTD), openttd.exe)
-	$(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/readme.txt" "$(BUNDLE_DIR)/COPYING" "$(BUNDLE_DIR)/changelog.txt" "$(BUNDLE_DIR)/known-bugs.txt"
-ifeq ($(OS), DOS)
-	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi.txt"   "$(BUNDLE_DIR)/docs/"
-ifndef STRIP
-	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi.exe"   "$(TTD_DIR)/"
-endif
-endif
-endif
-
-### Packing the current bundle into several compressed file formats ###
-#
-# Zips & dmgs do not contain a root folder, i.e. they have files in the root of the zip/dmg.
-# gzip, bzip2 and lha archives have a root folder, with the same name as the bundle.
-#
-# One can supply a custom name by adding BUNDLE_NAME:=<name> to the make command.
-#
-bundle_zip: bundle
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).zip'
-	$(Q)mkdir -p "$(BUNDLES_DIR)"
-	$(Q)cd "$(BUNDLE_DIR)" && zip -r $(shell if test -z "$(VERBOSE)"; then echo '-q'; fi) "$(BUNDLES_DIR)/$(BUNDLE_NAME).zip" .
-
-bundle_7z: bundle
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).7z'
-	$(Q)mkdir -p "$(BUNDLES_DIR)"
-	$(Q)cd "$(BUNDLE_DIR)" && 7z a "$(BUNDLES_DIR)/$(BUNDLE_NAME).7z" .
-
-bundle_gzip: bundle
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).tar.gz'
-	$(Q)mkdir -p "$(BUNDLES_DIR)/.gzip/$(BUNDLE_NAME)"
-	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.gzip/$(BUNDLE_NAME)/"
-	$(Q)cd "$(BUNDLES_DIR)/.gzip" && tar -zc$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.gz" "$(BUNDLE_NAME)"
-	$(Q)rm -rf   "$(BUNDLES_DIR)/.gzip"
-
-bundle_bzip2: bundle
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).tar.bz2'
-	$(Q)mkdir -p "$(BUNDLES_DIR)/.bzip2/$(BUNDLE_NAME)"
-	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.bzip2/$(BUNDLE_NAME)/"
-	$(Q)cd "$(BUNDLES_DIR)/.bzip2" && tar -jc$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.bz2" "$(BUNDLE_NAME)"
-	$(Q)rm -rf   "$(BUNDLES_DIR)/.bzip2"
-
-bundle_lzma: bundle
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).tar.lzma'
-	$(Q)mkdir -p "$(BUNDLES_DIR)/.lzma/$(BUNDLE_NAME)"
-	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.lzma/$(BUNDLE_NAME)/"
-	$(Q)cd "$(BUNDLES_DIR)/.lzma" && tar --lzma -c$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.lzma" "$(BUNDLE_NAME)"
-	$(Q)rm -rf   "$(BUNDLES_DIR)/.lzma"
-
-bundle_xz: bundle
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).tar.xz'
-	$(Q)mkdir -p "$(BUNDLES_DIR)/.xz/$(BUNDLE_NAME)"
-	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.xz/$(BUNDLE_NAME)/"
-	$(Q)cd "$(BUNDLES_DIR)/.xz" && tar --xz -c$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.xz" "$(BUNDLE_NAME)"
-	$(Q)rm -rf   "$(BUNDLES_DIR)/.xz"
-
-bundle_lha: bundle
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).lha'
-	$(Q)mkdir -p "$(BUNDLES_DIR)/.lha/$(BUNDLE_NAME)"
-	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.lha/$(BUNDLE_NAME)/"
-	$(Q)cd "$(BUNDLES_DIR)/.lha" && lha ao6 "$(BUNDLES_DIR)/$(BUNDLE_NAME).lha" "$(BUNDLE_NAME)"
-	$(Q)rm -rf   "$(BUNDLES_DIR)/.lha"
-
-bundle_dmg: bundle
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).dmg'
-	$(Q)mkdir -p "$(BUNDLES_DIR)/OpenTTD $(REV)"
-	$(Q)cp -R "$(BUNDLE_DIR)/" "$(BUNDLES_DIR)/OpenTTD $(REV)"
-	$(Q)hdiutil create -ov -format UDZO -srcfolder "$(BUNDLES_DIR)/OpenTTD $(REV)" "$(BUNDLES_DIR)/$(BUNDLE_NAME).dmg"
-	$(Q)rm -fr "$(BUNDLES_DIR)/OpenTTD $(REV)"
-
-bundle_exe: all
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).exe'
-	$(Q)mkdir -p "$(BUNDLES_DIR)"
-	$(Q)unix2dos "$(ROOT_DIR)/docs/"*.txt "$(ROOT_DIR)/readme.txt" "$(ROOT_DIR)/COPYING" "$(ROOT_DIR)/changelog.txt" "$(ROOT_DIR)/known-bugs.txt"
-	$(Q)cd $(ROOT_DIR)/os/windows/installer && makensis.exe //DVERSION_INCLUDE=version_$(PLATFORM).txt install.nsi
-	$(Q)mv $(ROOT_DIR)/os/windows/installer/*$(PLATFORM).exe "$(BUNDLES_DIR)/$(BUNDLE_NAME).exe"
-
-ifdef OSXAPP
-install:
-	@echo '[INSTALL] Cannot install the OSX Application Bundle'
-else
-install: bundle
-	@echo '[INSTALL] Installing OpenTTD'
-	$(Q)install -d "$(INSTALL_BINARY_DIR)"
-	$(Q)install -d "$(INSTALL_ICON_DIR)"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/gm"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/ai"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/data"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/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
-	$(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)/${BINARY_NAME}"
-endif
-	$(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/ai/"* "$(INSTALL_DATA_DIR)/ai"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/data/"* "$(INSTALL_DATA_DIR)/data"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/gm/"* "$(INSTALL_DATA_DIR)/gm"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/scripts/"* "$(INSTALL_DATA_DIR)/scripts"
-	$(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)"
-	$(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)"
-	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/16x16/apps"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.16.png" "$(INSTALL_ICON_THEME_DIR)/16x16/apps/${BINARY_NAME}.png"
-	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/32x32/apps"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.32.png" "$(INSTALL_ICON_THEME_DIR)/32x32/apps/${BINARY_NAME}.png"
-	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/48x48/apps"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.48.png" "$(INSTALL_ICON_THEME_DIR)/48x48/apps/${BINARY_NAME}.png"
-	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/64x64/apps"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.64.png" "$(INSTALL_ICON_THEME_DIR)/64x64/apps/${BINARY_NAME}.png"
-	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/128x128/apps"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.128.png" "$(INSTALL_ICON_THEME_DIR)/128x128/apps/${BINARY_NAME}.png"
-	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/256x256/apps"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.256.png" "$(INSTALL_ICON_THEME_DIR)/256x256/apps/${BINARY_NAME}.png"
-else
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/"*.png "$(INSTALL_ICON_DIR)"
-endif
-ifdef MAN_DIR
-	$(Q)install -d "$(INSTALL_MAN_DIR)"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/man/openttd.6.gz" "$(INSTALL_MAN_DIR)/${BINARY_NAME}.6.gz"
-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"
-endif
-endif # OSXAPP
--- a/Makefile.grf.in
+++ b/Makefile.grf.in
@@ -1,94 +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/>.
-#
-# Building requires GRFCodec and NFORenum. Older versions of GRFCodec are
-#  known to miscompile the graphics.
-#
-# Recent nightlies (including sources) of both can be found at:
-#  http://www.openttd.org/download-grfcodec
-#  http://www.openttd.org/download-nforenum
-#
-# The mercurial repository of both can be found at:
-#  http://hg.openttdcoop.org/grfcodec
-#  http://hg.openttdcoop.org/nforenum
-#
-
-
-ROOT_DIR = !!ROOT_DIR!!
-GRF_DIR  = $(ROOT_DIR)/media/extra_grf
-BIN_DIR  = !!BIN_DIR!!/data
-OBJS_DIR = !!GRF_OBJS_DIR!!
-OS       = !!OS!!
-STAGE    = !!STAGE!!
-
-# Check if we want to show what we are doing
-ifdef VERBOSE
-	Q =
-	E = @true
-else
-	Q = @
-	E = @echo
-endif
-
-# Some configurational settings for your environment.
-# If GRFCodec doesn't know a command, it'll exit with a non-zero exit code.
-GRFCODEC := $(shell grfcodec -s -v >/dev/null 2>/dev/null && echo "grfcodec -s" || echo "grfcodec")
-# Old NFORenums don't give an error code when a parameter isn't known, so we have to work around that.
-NFORENUM := $(shell [ `nforenum -s -v 2>/dev/null | wc -l ` -eq 1 ] && echo "nforenum -s" || echo "nforenum")
-MD5SUM   := $(shell [ "$(OS)" = "OSX" ] && echo "md5 -r" || echo "md5sum")
-
-# Some "should not be changed" settings.
-NFO_FILES    := $(GRF_DIR)/*.nfo
-PCX_FILES    := $(GRF_DIR)/*.pcx
-
-# Build the GRF.
-all: $(BIN_DIR)/openttdd.grf $(BIN_DIR)/openttdw.grf
-
-# Make sure the sprites directory exists.
-$(OBJS_DIR)/sprites:
-	$(Q)-mkdir "$@"
-
-$(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)/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:
-	$(Q)rm -f *.bak *.grf
-
-# Clean up temporary files
-mrproper: clean
-	$(Q)rm -fr sprites
-
-.PHONY: all mrproper depend clean
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,4 @@
-# $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/>.
+# Auto-generated file -- DO NOT EDIT

 # Check if we want to show what we are doing
 ifdef VERBOSE
@@ -14,47 +9,36 @@ endif

 include Makefile.am

-CONFIG_CACHE_PWD         = !!CONFIG_CACHE_PWD!!
+SOURCE_LIST = !!SOURCE_LIST!!
 CONFIG_CACHE_SOURCE_LIST = !!CONFIG_CACHE_SOURCE_LIST!!
-BIN_DIR        = !!BIN_DIR!!
-ICON_THEME_DIR = !!ICON_THEME_DIR!!
-MAN_DIR        = !!MAN_DIR!!
-MENU_DIR       = !!MENU_DIR!!
-SRC_DIR        = !!SRC_DIR!!
-ROOT_DIR       = !!ROOT_DIR!!
-BUNDLE_DIR     = "$(ROOT_DIR)/bundle"
-BUNDLES_DIR    = "$(ROOT_DIR)/bundles"
-INSTALL_DIR    = !!INSTALL_DIR!!
-INSTALL_BINARY_DIR     = "$(INSTALL_DIR)/"!!BINARY_DIR!!
-INSTALL_MAN_DIR        = "$(INSTALL_DIR)/$(MAN_DIR)"
-INSTALL_MENU_DIR       = "$(INSTALL_DIR)/$(MENU_DIR)"
-INSTALL_ICON_DIR       = "$(INSTALL_DIR)/"!!ICON_DIR!!
-INSTALL_ICON_THEME_DIR = "$(INSTALL_DIR)/$(ICON_THEME_DIR)"
-INSTALL_DATA_DIR       = "$(INSTALL_DIR)/"!!DATA_DIR!!
-INSTALL_DOC_DIR        = "$(INSTALL_DIR)/"!!DOC_DIR!!
-SOURCE_LIST     = !!SOURCE_LIST!!
 CONFIGURE_FILES = !!CONFIGURE_FILES!!
-BINARY_NAME = !!BINARY_NAME!!
-STRIP       = !!STRIP!!
-TTD         = !!TTD!!
-TTDS        = $(SRC_DIRS:%=%/$(TTD))
-OS          = !!OS!!
-OSXAPP      = !!OSXAPP!!
-LIPO        = !!LIPO!!
-REVISION    = !!REVISION!!
-AWK         = !!AWK!!
-SORT        = !!SORT!!
-DISTCC      = !!DISTCC!!
+LIPO = !!LIPO!!
+BIN_DIR = !!BIN_DIR!!
+SRC_DIR = !!SRC_DIR!!
+ROOT_DIR = !!ROOT_DIR!!
+BUNDLE_DIR = "$(ROOT_DIR)/bundle"
+BUNDLES_DIR = "$(ROOT_DIR)/bundles"
+INSTALL_DIR = !!INSTALL_DIR!!
+INSTALL_BINARY_DIR = "$(INSTALL_DIR)/"!!BINARY_DIR!!
+INSTALL_ICON_DIR = "$(INSTALL_DIR)/"!!ICON_DIR!!
+INSTALL_DATA_DIR = "$(INSTALL_DIR)/"!!DATA_DIR!!
+INSTALL_PERSONAL_DIR = !!PERSONAL_DIR!!
+TTD = !!TTD!!
+TTDS = $(SRC_DIRS:%=%/$(TTD))
+OS = !!OS!!
+OSXAPP = !!OSXAPP!!
+REVISION = !!REVISION!!
+AWK = !!AWK!!
+DISTCC = !!DISTCC!!

-RES := $(shell if [ ! -f $(CONFIG_CACHE_PWD) ] || [ "`pwd`" != "`cat $(CONFIG_CACHE_PWD)`" ]; then echo "`pwd`" > $(CONFIG_CACHE_PWD); fi )
-RES := $(shell if [ ! -f $(CONFIG_CACHE_SOURCE_LIST) ] || [ -n "`cmp $(CONFIG_CACHE_SOURCE_LIST) $(SOURCE_LIST) 2>/dev/null`" ]; then cp $(SOURCE_LIST) $(CONFIG_CACHE_SOURCE_LIST); fi )
+RES := $(shell if ! [ -f $(CONFIG_CACHE_SOURCE_LIST) ] || [ -n "`cmp $(CONFIG_CACHE_SOURCE_LIST) $(SOURCE_LIST)`" ]; then cp $(SOURCE_LIST) $(CONFIG_CACHE_SOURCE_LIST); fi )

-all: config.pwd config.cache
+all: config.cache
 ifdef DISTCC
 	@if [ -z "`echo '$(MFLAGS)' | grep '\-j'`" ]; then echo; echo "WARNING: you enabled distcc support, but you don't seem to be using the -jN paramter"; echo; fi
 endif
 	@for dir in $(DIRS); do \
-		$(MAKE) -C $$dir all || exit 1; \
+		$(MAKE) -C $$dir all; \
 	done
 ifdef LIPO
 # Lipo is an OSX thing. If it is defined, it means we are building for universal,
@@ -88,22 +72,16 @@ help:
 	@echo "  bundle_lha    create the lha installation bundle"
 	@echo "  bundle_dmg    create the dmg installation bundle"

-config.pwd: $(CONFIG_CACHE_PWD)
-	$(MAKE) reconfigure
-
 config.cache: $(CONFIG_CACHE_SOURCE_LIST) $(CONFIGURE_FILES)
-	$(MAKE) reconfigure
-
-reconfigure:
 ifeq ($(shell if test -f config.cache; then echo 1; fi), 1)
 	@echo "----------------"
 	@echo "The system detected that source.list or any configure file is altered."
 	@echo " Going to reconfigure with last known settings..."
 	@echo "----------------"
 # Make sure we don't lock config.cache
-	@$(shell cat config.cache | sed 's@\\ @\\\\ @g') || exit 1
+	@$(shell cat config.cache) || exit 1
 	@echo "----------------"
-	@echo "Reconfig done. Please re-execute make."
+	@echo "Reconfig done. Now compiling..."
 	@echo "----------------"
 else
 	@echo "----------------"
@@ -129,26 +107,10 @@ mrproper:
 		rm -f $$dir/Makefile; \
 	done
 	$(Q)rm -rf objs
-	$(Q)rm -f Makefile Makefile.am Makefile.bundle
-	$(Q)rm -f media/openttd.desktop media/openttd.desktop.install
-	$(Q)rm -f $(CONFIG_CACHE_SOURCE_LIST) config.cache config.pwd config.log $(CONFIG_CACHE_PWD)
-# directories for bundle generation
+	$(Q)rm -f Makefile Makefile.am
+	$(Q)rm -f $(CONFIG_CACHE_SOURCE_LIST) config.cache config.log
 	$(Q)rm -rf $(BUNDLE_DIR)
 	$(Q)rm -rf $(BUNDLES_DIR)
-# output of profiling
-	$(Q)rm -f $(BIN_DIR)/gmon.out
-# output of generating 'API' documentation
-	$(Q)rm -f $(ROOT_DIR)/openttd.tag
-	$(Q)rm -rf $(ROOT_DIR)/docs/source
-# output of generating AI API documentation
-	$(Q)rm -f $(SRC_DIR)/ai/api/openttd.tag
-	$(Q)rm -rf $(ROOT_DIR)/docs/aidocs
-# directories created by OpenTTD on regression testing
-	$(Q)rm -rf $(BIN_DIR)/ai/regression/content_download $(BIN_DIR)/ai/regression/save $(BIN_DIR)/ai/regression/scenario
-distclean: mrproper
-
-maintainer-clean: distclean
-	$(Q)rm -f $(BIN_DIR)/data/openttdd.grf $(BIN_DIR)/data/openttdw.grf

 depend:
 	@for dir in $(SRC_DIRS); do \
@@ -164,10 +126,6 @@ run-gdb: all
 run-prof: all
 	$(Q)cd !!BIN_DIR!! && ./!!TTD!! $(OPENTTD_ARGS) && gprof !!TTD!! | less

-regression: all
-	$(Q)cd !!BIN_DIR!! && sh ai/regression/run.sh
-test: regression
-
 %.o:
 	@for dir in $(SRC_DIRS); do \
 		$(MAKE) -C $$dir $(@:src/%=%); \
@@ -178,6 +136,145 @@ test: regression
 		$(MAKE) -C $$dir $@; \
 	done

-.PHONY: test distclean mrproper clean
+#
+# Creation of bundles
+#

-include Makefile.bundle
+# The revision is needed for the bundle name and creating an OSX application bundle.
+ifdef REVISION
+REV := $(REVISION)
+else
+# Are we a SVN dir?
+ifeq ($(shell if test -d $(SRC_DIR)/.svn; then echo 1; fi), 1)
+# Find if the local source if modified
+REV_MODIFIED := $(shell svnversion $(SRC_DIR) | sed -n 's/.*\(M\).*/\1/p' )
+# Find the revision like: rXXXX-branch
+REV := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^URL:.*branches/ { split($$2, a, "/"); BRANCH="-"a[5] } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }')
+endif
+endif
+# Make sure we have something in REV
+ifeq ($(REV),)
+REV := norev000
+endif
+
+ifndef BUNDLE_NAME
+BUNDLE_NAME = OTTD-$(OS)-custom-$(REV)
+endif
+
+# An OSX application bundle needs the data files, lang files and openttd executable in a different location.
+ifdef OSXAPP
+DATA_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/data
+LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
+TTD_DIR  = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
+else
+DATA_DIR = $(BUNDLE_DIR)/data
+LANG_DIR = $(BUNDLE_DIR)/lang
+TTD_DIR  = $(BUNDLE_DIR)
+endif
+
+bundle: all
+	@echo '[BUNDLE] Constructing bundle'
+	$(Q)rm -rf   "${BUNDLE_DIR}"
+	$(Q)mkdir -p "${BUNDLE_DIR}"
+	$(Q)mkdir -p "$(BUNDLE_DIR)/docs"
+	$(Q)mkdir -p "$(BUNDLE_DIR)/scenario"
+	$(Q)mkdir -p "$(BUNDLE_DIR)/scenario/heightmap"
+	$(Q)mkdir -p "$(BUNDLE_DIR)/media"
+	$(Q)mkdir -p "$(TTD_DIR)"
+	$(Q)mkdir -p "$(DATA_DIR)"
+	$(Q)mkdir -p "$(LANG_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)/docs/OSX_install_instructions.txt"      "$(BUNDLE_DIR)/docs/"
+	$(Q)cp    "$(ROOT_DIR)/os/macosx/splash.png"                   "$(DATA_DIR)"
+endif
+	$(Q)cp "$(BIN_DIR)/$(TTD)"                "$(TTD_DIR)/"
+	$(Q)cp "$(BIN_DIR)/data/"*.grf            "$(DATA_DIR)/"
+	$(Q)cp "$(BIN_DIR)/data/opntitle.dat"     "$(DATA_DIR)/"
+	$(Q)cp "$(BIN_DIR)/lang/"*.lng            "$(LANG_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)/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)/docs/"
+	$(Q)cp "$(ROOT_DIR)/media/openttd.64.png" "$(BUNDLE_DIR)/media/"
+	$(Q)cp "$(ROOT_DIR)/media/openttd.32.xpm" "$(BUNDLE_DIR)/media/"
+	$(Q)cp "$(ROOT_DIR)/media/openttd.32.bmp" "$(BUNDLE_DIR)/media/"
+ifeq ($(shell if test -n "`ls -l \"$(BIN_DIR)/scenario/\"*.scn 2> /dev/null`"; then echo 1; fi), 1)
+	$(Q)cp "$(BIN_DIR)/scenario/"*.scn        "$(BUNDLE_DIR)/scenario/"
+endif
+ifeq ($(shell if test -n "`ls -l \"$(BIN_DIR)/scenario/heightmaps/\"* 2>/dev/null`"; then echo 1; fi), 1)
+	$(Q)cp "$(BIN_DIR)/scenario/heightmaps/"* "$(BUNDLE_DIR)/scenario/heightmap/"
+endif
+ifeq ($(TTD), openttd.exe)
+	$(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/readme.txt" "$(BUNDLE_DIR)/COPYING"
+endif
+
+### Packing the current bundle into several compressed file formats ###
+#
+# Zips & dmgs do not contain a root folder, i.e. they have files in the root of the zip/dmg.
+# gzip, bzip2 and lha archives have a root folder, with the same name as the bundle.
+#
+# One can supply a custom name by adding BUNDLE_NAME:=<name> to the make command.
+#
+bundle_zip: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).zip'
+	$(Q)mkdir -p "$(BUNDLES_DIR)"
+	$(Q)cd "$(BUNDLE_DIR)" && zip -r $(shell if test -z "$(VERBOSE)"; then echo '-q'; fi) "$(BUNDLES_DIR)/$(BUNDLE_NAME).zip" .
+
+bundle_gzip: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).tar.gz'
+	$(Q)mkdir -p "$(BUNDLES_DIR)/.gzip/$(BUNDLE_NAME)"
+	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.gzip/$(BUNDLE_NAME)/"
+	$(Q)cd "$(BUNDLES_DIR)/.gzip" && tar -zc$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.gz" "$(BUNDLE_NAME)"
+	$(Q)rm -rf   "$(BUNDLES_DIR)/.gzip"
+
+bundle_bzip2: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).tar.bz2'
+	$(Q)mkdir -p "$(BUNDLES_DIR)/.bzip2/$(BUNDLE_NAME)"
+	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.bzip2/$(BUNDLE_NAME)/"
+	$(Q)cd "$(BUNDLES_DIR)/.bzip2" && tar -jc$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.bz2" "$(BUNDLE_NAME)"
+	$(Q)rm -rf   "$(BUNDLES_DIR)/.bzip2"
+
+bundle_lha: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).lha'
+	$(Q)mkdir -p "$(BUNDLES_DIR)/.lha/$(BUNDLE_NAME)"
+	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.lha/$(BUNDLE_NAME)/"
+	$(Q)cd "$(BUNDLES_DIR)/.lha" && lha ao6 "$(BUNDLES_DIR)/$(BUNDLE_NAME).lha" "$(BUNDLE_NAME)"
+	$(Q)rm -rf   "$(BUNDLES_DIR)/.lha"
+
+bundle_dmg: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).dmg'
+	$(Q)mkdir -p "$(BUNDLES_DIR)/OpenTTD $(REV)"
+	$(Q)cp -R "$(BUNDLE_DIR)/" "$(BUNDLES_DIR)/OpenTTD $(REV)"
+	$(Q)hdiutil create -ov -format UDZO -srcfolder "$(BUNDLES_DIR)/OpenTTD $(REV)" "$(BUNDLES_DIR)/$(BUNDLE_NAME).dmg"
+	$(Q)rm -fr "$(BUNDLES_DIR)/OpenTTD $(REV)"
+
+ifdef OSXAPP
+install:
+	@echo '[INSTALL] Cannot install the OSX Application Bundle'
+else
+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)/data"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/lang"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/docs"
+	$(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/data/"* "$(INSTALL_DATA_DIR)/data"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(INSTALL_DATA_DIR)/docs"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/media/"* "$(INSTALL_ICON_DIR)"
+ifdef INSTALL_PERSONAL_DIR
+	$(Q)mkdir -p ~/"$(INSTALL_PERSONAL_DIR)"
+	$(Q)cp -R "$(BUNDLE_DIR)/scenario" ~/"$(INSTALL_PERSONAL_DIR)"
+else
+	$(Q)cp -R "$(BUNDLE_DIR)/scenario" "$(INSTALL_DATA_DIR)"
+endif # INSTALL_PERSONAL_DIR
+endif # OSXAPP
--- a/Makefile.lang.in
+++ b/Makefile.lang.in
@@ -1,30 +1,24 @@
-# $Id$
+# Auto-generated file -- DO NOT EDIT

-# 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/>.
-
-STRGEN        = !!STRGEN!!
-ENDIAN_CHECK  = !!ENDIAN_CHECK!!
-SRC_DIR       = !!SRC_DIR!!
-LANG_DIR      = !!LANG_DIR!!
-BIN_DIR       = !!BIN_DIR!!
-LANGS_SRC     = $(shell ls $(LANG_DIR)/*.txt)
-LANGS         = $(LANGS_SRC:$(LANG_DIR)/%.txt=%.lng)
-CXX_BUILD     = !!CXX_BUILD!!
-CFLAGS_BUILD  = !!CFLAGS_BUILD!!
-LDFLAGS_BUILD = !!LDFLAGS_BUILD!!
-STRGEN_FLAGS  = !!STRGEN_FLAGS!!
-STAGE         = !!STAGE!!
-LANG_SUPPRESS = !!LANG_SUPPRESS!!
-LANG_OBJS_DIR = !!LANG_OBJS_DIR!!
+STRGEN       = !!STRGEN!!
+ENDIAN_CHECK = !!ENDIAN_CHECK!!
+SRC_DIR      = !!SRC_DIR!!
+LANG_DIR     = !!LANG_DIR!!
+BIN_DIR      = !!BIN_DIR!!
+LANGS_SRC    = $(shell ls $(LANG_DIR)/*.txt)
+LANGS        = $(LANGS_SRC:$(LANG_DIR)/%.txt=%.lng)
+CXX_BUILD    = !!CXX_BUILD!!
+CFLAGS_BUILD = !!CFLAGS_BUILD!!
+STRGEN_FLAGS = !!STRGEN_FLAGS!!
+STAGE        = !!STAGE!!
+LANG_SUPPRESS= !!LANG_SUPPRESS!!
+LANG_OBJS_DIR= !!LANG_OBJS_DIR!!

 ifeq ($(LANG_SUPPRESS), yes)
 LANG_ERRORS = >/dev/null 2>&1
 endif

-# Make sure endian_host.h is reachable as if it was in the src/ dir
+# Make sure endian_host.h is reasable as if it was in the src/ dir
 CFLAGS_BUILD += -I $(LANG_OBJS_DIR)

 ENDIAN_TARGETS := endian_host.h endian_target.h $(ENDIAN_CHECK)
@@ -42,7 +36,7 @@ RES := $(shell mkdir -p $(BIN_DIR)/lang )

 all: table/strings.h $(LANGS)

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

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

-alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<
-
 lang/english.txt: $(LANG_DIR)/english.txt
 	$(Q)mkdir -p lang
 	$(Q)cp $(LANG_DIR)/english.txt lang/english.txt

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

 table/strings.h: lang/english.txt $(STRGEN)
 	$(E) '$(STAGE) Generating $@'
@@ -88,7 +78,6 @@ clean:
 	$(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

 %.lng:
 	@echo '$(STAGE) No such language: $(@:%.lng=%)'
--- a/Makefile.msvc
+++ b/Makefile.msvc
@@ -1,35 +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/>.
-
-#
-# Makefile for creating bundles of MSVC's binaries in the same way as we make
-# the zip bundles for ALL other OSes.
-#
-# Usage: make -f Makefile.msvc PLATFORM=[Win32|x64] BUNDLE_NAME=openttd-<version>-win[32|64]
-#   or   make -f Makefile.msvc PLATFORM=[Win32|x64] BUNDLE_NAME=OTTD-win[32|64]-nightly-<revision>
-#
-
-# Check if we want to show what we are doing
-ifdef VERBOSE
-	Q =
-else
-	Q = @
-endif
-
-AWK         = "awk"
-ROOT_DIR   := $(shell pwd)
-BIN_DIR     = "$(ROOT_DIR)/bin"
-SRC_DIR     = "$(ROOT_DIR)/src"
-BUNDLE_DIR  = "$(ROOT_DIR)/bundle"
-BUNDLES_DIR = "$(ROOT_DIR)/bundles"
-TTD         = openttd.exe
-TARGET     := $(shell echo $(PLATFORM) | sed "s@win64@x64@;s@win32@Win32@")
-
-all:
-	$(Q)cp objs/$(TARGET)/Release/$(TTD) $(BIN_DIR)/$(TTD)
-
-include Makefile.bundle.in
--- a/Makefile.src.in
+++ b/Makefile.src.in
@@ -1,43 +1,34 @@
-# $Id$
+# Auto-generated file -- DO NOT EDIT

-# 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/>.
-
-CC_HOST        = !!CC_HOST!!
-CXX_HOST       = !!CXX_HOST!!
-CC_BUILD       = !!CC_BUILD!!
-CXX_BUILD      = !!CXX_BUILD!!
-WINDRES        = !!WINDRES!!
-STRIP          = !!STRIP!!
-CFLAGS         = !!CFLAGS!!
-CFLAGS_BUILD   = !!CFLAGS_BUILD!!
-CXXFLAGS       = !!CXXFLAGS!!
-CXXFLAGS_BUILD = !!CXXFLAGS_BUILD!!
-LIBS           = !!LIBS!!
-LDFLAGS        = !!LDFLAGS!!
-LDFLAGS_BUILD  = !!LDFLAGS_BUILD!!
-ROOT_DIR       = !!ROOT_DIR!!
-BIN_DIR        = !!BIN_DIR!!
-LANG_DIR       = !!LANG_DIR!!
-SRC_OBJS_DIR   = !!SRC_OBJS_DIR!!
-LANG_OBJS_DIR  = !!LANG_OBJS_DIR!!
-SRC_DIR        = !!SRC_DIR!!
-SCRIPT_SRC_DIR = !!SCRIPT_SRC_DIR!!
-MEDIA_DIR      = !!MEDIA_DIR!!
-TTD            = !!TTD!!
-STRGEN         = !!STRGEN!!
-ENDIAN_CHECK   = !!ENDIAN_CHECK!!
-DEPEND         = !!DEPEND!!
-ENDIAN_FORCE   = !!ENDIAN_FORCE!!
-OS             = !!OS!!
-STAGE          = !!STAGE!!
-MAKEDEPEND     = !!MAKEDEPEND!!
-CFLAGS_MAKEDEP = !!CFLAGS_MAKEDEP!!
-SORT           = !!SORT!!
-REVISION       = !!REVISION!!
-AWK            = !!AWK!!
+CC_HOST      = !!CC_HOST!!
+CXX_HOST     = !!CXX_HOST!!
+CC_BUILD     = !!CC_BUILD!!
+CXX_BUILD    = !!CXX_BUILD!!
+WINDRES      = !!WINDRES!!
+STRIP        = !!STRIP!!
+CC_CFLAGS    = !!CC_CFLAGS!!
+CFLAGS       = !!CFLAGS!!
+CFLAGS_BUILD = !!CFLAGS_BUILD!!
+LIBS         = !!LIBS!!
+LDFLAGS      = !!LDFLAGS!!
+BIN_DIR      = !!BIN_DIR!!
+LANG_DIR     = !!LANG_DIR!!
+SRC_OBJS_DIR = !!SRC_OBJS_DIR!!
+LANG_OBJS_DIR= !!LANG_OBJS_DIR!!
+SRC_DIR      = !!SRC_DIR!!
+MEDIA_DIR    = !!MEDIA_DIR!!
+TTD          = !!TTD!!
+STRGEN       = !!STRGEN!!
+ENDIAN_CHECK = !!ENDIAN_CHECK!!
+ENDIAN_FORCE = !!ENDIAN_FORCE!!
+OS           = !!OS!!
+STAGE        = !!STAGE!!
+MAKEDEPEND   = !!MAKEDEPEND!!
+CFLAGS_MAKEDEP= !!CFLAGS_MAKEDEP!!
+SORT         = !!SORT!!
+REVISION     = !!REVISION!!
+AWK          = !!AWK!!
+GCC295       = !!GCC295!!
 CONFIG_CACHE_COMPILER = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_COMPILER!!
 CONFIG_CACHE_LINKER   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_LINKER!!
 CONFIG_CACHE_ENDIAN   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_ENDIAN!!
@@ -52,19 +43,29 @@ OBJS     := $(OBJS_C) $(OBJS_CPP) $(OBJS_MM) $(OBJS_RC)
 SRCS     := !!SRCS!!

 # All C-files depend on those 3 files
-FILE_DEP := $(CONFIG_CACHE_COMPILER) endian_target.h
+FILE_DEP := $(CONFIG_CACHE_COMPILER) $(LANG_OBJS_DIR)/table/strings.h endian_target.h
 # Create all dirs and subdirs
 RES      := $(shell mkdir -p $(BIN_DIR) $(sort $(dir $(OBJS))))

 # Make sure endian_target.h is reasable as if it was in the src/ dir
 CFLAGS += -I $(SRC_OBJS_DIR) -I $(LANG_OBJS_DIR)
-CFLAGS_MAKEDEP += -I $(SRC_OBJS_DIR) -I $(LANG_OBJS_DIR)
-ifdef SCRIPT_SRC_DIR
-	CFLAGS_MAKEDEP += -I $(SCRIPT_SRC_DIR)
-endif

 ENDIAN_TARGETS := endian_target.h $(ENDIAN_CHECK)

+# This 'sed' basicly just removes 'const' from the line if it is a 2+D array
+# For more information, please check:
+#  http://maillist.openttd.org/pipermail/devs/2007-April/000284.html
+#  http://maillist.openttd.org/pipermail/devs/2007-February/000248.html
+GCC295_FIX=sed -r 's/^(\t*)(.*)( const )([A-Za-z0-9_ ]+(\[.*\]){2,})(( = \{)|(;))(.*)$$/\1\2 \4\6\8\9/g'
+# This 'sed' removes the 3rd '4' in the # lines of the -E output of
+#  gcc 2.95.3 and lower, as it should indicate that it is a C-linkage, but the
+#  compiler can't handle that information (just don't ask). So we remove it
+#  and then it compiles happily and without bitching :)
+# Furthermore gcc 2.95 has some trouble with protected and private when
+#  accessing the protected/private stuff of the enclosing class (or the
+#  super class of the enclosing class).
+GCC295_FIX_2=sed -e 's|\(^\# [0-9][0-9]* "[^"]*"[ 0-9]*\) 4$$|\1|g;s|private:|public:|g;s|protected:|public:|g'
+
 # Check if we want to show what we are doing
 ifdef VERBOSE
 	Q =
@@ -88,38 +89,50 @@ $(LANG_OBJS_DIR)/$(STRGEN):
 $(LANG_OBJS_DIR)/table/strings.h: $(LANG_DIR)/english.txt $(LANG_OBJS_DIR)/$(STRGEN)
 	$(MAKE) -C $(LANG_OBJS_DIR) table/strings.h

-# Always run version detection, so we always have an accurate modified
-# flag
-VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh")
-MODIFIED := $(shell echo "$(VERSIONS)" | cut -f 3 -d'	')
-
+# Make the revision number
 ifdef REVISION
-# Use specified revision (which should be of the form "r000").
 REV := $(REVISION)
-REV_NR := $(shell echo $(REVISION) | sed "s@[^0-9]@@g")
+REV_NR := $(shell echo $(REVISION) | sed "s/[^0-9]//g")
 else
-# Use autodetected revisions
-REV      := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
-REV_NR   := $(shell echo "$(VERSIONS)" | cut -f 2 -d'	')
+# Are we a SVN dir?
+ifeq ($(shell if test -d $(SRC_DIR)/.svn; then echo 1; fi), 1)
+# Find if the local source if modified
+REV_MODIFIED := $(shell svnversion $(SRC_DIR) | sed -n 's/.*\(M\).*/\1/p' )
+# Find the revision like: rXXXX-branch
+REV := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^URL:.*branch/ { split($$2, a, "/"); BRANCH="-"a[5] } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }')
+REV_NR := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^Last Changed Rev:/ { print $$4 }')
+else
+# Are we a git dir?
+ifeq ($(shell if test -d $(SRC_DIR)/../.git; then echo 1; fi), 1)
+# Find the revision like: gXXXXM-branch
+REV := g$(shell if head=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null`; then echo "$$head" | cut -c1-8; fi)$(shell if cd "$(SRC_DIR)/.." && git diff-index HEAD src | read dummy; then echo M; fi)$(shell git branch|grep '[*]' | sed 's/\* /-/;s/^-master$$//')
+REV_NR := $(shell LC_ALL=C cd "$(SRC_DIR)/.." && git log --pretty=format:%s src | grep -m 1 "^(svn r[0-9]*)" | sed "s/.*(svn r\([0-9]*\)).*/\1/" )
+else
+# Are we a hg (Mercurial) dir?
+ifeq ($(shell if test -d $(SRC_DIR)/../.hg; then echo 1; fi), 1)
+# Find the revision like: hXXXXM-branch
+REV := h$(shell if head=`LC_ALL=C hg tip 2>/dev/null`; then echo "$$head" | head -n 1 | cut -c19-26; fi)$(shell if hg status $(SRC_DIR) | grep -v '^?' | read dummy; then echo M; fi)$(shell hg branch | sed 's/^/-/;s/^-default$$//')
+REV_NR := $(shell LC_ALL=C hg log -k "svn" -l 1 --template "{desc}\n" $(SRC_DIR) | grep -m 1 "^(svn r[0-9]*)" | sed "s/.*(svn r\([0-9]*\)).*/\1/" )
+endif
+endif
+endif
 endif

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

 # This helps to recompile if flags change
-RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CXXFLAGS) $(CFLAGS)" ]; then echo "$(CXXFLAGS) $(CFLAGS)" > $(CONFIG_CACHE_COMPILER); fi )
+RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CC_CFLAGS) $(CFLAGS)" ]; then echo "$(CC_CFLAGS) $(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 )

 # If there is a change in the source-file-list, make sure we recheck the deps
 RES := $(shell if [ "`cat $(CONFIG_CACHE_SOURCE) 2>/dev/null`" != "$(SRCS)" ]; then echo "$(SRCS)" > $(CONFIG_CACHE_SOURCE); fi )
 # If there is a change in the revision, make sure we recompile rev.cpp
-RES := $(shell if [ "`cat $(CONFIG_CACHE_VERSION) 2>/dev/null`" != "$(REV) $(MODIFIED)" ]; then echo "$(REV) $(MODIFIED)" > $(CONFIG_CACHE_VERSION); fi )
+RES := $(shell if [ "`cat $(CONFIG_CACHE_VERSION) 2>/dev/null`" != "$(REV)" ]; then echo "$(REV)" > $(CONFIG_CACHE_VERSION); fi )

 ifndef MAKEDEPEND
 # The slow, but always correct, dep-check
@@ -141,18 +154,18 @@ endif

 $(OBJS_C:%.o=%.d): %.d: $(SRC_DIR)/%.c $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.c=%.c)'
-	$(Q)$(CC_HOST) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
+	$(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:%.d=%.o):#' > $@

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

 $(OBJS_RC:%.o=%.d): %.d: $(SRC_DIR)/%.rc $(FILE_DEP)
-	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.rc=%.rc)'
+	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.mm=%.mm)'
 	$(Q)touch $@

 else
@@ -165,18 +178,11 @@ ifeq ($(filter $(ENDIAN_TARGETS) depend clean mrproper, $(MAKECMDGOALS)),)
 -include Makefile.dep
 endif

-ifeq ("$(SRC_OBJS_DIR)/$(DEPEND)","$(MAKEDEPEND)")
-DEP := $(MAKEDEPEND)
-$(SRC_OBJS_DIR)/$(DEPEND): $(SRC_DIR)/depend/depend.cpp
-	$(E) '$(STAGE) Compiling and linking $(DEPEND)'
-	$(Q)$(CXX_BUILD) $(CXXFLAGS_BUILD) $(CFLAGS_BUILD) $(LDFLAGS_BUILD) -o $@ $<
-endif
-
 # Make sure that only 'make depend' ALWAYS triggers a recheck
 ifeq ($(filter depend, $(MAKECMDGOALS)),)
-Makefile.dep: $(FILE_DEP) $(SRCS:%=$(SRC_DIR)/%) $(CONFIG_CACHE_SOURCE) $(DEP)
+Makefile.dep: $(FILE_DEP) $(SRCS:%=$(SRC_DIR)/%) $(CONFIG_CACHE_SOURCE)
 else
-Makefile.dep: $(FILE_DEP) $(SRCS:%=$(SRC_DIR)/%) $(DEP) FORCE
+Makefile.dep: FORCE
 endif
 	$(E) '$(STAGE) DEP CHECK (all files)'
 	$(Q)rm -f Makefile.dep.tmp
@@ -187,7 +193,7 @@ endif

 # Convert x:/... paths to /x/... for mingw
 ifeq ($(OS), MINGW)
-	@cat Makefile.dep.tmp | sed 's@/\([a-zA-Z]\):\/@\/\1\/@g' > Makefile.dep.tmp.mingw
+	@cat Makefile.dep.tmp | sed 's@\([a-zA-Z]\):\/@\/\1\/@g' > Makefile.dep.tmp.mingw
 	@cp Makefile.dep.tmp.mingw Makefile.dep.tmp
 	@rm -f Makefile.dep.tmp.mingw
 endif
@@ -197,10 +203,10 @@ endif
 	@$(AWK) '                           \
 	/^# DO NOT/ { print $$0 ; next}     \
 	/^#/ {next}                         \
-	/: / {                               \
+	/:/ {                               \
 		left = NF - 1;                    \
 		for (n = 2; n <= NF; n++) {       \
-			if (match($$n, "^$(ROOT_DIR)") == 0) { \
+			if (match($$n, "^$(SRC_DIR)") == 0) { \
 				$$n = "";                     \
 				left--;                       \
 			}                               \
@@ -216,16 +222,16 @@ endif
 	{                                   \
 		print $$0                         \
 	}                                   \
-	' < Makefile.dep.tmp | sed 's@  *@ @g;s@ $$@@' | $(SORT) > Makefile.dep
+	' < Makefile.dep.tmp | sed 's/  */ /g;s/ $$//' | $(SORT) > Makefile.dep

 	$(Q)rm -f Makefile.dep.tmp Makefile.dep.tmp.bak

 endif

-# Avoid problems with deps if a .h/.hpp/.hpp.sq file is deleted without the deps
+# Avoid problems with deps if a .h/.hpp file is deleted without the deps
 #  being updated. Now the Makefile continues, the deps are recreated
 #  and all will be fine.
-%.h %.hpp %.hpp.sq:
+%.h %.hpp:
 	@true


@@ -233,11 +239,15 @@ endif

 $(OBJS_C): %.o: $(SRC_DIR)/%.c $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.c=%.c)'
-	$(Q)$(CC_HOST) $(CFLAGS) -c -o $@ $<
+	$(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -c -o $@ $<

 $(OBJS_CPP): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CXXFLAGS) $(CFLAGS) -c -o $@ $<
+ifeq ($(GCC295), 1)
+	$(Q)$(CXX_HOST) -E $(CFLAGS) $< | $(GCC295_FIX) | $(GCC295_FIX_2) | $(CXX_HOST) $(CFLAGS) -c -o $@ -x c++ -
+else
+	$(Q)$(CXX_HOST) $(CFLAGS) -c -o $@ $<
+endif

 $(OBJS_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.mm=%.mm)'
@@ -245,7 +255,7 @@ $(OBJS_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP)

 $(OBJS_RC): %.o: $(SRC_DIR)/%.rc $(FILE_DEP)
 	$(E) '$(STAGE) Compiling resource $(<:$(SRC_DIR)/%.rc=%.rc)'
-	$(Q)$(WINDRES) -o $@ -I `basename $<` $<
+	$(Q)$(WINDRES) -o $@ -I $(MEDIA_DIR) $<

 $(BIN_DIR)/$(TTD): $(TTD)
 	$(Q)cp $< $@
@@ -262,10 +272,6 @@ else
 endif
 ifdef STRIP
 	$(Q)$(STRIP) $@
-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
@@ -276,15 +282,15 @@ endian_target.h: $(ENDIAN_CHECK) $(CONFIG_CACHE_ENDIAN)

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

 # Revision files

 $(SRC_DIR)/rev.cpp: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/rev.cpp.in
-	$(Q)cat $(SRC_DIR)/rev.cpp.in      | sed "s@\!\!REVISION\!\!@$(REV_NR)@g;s@!!VERSION!!@$(REV)@g;s@!!MODIFIED!!@$(MODIFIED)@g;s@!!DATE!!@`date +%d.%m.%y`@g" > $(SRC_DIR)/rev.cpp
+	$(Q)cat $(SRC_DIR)/rev.cpp.in      | sed "s#@@REVISION@@#$(REV_NR)#g;s#@@VERSION@@#$(REV)#g;s#@@DATE@@#`date +%d.%m.%y`#g" > $(SRC_DIR)/rev.cpp

-$(SRC_DIR)/os/windows/ottdres.rc: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/os/windows/ottdres.rc.in
-	$(Q)cat $(SRC_DIR)/os/windows/ottdres.rc.in | sed "s@\!\!REVISION\!\!@$(REV_NR)@g;s@!!VERSION!!@$(REV)@g;s@!!DATE!!@`date +%d.%m.%y`@g" > $(SRC_DIR)/os/windows/ottdres.rc
+$(SRC_DIR)/ottdres.rc: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/ottdres.rc.in
+	$(Q)cat $(SRC_DIR)/ottdres.rc.in | sed "s#@@REVISION@@#$(REV_NR)#g;s#@@VERSION@@#$(REV)#g;s#@@DATE@@#`date +%d.%m.%y`#g" > $(SRC_DIR)/ottdres.rc

 FORCE:

@@ -292,10 +298,10 @@ depend: $(DEPS)

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

 mrproper: clean
-	$(Q)rm -f $(SRC_DIR)/rev.cpp $(SRC_DIR)/os/windows/ottdres.rc
+	$(Q)rm -f $(SRC_DIR)/rev.cpp $(SRC_DIR)/ottdres.rc

 %.o:
 	@echo '$(STAGE) No such source-file: $(@:%.o=%).[c|cpp|mm|rc]'
--- a/bin/ai/compat_0.7.nut
+++ b/bin/ai/compat_0.7.nut
@@ -1,260 +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("0.7 API compatability in effect:");
-AILog.Info(" - AITown::GetLastMonthProduction's behaviour has slightly changed.");
-AILog.Info(" - AISubsidy::GetDestination returns STATION_INVALID for awarded subsidies.");
-AILog.Info(" - AISubsidy::GetSource returns STATION_INVALID for awarded subsidies.");
-
-AISign.GetMaxSignID <- function()
-{
-	local list = AISignList();
-	local max_id = 0;
-	foreach (id, d in list) {
-		if (id > max_id) max_id = id;
-	}
-	return max_id;
-}
-
-AITile.GetHeight <- function(tile)
-{
-	if (!AIMap.IsValidTile(tile)) return -1;
-
-	return AITile.GetCornerHeight(tile, AITile.CORNER_N);
-}
-
-AIOrder.ChangeOrder <- function(vehicle_id, order_position, order_flags)
-{
-	return AIOrder.SetOrderFlags(vehicle_id, order_position, order_flags);
-}
-
-AIWaypoint.WAYPOINT_INVALID <- 0xFFFF;
-
-AISubsidy.SourceIsTown <- function(subsidy_id)
-{
-	if (!AISubsidy.IsValidSubsidy(subsidy_id) || AISubsidy.IsAwarded(subsidy_id)) return false;
-
-	return AISubsidy.GetSourceType(subsidy_id) == AISubsidy.SPT_TOWN;
-}
-
-AISubsidy.GetSource <- function(subsidy_id)
-{
-	if (!AISubsidy.IsValidSubsidy(subsidy_id)) return AIBaseStation.STATION_INVALID;
-
-	if (AISubsidy.IsAwarded(subsidy_id)) {
-		return AIBaseStation.STATION_INVALID;
-	}
-
-	return AISubsidy.GetSourceIndex(subsidy_id);
-}
-
-AISubsidy.DestinationIsTown <- function(subsidy_id)
-{
-	if (!AISubsidy.IsValidSubsidy(subsidy_id) || AISubsidy.IsAwarded(subsidy_id)) return false;
-
-	return AISubsidy.GetDestinationType(subsidy_id) == AISubsidy.SPT_TOWN;
-}
-
-AISubsidy.GetDestination <- function(subsidy_id)
-{
-	if (!AISubsidy.IsValidSubsidy(subsidy_id)) return AIBaseStation.STATION_INVALID;
-
-	if (AISubsidy.IsAwarded(subsidy_id)) {
-		return AIBaseStation.STATION_INVALID;
-	}
-
-	return AISubsidy.GetDestinationIndex(subsidy_id);
-}
-
-AITown.GetMaxProduction <- function(town_id, cargo_id)
-{
-	return AITown.GetLastMonthProduction(town_id, cargo_id);
-}
-
-AIRail.RemoveRailWaypoint <- function(tile)
-{
-	return AIRail.RemoveRailWaypointTileRect(tile, tile, true);
-}
-
-AIRail.RemoveRailStationTileRect <- function(tile, tile2)
-{
-	return AIRail.RemoveRailStationTileRectangle(tile, tile2, false);
-}
-
-AIVehicle.SkipToVehicleOrder <- function(vehicle_id, order_position)
-{
-	return AIOrder.SkipToOrder(vehicle_id, order_position);
-}
-
-AIEngine.IsValidEngine <- function(engine_id)
-{
-	return AIEngine.IsBuildable(engine_id);
-}
-
-AIEngine._GetName <- AIEngine.GetName;
-AIEngine.GetName <- function(engine_id)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return null;
-	return AIEngine._GetName(engine_id);
-}
-
-AIEngine._GetCargoType <- AIEngine.GetCargoType;
-AIEngine.GetCargoType <- function(engine_id)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return 255;
-	return AIEngine._GetCargoType(engine_id);
-}
-
-AIEngine._CanRefitCargo <- AIEngine.CanRefitCargo;
-AIEngine.CanRefitCargo <- function(engine_id, cargo_id)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return false;
-	return AIEngine._CanRefitCargo(engine_id, cargo_id);
-}
-
-AIEngine._CanPullCargo <- AIEngine.CanPullCargo;
-AIEngine.CanPullCargo <- function(engine_id, cargo_id)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return false;
-	return AIEngine._CanPullCargo(engine_id, cargo_id);
-}
-
-AIEngine._GetCapacity <- AIEngine.GetCapacity;
-AIEngine.GetCapacity <- function(engine_id)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine._GetCapacity(engine_id);
-}
-
-AIEngine._GetReliability <- AIEngine.GetReliability;
-AIEngine.GetReliability <- function(engine_id)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine._GetReliability(engine_id);
-}
-
-AIEngine._GetMaxSpeed <- AIEngine.GetMaxSpeed;
-AIEngine.GetMaxSpeed <- function(engine_id)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine._GetMaxSpeed(engine_id);
-}
-
-AIEngine._GetPrice <- AIEngine.GetPrice;
-AIEngine.GetPrice <- function(engine_id)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine._GetPrice(engine_id);
-}
-
-AIEngine._GetMaxAge <- AIEngine.GetMaxAge;
-AIEngine.GetMaxAge <- function(engine_id)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine._GetMaxAge(engine_id);
-}
-
-AIEngine._GetRunningCost <- AIEngine.GetRunningCost;
-AIEngine.GetRunningCost <- function(engine_id)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine._GetRunningCost(engine_id);
-}
-
-AIEngine._GetPower <- AIEngine.GetPower;
-AIEngine.GetPower <- function(engine_id)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine._GetPower(engine_id);
-}
-
-AIEngine._GetWeight <- AIEngine.GetWeight;
-AIEngine.GetWeight <- function(engine_id)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine._GetWeight(engine_id);
-}
-
-AIEngine._GetMaxTractiveEffort <- AIEngine.GetMaxTractiveEffort;
-AIEngine.GetMaxTractiveEffort <- function(engine_id)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine._GetMaxTractiveEffort(engine_id);
-}
-
-AIEngine._GetDesignDate <- AIEngine.GetDesignDate;
-AIEngine.GetDesignDate <- function(engine_id)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine._GetDesignDate(engine_id);
-}
-
-AIEngine._GetVehicleType <- AIEngine.GetVehicleType;
-AIEngine.GetVehicleType <- function(engine_id)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return AIVehicle.VT_INVALID;
-	return AIEngine._GetVehicleType(engine_id);
-}
-
-AIEngine._IsWagon <- AIEngine.IsWagon;
-AIEngine.IsWagon <- function(engine_id)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return false;
-	return AIEngine._IsWagon(engine_id);
-}
-
-AIEngine._CanRunOnRail <- AIEngine.CanRunOnRail;
-AIEngine.CanRunOnRail <- function(engine_id, track_rail_type)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return false;
-	return AIEngine._CanRunOnRail(engine_id, track_rail_type);
-}
-
-AIEngine._HasPowerOnRail <- AIEngine.HasPowerOnRail;
-AIEngine.HasPowerOnRail <- function(engine_id, track_rail_type)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return false;
-	return AIEngine._HasPowerOnRail(engine_id, track_rail_type);
-}
-
-AIEngine._GetRoadType <- AIEngine.GetRoadType;
-AIEngine.GetRoadType <- function(engine_id)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return AIRoad.ROADTYPE_INVALID;
-	return AIEngine._GetRoadType(engine_id);
-}
-
-AIEngine._GetRailType <- AIEngine.GetRailType;
-AIEngine.GetRailType <- function(engine_id)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return AIRail.RAILTYPE_INVALID;
-	return AIEngine._GetRailType(engine_id);
-}
-
-AIEngine._IsArticulated <- AIEngine.IsArticulated;
-AIEngine.IsArticulated <- function(engine_id)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return false;
-	return AIEngine._IsArticulated(engine_id);
-}
-
-AIEngine._GetPlaneType <- AIEngine.GetPlaneType;
-AIEngine.GetPlaneType <- function(engine_id)
-{
-	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine._GetPlaneType(engine_id);
-}
-
-_AIWaypointList <- AIWaypointList;
-class AIWaypointList extends _AIWaypointList {
-	constructor()
-	{
-		::_AIWaypointList.constructor(AIWaypoint.WAYPOINT_RAIL);
-	}
-}
--- a/bin/ai/compat_1.0.nut
+++ b/bin/ai/compat_1.0.nut
@@ -1,8 +0,0 @@
-/* $Id$ */
-
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
--- a/bin/ai/regression/completeness.sh
+++ b/bin/ai/regression/completeness.sh
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-# $Id$
-
-if ! [ -f ai/regression/regression.nut ]; then
-	echo "Make sure you are in the root of OpenTTD before starting this script."
-	exit 1
-fi
-
-cat ai/regression/regression.nut | tr ';' '\n' | awk '
-/^function/ {
-	for (local in locals) {
-		delete locals[local]
-	}
-	if (match($0, "function Regression::Start") || match($0, "function Regression::Stop")) next
-	locals["this"] = "AIControllerSquirrel"
-}
-
-/local/ {
-	gsub(".*local", "local")
-	if (match($4, "^AI")) {
-		sub("\\(.*", "", $4)
-		locals[$2] = $4
-	}
-}
-
-/Valuate/ {
-	gsub(".*Valuate\\(", "")
-	gsub("\\).*", "")
-	gsub(",.*", "")
-	gsub("\\.", "::")
-	print $0
-}
-
-/\./ {
-	for (local in locals) {
-		if (match($0, local ".")) {
-			fname = substr($0, index($0, local "."))
-			sub("\\(.*", "", fname)
-			sub("\\.", "::", fname)
-			sub(local, locals[local], fname)
-			print fname
-			if (match(locals[local], "List")) {
-				sub(locals[local], "AIAbstractList", fname)
-				print fname
-			}
-		}
-	}
-	# We want to remove everything before the FIRST occurence of AI.
-	# If we do not remove any other occurences of AI from the string
-	# we will remove everything before the LAST occurence of AI, so
-	# do some little magic to make it work the way we want.
-	sub("AI", "AXXXXY")
-	gsub("AI", "AXXXXX")
-	sub(".*AXXXXY", "AI")
-	if (match($0, "^AI") && match($0, ".")) {
-		sub("\\(.*", "", $0)
-		sub("\\.", "::", $0)
-		print $0
-	}
-}
-' | sed 's/	//g' | sort | uniq > tmp.in_regression
-
-grep 'DefSQ.*Method' ../src/ai/api/*.hpp.sq | grep -v 'AIError::' | grep -v 'AIAbstractList::Valuate' | grep -v '::GetClassName' | sed 's/^[^,]*, &//g;s/,[^,]*//g' | sort > tmp.in_api
-
-diff -u tmp.in_regression tmp.in_api | grep -v '^+++' | grep '^+' | sed 's/^+//'
-
-rm -f tmp.in_regression tmp.in_api
-
--- a/bin/ai/regression/regression.cfg
+++ b/bin/ai/regression/regression.cfg
@@ -1,17 +0,0 @@
-[misc]
-display_opt = SHOW_TOWN_NAMES|SHOW_STATION_NAMES|SHOW_SIGNS|WAYPOINTS
-language = english.lng
-
-[gui]
-autosave = off
-
-[game_creation]
-town_name = english
-
-[ai_players]
-none =
-regression =
-
-[vehicle]
-road_side = right
-plane_speed = 2
--- a/bin/ai/regression/regression.nut
+++ b/bin/ai/regression/regression.nut
--- a/bin/ai/regression/regression.sav
+++ b/bin/ai/regression/regression.sav
--- a/bin/ai/regression/regression.txt
+++ b/bin/ai/regression/regression.txt
--- a/bin/ai/regression/regression_info.nut
+++ b/bin/ai/regression/regression_info.nut
@@ -1,15 +0,0 @@
-/* $Id$ */
-
-class Regression extends AIInfo {
-	function GetAuthor()      { return "OpenTTD NoAI Developers Team"; }
-	function GetName()        { return "Regression"; }
-	function GetShortName()   { return "REGR"; }
-	function GetDescription() { return "This runs regression-tests on all commands. On the same map the result should always be the same."; }
-	function GetVersion()     { return 1; }
-	function GetAPIVersion()  { return "1.0"; }
-	function GetDate()        { return "2007-03-18"; }
-	function CreateInstance() { return "Regression"; }
-}
-
-RegisterAI(Regression());
-
--- a/bin/ai/regression/require.nut
+++ b/bin/ai/regression/require.nut
@@ -1,4 +0,0 @@
-/* $Id$ */
-
-print("  Required this file");
-
--- a/bin/ai/regression/run.sh
+++ b/bin/ai/regression/run.sh
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-# $Id$
-
-if ! [ -f ai/regression/regression.nut ]; then
-	echo "Make sure you are in the root of OpenTTD before starting this script."
-	exit 1
-fi
-
-cp ai/regression/regression.nut ai/regression/main.nut
-cp ai/regression/regression_info.nut ai/regression/info.nut
-
-if [ -f scripts/game_start.scr ]; then
-	mv scripts/game_start.scr scripts/game_start.scr.regression
-fi
-
-params=""
-gdb=""
-if [ "$1" != "-r" ]; then
-	params="-snull -mnull -vnull:ticks=30000"
-fi
-if [ "$1" = "-g" ]; then
-	gdb="gdb --ex run --args "
-fi
-if [ -n "$gdb" ]; then
-	$gdb ./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav
-else
-	./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
-
-if [ -z "$gdb" ]; then
-	res="`diff -ub ai/regression/regression.txt tmp.regression`"
-	if [ -z "$res" ]; then
-		echo "Regression test passed!"
-	else
-		echo "Regression test failed! Difference:"
-		echo "$res"
-	fi
-	echo ""
-	echo "Regression test done"
-fi
-
-rm -f ai/regression/main.nut ai/regression/info.nut
-
-if [ -f scripts/game_start.scr.regression ]; then
-	mv scripts/game_start.scr.regression scripts/game_start.scr
-fi
-
-if [ "$1" != "-k" ]; then
-	rm -f tmp.regression
-fi
--- a/bin/data/chars.grf
+++ b/bin/data/chars.grf
--- a/bin/data/no_sound.obs
+++ b/bin/data/no_sound.obs
@@ -1,49 +0,0 @@
-; $Id$
-;
-; This represents more or less nothingness
-;
-[metadata]
-name              = NoSound
-shortname         = NULL
-version           = 2
-fallback          = true
-description       = A sound pack without any sounds.
-description.af_ZA = 'n Klank stel sonder enige klanke.
-description.ar_EG = مجموعة صوت بدوت اصوات مضافة
-description.bg_BG = Празен звуков пакет.
-description.ca_ES = Un joc de sons sense cap so.
-description.cs_CZ = Prázdná sada zvuků.
-description.da_DA = En lydpakke uden lyde.
-description.de_DE = Basissounds ohne Sound.
-description.el_GR = Ένα πάκετο ήχων χώρις ήχους.
-description.en_GB = A sound pack without any sounds.
-description.en_US = A sound pack without any sounds.
-description.es_ES = Un conjunto de sonidos vacío.
-description.et_ET = Ilma häälteta helipakk.
-description.fi_FI = Äänipaketti ilman ääniä.
-description.fr_FR = Un pack de sons sans sons.
-description.hr_HR = Zvučni paket bez ikakvih zvukova.
-description.hu_HU = Hang alapcsomag hangok nélkül.
-description.id_ID = Paket efek suara tanpa berisi suara.
-description.it_IT = Un pacchetto sonoro non contenente alcun suono.
-description.nb_NO = En lydpakke uten noen lyder.
-description.nl_NL = Een geluidset zonder geluid.
-description.nn_NO = Ei lydpakke utan nokon lydar.
-description.pl_PL = Zestaw dźwięków nie zawierający żadnych dźwięków.
-description.pt_PT = Um conjunto de sons vazio.
-description.ro_RO = Un set de sunete fără nici un sunet inclus.
-description.ru_RU = "Пустой" набор звукового оформления, не содержащий никаких звуков.
-description.sk_SK = Zvuková sada neobsahujúca zvuky.
-description.sl_SL = Zvočni paket brez zvoka.
-description.sr_RS = Prazan skup zvukova.
-description.sv_SE = Ett ljudpaket utan några ljud.
-description.tr_TR = Ses içermeyen boş bir ses kümesi.
-description.zh_TW = 不含任何音效的音效集。
-
-[files]
-samples      =
-
-[md5s]
-
-[origin]
-default      = This file was part of your OpenTTD installation.
--- a/bin/data/openttdd.grf
+++ b/bin/data/openttdd.grf
--- a/bin/data/openttdw.grf
+++ b/bin/data/openttdw.grf
--- a/bin/data/opntitle.dat
+++ b/bin/data/opntitle.dat
--- a/bin/data/orig_dos.obg
+++ b/bin/data/orig_dos.obg
@@ -1,62 +0,0 @@
-; $Id$
-;
-; This represents the original graphics as on the non-German Transport
-; Tycoon Deluxe DOS CD.
-;
-[metadata]
-name              = original_dos
-shortname         = TTDD
-version           = 1
-palette           = DOS
-description       = Original Transport Tycoon Deluxe DOS edition graphics.
-description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS uitgawe grafieke.
-description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الرسومية نسخة الدوس
-description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за DOS.
-description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a DOS.
-description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (verze pro DOS).
-description.da_DA = Originalgrafik fra Transport Tycoon Deluxe DOS-version.
-description.de_DE = Original Transport Tycoon Deluxe DOS Basisgrafiken.
-description.el_GR = Αρχικά γραφικά από το Transport Tycoon Deluxe έκδοση DOS.
-description.en_GB = Original Transport Tycoon Deluxe DOS edition graphics.
-description.en_US = Original Transport Tycoon Deluxe DOS edition graphics.
-description.es_ES = Gráficos originales de Transport Tycoon Deluxe versión DOS.
-description.et_ET = Algse Transport Tycoon Deluxe DOSi versiooni graafika.
-description.fi_FI = Alkuperäiset Transport Tycoon Deluxe DOS grafiikat.
-description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version DOS).
-description.hr_HR = Originalna grafika za Transport Tycoon Deluxe DOS izdanje.
-description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS verziójának grafikája.
-description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi DOS.
-description.it_IT = Grafica originale di Transport Tycoon Deluxe, edizione DOS.
-description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for DOS.
-description.nl_NL = Originele graphics van de Transport Tycoon Deluxe DOS-versie.
-description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for DOS.
-description.pl_PL = Oryginalna edycja grafik dla Transport Tycoon Deluxe DOS.
-description.pt_PT = Gráficos originais da edição DOS de Transport Tycoon Deluxe.
-description.ro_RO = Setul grafic original al Transport Tycoon Deluxe pentru DOS.
-description.ru_RU = Оригинальная графика из Transport Tycoon Deluxe для DOS.
-description.sk_SK = Pôvodná grafika Transport Tycoon Deluxe (DOS).
-description.sl_SL = Originalna grafika Transport Tycoon Deluxe za različico DOS.
-description.sr_RS = Originalni skup grafika Transport Tycoon Deluxe DOS izdanja.
-description.sv_SE = Originalgrafiken från Transport Tycoon Deluxe, DOS-utgåvan.
-description.tr_TR = Orijinal Transport Tycoon Deluxe DOS sürümü grafikleri.
-description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版的圖形。
-
-[files]
-base         = TRG1.GRF
-logos        = TRGI.GRF
-arctic       = TRGC.GRF
-tropical     = TRGH.GRF
-toyland      = TRGT.GRF
-extra        = OPENTTDD.GRF
-
-[md5s]
-TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
-TRGC.GRF     = ed446637e034104c5559b32c18afe78d
-TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTDD.GRF = 177d3eeda710bb6f1b93955fdd3754fa
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTDD.GRF = This file was part of your OpenTTD installation.
--- a/bin/data/orig_dos.obs
+++ b/bin/data/orig_dos.obs
@@ -1,50 +0,0 @@
-; $Id$
-;
-; This represents the original sounds as on the Transport
-; Tycoon Deluxe DOS CD.
-;
-[metadata]
-name              = original_dos
-shortname         = TTDO
-version           = 0
-description       = Original Transport Tycoon Deluxe DOS edition sounds.
-description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS uitgawe klanke.
-description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الصوتية نسخة الدوس
-description.bg_BG = Оригинални звуци на Transport Tycoon Deluxe за DOS.
-description.ca_ES = Sons originals de Transport Tycoon Deluxe per a DOS.
-description.cs_CZ = Původní sada zvuků Transport Tycoon Deluxe (verze pro DOS).
-description.da_DA = Originallyd fra Transport Tycoon Deluxe DOS-version.
-description.de_DE = Original Transport Tycoon Deluxe DOS Basissounds.
-description.el_GR = Αρχικοί ήχοι από το Transport Tycoon Deluxe έκδοση DOS.
-description.en_GB = Original Transport Tycoon Deluxe DOS edition sounds.
-description.en_US = Original Transport Tycoon Deluxe DOS edition sounds.
-description.es_ES = Sonidos originales de Transport Tycoon Deluxe versión DOS.
-description.et_ET = Algse Transport Tycoon Deluxe DOSi versiooni helid.
-description.fi_FI = Alkuperäiset Transport Tycoon Deluxe DOS äänet.
-description.hr_HR = Originalni zvukovi za Transport Tycoon Deluxe DOS izdanje.
-description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS verziójának hangjai.
-description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version DOS).
-description.id_ID = Efek suara orisinil Transport Tycoon Deluxe versi DOS.
-description.it_IT = Suoni originali di Transport Tycoon Deluxe, edizione DOS.
-description.nb_NO = Originale lyder fra Transport Tycoon Deluxe for DOS.
-description.nl_NL = Originele geluiden van de Transport Tycoon Deluxe DOS-versie.
-description.nn_NO = Originale lydar frå Transport Tycoon Deluxe for DOS.
-description.pl_PL = Oryginalna edycja dźwięków dla Transport Tycoon Deluxe DOS.
-description.pt_PT = Sons originais da edição DOS de Transport Tycoon Deluxe.
-description.ro_RO = Setul de sunete original al Transport Tycoon Deluxe pentru DOS.
-description.ru_RU = Оригинальный набор звукового оформления из игры Transport Tycoon Deluxe для DOS.
-description.sk_SK = Pôvodné zvuky Transport Tycoon Deluxe (DOS).
-description.sl_SL = Originalni zvoki Transport Tycoon Deluxe različice DOS.
-description.sr_RS = Originalni skup zvukova Transport Tycoon Deluxe DOS izdanja.
-description.sv_SE = Originalljuden från Transport Tycoon Deluxe, DOS-utgåvan.
-description.tr_TR = Orijinal Transport Tycoon Deluxe DOS sürümü sesleri.
-description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版的音效。
-
-[files]
-samples      = SAMPLE.CAT
-
-[md5s]
-SAMPLE.CAT   = 422ea3dd074d2859bb51639a6e0e85da
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/bin/data/orig_dos_de.obg
+++ b/bin/data/orig_dos_de.obg
@@ -1,62 +0,0 @@
-; $Id$
-;
-; This represents the original graphics as on the German Transport
-; Tycoon Deluxe DOS CD. It contains one broken sprite.
-;
-[metadata]
-name              = original_dos_de
-shortname         = TTDD
-version           = 0
-palette           = DOS
-description       = Original Transport Tycoon Deluxe DOS (German) edition graphics.
-description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS (German) uitgawe grafieke.
-description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الالمانية نسخة الدوس
-description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за DOS (немски) .
-description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a DOS (Alemany).
-description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (německá verze pro DOS).
-description.da_DA = Originalgrafik fra Transport Tycoon Deluxe DOS (Tysk) version.
-description.de_DE = Original Transport Tycoon Deluxe DOS (Deutsch) Basisgrafiken.
-description.el_GR = Αρχικά γραφικά από το Transport Tycoon Deluxe έκδοση DOS (Γερμανικό).
-description.en_GB = Original Transport Tycoon Deluxe DOS (German) edition graphics.
-description.en_US = Original Transport Tycoon Deluxe DOS (German) edition graphics.
-description.es_ES = Gráficos originales de Transport Tycoon Deluxe versión DOS (Alemán).
-description.et_ET = Algse Transport Tycoon Deluxe DOSi (Saksa) versiooni graafika.
-description.fi_FI = Alkuperäiset Transport Tycoon Deluxe DOS (Saksalainen) grafiikat.
-description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version DOS allemande).
-description.hr_HR = Originalna grafika za Transport Tycoon Deluxe DOS (Njemački) izdanje.
-description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS (német) verziójának grafikája.
-description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi DOS (Jerman).
-description.it_IT = Grafica originale di Transport Tycoon Deluxe (tedesco), edizione DOS.
-description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for DOS (tysk).
-description.nl_NL = Originele graphics van de Duitse Transport Tycoon Deluxe DOS-versie.
-description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for DOS (tysk).
-description.pl_PL = Oryginalna edycja grafik dla Transport Tycoon Deluxe DOS (German).
-description.pt_PT = Gráficos originais da edição DOS (Alemã) de Transport Tycoon Deluxe.
-description.ro_RO = Setul grafic original al Transport Tycoon Deluxe pentru DOS (ediţia germană).
-description.ru_RU = Оригинальная графика из немецкой версии Transport Tycoon Deluxe для DOS.
-description.sk_SK = Pôvodná grafika Transport Tycoon Deluxe (DOS) (v jazyku nemčina).
-description.sl_SL = Originalna grafika Transport Tycoon Deluxe za nemško različico DOS.
-description.sr_RS = Originalni skup grafika nemačkog Transport Tycoon Deluxe DOS izdanja.
-description.sv_SE = Originalgrafiken från Transport Tycoon Deluxe, DOS-utgåvan (tyska).
-description.tr_TR = Orijinal Transport Tycoon Deluxe DOS (Almanca) sürümü grafikleri.
-description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版 (德國版) 的圖形。
-
-[files]
-base         = TRG1.GRF
-logos        = TRGI.GRF
-arctic       = TRGC.GRF
-tropical     = TRGH.GRF
-toyland      = TRGT.GRF
-extra        = OPENTTDD.GRF
-
-[md5s]
-TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
-TRGC.GRF     = ed446637e034104c5559b32c18afe78d
-TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTDD.GRF = 177d3eeda710bb6f1b93955fdd3754fa
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTDD.GRF = This file was part of your OpenTTD installation.
--- a/bin/data/orig_win.obg
+++ b/bin/data/orig_win.obg
@@ -1,62 +0,0 @@
-; $Id$
-;
-; This represents the original graphics as on the Transport
-; Tycoon Deluxe for Windows CD.
-;
-[metadata]
-name              = original_windows
-shortname         = TTDW
-version           = 0
-palette           = Windows
-description       = Original Transport Tycoon Deluxe Windows edition graphics.
-description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe grafieke.
-description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الرسومية نسخة وندوز
-description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за Windows.
-description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a Windows.
-description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (verze pro Windows).
-description.da_DA = Originalgrafik fra Transport Tycoon Deluxe Windows-version.
-description.de_DE = Original Transport Tycoon Deluxe Windows Basisgrafiken.
-description.el_GR = Αρχικά γραφικά από το Transport Tycoon Deluxe έκδοση Windows.
-description.en_GB = Original Transport Tycoon Deluxe Windows edition graphics.
-description.en_US = Original Transport Tycoon Deluxe Windows edition graphics.
-description.es_ES = Gráficos originales de Transport Tycoon Deluxe versión Windows.
-description.et_ET = Algse Transport Tycoon Deluxe Windowsi versiooni graafika.
-description.fi_FI = Alkuperäiset Transport Tycoon Deluxe Windows grafiikat.
-description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version Windows).
-description.hr_HR = Originalna grafika za Transport Tycoon Deluxe Windows izdanje.
-description.hu_HU = Az eredeti Transport Tycoon Deluxe Windows verziójának grafikája.
-description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi Windows.
-description.it_IT = Grafica originale di Transport Tycoon Deluxe, edizione Windows.
-description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for Windows.
-description.nl_NL = Originele graphics van de Transport Tycoon Deluxe Windows-versie.
-description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for Windows.
-description.pl_PL = Oryginalna edycja grafik dla Transport Tycoon Deluxe Windows.
-description.pt_PT = Gráficos originais da edição Windows de Transport Tycoon Deluxe.
-description.ro_RO = Setul grafic original al Transport Tycoon Deluxe pentru Windows.
-description.ru_RU = Оригинальная графика из Transport Tycoon Deluxe для Windows.
-description.sk_SK = Pôvodná grafika Transport Tycoon Deluxe (Windows).
-description.sl_SL = Originalna grafika Transport Tycoon Deluxe za različico oken(windows).
-description.sr_RS = Originalni skup grafika Transport Tycoon Deluxe Windows izdanja.
-description.sv_SE = Originalgrafiken från Transport Tycoon Deluxe, Windows-utgåvan.
-description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü grafikleri.
-description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的圖形。
-
-[files]
-base         = TRG1R.GRF
-logos        = TRGIR.GRF
-arctic       = TRGCR.GRF
-tropical     = TRGHR.GRF
-toyland      = TRGTR.GRF
-extra        = OPENTTDW.GRF
-
-[md5s]
-TRG1R.GRF    = b04ce593d8c5016e07473a743d7d3358
-TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
-TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
-TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
-TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTDW.GRF = 7f67abbead5b77b86c375d4f9a7b1a29
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTDW.GRF = This file was part of your OpenTTD installation.
--- a/bin/data/orig_win.obs
+++ b/bin/data/orig_win.obs
@@ -1,50 +0,0 @@
-; $Id$
-;
-; This represents the original sounds as on the Transport
-; Tycoon Deluxe for Windows CD.
-;
-[metadata]
-name              = original_windows
-shortname         = TTDO
-version           = 0
-description       = Original Transport Tycoon Deluxe Windows edition sounds.
-description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe klanke.
-description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الصوتية نسخة وندوز
-description.bg_BG = Оригинални звуци на Transport Tycoon Deluxe за Windows.
-description.ca_ES = Sons originals de Transport Tycoon Deluxe per a Windows.
-description.cs_CZ = Původní sada zvuků Transport Tycoon Deluxe (verze pro Windows).
-description.da_DA = Originallyd fra Transport Tycoon Deluxe Windows-version.
-description.de_DE = Original Transport Tycoon Deluxe Windows Basissounds.
-description.el_GR = Αρχικοί ήχοι από το Transport Tycoon Deluxe έκδοση Windows.
-description.en_GB = Original Transport Tycoon Deluxe Windows edition sounds.
-description.en_US = Original Transport Tycoon Deluxe Windows edition sounds.
-description.es_ES = Sonidos originales de Transport Tycoon Deluxe versión Windows.
-description.et_ET = Algse Transport Tycoon Deluxe Windowsi versiooni helid.
-description.fi_FI = Alkuperäiset Transport Tycoon Deluxe Windows äänet.
-description.hr_HR = Originalni zvukovi za Transport Tycoon Deluxe Windows izdanje.
-description.hu_HU = Az eredeti Transport Tycoon Deluxe Windows verziójának hangjai.
-description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version Windows).
-description.id_ID = Efek suara orisinil Transport Tycoon Deluxe versi Windows.
-description.it_IT = Suoni originali di Transport Tycoon Deluxe, edizione Windows.
-description.nb_NO = Originale lyder fra Transport Tycoon Deluxe for Windows.
-description.nl_NL = Originele geluiden van de Transport Tycoon Deluxe Windows-versie.
-description.nn_NO = Originale lydar frå Transport Tycoon Deluxe for Windows.
-description.pl_PL = Oryginalna edycja dźwięków dla Transport Tycoon Deluxe Windows.
-description.pt_PT = Sons originais da edição Windows de Transport Tycoon Deluxe.
-description.ro_RO = Setul de sunete original al Transport Tycoon Deluxe pentru Windows.
-description.ru_RU = Оригинальный набор звукового оформления из игры Transport Tycoon Deluxe для Windows.
-description.sk_SK = Pôvodné zvuky Transport Tycoon Deluxe (Windows).
-description.sl_SL = Originalni zvoki Transport Tycoon Deluxe različice oken(windows).
-description.sr_RS = Originalni skup zvukova Transport Tycoon Deluxe Windows izdanja.
-description.sv_SE = Originalljuden från Transport Tycoon Deluxe, Windows-utgåvan.
-description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü sesleri.
-description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的音效。
-
-[files]
-samples      = SAMPLE.CAT
-
-[md5s]
-SAMPLE.CAT   = 9212e81e72badd4bbe1eaeae66458e10
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/bin/gm/no_music.obm
+++ b/bin/gm/no_music.obm
@@ -1,81 +0,0 @@
-; $Id$
-;
-; This represents more or less nothingness
-;
-[metadata]
-name              = NoMusic
-shortname         = NULL
-version           = 0
-fallback          = true
-description       = A music pack without actual music.
-description.af_ZA = 'n Musiek stel sonder enige musiek.
-description.ar_EG = مجموعة موسيقى بدون موسيقى
-description.bg_BG = Празен музикален пакет.
-description.ca_ES = Un joc de música sense cap música.
-description.cs_CZ = Prázná hudební sada.
-description.da_DA = En musikpakke uden musik.
-description.de_DE = Ein Musikset ohne Musik.
-description.el_GR = Ένα πάκετο μουσικής χωρίς πραγματική μουσική.
-description.en_GB = A music pack without actual music.
-description.en_US = A music pack without actual music.
-description.es_ES = Un conjunto de música vacío.
-description.et_ET = Muusikakomplekt ilma igasuguse muusikata.
-description.fi_FI = Musiikkipaketti, jossa ei ole musiikkia.
-description.fr_FR = Un pack de musiques sans musiques.
-description.hr_HR = Muzički paket bez ikakve muzike.
-description.hu_HU = Zenei alapcsomag zene nélkül.
-description.id_ID = Paket musik tanpa berisi musik.
-description.it_IT = Un pacchetto musicale non contenente alcuna musica.
-description.nb_NO = En musikkpakke uten noe musikk.
-description.nl_NL = Een muziekset zonder muziek.
-description.nn_NO = Ei musikkpakke utan noko musikk.
-description.pl_PL = Zestaw utworów muzycznych nie zawierający żadnej muzyki.
-description.pt_PT = Um conjunto de música vazio.
-description.ro_RO = Un set de muzică fără muzică inclusă.
-description.ru_RU = "Пустой" набор музыкального оформления, не содержащий никакой музыки.
-description.sk_SK = Sada hudby neobsahujúca hudbu.
-description.sl_SL = Glasbeni paket z vključeno glasbo.
-description.sr_RS = Prazan skup muzičkih numera.
-description.sv_SE = Ett musikpaket utan någon musik.
-description.tr_TR = Müzik içermeyen boş bir müzik paketi.
-description.zh_TW = 不含任何音樂的音樂集。
-
-[files]
-theme =
-old_0 =
-old_1 =
-old_2 =
-old_3 =
-old_4 =
-old_5 =
-old_6 =
-old_7 =
-old_8 =
-old_9 =
-new_0 =
-new_1 =
-new_2 =
-new_3 =
-new_4 =
-new_5 =
-new_6 =
-new_7 =
-new_8 =
-new_9 =
-ezy_0 =
-ezy_1 =
-ezy_2 =
-ezy_3 =
-ezy_4 =
-ezy_5 =
-ezy_6 =
-ezy_7 =
-ezy_8 =
-ezy_9 =
-
-[md5s]
-
-[names]
-
-[origin]
-default      = This file was part of your OpenTTD installation.
--- a/bin/gm/orig_win.obm
+++ b/bin/gm/orig_win.obm
@@ -1,125 +0,0 @@
-; $Id$
-;
-; This represents the original music as on the Transport
-; Tycoon Deluxe for Windows CD.
-;
-[metadata]
-name              = original_windows
-shortname         = TTDW
-version           = 1
-description       = Original Transport Tycoon Deluxe Windows edition music.
-description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe musiek.
-description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الموسيقية نسخة وندوز
-description.bg_BG = Оригинална музика на Transport Tycoon Deluxe за Windows.
-description.ca_ES = Música Original de Transport Tycoon Deluxe per a Windows.
-description.cs_CZ = Původní hudba Transport Tycoon Deluxe (verze pro Windows).
-description.da_DA = Originalmusik fra Transport Tycoon Deluxe Windows-version.
-description.de_DE = Original Transport Tycoon Deluxe Windows Musikset.
-description.el_GR = Αρχική μουσική από το Transport Tycoon Deluxe έκδοση Windows.
-description.en_GB = Original Transport Tycoon Deluxe Windows edition music.
-description.en_US = Original Transport Tycoon Deluxe Windows edition music.
-description.es_ES = Música original de Transport Tycoon Deluxe versión Windows.
-description.et_ET = Algse Transport Tycoon Deluxe Windowsi versiooni muusika.
-description.fi_FI = Alkuperäinen Transport Tycoon Deluxe Windows musiikki.
-description.fr_FR = Musiques originales de Transport Tycoon Deluxe (version Windows).
-description.hr_HR = Originalna muzika za Transport Tycoon Deluxe Windows izdanje.
-description.hu_HU = Az eredeti Transport Tycoon Deluxe Windows verziójának zenéje.
-description.id_ID = Musik pengiring orisinil Transport Tycoon Deluxe versi Windows.
-description.it_IT = Musica originale di Transport Tycoon Deluxe, edizione Windows.
-description.nb_NO = Original musikk fra Transport Tycoon Deluxe for Windows.
-description.nl_NL = Originele muziek van de Transport Tycoon Deluxe Windows-versie.
-description.nn_NO = Original musikk frå Transport Tycoon Deluxe for Windows.
-description.pl_PL = Oryginalna edycja utworów muzycznych w Transport Tycoon Deluxe Windows.
-description.pt_PT = Música original da edição Windows de Transport Tycoon Deluxe.
-description.ro_RO = Setul de muzică original al Transport Tycoon Deluxe pentru Windows.
-description.ru_RU = Оригинальный набор музыкального оформления из игры Transport Tycoon Deluxe.
-description.sk_SK = Pôvodná hudba z Transport Tycoon Deluxe (Windows).
-description.sl_SL = Originalna glasba Transport Tycoon Deluxe različice oken(windows).
-description.sr_RS = Originalni skup muzičkih numera Transport Tycoon Deluxe Windows izdanja.
-description.sv_SE = Originalmusiken från Transport Tycoon Deluxe, Windows-utgåvan.
-description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü müzikleri.
-description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的音樂。
-
-[files]
-theme = GM_TT00.GM
-old_0 = GM_TT02.GM
-old_1 = GM_TT06.GM
-old_2 = GM_TT03.GM
-old_3 = GM_TT12.GM
-old_4 = GM_TT08.GM
-old_5 = GM_TT13.GM
-old_6 = GM_TT14.GM
-old_7 = GM_TT10.GM
-old_8 =
-old_9 =
-new_0 = GM_TT04.GM
-new_1 = GM_TT01.GM
-new_2 = GM_TT05.GM
-new_3 = GM_TT15.GM
-new_4 = GM_TT11.GM
-new_5 = GM_TT16.GM
-new_6 = GM_TT09.GM
-new_7 =
-new_8 =
-new_9 =
-ezy_0 = GM_TT18.GM
-ezy_1 = GM_TT19.GM
-ezy_2 = GM_TT21.GM
-ezy_3 = GM_TT17.GM
-ezy_4 = GM_TT20.GM
-ezy_5 = GM_TT07.GM
-ezy_6 =
-ezy_7 =
-ezy_8 =
-ezy_9 =
-
-[md5s]
-GM_TT00.GM = 45cfec1b9d8c7a0ad45e755833cbf221
-GM_TT01.GM = ab14ed3392d848abd2a2e90a9d75d121
-GM_TT02.GM = dd4f696e4be5987ce738257b08b50171
-GM_TT03.GM = a1bfde23343df9e4063419bf29c166b8
-GM_TT04.GM = 4e6943aa0c455203d76c79389054747d
-GM_TT05.GM = cee281cb85a2e2343552d97640545a47
-GM_TT06.GM = 26d1de5efa8675f94065784e9d539e49
-GM_TT07.GM = 6f2691e17558f552ec4c565e4ab7139c
-GM_TT08.GM = a42bf2cb3340a822f1a69646fc7a487d
-GM_TT09.GM = eb35761a58a8df3c59ed8929cce13916
-GM_TT10.GM = 42fecd686720a785d20a78590c466a82
-GM_TT11.GM = 50ef1ef02e49d2112786dd45e69dc3ee
-GM_TT12.GM = 4ce707a0e0e72419f0681dd9bd95271b
-GM_TT13.GM = e765753be29d889ec818f38009103619
-GM_TT14.GM = 270e2d63bd32b95a4d007ce15a6ce45f
-GM_TT15.GM = 89e116a1c0c69f1845cc903a9bfbe460
-GM_TT16.GM = f824e2371b3bedfe61aad4b9c62dd6be
-GM_TT17.GM = 1b23eebb0796c1ab99cd97fa7082cf7b
-GM_TT18.GM = 15650de3bad645d0e88c4f5c7a2df92a
-GM_TT19.GM = 7aec079e15bd09588660b85545ac4dfc
-GM_TT20.GM = 1509097889dee617aa1e9a1738a5a930
-GM_TT21.GM = a8d0aaad02e1a762d8d54cf81da56bab
-
-[names]
-GM_TT00.GM = Tycoon DELUXE Theme
-GM_TT01.GM = Snarl Up
-GM_TT02.GM = Easy Driver
-GM_TT03.GM = Little Red Diesel
-GM_TT04.GM = City Groove
-GM_TT05.GM = Aliens Ate My Railway
-GM_TT06.GM = Stoke It
-GM_TT07.GM = Don't Walk!
-GM_TT08.GM = Sawyer's Tune
-GM_TT09.GM = Fell Apart On Me
-GM_TT10.GM = Can't Get There From Here
-GM_TT11.GM = Hard Drivin'
-GM_TT12.GM = Road Hog
-GM_TT13.GM = Hold That Train!
-GM_TT14.GM = Broomer's Oil Rag
-GM_TT15.GM = Goss Groove
-GM_TT16.GM = Small Town
-GM_TT17.GM = Cruise Control
-GM_TT18.GM = Stroll On
-GM_TT19.GM = Funk Central
-GM_TT20.GM = Jammit
-GM_TT21.GM = Movin' On
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/bin/scenario/README
+++ b/bin/scenario/README
@@ -0,0 +1,4 @@
+You can place you scenarios in this dir.
+
+This file is really here to make the Makefile happy, it should be modified to
+properly handle scenarios (or maybe even not at all...).
--- a/bin/scripts/game_start.scr.example
+++ b/bin/scripts/game_start.scr.example
@@ -1,2 +0,0 @@
-start_ai MyAI
-
--- a/bin/scripts/on_server_connect.scr.example
+++ b/bin/scripts/on_server_connect.scr.example
@@ -1,2 +0,0 @@
-# Show a MOTD
-say "Welcome..."
--- a/bin/scripts/readme.txt
+++ b/bin/scripts/readme.txt
@@ -10,8 +10,6 @@ local scripts:
   should be used to set client optimization settings:
 - 'on_client.scr' is executed when you join a server [all clients]

- - 'on_server_connect.scr' is executed on the server when a client has joined (MOTD)
-
   should be used to set the servers port/ip and/or server optimization settings/patches:
 - 'pre_server.scr' is executed before the servers tcp stack is started [in-game only]
 - 'pre_dedicated.scr' is executed before the servers tcp stack is started [dedicated only]
--- a/changelog.txt
+++ b/changelog.txt
--- a/config.lib
+++ b/config.lib
--- a/81
+++ b/81
@@ -1,20 +1,5 @@
 #!/bin/sh

-# $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/>.
-
-check_path_characters() {
-	if [ -n "`echo $ROOT_DIR | grep '[^-_A-Za-z0-9\/\\\.:]'`" ]; then
-		echo "WARNING: The path contains a non-alphanumeric character that might cause"
-		echo "         failures in subsequent build stages. Any failures with the build"
-		echo "         will most likely be caused by this."
-	fi
-}
-
 CONFIGURE_EXECUTABLE="$_"
 # On *nix systems those two are equal when ./configure is done
 if [ "$0" != "$CONFIGURE_EXECUTABLE" ]; then
@@ -29,17 +14,10 @@ if [ "$0" != "$CONFIGURE_EXECUTABLE" ]; then
 fi
 # Find out where configure is (in what dir)
 ROOT_DIR="`dirname $0`"
-# For MSYS/MinGW we want to know the FULL path. This as that path is generated
-# once you call an outside binary. Having the same path for the rest is needed
-# for dependency checking.
-# pwd -W returns said FULL path, but doesn't exist on others so fall back.
-ROOT_DIR="`cd $ROOT_DIR && (pwd -W 2>/dev/null || pwd 2>/dev/null)`"
+ROOT_DIR="`cd $ROOT_DIR && pwd`"

-check_path_characters
-
-# Same here as for the ROOT_DIR above
-PWD="`pwd -W 2>/dev/null || pwd 2>/dev/null`"
-PREFIX="$PWD/bin"
+PWD="`pwd`"
+PREFIX="`pwd`/bin"

 . $ROOT_DIR/config.lib

@@ -47,24 +25,22 @@ PREFIX="$PWD/bin"
 OBJS_DIR="$PWD/objs"
 BASE_SRC_OBJS_DIR="$OBJS_DIR"
 LANG_OBJS_DIR="$OBJS_DIR/lang"
-GRF_OBJS_DIR="$OBJS_DIR/extra_grf"
 BIN_DIR="$PREFIX"
 SRC_DIR="$ROOT_DIR/src"
 LANG_DIR="$SRC_DIR/lang"
 MEDIA_DIR="$ROOT_DIR/media"
 SOURCE_LIST="$ROOT_DIR/source.list"

-if [ "$1" = "--reconfig" ] || [ "$1" = "--reconfigure" ]; then
-	if [ ! -f "config.cache" ]; then
+if [ "$1" = "--reconfig" ]; then
+	if ! [ -f "config.cache" ]; then
 		echo "can't reconfigure, because never configured before"
 		exit 1
 	fi
 	# Make sure we don't lock config.cache
-	cat config.cache | sed 's@\\ @\\\\ @g' > cache.tmp
+	cat config.cache > cache.tmp
 	sh cache.tmp
-	RET=$?
 	rm -f cache.tmp
-	exit $RET
+	exit $?
 fi

 set_default
@@ -74,28 +50,27 @@ save_params
 make_cflags_and_ldflags

 EXE=""
-if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "OS2" ] || [ "$os" = "DOS" ] || [ "$os" = "WINCE" ]; then
+if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "OS2" ] || [ "$os" = "WINCE" ]; then
 	EXE=".exe"
 fi

 TTD="openttd$EXE"
 STRGEN="strgen$EXE"
 ENDIAN_CHECK="endian_check$EXE"
-DEPEND="depend$EXE"

 if [ -z "$sort" ]; then
-	PIPE_SORT="sed s@a@a@"
+	PIPE_SORT="sed s/a/a/"
 else
 	PIPE_SORT="$sort"
 fi

-if [ ! -f "$LANG_DIR/english.txt" ]; then
+if ! [ -f "$LANG_DIR/english.txt" ]; then
 	echo "Languages not found in $LANG_DIR. Can't continue without it."
 	echo "Please make sure the dir exists and contains at least english.txt"
 fi

 # Read the source.list and process it
-AWKCOMMAND='
+SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | $awk '
 	{  }
 	/^(	*)#end/  { if (deep == skip) { skip -= 1; } deep -= 1; next; }
 	/^(	*)#else/ { if (deep == skip) { skip -= 1; } else if (deep - 1 == skip) { skip += 1; } next; }
@@ -107,26 +82,21 @@ AWKCOMMAND='

 		deep += 1;

-		if ($0 == "ALLEGRO"     && "'$allegro_config'" == "")      { next; }
 		if ($0 == "SDL"         && "'$sdl_config'" == "")          { next; }
 		if ($0 == "PNG"         && "'$png_config'" == "")          { next; }
 		if ($0 == "OSX"         && "'$os'" != "OSX")               { next; }
 		if ($0 == "OS2"         && "'$os'" != "OS2")               { next; }
 		if ($0 == "PSP"         && "'$os'" != "PSP")               { next; }
 		if ($0 == "DEDICATED"   && "'$enable_dedicated'" != "1")   { next; }
-		if ($0 == "AI"          && "'$enable_ai'" == "0")          { next; }
 		if ($0 == "COCOA"       && "'$with_cocoa'" == "0")         { next; }
-		if ($0 == "DOS"         && "'$os'" != "DOS")               { next; }
-		if ($0 == "BEOS"        && "'$os'" != "BEOS" &&
-		                                       "'$os'" != "HAIKU") { next; }
+		if ($0 == "BEOS"        && "'$os'" != "BEOS")              { next; }
 		if ($0 == "WIN32"       && "'$os'" != "MINGW" &&
-		                 "'$os'" != "CYGWIN" && "'$os'" != "MSVC") { next; }
-		if ($0 == "MORPHOS"     && "'$os'" != "MORPHOS")           { next; }
+		                "'$os'" != "CYGWIN" && "'$os'" != "MSVC" ) { next; }
 		if ($0 == "WINCE"       && "'$os'" != "WINCE")             { next; }
 		if ($0 == "MSVC"        && "'$os'" != "MSVC")              { next; }
 		if ($0 == "DIRECTMUSIC" && "'$with_direct_music'" == "0")  { next; }
 		if ($0 == "LIBTIMIDITY" && "'$libtimidity'" == "" )        { next; }
-		if ($0 == "HAVE_THREAD" && "'$with_threads'" == "0")       { next; }
+		if ($0 == "NO_THREADS"  && "'$with_threads'" == "0")       { next; }

 		skip += 1;

@@ -142,30 +112,23 @@ AWKCOMMAND='
 			print $0;
 		}
 	}
-'
+' | $PIPE_SORT`"

-# Read the source.list and process it
-# Please escape ALL " within ` because e.g. "" terminates the string in some sh implementations
-SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | $awk \"$AWKCOMMAND\" | $PIPE_SORT`"
-
-OBJS_C="`  echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.c$/   { gsub(\".c$\",   \".o\", $0); print $0; }'`"
-OBJS_CPP="`echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.cpp$/ { gsub(\".cpp$\", \".o\", $0); print $0; }'`"
-OBJS_MM="` echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.mm$/  { gsub(\".mm$\",  \".o\", $0); print $0; }'`"
-OBJS_RC="` echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.rc$/  { gsub(\".rc$\",  \".o\", $0); print $0; }'`"
-SRCS="`    echo \"$SRCS\" | $awk ' { ORS = \" \" } { print $0; }'`"
+OBJS_C="`  echo \"$SRCS\" | $awk ' { ORS = " " } /\.c$/   { gsub(".c$",   ".o", $0); print $0; }'`"
+OBJS_CPP="`echo \"$SRCS\" | $awk ' { ORS = " " } /\.cpp$/ { gsub(".cpp$", ".o", $0); print $0; }'`"
+OBJS_MM="` echo \"$SRCS\" | $awk ' { ORS = " " } /\.mm$/  { gsub(".mm$",  ".o", $0); print $0; }'`"
+OBJS_RC="` echo \"$SRCS\" | $awk ' { ORS = " " } /\.rc$/  { gsub(".rc$",  ".o", $0); print $0; }'`"
+SRCS="`    echo \"$SRCS\" | $awk ' { ORS = " " } { print $0; }'`"

 # In makefiles, we always use -u for sort
 if [ -z "$sort" ]; then
-	sort="sed s@a@a@"
+	sort="sed s/a/a/"
 else
 	sort="$sort -u"
 fi

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

 generate_main
 generate_lang
-generate_grf
 generate_src
-
-check_path_characters
--- a/docs/32bpp.txt
+++ b/docs/32bpp.txt
@@ -27,7 +27,7 @@ OpenTTD palette. Upon load of the PNG, the mask is loaded too, and overrides
 the RGB (not the Alpha) of the original PNG image, and replacing it with a
 8bpp color remapped and converted to 32bpp.

-Another thing that OpenTTD needs in your png, is 2 tEXt chunks: x_offs and
+An other thing that OpenTTD needs in your png, is 2 tEXt chunks: x_offs and
 y_offs. This to define the x- and y-offset, of course. Use the tool we supply
 to add this information. Sadly enough most graphical editors trashes those
 chunks upon save, so you have to readd it every time you save your image.
--- a/docs/HOWTO_compile_lang_files.txt
+++ b/docs/HOWTO_compile_lang_files.txt
@@ -1,15 +1,14 @@
 STRGEN USAGE
 ------------
 This guide is only interesting for people who want to alter something
-themselves without access to translator.openttd.org. Please note that
+themselves without access to WT2 (translator2.openttd.org). Please note that
 your compiled language file will only be compatible with the OpenTTD version
 you have downloaded english.txt, the master language file, for. While this is
 not always true, namely when changes in the code have not touched language
 files, your safest bet is to assume this 'limitation'.
 As a first step you need to compile strgen. This is as easy as typing
-'make strgen'. You can download the precompile strgen from:
-http://www.openttd.org/download-strgen
-
+'make strgen'. You can also download a precompiled binary from a release,
+nightly, etc.
 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.
--- a/docs/Manual.txt
+++ b/docs/Manual.txt
@@ -0,0 +1,100 @@
+Welcome to the manual for OpenTTD. The latest release version at the time of  writing is 0.3.2.
+
+1 Obtaining OpenTTD.
+
+You can obtain built binaries of OpenTTD for the 4 supported platforms - Win32, Linux,-x86, BeOS 5 and MacOS-X from the projects Sourceforge page, at http://sourceforge.net/projects/openttd . For the non-Win32 builds you will need libSDL.so, libpng.so and zlib.so compiled for your platform. Some builds will include these.
+
+If you use another platform, such as FreeBSD, which has POSIX file i/o and an SDL port, you should be able to build OpenTTD from its source. This is available in the proejcts Subversion repository at svn://svn.openttd.com . The module name is "trunk".
+
+1.1 Building OpenTTD.
+
+Once you have obtained a recent copy of the source, you must build it. Windows build instructions will be provided later.
+
+On UNIX platforms (including OS-X and BeOS), ensure you have a recent GCC (2.9  or above, or 3 and above).You will also need SDL development headers and libraries (libSDL 1.2 or higher). For PNG screenshot support and zlib compressed games, you will need libpng 1.0.12 or higher and zlib 1.2 or higher.
+
+Most UNIX platforms:
+First run ./configure, them use make or gmake to compile OpenTTD. You can configure the different compile options via ./configure.
+
+BeOS:
+On BeOS, run ./configure and then use jam. There are a variaty of options you can pass to your build tool, these are reported by ./configure.
+
+1.2 Installing OpenTTD.
+
+On Windows, insert your "Transport Tycoon Deluxe for Windows 95" disk. You can use a DOS version, but your graphics will be purple. NB: Even if your version of Transport Tycoon Deluxe ran on Windows 95, it may still be the DOS version. Then run the OpenTTD installer.
+
+On UNIX platforms; decompress your OpenTTD archive, or otherwise run the installer. You should be left with an OpenTTD directory on your system. In this directory, make a subdirectory called 'data', and into this place the sample.cat file and all the .grf files from the install CD of 'Transport Tycoon Deluxe for Windows 95".
+(Alternatively you can use the TTD GRF files from the DOS version: TRG1.GRF, TRGC.GRF, TRGH.GRF, TRGI.GRF, TRGT.GRF. A few minor graphical glitches with the DOS graphics remain. E.g. the autorail button in the rail toolbar doesn't look as nice as with the Windows graphics.)
+
+If you want MIDI music, copy the 'gm' folder from the original game directory/CD to the OpenTTD folder.
+
+1.3 Running OpenTTD.
+
+On Windows, you can use a third-party launcher such as OTTD-Launcher to run OpenTTD directly from Explorer. Otherwise, navigate via the command prompt to the correct location and launch ttd.exe.
+
+On Linux, navigate at the shell to the correct location and run ttd.
+
+On BeOS and Mac OS-X, just double click the ttd binary in the Tracker/Finder. You can also start from the shell.
+
+1.4 Configuring OpenTTD
+
+OpenTTD's launch menu contains three configuration menus - Difficulty Settings, Configure Patches and Game Settings. Most of these menus can be configured from within a running game as well.
+
+Difficulty Settings lets you configure settings that affect the difficulty of playing the game. These include when your (computer-controlled) competitors can start building, how many of them there are, and how intelligent they are. You can also control how much the subsidy mutliplier is for subsidised routes, and how stable/volitile the in-game economy is. You can also set how you want the terrain to be configured in a random game.
+
+Game Settings lets you set regional settings - currency, language, town names, etc. It also lets you select the resolution to run the game at, as well as the screenshot format to use.
+
+Configure Patches lets you select which patches to use in the game. This allows you to set the game play to either original Transport Tycoon Deluxe compatible mode or a mode more like playing under TTD-Patch. Patches include building on slopes, longer bridges, longer trains, pre-signals, and TTD-Patch compatible handling of non-stop orders.
+
+2.1 Gameplay
+
+This section of the manual is written with the assumption that you already know the gameplay basics of Transport Tycoon Deluxe, on either DOS or Windows. As you must have the Windows Transport Tycoon Deluxe CD to play OpenTTD, you should either have a paper manual or the complete manual in PDF format on the disk. This section will only cover the gameplay differences from Transport Tycoon Deluxe.
+
+2.2 Station Construction
+
+In OpenTTD, you can build rail stations up to seven squares long and with up to seven platforms. You can also have stations spreading across far larger distances, allowing a large rail station to be connected to a large airport, for instance.
+
+However, there is an even more noticable difference in rail station construction. You may now add platforms and lenght to a station after it has been built, and you may also add platforms of a different type. Users of TTDPatch will be used to this behaviour. But beyond what TTDPatch has, you can make stations of uneven lenght/width, and even ones with perpendicular tracks. You can also delete single tiles or tracks from a station, by holding down Shift before pressing the station construction button.
+
+2.3 Checkpoint Stations
+
+Checkpoint stations (the small blue item in the rail construction window) are small 1x1 stations. They must be built on top of pre-existing track. They do not accept or produce carge of any kind. They exist solely for use as route points. They become useful when dealing with large networks  where trains may attempt to route themselves along undesirable or impossible routes. As an alternative to checkpoint stations, you can also direct trains to visit depots along the way. This has the advantage of also servicing the train and hence the train will rarely to never need to depart from its route to be serviced.
+
+2.4 Freeform Rail Laying.
+
+Along side the other rail laying buttons, you will see a button that looks somewhat like a crossing. This is the freeform rail laying tool., and it allows you to drag rail in any direction to lay it. This has a number of advantages, one of the main ones being that it can seriously speed up the laying of diagonal tracks.
+
+2.5 Vehicle Queuing (with Quantum Effects)
+
+This useful addition to OpenTTD means that road vehicles will queue outside a road station to  wait for a space rather than attempt to enter it immediately. As anyone who has operated a large road network with busy stations will know, road vehicles quickly pile up inside stations. This will prevent that. The Quantum Effects are down to a bug in the game that means that mutliple vehicles will often only take up one space in the queue. However, this is almost too useful to fix, and should still be there in later versions. This can be enabled/disabled.
+
+2.6 Building On Slopes
+
+This allows you to build roads, rails, stations and depots on slopes. It also allows the construction of trasmitters and lighthouses on slopes in the scenario editor. There are some minor differences between OpenTTD's and TTD-Patch's handling of building on slopes, the main one being that  bridges must still have solid land at their endings.
+
+2.7 Long Bridges
+
+OpenTTD allows you to constuct bridges up to 127 squares - half the size of the current map. This means that the crossing of large estuaries, such at the Bristol Channel in the original "West Country 90210" scenario can be acheived with one bridge instead of many bridges with staging points.
+
+2.8 Long trains
+
+OpenTTD allows trains of around 60 cars length, hence allowing you to use 7 square stations to their capacity and beyond.
+
+2.9 Speed Display
+
+This addition to OpenTTD allows you to see the current speed of any vehicle in their status window. Just open the status window of a vehicle and you can see the speed at that given moment. This allows you to see wheter better bridges, flatter/straighter track or more powerful engines could be used to increase the speed of a vehicle
+
+2.10 More Trains, More Ships, More Everything!
+
+Virtually any settings - train numbers, start date, what vehicles your competitors can use, etc - can be set in OpenTTD. Just use the Configure Patches menu on the main screen.
+
+2.11 Network Play
+
+See multiplayer.txt for more info.
+
+2.12 Rail Recycling.
+
+This button, at the end of the train construction window, lets you 'recycle' track to a new type. It also works on bridges, tunnels, stations and depots.
+
+2.13 Canal Building
+
+This button, at the end of the water construction window, lets you build canals and shiplifts across the landscape. These act just like normal water.
--- a/docs/OSX_install_instructions.txt
+++ b/docs/OSX_install_instructions.txt
@@ -0,0 +1,23 @@
+To install OpenTTD, you should drag the game to any location you want and in that folder, you should create a folder called "data". It should contain:
+sample.cat
+trg1r.grf
+trgcr.grf
+trghr.grf
+trgir.grf
+trgtr.grf
+
+(Alternatively you can use the TTD GRF files from the DOS version: TRG1.GRF, TRGC.GRF, TRGH.GRF, TRGI.GRF, TRGT.GRF. A few minor graphical glitches with the DOS graphics remain. E.g. the autorail button in the rail toolbar doesn't look as nice as with the Windows graphics.)
+
+You should also use the data folder to add any custom grf files if you like
+
+if you want music, you can add a GM folder and add all .gm files from TTD inside it
+
+If you want to use the scenarios, you can copy the scenario folder as well. If you already have one, just copy the content so you don't overwrite old ones that have been removed.
+
+In the end, you should have a folder containing:
+OpenTTD (the actual game)
+data (containing the grf files)
+GM   (optional for music)
+scenario (optional pregenerated maps)
+
+The game adds some items by itself when it runs, like a save folder and a setting file
--- a/docs/Readme_Windows_MSVC.txt
+++ b/docs/Readme_Windows_MSVC.txt
@@ -1,16 +1,16 @@
 Compiling OpenTTD using Microsoft Visual C++
-Last updated: 2010-01-03
+January 2, 2007
 --------------------------------------------
 PLEASE READ THE ENTIRE DOCUMENT BEFORE DOING ANY ACTUAL CHANGES!!


 SUPPORTED MSVC COMPILERS
 ------------------------
-OpenTTD includes projects for MSVC 2005.NET and MSVC 2008.NET. Both will
+OpenTTD includes projects for MSVC 2003.NET and MSVC 2005.NET. Both will
 compile out of the box, providing you have the required libraries/headers;
-which ones, see below. There is no support for VS6 or MSVC 2002, or
-MSVC 2003.NET. You are therefore strongly encouraged to either upgrade to
-MSVC 2008 Express (free) or use GCC.
+which ones, see below. There is no support for VS6, you are therefore
+strongly encouraged to either upgrade to MSVC 2005 Express (free) or use GCC.
+MSVC 2002 probably works as well, but it has not been tested.


 1) REQUIRED FILES
@@ -20,7 +20,7 @@ downloading; mostly because the DirectX SDK and Platform SDK are about
 500MB each.
 Download the following files:

-	* openttd-useful.zip (http://binaries.openttd.org/extra/openttd-useful/)
+	* openttd-useful.zip (http://sf.net/project/showfiles.php?group_id=103924&package_id=114307)
 	* DirectX 8.1 SDK (http://neuron.tuke.sk/~mizanin/eng/Dx81sdk-include-lib.rar) (or alternatively the latest DirectX SDK from Microsoft)
 	* MS Windows Platform SDK (http://www.microsoft.com/downloads/details.aspx?FamilyId=A55B6B43-E24F-4EA3-A93E-40C0EC4F68E5&displaylang=en)
 	* afxres.h (http://www-d0.fnal.gov/d0dist/dist/packages/d0ve/devel/windows/AFXRES.H)
@@ -29,23 +29,23 @@ Download the following files:

 You need an SVN-client to download the source from subversion:

-	* CLI Subversion (http://subversion.tigris.org/)
-	* GUI TortoiseSVN (http://tortoisesvn.tigris.org/)
+	* CLI Subversion (http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91)
+	* GUI TortoiseSVN (http://tortoisesvn.tigris.org/download.html)


 2) INCLUDES AND LIBRARIES
 -------------------------
 Put the newly downloaded files in the VC lib\ and include\ directories; where
-"C:\Program Files\Microsoft Visual Studio 9.0\VC" is your location of Visual C.
+"C:\Program Files\Microsoft Visual Studio 8\VC" is your location of Visual C.
 If you are compiling for an x64 system, use the include\ and lib\ directories
 from the win64/ folder.

 	* openttd-useful.zip\include\*
 	* afxresh.h
-	to >	C:\Program Files\Microsoft Visual Studio 9.0\VC\Include
+	to >	C:\Program Files\Microsoft Visual Studio 8\VC\Include

 	* openttd-useful.zip\lib\*
-	to >	C:\Program Files\Microsoft Visual Studio 9.0\VC\Lib
+	to >	C:\Program Files\Microsoft Visual Studio 8\VC\Lib

 Custom directories might be recommended, check 2.2)

@@ -74,19 +74,40 @@ NOTE: make sure that the directory for the DirectX SDK is the first one in the
 list, above all others, otherwise compilation will most likely fail!!


+2.3) DEBUGGING - WORKING DIRECTORY (MSVC 2003 ONLY!)
+----------------------------------------------------
+The very first time you check out and compile OpenTTD with Visual Studio 2003, running
+the binary will complain about missing files. You need to go into and change a setting
+
+OpenTTD > Project > Properties > Configuration (All Configurations) > ...
+ Configuration Properties > Debugging >
+
+	* Working Directory: ..\bin
+
+VS 2005 works out of the box because Microsoft allowed a user to supply a humanly-
+readable defaults file (openttd_vs80.vcproj.user), whereas 2003 is braindead.
+
+
 3) TTD GRAPHICS FILES
 ---------------------
-See section 4.1 of readme.txt for the required 3rdparty files and how to install them.
+Copy the following files from Transport Tycoon Deluxe to the bin/data folder
+
+	* sample.cat
+	* trg1r.grf
+	* trgcr.grf
+	* trghr.grf
+	* trgir.grf
+	* trgtr.grf


 4) COMPILING
 ------------
-Open trunk/openttd_vs[89]0.sln
+Open trunk/openttd[_vs80].sln
 Set the build mode to 'Release' in
 Build > Configuration manager > Active solution configuration > select "Release"
 Compile...

-If everything works well the binary should be in trunk/objs/Win[32|64]/Release/openttd.exe
+If everything works well the binary should be in trunk/objs/[Win32]/Release/openttd.exe


 5) EDITING, CHANGING SOURCE CODE
@@ -105,4 +126,4 @@ to ask about reasons; or just wait. The problem will most likely solve itself
 within a few days as the problem is noticed and fixed.

 An up-to-date version of this README can be found on the wiki:
-http://wiki.openttd.org/Microsoft_Visual_C%2B%2B_2008_Express_Editions
+http://wiki.openttd.org/index.php/MicrosoftVisualCExpress
--- a/docs/landscape.html
+++ b/docs/landscape.html
--- a/docs/landscape_grid.html
+++ b/docs/landscape_grid.html
@@ -6,7 +6,6 @@
  <title>OpenTTD Landscape Internals - #2</title>
  <style type="text/css">
    span.abuse { font-family: "Courier New", Courier, mono; background-color: rgb(255, 58, 31); }
-    span.option{ font-family: "Courier New", Courier, mono; background-color: rgb(255,255, 30); }
    span.free  { font-family: "Courier New", Courier, mono; background-color: rgb(30, 178, 54); }
    span.used  { font-family: "Courier New", Courier, mono; }
    td.bits    { white-space: nowrap; text-align: center; font-family: "Courier New", Courier, mono; }
@@ -23,8 +22,7 @@ the array so you can quickly see what is used and what is not.
 <ul>
  <li><span style="font-weight: bold;"><span class="free">O</span></span> - bit is free</li>
  <li><span style="font-weight: bold;"><span class="used">X</span></span> - bit is used</li>
-  <li><span style="font-weight: bold;"><span class="abuse">&nbsp;</span></span> - bit of attribute is abused for different purposes, i.e. other bits define the actual meaning.</li>
-  <li><span style="font-weight: bold;"><span class="option">~</span></span> - bit is accessed, but does not really have a meaning (e.g. owner of clear land is always OWNER_NONE)</li>
+  <li><span style="font-weight: bold;"><span class="abuse">&nbsp;</span></span> - bit of attribute is abused for different purposes</li>
 </ul>
 <p>
 <ul>
@@ -66,9 +64,9 @@ 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="option">~~~~ ~~~~</span></td>
+      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOO</span>X <span class="free">OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">XXXX XX<span class="free">OO</span></td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits">XX<span class="free">OO OO</span>XX</td>
@@ -77,11 +75,11 @@ the array so you can quickly see what is used and what is not.
    <tr>
      <td class="caption">farmland</td>
      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
+      <td class="bits">-inherit-</td>
      <td class="bits">XXXX XXXX XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO</span> XXXX</td>
+      <td class="bits">-inherit-</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">OO OO</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
@@ -89,22 +87,11 @@ the array so you can quickly see what is used and what is not.
      <td rowspan=3>1</td>
      <td class="caption">rail</td>
      <td class="bits">XXXX 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>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-    </tr>
-    <tr>
-      <td class="caption">rail with signals</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO</span> XXXX XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO O</span>XXX <span class="free">O</span>XXX</td>
+      <td class="bits">XXXX XXXX</td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits">-inherit-</td>
      <td class="bits">XX<span class="free">OO OO</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
@@ -112,10 +99,21 @@ the array so you can quickly see what is used and what is not.
      <td class="caption">depot</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
+      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOOO</span> XXXX</td>
+      <td class="bits"><span class="free">OOOO</span> XXXX</td>
+      <td class="bits">XX<span class="free">OO O</span>XXX</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
+    </tr>
+    <tr>
+      <td class="caption">waypoint</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
      <td class="bits">XXXX XXXX XXXX XXXX</td>
      <td class="bits"><span class="free">OOOO</span> XXXX</td>
      <td class="bits"><span class="free">OOOO</span> XXXX</td>
-      <td class="bits">XX<span class="free">O</span>X <span class="free">O</span>XXX</td>
+      <td class="bits">XX<span class="free">OO O</span>XXX</td>
      <td class="bits">XX<span class="free">OO OO</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
@@ -123,13 +121,13 @@ 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="option">~~~</span>X XXXX</td>
+      <td class="bits">XXXX XXXX</td>
      <td class="bits">XXXX XXXX XXXX XXXX</td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX X<span class="free">O</span>XX</td>
-      <td class="bits">XXX<span class="free">O</span> XXXX</td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
    </tr>
    <tr>
      <td class="caption">level crossing</td>
@@ -137,19 +135,19 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">XXXX<span class="free"> OOO</span>X</td>
-      <td class="bits">XXXX X<span class="free">O</span>XX</td>
+      <td class="bits"><span class="free">O</span>XXX XXXX</td>
+      <td class="bits">XX<span class="free">OO</span> XXXX</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
      <td class="bits">XXXX XXXX</td>
    </tr>
    <tr>
      <td class="caption">road depot</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
+      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
+      <td class="bits">X<span class="free">OOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits">XX<span class="free">OO</span> XXXX</td>
      <td class="bits">XX<span class="free">OO OO</span>XX</td>
      <td class="bits">XXX<span class="free">O OOOO</span></td>
    </tr>
@@ -159,133 +157,45 @@ 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">XXX<span class="option">~ ~~</span>XX</td>
+      <td class="bits">XX<span class="free">O</span>X XXXX</td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXX<span class="abuse">X XXXX</span></td>
+      <td class="bits">XX<span class="abuse">XX XXXX</span></td>
      <td class="bits"><span class="abuse">XXXX XX</span>XX</td>
-      <td class="bits">XXXX <span class="abuse">XXXX</span></td>
+      <td class="bits"><span class="abuse">X</span>XX<span class="abuse">X XXX</span>X</td>
    </tr>
    <tr>
      <td>4</td>
      <td class="caption">trees</td>
      <td class="bits">XXXX XXXX</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">XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span> XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</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>
    </tr>
    <tr>
-      <td rowspan=7>5</td>
-      <td class="caption">rail station</td>
+      <td>5</td>
+      <td class="caption">station</td>
+      <td class="bits">XXXX XXXX</td>
      <td class="bits">XXXX 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>
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OO</span>XX XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
+    </tr>
+    <tr>
+      <td>6</td>
+      <td class="caption">water</td>
      <td class="bits">XXXX XXXX</td>
-    </tr>
-    <tr>
-      <td class="caption">rail waypoint</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-    </tr>
-    <tr>
-      <td class="caption">road stop</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">XXXX <span class="free">OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="option">~~~~ ~</span>XXX</td>
-      <td class="bits"><span class="free">OO</span>XX XXXX</td>
-      <td class="bits">XX<span class="free">O</span>X XXXX</td>
-    </tr>
-    <tr>
-      <td class="caption">dock</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</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>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-    </tr>
-    <tr>
-      <td class="caption">airport</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
-      <td class="bits"><span class="free">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 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>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-    </tr>
-    <tr>
-      <td class="caption">oilrig</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-    </tr>
-    <tr>
-      <td rowspan=3>6</td>
-      <td class="caption">sea, shore</td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><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 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>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-    </tr>
-    <tr>
-      <td class="caption">canal, river</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO 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>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-    </tr>
-    <tr>
-      <td class="caption">shipdepot</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">XXXX XXXX XXXX XXXX</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">XXXX XXXX</td>
      <td class="bits">XX<span class="free">OO OO</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
@@ -293,7 +203,7 @@ 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">
+      <td class="bits"><span class="abuse">X</span><span class="free">OO</span><span class="abuse">X
        XXXX</span></td>
      <td class="bits">XXXX XXXX XXXX XXXX</td>
      <td class="bits">XXXX XXXX</td>
@@ -306,45 +216,35 @@ 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="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>
-      <td class="bits">X<span class="free">OO</span>X XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOOO</span> XXXX</td>
+      <td class="bits">X<span class="free">OOO OOOO</span></td>
+      <td class="bits">X<span class="free">OOO</span> XXXX</td>
      <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits">XXXX X<span class="free">O</span>XX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
    <tr>
      <td>bridge ramp</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits">-inherit-</td>
-    </tr>
-    <tr>
-      <td rowspan=2>A</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"><span class="free">OOOO OOOO</span> <span class="abuse">XXXX</span>
+        <span class="free">OOOO</span></td>
+      <td class="bits"><span class="free">OOOO</span> XXXX</td>
+      <td class="bits">X<span class="free">OOO OOOO</span></td>
+      <td class="bits">X<span class="free">OOO</span> 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">company statue</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">XXXX XXXX XXXX XXXX</td>
+      <td>A</td>
+      <td class="caption">unmovables</td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits">-inherit-</td>
+      <td class="bits">XXXX XXXX</td>
      <td class="bits">XX<span class="free">OO OO</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
--- a/docs/multiplayer.txt
+++ b/docs/multiplayer.txt
@@ -23,7 +23,7 @@ Multiplayer Manual for OpenTTD (0.3.5)
 - 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
+ - If there were more then one server
   - select one in the list below the buttons
   - click on 'join game'

--- a/docs/obg_format.txt
+++ b/docs/obg_format.txt
@@ -1,83 +0,0 @@
-;
-; Example file for the OpenTTD Base Graphics replacement sets.
-; This file consists of basically two different parts:
-;  * metadata
-;  * information about the files
-;
-; Metadata contains information about the name, version and palette
-; of the graphics set.
-;
-; == Getting started ==
-; - you can't add comments after values
-; - you have to fill the MD5 checksum for each file
-; - you may not miss any of the metadata or files items
-; - `openttd -h` lists all graphics replacements sets it found to be correct
-; - `openttd -d grf=1` shows warnings/errors when parsing an .obg file
-; - `openttd -I <name>` starts OpenTTD with the given set (case sensitive)
-; - adding `graphicsset = <name>` to the misc section of openttd.cfg makes
-;   OpenTTD start with that graphics set by default
-; - there is a command line tool for all platforms called md5sum that can
-;   create the MD5 checksum you need.
-; - all files specified in this file are search relatively to the path where
-;   this file is found, i.e. if the graphics files are in a subdir you have
-;   to add that subdir to the names in this file to! It will NOT search for
-;   a file named like specified in here.
-
-[metadata]
-; the name of the pack, preferably less than 16 characters
-name         = example
-; the short name (4 characters), used to identify this set
-shortname    = XMPL
-; the version of this graphics set (read as single integer)
-version      = 0
-; a fairly short description of the set
-; By adding '.<iso code>' you can translate the description.
-; Note that OpenTTD first tries the full ISO code, then the first
-; two characters and then uses the fallback (no '.<iso code>').
-; The ISO code matching is case sensitive!
-; So en_US will be used for en_GB if no en_GB translation is added.
-; As a result the below example has 'howdie' for en_US and en_GB but
-; 'foo' for all other languages.
-description  = foo
-description.en_US = howdie
-; palette used by the set; either DOS or Windows
-palette      = DOS
-
-; The files section lists the files that replace sprites.
-; The file names are case sensitive.
-[files]
-; GRF file with the base sprites
-base         = TRG1.GRF
-; GRF file with logos, original terrain generator sprites
-logos        = TRGI.GRF
-; GRF file with extra arctic sprites
-arctic       = TRGC.GRF
-; GRF file with extra tropical sprites
-tropical     = TRGH.GRF
-; GRF file with extra toyland sprites
-toyland      = TRGT.GRF
-; NewGRF file using Actions 5, 7, 9 and A to replace sprites
-; Must use a GRF ID starting with FF so it cannot be selected from
-; the in-game NewGRF list and (thus) be loaded twice.
-extra        = OPENTTDD.GRF
-
-; The md5s section lists the MD5 checksum for the files that replace them.
-; Note that the list of files is case sensitive. Each GRF listed in the
-; files section must be listed here with it's MD5 checksum, otherwise you
-; will get a lot of warnings when starting OpenTTD.
-[md5s]
-TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
-TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGC.GRF     = ed446637e034104c5559b32c18afe78d
-TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTDD.GRF = f829f62c137d6d7c6e272c481b796dd5
-
-; The origin section provides the possibility to put and extra line into
-; the warning that a file is missing/corrupt. This can be used to tell
-; them where to find it. It works on the filename specified in the
-; files section and if that is not found it will fall back to the default
-; as shown below here.
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTDD.GRF = This file was part of your installation.
--- a/docs/obm_format.txt
+++ b/docs/obm_format.txt
@@ -1,106 +0,0 @@
-;
-; Example file for the OpenTTD Base Music replacement sets.
-; This file consists of basically two different parts:
-;  * metadata
-;  * information about the files/songs
-;
-; Metadata contains information about the name and version
-; of the music set.
-;
-; == Getting started ==
-; - you can't add comments after values
-; - you have to fill the MD5 checksum for each file
-; - you may not miss any of the metadata or files items
-; - `openttd -h` lists all music replacement sets it found to be correct
-; - `openttd -d grf=1` shows warnings/errors when parsing an .obm file
-; - `openttd -M <name>` starts OpenTTD with the given set (case sensitive)
-; - adding `musicset = <name>` to the misc section of openttd.cfg makes
-;   OpenTTD start with that sound set by default
-; - there is a command line tool for all platforms called md5sum that can
-;   create the MD5 checksum you need.
-; - all files specified in this file are search relatively to the path where
-;   this file is found, i.e. if the sound files are in a subdir you have
-;   to add that subdir to the names in this file to! It will NOT search for
-;   a file named like specified in here.
-
-[metadata]
-; the name of the pack, preferably less than 16 characters
-name         = example
-; the short name (4 characters), used to identify this set
-shortname    = XMPL
-; the version of this sound set (read as single integer)
-version      = 0
-; a fairly short description of the set
-; By adding '.<iso code>' you can translate the description.
-; Note that OpenTTD first tries the full ISO code, then the first
-; two characters and then uses the fallback (no '.<iso code>').
-; The ISO code matching is case sensitive!
-; So en_US will be used for en_GB if no en_GB translation is added.
-; As a result the below example has 'howdie' for en_US and en_GB but
-; 'foo' for all other languages.
-description  = foo
-description.en_US = howdie
-
-; The files section lists the files that replace songs.
-; The file names are case sensitive.
-; You can have empty file names; in that case no song will be loaded
-; for that 'entry'.
-[files]
-; The theme song for OpenTTD
-theme = THEME_SONG.GM
-; The songs in the 'old style' category
-old_0 =
-old_1 =
-old_2 =
-old_3 =
-old_4 =
-old_5 =
-old_6 =
-old_7 =
-old_8 =
-old_9 =
-; The songs in the 'new style' category
-new_0 =
-new_1 =
-new_2 =
-new_3 =
-new_4 =
-new_5 =
-new_6 =
-new_7 =
-new_8 =
-new_9 =
-; The songs in the 'ezy street' category
-ezy_0 =
-ezy_1 =
-ezy_2 =
-ezy_3 =
-ezy_4 =
-ezy_5 =
-ezy_6 =
-ezy_7 =
-ezy_8 =
-ezy_9 =
-
-; The names section lists the song names for the given file name.
-; Note that the list of files is case sensitive. Each file listed in the
-; files section must be listed here with it's song name, otherwise you
-; will get a lot of warnings when starting OpenTTD.
-[names]
-THEME_SONG.GM = Tycoon DELUXE Theme
-
-; The md5s section lists the MD5 checksum for the files that replace them.
-; Note that the list of files is case sensitive. Each file listed in the
-; files section must be listed here with it's MD5 checksum, otherwise you
-; will get a lot of warnings when starting OpenTTD.
-[md5s]
-THEME_SONG.GM = 45cfec1b9d8c7a0ad45e755833cbf221
-
-; The origin section provides the possibility to put and extra line into
-; the warning that a file is missing/corrupt. This can be used to tell
-; them where to find it. It works on the filename specified in the
-; files section and if that is not found it will fall back to the default
-; as shown below here.
-[origin]
-default       = You can find it on your Transport Tycoon Deluxe CD-ROM.
-THEME_SONG.GM  = You can find it also on your Transport Tycoon Deluxe CD-ROM.
--- a/docs/obs_format.txt
+++ b/docs/obs_format.txt
@@ -1,64 +0,0 @@
-;
-; Example file for the OpenTTD Base Sound replacement sets.
-; This file consists of basically two different parts:
-;  * metadata
-;  * information about the files
-;
-; Metadata contains information about the name and version
-; of the sound set.
-;
-; == Getting started ==
-; - you can't add comments after values
-; - you have to fill the MD5 checksum for each file
-; - you may not miss any of the metadata or files items
-; - `openttd -h` lists all sound replacements sets it found to be correct
-; - `openttd -d grf=1` shows warnings/errors when parsing an .obs file
-; - `openttd -S <name>` starts OpenTTD with the given set (case sensitive)
-; - adding `soundsset = <name>` to the misc section of openttd.cfg makes
-;   OpenTTD start with that sound set by default
-; - there is a command line tool for all platforms called md5sum that can
-;   create the MD5 checksum you need.
-; - all files specified in this file are search relatively to the path where
-;   this file is found, i.e. if the sound files are in a subdir you have
-;   to add that subdir to the names in this file to! It will NOT search for
-;   a file named like specified in here.
-
-[metadata]
-; the name of the pack, preferably less than 16 characters
-name         = example
-; the short name (4 characters), used to identify this set
-shortname    = XMPL
-; the version of this sound set (read as single integer)
-version      = 0
-; a fairly short description of the set
-; By adding '.<iso code>' you can translate the description.
-; Note that OpenTTD first tries the full ISO code, then the first
-; two characters and then uses the fallback (no '.<iso code>').
-; The ISO code matching is case sensitive!
-; So en_US will be used for en_GB if no en_GB translation is added.
-; As a result the below example has 'howdie' for en_US and en_GB but
-; 'foo' for all other languages.
-description  = foo
-description.en_US = howdie
-
-; The files section lists the files that replace sprites.
-; The file names are case sensitive.
-[files]
-; The file with the samples. Must contain exactly 73 samples.
-samples      = SAMPLES.CAT
-
-; The md5s section lists the MD5 checksum for the files that replace them.
-; Note that the list of files is case sensitive. Each file listed in the
-; files section must be listed here with it's MD5 checksum, otherwise you
-; will get a lot of warnings when starting OpenTTD.
-[md5s]
-SAMPLES.CAT  = 422ea3dd074d2859bb51639a6e0e85da
-
-; The origin section provides the possibility to put and extra line into
-; the warning that a file is missing/corrupt. This can be used to tell
-; them where to find it. It works on the filename specified in the
-; files section and if that is not found it will fall back to the default
-; as shown below here.
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-SAMPLES.CAT  = You can find it also on your Transport Tycoon Deluxe CD-ROM.
--- a/docs/openttd.6
+++ b/docs/openttd.6
@@ -1,111 +1,62 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd Apr 01, 2010
+.Dd Sep 15, 2007
 .Dt OPENTTD 6
 .Sh NAME
 .Nm openttd
 .Nd An open source clone of the Microprose game "Transport Tycoon Deluxe"
 .Sh SYNOPSIS
 .Nm
-.Op Fl efhx
-.Op Fl b Ar blitter
-.Op Fl c Ar config_file
-.Op Fl d Ar [level | cat=lvl[,...]]
-.Op Fl D Ar [host][:port]
-.Op Fl g Ar [savegame]
+.Op Fl Defhi
 .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
-.Op Fl M Ar musicset
+.Op Fl d Ar [level | cat=lvl[, ...]]
+.Op Fl g Ar [savegame]
 .Op Fl n Ar host[:port][#player]
-.Op Fl p Ar password
-.Op Fl P Ar password
 .Op Fl r Ar widthxheight
+.Op Fl t Ar date
+.Op Fl m Ar driver
 .Op Fl s Ar driver
-.Op Fl S Ar soundset
-.Op Fl t Ar year
 .Op Fl v Ar driver
 .Sh OPTIONS
 .Bl -tag -width ".Fl n Ar host[:port][#player]"
-.It Fl b Ar blitter
-Set the blitter, see
-.Fl h
-for a full list
-.It Fl c Ar config_file
-Use 'config_file' instead of 'openttd.cfg'
+.It Fl D
+Start a dedicated server
+.It Fl G Ar seed
+Seed the pseudo random number generator
 .It Fl d Ar [level]
 Set debug verbosity for all categories to
 .Ar level
 or 1 if omitted
-.It Fl d Ar cat=level[,...]
+.It Fl d Ar cat=level[, ...]
 Set debug verbosity for a specific category
-.It Fl D Ar [host][:port]
-Start a dedicated server. Sets network debug level to 6. If you want to change this, use
-.Fl d
-after
-.Fl D
-.It Fl G Ar seed
-Seed the pseudo random number generator
 .It Fl e
 Start in world editor mode
 .It Fl f
-Fork into background (dedicated server only, see
+Fork into background (dedicated only, see
 .Fl D )
 .It Fl g Ar [savegame]
 Load
 .Ar savegame
-at start or start a new game if omitted. The
-.Ar savegame
-must be either absolute or relative to the current path or one of the search paths.
+at start or start a new game if omitted
 .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
-for a full list
-.It Fl l Ar host[:port]
-Redirect DEBUG(), See
-.Fl D
+Display a summary of all options and available drivers
+.It Fl i
+Force to use the DOS palette (use this if you see a lot of magenta)
 .It Fl m Ar driver
 Set the music driver, see
 .Fl h
-for a full list
-.It Fl M Ar musicset
-Set the music set, see
-.Fl h
-for a full list
 .It Fl n Ar host[:port][#player]
-Join a network game, optionally specify a port to connect to and player to play as
-.It Fl p Ar password
-Password used to join server. Only useful with
-.Fl n
-.It Fl P Ar password
-Password used to join company. Only useful with
-.Fl n
+Join a network game, optionally specify player to play as and port to connect to
 .It Fl r Ar widthxheight
 Set the resolution
 .It Fl s Ar driver
 Set the sound driver, see
 .Fl h
-for a full list
-.It Fl S Ar soundset
-Set the sound set, see
-.Fl h
-for a full list
-.It Fl t Ar year
-Set the starting year
+.It Fl t Ar date
+Set the starting date
 .It Fl v Ar driver
 Set the video driver, see
 .Fl h
-for a full list
-.It Fl x
-Do not automatically save to config file on exit
 .El
 .Sh SEE ALSO
 http://wiki.openttd.org/, http://www.openttd.org
--- a/docs/palettes/openttd.gpl
+++ b/docs/palettes/openttd.gpl
@@ -1,260 +0,0 @@
-GIMP Palette
-Name: openttd
-Columns: 16
-#
-  0   0 255	unnamed
-238   0 238	unnamed
-239   0 239	unnamed
-240   0 240	unnamed
-241   0 241	unnamed
-242   0 242	unnamed
-243   0 243	unnamed
-244   0 244	unnamed
-245   0 245	unnamed
-246   0 246	unnamed
-168 168 168	unnamed
-184 184 184	unnamed
-200 200 200	unnamed
-216 216 216	unnamed
-232 232 232	unnamed
-252 252 252	unnamed
- 52  60  72	unnamed
- 68  76  92	unnamed
- 88  96 112	unnamed
-108 116 132	unnamed
-132 140 152	unnamed
-156 160 172	unnamed
-176 184 196	unnamed
-204 208 220	unnamed
- 48  44   4	unnamed
- 64  60  12	unnamed
- 80  76  20	unnamed
- 96  92  28	unnamed
-120 120  64	unnamed
-148 148 100	unnamed
-176 176 132	unnamed
-204 204 168	unnamed
-100 100 100	unnamed
-116 116 116	unnamed
-104  80  44	unnamed
-124 104  72	unnamed
-152 132  92	unnamed
-184 160 120	unnamed
-212 188 148	unnamed
-244 220 176	unnamed
-132 132 132	unnamed
- 88   4  16	unnamed
-112  16  32	unnamed
-136  32  52	unnamed
-160  56  76	unnamed
-188  84 108	unnamed
-204 104 124	unnamed
-220 132 144	unnamed
-236 156 164	unnamed
-252 188 192	unnamed
-252 208   0	unnamed
-252 232  60	unnamed
-252 252 128	unnamed
- 76  40   0	unnamed
- 96  60   8	unnamed
-116  88  28	unnamed
-136 116  56	unnamed
-156 136  80	unnamed
-176 156 108	unnamed
-196 180 136	unnamed
- 68  24   0	unnamed
- 96  44   4	unnamed
-128  68   8	unnamed
-156  96  16	unnamed
-184 120  24	unnamed
-212 156  32	unnamed
-232 184  16	unnamed
-252 212   0	unnamed
-252 248 128	unnamed
-252 252 192	unnamed
- 32   4   0	unnamed
- 64  20   8	unnamed
- 84  28  16	unnamed
-108  44  28	unnamed
-128  56  40	unnamed
-148  72  56	unnamed
-168  92  76	unnamed
-184 108  88	unnamed
-196 128 108	unnamed
-212 148 128	unnamed
-  8  52   0	unnamed
- 16  64   0	unnamed
- 32  80   4	unnamed
- 48  96   4	unnamed
- 64 112  12	unnamed
- 84 132  20	unnamed
-104 148  28	unnamed
-128 168  44	unnamed
- 64  64  64	unnamed
- 44  68  32	unnamed
- 60  88  48	unnamed
- 80 104  60	unnamed
-104 124  76	unnamed
-128 148  92	unnamed
-152 176 108	unnamed
-180 204 124	unnamed
- 16  52  24	unnamed
- 32  72  44	unnamed
- 56  96  72	unnamed
- 76 116  88	unnamed
- 96 136 108	unnamed
-120 164 136	unnamed
-152 192 168	unnamed
-184 220 200	unnamed
- 32  24   0	unnamed
- 56  28   0	unnamed
- 80  80  80	unnamed
- 88  52  12	unnamed
-104  64  24	unnamed
-124  84  44	unnamed
-140 108  64	unnamed
-160 128  88	unnamed
- 76  40  16	unnamed
- 96  52  24	unnamed
-116  68  40	unnamed
-136  84  56	unnamed
-164  96  64	unnamed
-184 112  80	unnamed
-204 128  96	unnamed
-212 148 112	unnamed
-224 168 128	unnamed
-236 188 148	unnamed
- 80  28   4	unnamed
-100  40  20	unnamed
-120  56  40	unnamed
-140  76  64	unnamed
-160 100  96	unnamed
-184 136 136	unnamed
- 36  40  68	unnamed
- 48  52  84	unnamed
- 64  64 100	unnamed
- 80  80 116	unnamed
-100 100 136	unnamed
-132 132 164	unnamed
-172 172 192	unnamed
-212 212 224	unnamed
- 48  48  48	unnamed
- 64  44 144	unnamed
- 88  64 172	unnamed
-104  76 196	unnamed
-120  88 224	unnamed
-140 104 252	unnamed
-160 136 252	unnamed
-188 168 252	unnamed
-  0  24 108	unnamed
-  0  36 132	unnamed
-  0  52 160	unnamed
-  0  72 184	unnamed
-  0  96 212	unnamed
- 24 120 220	unnamed
- 56 144 232	unnamed
- 88 168 240	unnamed
-128 196 252	unnamed
-188 224 252	unnamed
- 16  64  96	unnamed
- 24  80 108	unnamed
- 40  96 120	unnamed
- 52 112 132	unnamed
- 80 140 160	unnamed
-116 172 192	unnamed
-156 204 220	unnamed
-204 240 252	unnamed
-172  52  52	unnamed
-212  52  52	unnamed
-252  52  52	unnamed
-252 100  88	unnamed
-252 144 124	unnamed
-252 184 160	unnamed
-252 216 200	unnamed
-252 244 236	unnamed
- 72  20 112	unnamed
- 92  44 140	unnamed
-112  68 168	unnamed
-140 100 196	unnamed
-168 136 224	unnamed
-200 176 248	unnamed
-208 184 255	unnamed
-232 208 252	unnamed
- 60   0   0	unnamed
- 92   0   0	unnamed
-128   0   0	unnamed
-160   0   0	unnamed
-196   0   0	unnamed
-224   0   0	unnamed
-252   0   0	unnamed
-252  80   0	unnamed
-252 108   0	unnamed
-252 136   0	unnamed
-252 164   0	unnamed
-252 192   0	unnamed
-252 220   0	unnamed
-252 252   0	unnamed
-204 136   8	unnamed
-228 144   4	unnamed
-252 156   0	unnamed
-252 176  48	unnamed
-252 196 100	unnamed
-252 216 152	unnamed
-  8  24  88	unnamed
- 12  36 104	unnamed
- 20  52 124	unnamed
- 28  68 140	unnamed
- 40  92 164	unnamed
- 56 120 188	unnamed
- 72 152 216	unnamed
-100 172 224	unnamed
- 92 156  52	unnamed
-108 176  64	unnamed
-124 200  76	unnamed
-144 224  92	unnamed
-224 244 252	unnamed
-200 236 248	unnamed
-180 220 236	unnamed
-132 188 216	unnamed
- 88 152 172	unnamed
- 16  16  16	unnamed
- 32  32  32	unnamed
- 32  68 112	unnamed
- 36  72 116	unnamed
- 40  76 120	unnamed
- 44  80 124	unnamed
- 48  84 128	unnamed
- 72 100 144	unnamed
-100 132 168	unnamed
-216 244 252	unnamed
- 96 128 164	unnamed
- 68  96 140	unnamed
- 76  24   8	unnamed
-108  44  24	unnamed
-144  72  52	unnamed
-176 108  84	unnamed
-210 146 126	unnamed
-252  60   0	unnamed
-252  84   0	unnamed
-252 104   0	unnamed
-252 124   0	unnamed
-252 148   0	unnamed
-252 172   0	unnamed
-252 196   0	unnamed
- 64   0   0	unnamed
-255   0   0	unnamed
- 48  48   0	unnamed
- 64  64   0	unnamed
- 80  80   0	unnamed
-255 255   0	unnamed
-148 148 148	unnamed
-247   0 247	unnamed
-248   0 248	unnamed
-249   0 249	unnamed
-250   0 250	unnamed
-251   0 251	unnamed
-252   0 252	unnamed
-253   0 253	unnamed
-254   0 254	unnamed
-255   0 255	unnamed
-255 255 255	unnamed
--- a/findversion.sh
+++ b/findversion.sh
@@ -1,124 +0,0 @@
-#!/bin/sh
-
-# $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/>.
-
-
-# Arguments given? Show help text.
-if [ "$#" != "0" ]; then
-	cat <<EOF
-Usage: ./findversion.sh
-Finds the current revision and if the code is modified.
-
-Output: <REV>\t<REV_NR>\t<MODIFIED>\t<CLEAN_REV>
-REV
-    a string describing what version of the code the current checkout is
-    based on. The exact format of this string depends on the version
-    control system in use, but it tries to identify the revision used as
-    close as possible (using the svn revision number or hg/git hash).
-    This also includes an indication of whether the checkout was
-    modified and which branch was checked out. This value is not
-    guaranteed to be sortable, but is mainly meant for identifying the
-    revision and user display.
-
-    If no revision identifier could be found, this is left empty.
-REV_NR
-    the revision number of the svn revision this checkout is based on.
-    This can be used to determine which functionality is present in this
-    checkout. For trunk svn checkouts and hg/git branches based upon it,
-    this number should be accurate. For svn branch checkouts, this
-    number is mostly meaningless, at least when comparing with the
-    REV_NR from other branches or trunk.
-
-    This number should be sortable. Within a given branch or trunk, a
-    higher number means a newer version. However, when using git or hg,
-    this number will not increase on new commits.
-
-    If no revision number could be found, this is left empty.
-MODIFIED
-    Whether (the src directory of) this checkout is modified or not. A
-    value of 0 means not modified, a value of 2 means it was modified.
-    Modification is determined in relation to the commit identified by
-    REV, so not in relation to the svn revision identified by REV_NR.
-
-    A value of 1 means that the modified status is unknown, because this
-    is not an svn/git/hg checkout for example.
-
-CLEAN_REV
-    the same as REV but without branch name
-
-By setting the AWK environment variable, a caller can determine which
-version of "awk" is used. If nothing is set, this script defaults to
-"awk".
-EOF
-exit 1;
-fi
-
-# Allow awk to be provided by the caller.
-if [ -z "$AWK" ]; then
-	AWK=awk
-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 \"$SRC_DIR\" | grep 'M'`" ]; then
-		MODIFIED="2"
-	fi
-	# Find the revision like: rXXXXM-branch
-	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
-		REV="r$REV_NR"
-	fi
-elif [ -d "$ROOT_DIR/.git" ]; then
-	# We are a git checkout
-	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 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 \"$SRC_DIR\" | grep -v '^?'`" ]; then
-		MODIFIED="2"
-	fi
-	HASH=`LC_ALL=C hg parents --template="{node}"`
-	REV="h`echo $HASH | cut -c1-8`"
-	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"
-	BRANCH=""
-	REV=""
-	REV_NR=""
-fi
-
-if [ "$MODIFIED" -eq "2" ]; then
-	REV="${REV}M"
-fi
-
-CLEAN_REV=${REV}
-
-if [ -n "$BRANCH" ]; then
-	REV="${REV}-$BRANCH"
-fi
-
-echo "$REV	$REV_NR	$MODIFIED	$CLEAN_REV"
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,18 +1,5 @@
-OpenTTD's known bugs
-Last updated:    2010-11-20
-Release version: 1.0.5
+README
 ------------------------------------------------------------------------
-
-
-Table of Contents:
------------------
-1) About
-2) Known bugs in the this stable release
-3) Known bugs that will not be solved
-
-
-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!!
@@ -21,253 +8,24 @@ Of course if you have more knowledge about any of these bugs, have more
 specifics, we welcome you to report them. React to the given bug indicated
 by the number below on http://bugs.openttd.org.

+If the bug report is closed, it has been fixed, which then can be verified
+in the latest SVN version of /trunk.

-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.
+Bugs for 0.6.0-beta1
+------------------------------------------------------------------------
+URL: http://bugs.openttd.org

-The bugs in this section all refer to a ticket in our bug tracking system
-that you can find at: http://bugs.openttd.org
-If the bugs are closed but still listed here it means that the bug is fixed
-and that the nightlies and next major release will not have that bug.
-
-Issues prefixed with [OSX] are required to be fixed before we consider
-officially supporting Mac OS X again. For now it remains unsupported and
-we only apply bug fixes provided by the community but we are unable to fix
-these bugs ourselves.
-
- 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
-
-
-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
-be able to completely fix them.
-
-No suitable AI can be found
-	If you have no AIs and an AI is started the so-called 'dummy' AI will
-	be loaded. This AI does nothing but writing a message on the AI debug
-	window and showing a red warning. There are basically two solutions
-	for this problem: you must change the settings so no AI is started,
-	this is done in the difficulty settings window. The other solution is
-	acquiring (downloading) some AI. The easiest way to do this is via
-	the "Check Online Content" button in the main (intro) menu or via
-	"AI Settings" -> "Select AI" -> "Check Online Content" which is also
-	accessed via the main menu.
-
-After a while of playing, colours get corrupted
-	In Windows 7 the background slideshow corrupts the colour mapping of
-	OpenTTD's 8bpp screen modes. Workarounds for this are:
-		a) Switching to windowed mode, instead of fullscreen
-		b) Switching off background slideshow
-		c) Setting up the 32bpp-anim or 32bpp-optimized blitter
-
-Long delay between switching songs/music
-	On Windows there is a delay of a (few) second(s) between switching of
-	songs for the "win32" driver. This delay is caused by the fact that
-	opening a MIDI file via MCI is extremely slow.
-
-	DirectMusic, known as "dmusic" in OpenTTD, has a much shorter delay.
-	However, under some circumstances DirectMusic does not reset its
-	state properly causing wrongly pitched/bad sounding songs. This
-	problem is in DirectMusic as it is reproducable with Microsoft's
-	DirectMusic Producer. DirectMusic has been deprecated since 2004
-	and as such has no support for 64 bits OpenTTD.
-
-	As a delay is favourable over bad sounding music the "win32" driver
-	is the default driver for OpenTTD. You can change this default by
-	setting the "musicdriver" in your openttd.cfg to "dmusic".
-
-Custom vehicle type name is incorrectly aligned
-	Some NewGRFs use sprites that are bigger than normal in the "buy
-	vehicle" window. Due to this they have to encode an offset for the
-	vehicle type name. Upon renaming the vehicle type this encoded offset
-	is stripped from the name because the "edit box" cannot show this
-	encoding. As a result the custom vehicle type names will get the
-	default alignment. The only way to (partly) fix this is by adding
-	spaces to the custom name.
-
-Clipping problems [FS#119]
-	In some cases sprites are not drawn as one would expect. Examples of
-	this are aircraft that might be hidden below the runway or trees that
-	in some cases are rendered over vehicles.
-	The primary cause of this problem is that OpenTTD does not have enough
-	data (like a 3D model) to properly determine what needs to be drawn in
-	front of what. OpenTTD has bounding boxes but in lots of cases they
-	are either too big or too small and then cause problems with what
-	needs to be drawn in front of what. Also some visual tricks are used.
-	For example trains at 8 pixels high, the catenary needs to be drawn
-	above that. When you want to draw bridges on top of that, which are
-	only one height level (= 8 pixels) higher, you are getting into some
-	big problems.
-	We can not change the height levels; it would require us to either
-	redraw all vehicle or all landscape graphics. Doing so would mean we
-	leave the Transport Tycoon graphics, which in effect means OpenTTD
-	will not be a Transport Tycoon clone anymore.
-
-Mouse scrolling not possible at the edges of the screen [FS#383] [FS#3966]
-	Scrolling the viewport with the mouse cursor at the edges of the screen
-	in the same direction of the edge will fail. If the cursor is near the
-	edge the scrolling will be very slow.
-	OpenTTD only receives cursor position updates when the cursor is inside
-	OpenTTD's window. It is not told how far you have moved the cursor
-	outside of OpenTTD's window.
-
-Lost trains ignore (block) exit signals [FS#1473]
-	If trains are lost they ignore block exit signals, blocking junctions
-	with presignals. This is caused because the path finders cannot tell
-	where the train needs to go. As such a random direction is chosen at
-	each junction. This causes the trains to occasionally to make choices
-	that are unwanted from a player's point of view.
-	This will not be fixed because lost trains are in almost all cases a
-	network problem, e.g. a train can never reach a specific place. This
-	makes the impact of fixing the bug enormously small against the
-	amount of work needed to write a system that prevents the lost trains
-	from taking the wrong direction.
-
-Vehicle owner of last transfer leg gets paid for all [FS#2427]
-	When you make a transfer system that switches vehicle owners. This
-	is only possible with 'industry stations', e.g. the oil rig station
-	the owner of the vehicle that does the final delivery gets paid for
-	the whole trip. It is not shared amongst the different vehicle
-	owners that have participated in transporting the cargo.
-	This sharing is not done because it would enormously increase the
-	memory and CPU usage in big games for something that is happening
-	in only one corner case. We think it is not worth the effort until
-	sharing of stations is an official feature.
-
-Forbid 90 degree turns does not work for crossing PBS paths [FS#2737]
-	When you run a train through itself on a X junction with PBS turned on
-	the train will not obey the 'forbid 90 degree turns' setting. This is
-	due to the fact that we can not be sure that the setting was turned
-	off when the track was reserved, which means that we assume it was
-	turned on and that the setting does not hold at the time. We made it
-	this way to allow one to change the setting in-game, but it breaks
-	slightly when you are running your train through itself. Running a
-	train through means that your network is broken and is thus a user
-	error which OpenTTD tries to graciously handle.
-	Fixing this bug means that we need to record whether this particular
-	setting was turned on or off at the time the reservation was made. This
-	means adding quite a bit of data to the savegame for solving an issue
-	that is basically an user error. We think it is not worth the effort.
-
-Duplicate (station) names after renaming [FS#3204]
-	After renaming stations one can create duplicate station names. This
-	is done giving a station the same custom name as another station with
-	an automatically generated name.
-	The major part of this problem is that station names are translatable.
-	Meaning that a station is called e.g. '<TOWN> Central' in English and
-	'<TOWN> Centraal' in Dutch. This means that in network games the
-	renaming of a town could cause the rename to succeed on some clients
-	and fail at others. This creates an inconsistent game state that will
-	be seen as a 'desync'. Secondly the custom names are intended to fall
-	completely outside of the '<TOWN> <name>' naming of stations, so when
-	you rename a town all station names are updated accordingly.
-	As a result the decision has been made that all custom names are only
-	compared to the other custom names in the same class and not compared
-	to the automatically generated names.
-
-Extreme CPU usage/hangs when using SDL and PulseAudio [FS#3294]
-OpenTTD hangs/freezes when closing, OpenTTD is slow, OpenTTD uses a lot of CPU
-	OpenTTD can be extremely slow/use a lot of CPU when the sound is
-	played via SDL and then through PulseAudio's ALSA wrapper. Under the
-	same configuration OpenTTD, or rather SDL, might hang when exiting
-	the game. This problem is seen most in Ubuntu 9.04 and higher.
-
-	This is because recent versions of the PulseAudio sound server are
-	configured to use timer-based audio scheduling rather than
-	interrupt-based audio scheduling. Configuring PulseAudio to force
-	use of interrupt-based scheduling may resolve sound problems for
-	some users. Under recent versions of Ubuntu Linux (9.04 and higher)
-	this can be accomplished by changing the following line in the
-	/etc/pulse/default.pa file:
-		load-module module-udev-detect
-	to
-		load-module module-udev-detect tsched=0
-	Note that PulseAudio must be restarted for changes to take effect.
-	Older versions of PulseAudio may use the module-hal-detect module
-	instead. Adding tsched=0 to the end of that line will have a similar
-	effect.
-
-	Another possible solution is selecting the "pulse" backend of SDL
-	by either using "SDL_AUDIODRIVER=pulse openttd" at the command
-	prompt or installing the 'libsdl1.2debian-pulseaudio' package from
-	Ubuntu's Universe repository. For other distributions a similar
-	package needs to be installed.
-
-OpenTTD not properly resizing with SDL on X [FS#3305]
-	Under some X window managers OpenTTD's window does not properly
-	resize. You will either end up with a black bar at the right/bottom
-	side of the window or you cannot see the right/bottom of the window,
-	e.g you cannot see the status bar. The problem is that OpenTTD does
-	not always receive a resize event from SDL making it impossible for
-	OpenTTD to know that the window was resized; sometimes moving the
-	window will solve the problem.
-	Window managers that are known to exhibit this behaviour are KDE's
-	and GNOME's. With the XFCE's and LXDE's window managers the resize
-	event is sent when the user releases the mouse.
-
-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
-	back another train can enter the reserved path (only) via that same
-	two way block signal.
-	The reason for this has to do with optimisation; to fix this issue
-	the signal update has to pass all path signals until it finds either
-	a train or a backwards facing signal. This is a very expensive task.
-	The (signal) setups that allow these crashes can furthermore be
-	considered incorrectly signalled; one extra safe waiting point for
-	the train entering from path signal just after the backwards facing
-	signal (from the path signal train) resolves the issue.
-
-Crashes when playing music [FS#3941]
-	Mac OS X's QuickTime (default music driver) and Windows' MCI (win32
-	music driver) crash on some songs from OpenMSX. OpenTTD cannot do
-	anything about this. Please report these crashes to the authors of
-	OpenMSX so the crash causing songs can be removed or fixed.
-
-Crashes when run in a VM using Parallels Desktop [FS#4003]
-	When the Windows version of OpenTTD is executed in a VM under
-	Parallels Desktop a privileged instruction exception may be thrown.
-	As OpenTTD works natively on OSX as well as natively on	Windows and
-	these native builds both don't exhibit this behaviour this crash is
-	most likely due to a bug in the virtual machine, something out of
-	the scope of OpenTTD. Most likely this is due to Parallels Desktop
-	lacking support for RDTSC calls. The problem can be avoided by using
-	other VM-software, Wine, or running natively on OSX.
-
-OpenTTD hangs when started on 32 bits Windows [FS#4083]
-	Under some circumstances OpenTTD might hang for hours on the
-	initialisation of the music driver. The exact circumstances are
-	unknown except that it is the "dmusic" music driver that has the
-	problem and that the "win32" music driver does not.
-	As a result using the "win32" music driver will work around this
-	issue.
-
-	As the exact circumstances are unknown, and the obvious
-	configuration settings related to the music driver are at their
-	default we are not able to detect this failure, except when Windows'
-	music initialisation function returns after several hours and then
-	there is no point in switching the music driver anymore.
-	The reason we do not use the "win32" music driver as default are
-	described in the "Long delay between switching music/song" section
-	of this document.
+- 1519	Full screen issues in windows
+- 1495	Long vehicles block multistop station
+- 1487	Ending_year is never written to
+- 1473	Train not going to available platform
+- 1404	Spinner widget interprets one click as many
+- 1386	Mac OS X fails to compile out of the box on 10.5
+- 1264	Autoreplace for multiple NewGRF DMU sets fails
+- 1200	Illegal names skip comparisons for uniquity
+- 1141	[OSX] Not smooth moving map with touchpad
+- 1109	[OSX] Choppy mouse cursor movement in fullscreen mode
+- 1074	Large slowdown when building tracks
+- 1072	Text overflows in several windows
+-  716	Train crash in depot with long long tracks
+-  119	Clipping problems with vehicles on slopes
--- a/media/extra_grf/2ccmapd.nfo
+++ b/media/extra_grf/2ccmapd.nfo
--- a/media/extra_grf/2ccmapw.nfo
+++ b/media/extra_grf/2ccmapw.nfo
--- a/media/extra_grf/airports.nfo
+++ b/media/extra_grf/airports.nfo
@@ -1,25 +0,0 @@
-//
-// $Id$
-//
-// This file is part of OpenTTD.
-// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-//
-   -1 * 0	 0C "Extra airport graphics"
-   -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
--- a/media/extra_grf/airports.pcx
+++ b/media/extra_grf/airports.pcx
--- a/media/extra_grf/aqueduct.nfo
+++ b/media/extra_grf/aqueduct.nfo
@@ -1,18 +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 "Aqueduct graphics by Jonathan G. Rennison"
-   -1 * 3	 05 12 08
-   -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
--- a/media/extra_grf/aqueduct.pcx
+++ b/media/extra_grf/aqueduct.pcx
--- a/media/extra_grf/autorail.nfo
+++ b/media/extra_grf/autorail.nfo
@@ -1,65 +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 "Autorail graphics"
-   -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
--- a/media/extra_grf/autorail.pcx
+++ b/media/extra_grf/autorail.pcx
--- a/media/extra_grf/canals.nfo
+++ b/media/extra_grf/canals.nfo
@@ -1,75 +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 "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
--- a/media/extra_grf/canals.pcx
+++ b/media/extra_grf/canals.pcx
--- a/media/extra_grf/chars.nfo
+++ b/media/extra_grf/chars.nfo
@@ -1,630 +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 "Characters, graphics by Bilbo and Jasper Vries"
-//U+20AC Euro-sign
-   -1 * 0 12 03 00 01 AC 20 01 01 AC 20 02 01 AC 20
-   -1 sprites/chars.pcx 30 10 01 13 8 0 -2
-   -1 sprites/chars.pcx 30 30 01 6 5 0 0
-   -1 sprites/chars.pcx 30 40 01 21 15 0 -2
-
-//U+0152 Latin Capital Ligature OE
-//U+0153 Latin Small Ligature OE
-   -1 * 0 12 03 00 02 52 01 01 02 52 01 02 02 52 01
-   -1 sprites/chars.pcx 50 10 01 13 12 0 -2
-   -1 sprites/chars.pcx 300 10 01 13 9 0 -2
-   -1 sprites/chars.pcx 50 30 01 5 5 0 1
-   -1 sprites/chars.pcx 70 30 01 5 5 0 1
-   -1 sprites/chars.pcx 50 40 01 21 19 0 -2
-   -1 sprites/chars.pcx 70 40 01 21 13 0 -2
-
-//U+0160 Latin Capital Letter S with caron
-//U+0161 Latin Small Letter S with caron
-   -1 * 0 12 03 00 02 60 01 01 02 60 01 02 02 60 01
-   -1 sprites/chars.pcx 90 10 01 13 8 0 -2
-   -1 sprites/chars.pcx 110 10 01 13 6 0 -2
-   -1 sprites/chars.pcx 90 30 01 6 3 0 0
-   -1 sprites/chars.pcx 110 30 01 6 3 0 0
-   -1 sprites/chars.pcx 90 40 01 21 9 0 -2
-   -1 sprites/chars.pcx 110 40 01 21 6 0 -2
-
-//U+017D Latin Capital Letter Z with caron
-//U+017E Latin Small Letter Z with caron
-   -1 * 0 12 03 00 02 7D 01 01 02 7D 01 02 02 7D 01
-   -1 sprites/chars.pcx 120 10 01 13 8 0 -2
-   -1 sprites/chars.pcx 140 10 01 13 7 0 -2
-   -1 sprites/chars.pcx 120 30 01 6 3 0 0
-   -1 sprites/chars.pcx 140 30 01 6 3 0 0
-   -1 sprites/chars.pcx 120 40 01 21 12 0 -2
-   -1 sprites/chars.pcx 140 40 01 21 7 0 -2
-
-//U+00B0 Degree symbol
-   -1 * 0 12 03 00 01 B0 00 01 01 B0 00 02 01 B0 00
-   -1 sprites/chars.pcx 150 10 01 13 6 0 -2
-   -1 sprites/chars.pcx 150 30 01 6 3 0 0
-   -1 sprites/chars.pcx 150 40 01 21 7 0 -2
-
-//U+007B Left curly bracket
-//U+007C Vertical bar
-//U+007C Right Curly Bracket
-//U+007D Tilde
-   -1 * 0 12 03 00 04 7B 00 01 04 7B 00 02 04 7B 00
-   -1 sprites/chars.pcx 160 10 01 13 5 0 -2
-   -1 sprites/chars.pcx 170 10 01 13 3 0 -2
-   -1 sprites/chars.pcx 180 10 01 13 5 0 -2
-   -1 sprites/chars.pcx 190 10 01 13 7 0 -2
-   -1 sprites/chars.pcx 160 30 01 5 3 0 1
-   -1 sprites/chars.pcx 170 30 01 5 1 0 1
-   -1 sprites/chars.pcx 180 30 01 5 3 0 1
-   -1 sprites/chars.pcx 190 30 01 5 4 0 1
-   -1 sprites/chars.pcx 160 40 01 21 6 0 -2
-   -1 sprites/chars.pcx 170 40 01 21 3 0 -2
-   -1 sprites/chars.pcx 180 40 01 21 6 0 -2
-   -1 sprites/chars.pcx 190 40 01 21 12 0 -2
-
-//U+00B7 Middle dot
-   -1 * 0 12 03 00 01 B7 00 01 01 B7 00 02 01 B7 00
-   -1 sprites/chars.pcx 210 10 01 13 3 0 -2
-   -1 sprites/chars.pcx 210 30 01 5 1 0 1
-   -1 sprites/chars.pcx 210 40 01 21 2 0 -2
-
-//U+0150 Latin Capital Letter O with double acute
-//U+0151 Latin Small Letter O with double acute
-   -1 * 0 12 03 00 02 50 01 01 02 50 01 02 02 50 01
-   -1 sprites/chars.pcx 230 10 01 13 9 0 -2
-   -1 sprites/chars.pcx 320 10 01 13 6 0 -2
-   -1 sprites/chars.pcx 230 30 01 6 4 0 0
-   -1 sprites/chars.pcx 220 30 01 6 4 0 0
-   -1 sprites/chars.pcx 230 40 01 21 13 0 -2
-   -1 sprites/chars.pcx 220 40 01 21 9 0 -2
-
-//U+0170 Latin Capital Letter U with double acute
-//U+0171 Latin Small Letter U with double acute
-   -1 * 0 12 03 00 02 70 01 01 02 70 01 02 02 70 01
-   -1 sprites/chars.pcx 260 10 01 13 8 0 -2
-   -1 sprites/chars.pcx 250 10 01 13 7 0 -2
-   -1 sprites/chars.pcx 260 30 01 6 4 0 0
-   -1 sprites/chars.pcx 250 30 01 6 4 0 0
-   -1 sprites/chars.pcx 260 40 01 21 14 0 -2
-   -1 sprites/chars.pcx 250 40 01 21 9 0 -2
-
-//U+010C Latin Capital Letter C with caron
-//U+010D Latin Small Letter C with caron
-   -1 * 0 12 03 00 02 0C 01 01 02 0C 01 02 02 0C 01
-   -1 sprites/chars.pcx 30 70 01 13 9 0 -2
-   -1 sprites/chars.pcx 50 70 01 13 6 0 -2
-   -1 sprites/chars.pcx 30 90 01 6 3 0 0
-   -1 sprites/chars.pcx 50 90 01 6 3 0 0
-   -1 sprites/chars.pcx 30 100 01 21 12 0 -2
-   -1 sprites/chars.pcx 50 100 01 21 8 0 -2
-
-//U+010E Latin Capital Letter D with caron
-//U+010F Latin Small Letter D with caron
-   -1 * 0 12 03 00 02 0E 01 01 02 0E 01 02 02 0E 01
-   -1 sprites/chars.pcx 70 70 01 13 8 0 -2
-   -1 sprites/chars.pcx 90 70 01 13 9 0 -2
-   -1 sprites/chars.pcx 70 90 01 6 3 0 0
-   -1 sprites/chars.pcx 90 90 01 5 5 0 1
-   -1 sprites/chars.pcx 70 100 01 21 14 0 -2
-   -1 sprites/chars.pcx 90 100 01 21 12 0 -2
-
-//U+011A Latin Capital Letter E with caron
-//U+011B Latin Small Letter E with caron
-   -1 * 0 12 03 00 02 1A 01 01 02 1A 01 02 02 1A 01
-   -1 sprites/chars.pcx 110 70 01 13 8 0 -2
-   -1 sprites/chars.pcx 130 70 01 13 6 0 -2
-   -1 sprites/chars.pcx 110 90 01 6 3 0 0
-   -1 sprites/chars.pcx 130 90 01 6 3 0 0
-   -1 sprites/chars.pcx 110 100 01 21 13 0 -2
-   -1 sprites/chars.pcx 130 100 01 21 8 0 -2
-
-//U+0147 Latin Capital Letter N with caron
-//U+0148 Latin Small Letter N with caron
-   -1 * 0 12 03 00 02 47 01 01 02 47 01 02 02 47 01
-   -1 sprites/chars.pcx 150 70 01 13 8 0 -2
-   -1 sprites/chars.pcx 170 70 01 13 6 0 -2
-   -1 sprites/chars.pcx 150 90 01 6 4 0 0
-   -1 sprites/chars.pcx 170 90 01 6 3 0 0
-   -1 sprites/chars.pcx 150 100 01 21 16 0 -2
-   -1 sprites/chars.pcx 170 100 01 21 10 0 -2
-
-//U+0158 Latin Capital Letter R with caron
-//U+0159 Latin Small Letter R with caron
-   -1 * 0 12 03 00 02 58 01 01 02 58 01 02 02 58 01
-   -1 sprites/chars.pcx 190 70 01 13 8 0 -2
-   -1 sprites/chars.pcx 210 70 01 13 5 0 -2
-   -1 sprites/chars.pcx 190 90 01 6 3 0 0
-   -1 sprites/chars.pcx 210 90 01 6 3 0 0
-   -1 sprites/chars.pcx 190 100 01 21 12 0 -2
-   -1 sprites/chars.pcx 210 100 01 21 6 0 -2
-
-//U+0164 Latin Capital Letter T with caron
-//U+0165 Latin Small Letter T with caron
-   -1 * 0 12 03 00 02 64 01 01 02 64 01 02 02 64 01
-   -1 sprites/chars.pcx 230 70 01 13 9 0 -2
-   -1 sprites/chars.pcx 250 70 01 13 8 0 -2
-   -1 sprites/chars.pcx 230 90 01 6 3 0 0
-   -1 sprites/chars.pcx 250 90 01 5 4 0 1
-   -1 sprites/chars.pcx 230 100 01 21 13 0 -2
-   -1 sprites/chars.pcx 250 100 01 21 7 0 -2
-
-//U+016E Latin Capital Letter U with ring above
-//U+016F Latin Small Letter U with ring above
-   -1 * 0 12 03 00 02 6E 01 01 02 6E 01 02 02 6E 01
-   -1 sprites/chars.pcx 270 70 01 13 8 0 -2
-   -1 sprites/chars.pcx 290 70 01 13 6 0 -2
-   -1 sprites/chars.pcx 270 90 01 6 3 0 0
-   -1 sprites/chars.pcx 290 90 01 6 3 0 0
-   -1 sprites/chars.pcx 270 100 01 21 14 0 -2
-   -1 sprites/chars.pcx 290 100 01 21 8 0 -2
-
-//U+0106 Latin Capital Letter C with acute
-//U+0107 Latin Small Letter C with acute
-   -1 * 0 12 03 00 02 06 01 01 02 06 01 02 02 06 01
-   -1 sprites/chars.pcx 310 70 01 13 9 0 -2
-   -1 sprites/chars.pcx 330 70 01 13 6 0 -2
-   -1 sprites/chars.pcx 310 90 01 6 3 0 0
-   -1 sprites/chars.pcx 330 90 01 6 3 0 0
-   -1 sprites/chars.pcx 310 100 01 21 12 0 -2
-   -1 sprites/chars.pcx 330 100 01 21 8 0 -2
-
-//U+0110 Latin Capital Letter D with stroke
-//U+0111 Latin Small Letter D with stroke
-   -1 * 0 12 03 00 02 10 01 01 02 10 01 02 02 10 01
-   -1 sprites/chars.pcx 350 70 01 13 9 0 -2
-   -1 sprites/chars.pcx 370 70 01 13 7 0 -2
-   -1 sprites/chars.pcx 350 90 01 5 4 0 1
-   -1 sprites/chars.pcx 370 90 01 6 4 0 0
-   -1 sprites/chars.pcx 350 100 01 21 14 0 -2
-   -1 sprites/chars.pcx 370 100 01 21 9 0 -2
-
-//U+013D Latin Capital Letter L with caron
-//U+013E Latin Small Letter L with caron
-   -1 * 0 12 03 00 02 3D 01 01 02 3D 01 02 02 3D 01
-   -1 sprites/chars.pcx 390 70 01 13 7 0 -2
-   -1 sprites/chars.pcx 410 70 01 13 6 0 -2
-   -1 sprites/chars.pcx 390 90 01 5 5 0 1
-   -1 sprites/chars.pcx 410 90 01 5 3 0 1
-   -1 sprites/chars.pcx 390 100 01 21 12 0 -2
-   -1 sprites/chars.pcx 410 100 01 21 7 0 -2
-
-//U+00B4 Acute accent
-   -1 * 0 12 03 00 01 B4 00 01 01 B4 00 02 01 B4 00
-   -1 sprites/chars.pcx 30 130 01 13 4 0 -2
-   -1 sprites/chars.pcx 30 150 01 5 1 0 1
-   -1 sprites/chars.pcx 30 160 01 21 3 0 -2
-
-//U+00BD Vulgar fraction one half
-   -1 * 0 12 03 00 01 BD 00 01 01 BD 00 02 01 BD 00
-   -1 sprites/chars.pcx 40 130 01 13 11 0 -2
-   -1 sprites/chars.pcx 40 150 01 5 9 0 1
-   -1 sprites/chars.pcx 40 160 01 21 11 0 -2
-
-//U+00B5 Micro sign
-   -1 * 0 12 03 00 01 B5 00 01 01 B5 00 02 01 B5 00
-   -1 sprites/chars.pcx 60 130 01 13 6 0 -2
-   -1 sprites/chars.pcx 60 150 01 5 3 0 1
-   -1 sprites/chars.pcx 60 160 01 21 10 0 -2
-
-//U+00AA Feminine Ordinal Indicator
-   -1 * 0 12 03 00 01 AA 00 01 01 AA 00 02 01 AA 00
-   -1 sprites/chars.pcx 80 130 01 13 5 0 -2
-   -1 sprites/chars.pcx 80 150 01 5 1 0 1
-   -1 sprites/chars.pcx 80 160 01 21 6 0 -2
-
-//U+2019 RIGHT SINGLE QUOTATION MARK
-   -1 * 0 12 03 00 01 19 20 01 01 19 20 02 01 19 20
-   -1 sprites/chars.pcx 90 130 01 13 3 0 -2
-   -1 sprites/chars.pcx 90 150 01 5 1 0 1
-   -1 sprites/chars.pcx 90 160 01 21 4 0 -2
-
-//U+201E DOUBLE LOW-9 QUOTATION MARK
-   -1 * 0 12 03 00 01 1E 20 01 01 1E 20 02 01 1E 20
-   -1 sprites/chars.pcx 100 130 01 13 5 0 -2
-   -1 sprites/chars.pcx 100 150 01 5 3 0 1
-   -1 sprites/chars.pcx 100 160 01 21 8 0 -2
-
-//U+201C LEFT DOUBLE QUOTATION MARK
-   -1 * 0 12 03 00 01 1C 20 01 01 1C 20 02 01 1C 20
-   -1 sprites/chars.pcx 110 130 01 13 5 0 -2
-   -1 sprites/chars.pcx 110 150 01 5 3 0 1
-   -1 sprites/chars.pcx 110 160 01 21 8 0 -2
-
-//U+203A SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-   -1 * 0 12 03 00 01 3A 20 01 01 3A 20 02 01 3A 20
-   -1 sprites/chars.pcx 760 130 01 13 5 0 -2
-   -1 sprites/chars.pcx 760 150 01 5 2 0 1
-   -1 sprites/chars.pcx 760 160 01 21 4 0 -2
-
-//U+2013 EN DASH
-   -1 * 0 12 03 00 01 13 20 01 01 13 20 02 01 13 20
-   -1 sprites/chars.pcx 120 130 01 13 7 0 -2
-   -1 sprites/chars.pcx 120 150 01 5 4 0 1
-   -1 sprites/chars.pcx 120 160 01 21 9 0 -2
-
-//U+0174 Latin Capital Letter W with circumflex
-//U+0175 Latin Small Letter W with circumflex
-   -1 * 0 12 03 00 02 74 01 01 02 74 01 02 02 74 01
-   -1 sprites/chars.pcx 420 70 01 13 12 0 -2
-   -1 sprites/chars.pcx 440 70 01 13 10 0 -2
-   -1 sprites/chars.pcx 420 90 01 6 5 0 0
-   -1 sprites/chars.pcx 440 90 01 6 5 0 0
-   -1 sprites/chars.pcx 420 100 01 21 18 0 -2
-   -1 sprites/chars.pcx 440 100 01 21 13 0 -2
-
-//U+0176 Latin Capital Letter Y with circumflex
-//U+0177 Latin Small Letter Y with circumflex
-   -1 * 0 12 03 00 02 76 01 01 02 76 01 02 02 76 01
-   -1 sprites/chars.pcx 460 70 01 13 9 0 -2
-   -1 sprites/chars.pcx 480 70 01 13 7 0 -2
-   -1 sprites/chars.pcx 460 90 01 6 3 0 0
-   -1 sprites/chars.pcx 480 90 01 6 3 0 0
-   -1 sprites/chars.pcx 460 100 01 21 13 0 -2
-   -1 sprites/chars.pcx 480 100 01 21 9 0 -2
-
-//U+0108 Latin Capital Letter C with circumflex
-//U+0109 Latin Small Letter C with circumflex
-   -1 * 0 12 03 00 02 08 01 01 02 08 01 02 02 08 01
-   -1 sprites/chars.pcx 500 70 01 13 9 0 -2
-   -1 sprites/chars.pcx 520 70 01 13 6 0 -2
-   -1 sprites/chars.pcx 500 90 01 6 3 0 0
-   -1 sprites/chars.pcx 520 90 01 6 3 0 0
-   -1 sprites/chars.pcx 500 100 01 21 12 0 -2
-   -1 sprites/chars.pcx 520 100 01 21 8 0 -2
-
-//U+011C Latin Capital Letter G with circumflex
-//U+011D Latin Small Letter G with circumflex
-   -1 * 0 12 03 00 02 1C 01 01 02 1C 01 02 02 1C 01
-   -1 sprites/chars.pcx 540 70 01 13 9 0 -2
-   -1 sprites/chars.pcx 560 70 01 13 6 0 -2
-   -1 sprites/chars.pcx 540 90 01 6 3 0 0
-   -1 sprites/chars.pcx 560 90 01 6 3 0 0
-   -1 sprites/chars.pcx 540 100 01 21 13 0 -2
-   -1 sprites/chars.pcx 560 100 01 21 10 0 -2
-
-//U+0124 Latin Capital Letter H with circumflex
-//U+0125 Latin Small Letter H with circumflex
-   -1 * 0 12 03 00 02 24 01 01 02 24 01 02 02 24 01
-   -1 sprites/chars.pcx 580 70 01 13 8 0 -2
-   -1 sprites/chars.pcx 600 70 01 13 8 0 -2
-   -1 sprites/chars.pcx 580 90 01 6 3 0 0
-   -1 sprites/chars.pcx 600 90 01 6 3 0 0
-   -1 sprites/chars.pcx 580 100 01 21 15 0 -2
-   -1 sprites/chars.pcx 600 100 01 21 10 0 -2
-
-//U+0134 Latin Capital Letter J with circumflex
-//U+0135 Latin Small Letter J with circumflex
-   -1 * 0 12 03 00 02 34 01 01 02 34 01 02 02 34 01
-   -1 sprites/chars.pcx 620 70 01 13 7 0 -2
-   -1 sprites/chars.pcx 640 70 01 13 6 0 -2
-   -1 sprites/chars.pcx 620 90 01 6 3 0 0
-   -1 sprites/chars.pcx 640 90 01 6 3 0 0
-   -1 sprites/chars.pcx 620 100 01 21 8 0 -2
-   -1 sprites/chars.pcx 640 100 01 21 5 0 -2
-
-//U+016C Latin Capital Letter U with breve
-//U+016D Latin Small Letter U with breve
-   -1 * 0 12 03 00 02 6C 01 01 02 6C 01 02 02 6C 01
-   -1 sprites/chars.pcx 650 70 01 13 8 0 -2
-   -1 sprites/chars.pcx 670 70 01 13 6 0 -2
-   -1 sprites/chars.pcx 650 90 01 6 3 0 0
-   -1 sprites/chars.pcx 670 90 01 6 3 0 0
-   -1 sprites/chars.pcx 650 100 01 21 14 0 -2
-   -1 sprites/chars.pcx 670 100 01 21 9 0 -2
-
-//U+0102 Latin Capital Letter A with breve
-//U+0103 Latin Small Letter A with breve
-   -1 * 0 12 03 00 02 02 01 01 02 02 01 02 02 02 01
-   -1 sprites/chars.pcx 690 70 01 13 9 0 -2
-   -1 sprites/chars.pcx 710 70 01 13 7 0 -2
-   -1 sprites/chars.pcx 690 90 01 6 3 0 0
-   -1 sprites/chars.pcx 710 90 01 6 3 0 0
-   -1 sprites/chars.pcx 690 100 01 21 14 0 -2
-   -1 sprites/chars.pcx 710 100 01 21 8 0 -2
-
-//U+015E Latin Capital Letter S with cedilla
-//U+015F Latin Small Letter S with cedilla
-   -1 * 0 12 03 00 02 5E 01 01 02 5E 01 02 02 5E 01
-   -1 sprites/chars.pcx 730 70 01 13 8 0 -2
-   -1 sprites/chars.pcx 740 70 01 13 6 0 -2
-   -1 sprites/chars.pcx 730 90 01 6 3 0 1
-   -1 sprites/chars.pcx 740 90 01 6 3 0 1
-   -1 sprites/chars.pcx 730 100 01 21 9 0 -2
-   -1 sprites/chars.pcx 740 100 01 21 6 0 -2
-
-//U+0162 Latin Capital Letter T with cedilla
-//U+0163 Latin Small Letter T with cedilla
-   -1 * 0 12 03 00 02 62 01 01 02 62 01 02 02 62 01
-   -1 sprites/chars.pcx 750 70 01 13 9 0 -2
-   -1 sprites/chars.pcx 770 70 01 13 6 0 -2
-   -1 sprites/chars.pcx 750 90 01 6 3 0 1
-   -1 sprites/chars.pcx 770 90 01 6 2 0 1
-   -1 sprites/chars.pcx 750 100 01 21 13 0 -2
-   -1 sprites/chars.pcx 770 100 01 21 5 0 -2
-
-//U+011E Latin Capital Letter G with breve
-//U+011F Latin Small Letter G with breve
-   -1 * 0 12 03 00 02 1E 01 01 02 1E 01 02 02 1E 01
-   -1 sprites/chars.pcx 140 130 01 13 9 0 -2
-   -1 sprites/chars.pcx 160 130 01 13 6 0 -2
-   -1 sprites/chars.pcx 140 150 01 6 3 0 0
-   -1 sprites/chars.pcx 160 150 01 6 3 0 0
-   -1 sprites/chars.pcx 140 160 01 21 13 0 -2
-   -1 sprites/chars.pcx 160 160 01 21 10 0 -2
-
-//U+0130 Latin Capital Letter I with dot above
-//U+0131 Latin Small Letter dotless I
-   -1 * 0 12 03 00 02 30 01 01 02 30 01 02 02 30 01
-   -1 sprites/chars.pcx 180 130 01 13 3 0 -2
-   -1 sprites/chars.pcx 190 130 01 13 3 0 -2
-   -1 sprites/chars.pcx 180 150 01 6 1 0 0
-   -1 sprites/chars.pcx 190 150 01 5 1 0 1
-   -1 sprites/chars.pcx 180 160 01 21 7 0 -2
-   -1 sprites/chars.pcx 190 160 01 21 4 0 -2
-
-//U+0122 Latin Capital Letter G with cedilla
-//U+0123 Latin Small Letter G with cedilla
-   -1 * 0 12 03 00 02 22 01 01 02 22 01 02 02 22 01
-   -1 sprites/chars.pcx 200 130 01 13 9 0 -2
-   -1 sprites/chars.pcx 220 130 01 13 6 0 -2
-   -1 sprites/chars.pcx 200 150 01 6 3 0 0
-   -1 sprites/chars.pcx 220 150 01 6 3 0 1
-   -1 sprites/chars.pcx 200 160 01 21 13 0 -2
-   -1 sprites/chars.pcx 220 160 01 21 10 0 -2
-
-//U+0136 Latin Capital Letter K with cedilla
-//U+0137 Latin Small Letter K with cedilla
-   -1 * 0 12 03 00 02 36 01 01 02 36 01 02 02 36 01
-   -1 sprites/chars.pcx 240 130 01 13 8 0 -2
-   -1 sprites/chars.pcx 260 130 01 13 7 0 -2
-   -1 sprites/chars.pcx 240 150 01 6 3 0 1
-   -1 sprites/chars.pcx 260 150 01 6 3 0 1
-   -1 sprites/chars.pcx 240 160 01 21 14 0 -2
-   -1 sprites/chars.pcx 260 160 01 21 10 0 -2
-
-//U+013B Latin Capital Letter L with cedilla
-//U+013C Latin Small Letter L with cedilla
-   -1 * 0 12 03 00 02 3B 01 01 02 3B 01 02 02 3B 01
-   -1 sprites/chars.pcx 280 130 01 13 7 0 -2
-   -1 sprites/chars.pcx 300 130 01 13 4 0 -2
-   -1 sprites/chars.pcx 280 150 01 6 3 0 1
-   -1 sprites/chars.pcx 300 150 01 6 2 0 1
-   -1 sprites/chars.pcx 280 160 01 21 12 0 -2
-   -1 sprites/chars.pcx 300 160 01 21 5 0 -2
-
-//U+0145 Latin Capital Letter N with cedilla
-//U+0146 Latin Small Letter N with cedilla
-   -1 * 0 12 03 00 02 45 01 01 02 45 01 02 02 45 01
-   -1 sprites/chars.pcx 310 130 01 13 8 0 -2
-   -1 sprites/chars.pcx 330 130 01 13 6 0 -2
-   -1 sprites/chars.pcx 310 150 01 6 4 0 1
-   -1 sprites/chars.pcx 330 150 01 6 3 0 1
-   -1 sprites/chars.pcx 310 160 01 21 16 0 -2
-   -1 sprites/chars.pcx 330 160 01 21 10 0 -2
-
-//U+0100 Latin Capital Letter A with macron
-//U+0101 Latin Small Letter A with macron
-   -1 * 0 12 03 00 02 00 01 01 02 00 01 02 02 00 01
-   -1 sprites/chars.pcx 350 130 01 13 9 0 -2
-   -1 sprites/chars.pcx 370 130 01 13 7 0 -2
-   -1 sprites/chars.pcx 350 150 01 6 3 0 0
-   -1 sprites/chars.pcx 370 150 01 6 3 0 0
-   -1 sprites/chars.pcx 350 160 01 21 14 0 -2
-   -1 sprites/chars.pcx 370 160 01 21 8 0 -2
-
-//U+0112 Latin Capital Letter E with macron
-//U+0113 Latin Small Letter E with macron
-   -1 * 0 12 03 00 02 12 01 01 02 12 01 02 02 12 01
-   -1 sprites/chars.pcx 380 130 01 13 8 0 -2
-   -1 sprites/chars.pcx 400 130 01 13 6 0 -2
-   -1 sprites/chars.pcx 380 150 01 6 3 0 0
-   -1 sprites/chars.pcx 400 150 01 6 3 0 0
-   -1 sprites/chars.pcx 380 160 01 21 13 0 -2
-   -1 sprites/chars.pcx 400 160 01 21 8 0 -2
-
-//U+012A Latin Capital Letter I with macron
-//U+012B Latin Small Letter I with macron
-   -1 * 0 12 03 00 02 2A 01 01 02 2A 01 02 02 2A 01
-   -1 sprites/chars.pcx 410 130 01 13 5 0 -2
-   -1 sprites/chars.pcx 420 130 01 13 5 0 -2
-   -1 sprites/chars.pcx 410 150 01 6 3 0 0
-   -1 sprites/chars.pcx 420 150 01 6 3 0 0
-   -1 sprites/chars.pcx 410 160 01 21 7 0 -2
-   -1 sprites/chars.pcx 420 160 01 21 4 0 -2
-
-//U+016A Latin Capital Letter U with macron
-//U+016B Latin Small Letter U with macron
-   -1 * 0 12 03 00 02 6A 01 01 02 6A 01 02 02 6A 01
-   -1 sprites/chars.pcx 430 130 01 13 8 0 -2
-   -1 sprites/chars.pcx 450 130 01 13 6 0 -2
-   -1 sprites/chars.pcx 430 150 01 6 3 0 0
-   -1 sprites/chars.pcx 450 150 01 6 3 0 0
-   -1 sprites/chars.pcx 430 160 01 21 14 0 -2
-   -1 sprites/chars.pcx 450 160 01 21 9 0 -2
-
-//U+0143 Latin Capital Letter N with acute
-//U+0144 Latin Small Letter N with acute
-   -1 * 0 12 03 00 02 43 01 01 02 43 01 02 02 43 01
-   -1 sprites/chars.pcx 470 130 01 13 8 0 -2
-   -1 sprites/chars.pcx 490 130 01 13 6 0 -2
-   -1 sprites/chars.pcx 470 150 01 6 4 0 0
-   -1 sprites/chars.pcx 490 150 01 6 3 0 0
-   -1 sprites/chars.pcx 470 160 01 21 16 0 -2
-   -1 sprites/chars.pcx 490 160 01 21 10 0 -2
-
-//U+015A Latin Capital Letter S with acute
-//U+015B Latin Small Letter S with acute
-   -1 * 0 12 03 00 02 5A 01 01 02 5A 01 02 02 5A 01
-   -1 sprites/chars.pcx 510 130 01 13 8 0 -2
-   -1 sprites/chars.pcx 520 130 01 13 6 0 -2
-   -1 sprites/chars.pcx 510 150 01 6 3 0 0
-   -1 sprites/chars.pcx 520 150 01 6 3 0 0
-   -1 sprites/chars.pcx 510 160 01 21 9 0 -2
-   -1 sprites/chars.pcx 520 160 01 21 6 0 -2
-
-//U+017B Latin Capital Letter Z with dot above
-//U+017C Latin Small Letter Z with dot above
-   -1 * 0 12 03 00 02 7B 01 01 02 7B 01 02 02 7B 01
-   -1 sprites/chars.pcx 530 130 01 13 8 0 -2
-   -1 sprites/chars.pcx 550 130 01 13 7 0 -2
-   -1 sprites/chars.pcx 530 150 01 6 3 0 0
-   -1 sprites/chars.pcx 550 150 01 6 3 0 0
-   -1 sprites/chars.pcx 530 160 01 21 12 0 -2
-   -1 sprites/chars.pcx 550 160 01 21 7 0 -2
-
-//U+0179 Latin Capital Letter Z with acute
-//U+017A Latin Small Letter Z with acute
-   -1 * 0 12 03 00 02 79 01 01 02 79 01 02 02 79 01
-   -1 sprites/chars.pcx 770 130 01 13 8 0 -2
-   -1 sprites/chars.pcx 790 130 01 13 7 0 -2
-   -1 sprites/chars.pcx 770 150 01 6 3 0 0
-   -1 sprites/chars.pcx 790 150 01 6 3 0 0
-   -1 sprites/chars.pcx 770 160 01 21 12 0 -2
-   -1 sprites/chars.pcx 790 160 01 21 7 0 -2
-
-//U+0139 Latin Capital Letter L with acute
-//U+013A Latin Small Letter L with acute
-   -1 * 0 12 03 00 02 39 01 01 02 39 01 02 02 39 01
-   -1 sprites/chars.pcx 30 190 01 13 7 0 -2
-   -1 sprites/chars.pcx 50 190 01 13 4 0 -2
-   -1 sprites/chars.pcx 30 210 01 6 3 0 0
-   -1 sprites/chars.pcx 50 210 01 6 2 0 0
-   -1 sprites/chars.pcx 30 220 01 21 12 0 -2
-   -1 sprites/chars.pcx 50 220 01 21 5 0 -2
-
-//U+0141 Latin Capital Letter L with stroke
-//U+0142 Latin Small Letter L with stroke
-   -1 * 0 12 03 00 02 41 01 01 02 41 01 02 02 41 01
-   -1 sprites/chars.pcx 560 130 01 13 8 0 -2
-   -1 sprites/chars.pcx 580 130 01 13 5 0 -2
-   -1 sprites/chars.pcx 560 150 01 5 4 0 1
-   -1 sprites/chars.pcx 580 150 01 5 3 0 1
-   -1 sprites/chars.pcx 560 160 01 21 12 0 -2
-   -1 sprites/chars.pcx 580 160 01 21 6 0 -2
-
-//U+0104 Latin Capital Letter A with ogonek
-//U+0105 Latin Small Letter A with ogonek
-   -1 * 0 12 03 00 02 04 01 01 02 04 01 02 02 04 01
-   -1 sprites/chars.pcx 590 130 01 13 9 0 -2
-   -1 sprites/chars.pcx 610 130 01 13 7 0 -2
-   -1 sprites/chars.pcx 590 150 01 6 3 0 1
-   -1 sprites/chars.pcx 610 150 01 6 3 0 1
-   -1 sprites/chars.pcx 590 160 01 21 14 0 -2
-   -1 sprites/chars.pcx 610 160 01 21 8 0 -2
-
-//U+0118 Latin Capital Letter E with ogonek
-//U+0119 Latin Small Letter E with ogonek
-   -1 * 0 12 03 00 02 18 01 01 02 18 01 02 02 18 01
-   -1 sprites/chars.pcx 620 130 01 13 8 0 -2
-   -1 sprites/chars.pcx 640 130 01 13 6 0 -2
-   -1 sprites/chars.pcx 620 150 01 6 3 0 1
-   -1 sprites/chars.pcx 640 150 01 6 3 0 1
-   -1 sprites/chars.pcx 620 160 01 21 13 0 -2
-   -1 sprites/chars.pcx 640 160 01 21 8 0 -2
-
-//U+012E Latin Capital Letter I with ogonek
-//U+012F Latin Small Letter I with ogonek
-   -1 * 0 12 03 00 02 2E 01 01 02 2E 01 02 02 2E 01
-   -1 sprites/chars.pcx 650 130 01 13 4 0 -2
-   -1 sprites/chars.pcx 660 130 01 13 4 0 -2
-   -1 sprites/chars.pcx 650 150 01 6 2 0 1
-   -1 sprites/chars.pcx 660 150 01 6 2 0 1
-   -1 sprites/chars.pcx 650 160 01 21 7 0 -2
-   -1 sprites/chars.pcx 660 160 01 21 4 0 -2
-
-//U+0172 Latin Capital Letter U with ogonek
-//U+0173 Latin Small Letter U with ogonek
-   -1 * 0 12 03 00 02 72 01 01 02 72 01 02 02 72 01
-   -1 sprites/chars.pcx 670 130 01 13 8 0 -2
-   -1 sprites/chars.pcx 690 130 01 13 7 0 -2
-   -1 sprites/chars.pcx 670 150 01 6 3 0 1
-   -1 sprites/chars.pcx 690 150 01 6 3 0 1
-   -1 sprites/chars.pcx 670 160 01 21 14 0 -2
-   -1 sprites/chars.pcx 690 160 01 21 9 0 -2
-
-//U+0116 Latin Capital Letter E with dot above
-//U+0117 Latin Small Letter E with dot above
-   -1 * 0 12 03 00 02 16 01 01 02 16 01 02 02 16 01
-   -1 sprites/chars.pcx 710 130 01 13 8 0 -2
-   -1 sprites/chars.pcx 730 130 01 13 6 0 -2
-   -1 sprites/chars.pcx 710 150 01 6 3 0 0
-   -1 sprites/chars.pcx 730 150 01 6 3 0 0
-   -1 sprites/chars.pcx 710 160 01 21 13 0 -2
-   -1 sprites/chars.pcx 730 160 01 21 8 0 -2
-
-//U+015C Latin Capital Letter S with circumflex
-//U+015D Latin Small Letter S with circumflex
-   -1 * 0 12 03 00 02 5C 01 01 02 5C 01 02 02 5C 01
-   -1 sprites/chars.pcx 740 130 01 13 8 0 -2
-   -1 sprites/chars.pcx 750 130 01 13 6 0 -2
-   -1 sprites/chars.pcx 740 150 01 6 3 0 0
-   -1 sprites/chars.pcx 750 150 01 6 3 0 0
-   -1 sprites/chars.pcx 740 160 01 21 9 0 -2
-   -1 sprites/chars.pcx 750 160 01 21 6 0 -2
-
-
-// Large font only
-//U+00C6 Latin Capital letter AE
-   -1 * 0 12 01 02 01 C6 00
-   -1 sprites/chars.pcx 300 40 01 21 19 0 -2
-
-//U+00E6 Latin Small Letter AE
-   -1 * 0 12 01 02 01 E6 00
-   -1 sprites/chars.pcx 280 40 01 21 13 0 -2
-
-//U+00D8 Latin Capital letter O with stroke
-   -1 * 0 12 01 02 01 D8 00
-   -1 sprites/chars.pcx 330 40 01 21 13 0 -2
-
-//U+00F8 Latin Small Letter O with stroke
-   -1 * 0 12 01 02 01 F8 00
-   -1 sprites/chars.pcx 320 40 01 21 9 0 -2
-
-//U+00D0 Latin Capital letter Eth
-   -1 * 0 12 01 02 01 D0 00
-   -1 sprites/chars.pcx 350 40 01 21 14 0 -2
-
-//U+00F0 Latin Small Letter Eth
-   -1 * 0 12 01 02 01 F0 00
-   -1 sprites/chars.pcx 370 40 01 21 9 0 -2
-
-//U+00DE Latin Capital Letter Thorn
-   -1 * 0 12 01 02 01 DE 00
-   -1 sprites/chars.pcx 380 40 01 21 14 0 -2
-
-//U+00FE Latin Small Letter Thorn
-   -1 * 0 12 01 02 01 FE 00
-   -1 sprites/chars.pcx 400 40 01 21 14 0 -2
-
-//U+00A7 Section sign
-   -1 * 0 12 01 02 01 A7 00
-   -1 sprites/chars.pcx 420 40 01 21 9 0 -2
-
-//U+00A9 Copyright sign
-   -1 * 0 12 01 02 01 A9 00
-   -1 sprites/chars.pcx 430 40 01 21 16 0 -2
-
-//U+00AE Registered sign
-   -1 * 0 12 01 02 01 AE 00
-   -1 sprites/chars.pcx 150 40 01 21 7 0 -2
-
-//U+00B1 Plus-minus sign
-//U+00B2 Superscript two
-//U+00B3 Superscript three
-   -1 * 0 12 01 02 03 B1 00
-   -1 sprites/chars.pcx 480 40 01 21 9 0 -2
-   -1 sprites/chars.pcx 490 40 01 21 6 0 -2
-   -1 sprites/chars.pcx 500 40 01 21 5 0 -2
-
-//U+00D7 Multiplication sign
-   -1 * 0 12 01 02 01 D7 00
-   -1 sprites/chars.pcx 510 40 01 21 8 0 -2
-
-//U+00F7 Division sign
-   -1 * 0 12 01 02 01 F7 00
-   -1 sprites/chars.pcx 520 40 01 21 9 0 -2
--- a/media/extra_grf/chars.pcx
+++ b/media/extra_grf/chars.pcx
--- a/media/extra_grf/elrails.nfo
+++ b/media/extra_grf/elrails.nfo
@@ -1,58 +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 "Electrified rail by Michael Blunck"
-   -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
--- a/media/extra_grf/elrails.pcx
+++ b/media/extra_grf/elrails.pcx
--- a/media/extra_grf/fix_graphics.nfo
+++ b/media/extra_grf/fix_graphics.nfo
@@ -1,135 +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 "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.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.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.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.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.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.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.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.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.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.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.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.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.pcx 776 250 01 10 9 0 0
-
--- a/media/extra_grf/fix_graphics.pcx
+++ b/media/extra_grf/fix_graphics.pcx
--- a/media/extra_grf/flags.nfo
+++ b/media/extra_grf/flags.nfo
@@ -1,46 +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 "Flag graphics"
-   -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
--- a/media/extra_grf/flags.pcx
+++ b/media/extra_grf/flags.pcx
--- a/media/extra_grf/foundations.nfo
+++ b/media/extra_grf/foundations.nfo
@@ -1,377 +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 "Foundations. Non-halftile ones by Marcin Grzegorczyk"
-   -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
--- a/media/extra_grf/foundations.pcx
+++ b/media/extra_grf/foundations.pcx
--- a/media/extra_grf/oneway.nfo
+++ b/media/extra_grf/oneway.nfo
@@ -1,16 +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 "One way road graphics"
-   -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
--- a/media/extra_grf/oneway.pcx
+++ b/media/extra_grf/oneway.pcx
--- a/media/extra_grf/openttd.nfo
+++ b/media/extra_grf/openttd.nfo
@@ -1,124 +0,0 @@
-// Automatically generated by GRFCODEC. Do not modify!
-// (Info version 7)
-// Format: spritenum pcxfile xpos ypos compression ysize xsize xrel yrel
-//
-// $Id$
-//
-// This file is part of OpenTTD.
-// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-//
-// Sources for OpenTTD's required base graphics.
-// Checks whether the correct version of OpenTTD is used before
-// allowing it to be used.
-//
-
-//
-// -- NFO Renum 'settings' --
-// Do not make nforenum warn about the fact that we use a reserved GRF ID
-// @@WARNING DISABLE 101
-// -- End of NFO Renum 'settings' --
-//
-
-//
-// Number of sprites, it is wrong, but GRFcodec automagically gets it right.
-//
-    0 * 4	 00 00 00 00
-
-
-//
-// Check whether we are running OTTD or not.
-//
-   -1 * 0	 07 9D 04 \7= 01 00 00 00 01
-   -1 * 0	 0B 03 7F FF 80 " is not for TTDPatch. Use ttdpatch(w).grf." 00
-
-
-//
-// Check for OTTD's version number
-//
-
-// First step... Variable A1 might not exist. If that's the case it always
-// skips. As we do not want to skip out of the whole testing, we skip over
-// the real version check.
-   -1 * 0	 07 A1 04 \7= FF FF FF FF 02
-
-// Real version check.
-   -1 * 0	 07 A1 04 \7> \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 "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 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
-
-
-//
-// 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 "
-#ifdef DOS
-             "(DOS)"
-#else
-             "(Windows)"
-#endif
-             00
-
-// Description of the GRF.
-             "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
-             "OpenTTD developers: other graphics" 00
-
-//
-// The real data of the GRF is acquired from several subfiles.
-//
-#ifdef DOS
-# include "2ccmapd.nfo"
-#else
-# include "2ccmapw.nfo"
-#endif
-#include "signals.nfo"
-#include "elrails.nfo"
-#include "foundations.nfo"
-#include "canals.nfo"
-#include "oneway.nfo"
-#include "tramtracks.nfo"
-#include "shore.nfo"
-#include "sloped_tracks.nfo"
-#include "airports.nfo"
-#include "roadstops.nfo"
-#include "aqueduct.nfo"
-#include "autorail.nfo"
-#include "flags.nfo"
-#include "openttdgui.nfo"
-#include "chars.nfo"
-#include "overrides.nfo"
-#include "fix_graphics.nfo"
--- a/media/extra_grf/openttdgui.nfo
+++ b/media/extra_grf/openttdgui.nfo
@@ -1,175 +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/>.
-//
-// -- NFO Renum 'settings' --
-// Do not make nforenum warn about the fact that we use more sprites.
-// We are the 'authority' on how many sprites may be used.
-// @@WARNING DISABLE 60
-// -- End of NFO Renum 'settings' --
-//
-   -1 * 0	 0C "OpenTTD GUI graphics"
-   -1 * 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
-// @@WARNING ENABLE 60
-// -- End of NFO Renum 'settings' --
--- a/media/extra_grf/openttdgui.pcx
+++ b/media/extra_grf/openttdgui.pcx
--- a/media/extra_grf/overrides.nfo
+++ b/media/extra_grf/overrides.nfo
@@ -1,13 +0,0 @@
-//
-// $Id$
-//
-// This file is part of OpenTTD.
-// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-//
-   -1 * 0	 0C "NewGRF overrides"
-   -1 * 30	 00 08 01 03 00 11
-	 44 44 22 02    44 44 01 11  // UKRS addons modifies UKRS
-	 6D 62 04 02    6D 62 04 01  // DBSetXL ECS extension modifies DBSetXL
-	 4D 65 6f 20    4D 65 6F 17  // LV4cut modifies LV4
--- a/media/extra_grf/roadstops.nfo
+++ b/media/extra_grf/roadstops.nfo
@@ -1,18 +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 "Road stop graphics"
-   -1 * 0	 05 11 08
-   -1 sprites/roadstops.pcx 18 8 09 23 13 5 -11
-   -1 sprites/roadstops.pcx 50 8 09 15 13 5 -2
-   -1 sprites/roadstops.pcx 82 8 09 19 21 -20 -7
-   -1 sprites/roadstops.pcx 114 8 09 17 22 -25 -4
-   -1 sprites/roadstops.pcx 146 8 09 25 32 -5 -9
-   -1 sprites/roadstops.pcx 194 8 09 26 28 -3 -12
-   -1 sprites/roadstops.pcx 242 8 09 25 29 -24 -12
-   -1 sprites/roadstops.pcx 290 8 09 25 32 -25 -9
--- a/media/extra_grf/roadstops.pcx
+++ b/media/extra_grf/roadstops.pcx
--- a/media/extra_grf/shore.nfo
+++ b/media/extra_grf/shore.nfo
@@ -1,79 +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/>.
-//
-
-//
-// -- NFO Renum 'settings' --
-// Do not make nforenum warn about the fact that we use an incorrect number of shores
-// @@WARNING DISABLE 60
-// -- End of NFO Renum 'settings' --
-//
-
-   -1 * 6	 07 83 01 \7! 00 0C
-   -1 * 54	 0C "Missing shore tile graphics for "
-	 "the Temperate climate"
-   -1 * 3	 05 0D 0A
-   -1 sprites/shore.pcx 66 8 09 15 64 -31 0
-   -1 sprites/shore.pcx 146 8 09 31 64 -31 -8
-   -1 sprites/shore.pcx 226 8 09 23 64 -31 0
-   -1 sprites/shore.pcx 306 8 09 47 64 -31 -16
-   -1 sprites/shore.pcx 386 8 09 31 64 -31 -8
-   -1 sprites/shore.pcx 466 8 09 39 64 -31 -8
-   -1 sprites/shore.pcx 546 8 09 31 64 -31 -8
-   -1 sprites/shore.pcx 626 8 09 31 64 -31 -8
-   -1 sprites/shore.pcx 706 7 09 32 64 -31 -1
-   -1 sprites/shore.pcx 2 72 09 31 64 -31 -8
-   -1 * 6	 07 83 01 \7! 01 0C
-   -1 * 55	 0C "Missing shore tile graphics for "
-	 "the sub-arctic climate"
-   -1 * 3	 05 0D 0A
-   -1 sprites/shore.pcx 130 72 09 15 64 -31 0
-   -1 sprites/shore.pcx 210 72 09 31 64 -31 -8
-   -1 sprites/shore.pcx 290 72 09 23 64 -31 0
-   -1 sprites/shore.pcx 370 72 09 47 64 -31 -16
-   -1 sprites/shore.pcx 450 72 09 31 64 -31 -8
-   -1 sprites/shore.pcx 530 72 09 39 64 -31 -8
-   -1 sprites/shore.pcx 610 72 09 31 64 -31 -8
-   -1 sprites/shore.pcx 690 72 09 31 64 -31 -8
-   -1 sprites/shore.pcx 2 135 09 32 64 -31 -1
-   -1 sprites/shore.pcx 82 136 09 31 64 -31 -8
-   -1 * 6	 07 83 01 \7! 02 0C
-   -1 * 57	 0C "Missing shore tile graphics for "
-	 "the sub-tropical climate"
-   -1 * 3	 05 0D 0A
-   -1 sprites/shore.pcx 210 136 09 15 64 -31 0
-   -1 sprites/shore.pcx 290 136 09 31 64 -31 -8
-   -1 sprites/shore.pcx 370 136 09 23 64 -31 0
-   -1 sprites/shore.pcx 450 136 09 47 64 -31 -16
-   -1 sprites/shore.pcx 530 136 09 31 64 -31 -8
-   -1 sprites/shore.pcx 610 136 09 39 64 -31 -8
-   -1 sprites/shore.pcx 690 136 09 31 64 -31 -8
-   -1 sprites/shore.pcx 2 200 09 31 64 -31 -8
-   -1 sprites/shore.pcx 82 199 09 32 64 -31 -1
-   -1 sprites/shore.pcx 162 200 09 31 64 -31 -8
-   -1 * 6	 07 83 01 \7! 03 0C
-   -1 * 44	 0C "Missing shore tile graphics for "
-	 "the toyland"
-   -1 * 3	 05 0D 0A
-   -1 sprites/shore.pcx 290 200 09 15 64 -31 0
-   -1 sprites/shore.pcx 370 200 09 31 64 -31 -8
-   -1 sprites/shore.pcx 450 200 09 23 64 -31 0
-   -1 sprites/shore.pcx 530 200 09 47 64 -31 -16
-   -1 sprites/shore.pcx 610 200 09 31 64 -31 -8
-   -1 sprites/shore.pcx 690 200 09 39 64 -31 -8
-   -1 sprites/shore.pcx 2 264 09 31 64 -31 -8
-   -1 sprites/shore.pcx 82 264 09 31 64 -31 -8
-   -1 sprites/shore.pcx 162 263 09 32 64 -31 -1
-   -1 sprites/shore.pcx 242 264 09 31 64 -31 -8
-
-//
-// -- NFO Renum 'settings' --
-// Reset warning about incorrect number of shores
-// @@WARNING ENABLE 60
-// -- End of NFO Renum 'settings' --
-//
--- a/media/extra_grf/shore.pcx
+++ b/media/extra_grf/shore.pcx
--- a/media/extra_grf/signals.nfo
+++ b/media/extra_grf/signals.nfo
@@ -1,493 +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 "Pre-signal, semaphore, and PBS graphics by Michael Blunck"
-   -1 * 0	 05 04 F0
-   -1 sprites/signals.pcx 66 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 82 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 98 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 114 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 130 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 146 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 162 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 178 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 194 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 210 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 226 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 242 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 258 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 274 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 290 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 306 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 322 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 338 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 354 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 370 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 386 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 402 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 418 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 434 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 450 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 466 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 482 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 498 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 514 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 530 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 546 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 562 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 578 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 594 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 610 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 626 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 642 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 658 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 674 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 690 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 706 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 722 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 738 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 754 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 770 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 786 8 01 21 6 -2 -19
-   -1 sprites/signals.pcx 2 40 01 21 6 -2 -19
-   -1 sprites/signals.pcx 18 40 01 21 6 -2 -19
-   -1 sprites/signals.pcx 34 40 01 21 10 -6 -19
-   -1 sprites/signals.pcx 50 40 01 23 7 -3 -21
-   -1 sprites/signals.pcx 66 40 01 21 10 1 -19
-   -1 sprites/signals.pcx 82 40 01 21 9 1 -19
-   -1 sprites/signals.pcx 98 40 01 21 9 1 -19
-   -1 sprites/signals.pcx 114 40 01 23 6 1 -21
-   -1 sprites/signals.pcx 130 40 01 21 10 -7 -19
-   -1 sprites/signals.pcx 146 40 01 21 10 -7 -19
-   -1 sprites/signals.pcx 162 40 01 21 2 1 -19
-   -1 sprites/signals.pcx 178 40 01 24 2 1 -22
-   -1 sprites/signals.pcx 194 40 01 23 2 1 -21
-   -1 sprites/signals.pcx 210 40 01 26 2 1 -24
-   -1 sprites/signals.pcx 226 40 01 21 11 -7 -19
-   -1 sprites/signals.pcx 242 40 01 21 8 -4 -19
-   -1 sprites/signals.pcx 258 40 01 21 11 1 -19
-   -1 sprites/signals.pcx 274 40 01 21 8 1 -19
-   -1 sprites/signals.pcx 290 40 01 21 12 -6 -19
-   -1 sprites/signals.pcx 322 40 01 23 9 -3 -21
-   -1 sprites/signals.pcx 338 40 01 21 12 -1 -19
-   -1 sprites/signals.pcx 370 40 01 21 11 -1 -19
-   -1 sprites/signals.pcx 386 40 01 21 11 -1 -19
-   -1 sprites/signals.pcx 402 40 01 23 8 -1 -21
-   -1 sprites/signals.pcx 418 40 01 21 12 -7 -19
-   -1 sprites/signals.pcx 450 40 01 21 12 -7 -19
-   -1 sprites/signals.pcx 482 40 01 21 4 1 -19
-   -1 sprites/signals.pcx 498 40 01 24 4 1 -22
-   -1 sprites/signals.pcx 514 40 01 23 4 -1 -21
-   -1 sprites/signals.pcx 530 40 01 26 4 -1 -24
-   -1 sprites/signals.pcx 546 40 01 21 13 -7 -19
-   -1 sprites/signals.pcx 578 40 01 21 10 -4 -19
-   -1 sprites/signals.pcx 594 40 01 21 13 -1 -19
-   -1 sprites/signals.pcx 626 40 01 21 10 -1 -19
-   -1 sprites/signals.pcx 642 40 01 21 11 -6 -19
-   -1 sprites/signals.pcx 658 40 01 23 8 -3 -21
-   -1 sprites/signals.pcx 674 40 01 21 11 0 -19
-   -1 sprites/signals.pcx 690 40 01 21 10 0 -19
-   -1 sprites/signals.pcx 706 40 01 21 10 0 -19
-   -1 sprites/signals.pcx 722 40 01 23 7 0 -21
-   -1 sprites/signals.pcx 738 40 01 21 11 -7 -19
-   -1 sprites/signals.pcx 754 40 01 21 11 -7 -19
-   -1 sprites/signals.pcx 770 40 01 21 4 1 -19
-   -1 sprites/signals.pcx 786 40 01 24 4 1 -22
-   -1 sprites/signals.pcx 2 88 01 23 4 -1 -21
-   -1 sprites/signals.pcx 18 88 01 26 4 -1 -24
-   -1 sprites/signals.pcx 34 88 01 21 12 -7 -19
-   -1 sprites/signals.pcx 66 88 01 21 9 -4 -19
-   -1 sprites/signals.pcx 82 88 01 21 12 0 -19
-   -1 sprites/signals.pcx 114 88 01 21 9 0 -19
-   -1 sprites/signals.pcx 130 88 01 21 11 -6 -19
-   -1 sprites/signals.pcx 146 88 01 23 8 -3 -21
-   -1 sprites/signals.pcx 162 88 01 21 11 0 -19
-   -1 sprites/signals.pcx 178 88 01 21 10 0 -19
-   -1 sprites/signals.pcx 194 88 01 21 10 0 -19
-   -1 sprites/signals.pcx 210 88 01 23 7 0 -21
-   -1 sprites/signals.pcx 226 88 01 21 11 -7 -19
-   -1 sprites/signals.pcx 242 88 01 21 11 -7 -19
-   -1 sprites/signals.pcx 258 88 01 21 4 1 -19
-   -1 sprites/signals.pcx 274 88 01 24 4 1 -22
-   -1 sprites/signals.pcx 290 88 01 23 4 -1 -21
-   -1 sprites/signals.pcx 306 88 01 26 4 -1 -24
-   -1 sprites/signals.pcx 322 88 01 21 12 -7 -19
-   -1 sprites/signals.pcx 354 88 01 21 9 -4 -19
-   -1 sprites/signals.pcx 370 88 01 21 12 0 -19
-   -1 sprites/signals.pcx 402 88 01 21 9 0 -19
-   -1 sprites/signals.pcx 418 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 434 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 450 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 466 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 482 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 498 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 514 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 530 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 546 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 562 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 578 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 594 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 610 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 626 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 642 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 658 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 674 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 690 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 706 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 722 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 738 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 754 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 770 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 786 88 01 19 6 -2 -17
-   -1 sprites/signals.pcx 2 136 01 19 6 -2 -17
-   -1 sprites/signals.pcx 18 136 01 19 6 -2 -17
-   -1 sprites/signals.pcx 34 136 01 19 6 -2 -17
-   -1 sprites/signals.pcx 50 136 01 19 6 -2 -17
-   -1 sprites/signals.pcx 66 136 01 19 6 -2 -17
-   -1 sprites/signals.pcx 82 136 01 19 6 -2 -17
-   -1 sprites/signals.pcx 98 136 01 19 6 -2 -17
-   -1 sprites/signals.pcx 114 136 01 19 6 -2 -17
-   -1 sprites/signals.pcx 130 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 146 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 162 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 178 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 194 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 210 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 226 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 242 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 258 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 274 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 290 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 306 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 322 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 338 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 354 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 370 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 386 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 402 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 418 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 434 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 450 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 466 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 482 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 498 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 514 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 530 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 546 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 562 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 578 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 594 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 610 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 626 136 01 21 6 -2 -19
-   -1 sprites/signals.pcx 642 136 01 21 10 -6 -19
-   -1 sprites/signals.pcx 658 136 01 23 7 -3 -21
-   -1 sprites/signals.pcx 674 136 01 21 10 1 -19
-   -1 sprites/signals.pcx 690 136 01 21 9 1 -19
-   -1 sprites/signals.pcx 706 136 01 21 9 1 -19
-   -1 sprites/signals.pcx 722 136 01 23 6 1 -21
-   -1 sprites/signals.pcx 738 136 01 21 10 -7 -19
-   -1 sprites/signals.pcx 754 136 01 21 10 -7 -19
-   -1 sprites/signals.pcx 770 136 01 21 2 1 -19
-   -1 sprites/signals.pcx 786 136 01 24 2 1 -22
-   -1 sprites/signals.pcx 2 184 01 23 2 1 -21
-   -1 sprites/signals.pcx 18 184 01 26 2 1 -24
-   -1 sprites/signals.pcx 34 184 01 21 11 -7 -19
-   -1 sprites/signals.pcx 50 184 01 21 8 -4 -19
-   -1 sprites/signals.pcx 66 184 01 21 11 1 -19
-   -1 sprites/signals.pcx 82 184 01 21 8 1 -19
-   -1 sprites/signals.pcx 98 184 01 21 12 -6 -19
-   -1 sprites/signals.pcx 130 184 01 23 9 -3 -21
-   -1 sprites/signals.pcx 146 184 01 21 12 -1 -19
-   -1 sprites/signals.pcx 178 184 01 21 11 -1 -19
-   -1 sprites/signals.pcx 194 184 01 21 11 -1 -19
-   -1 sprites/signals.pcx 210 184 01 23 8 -1 -21
-   -1 sprites/signals.pcx 226 184 01 21 12 -7 -19
-   -1 sprites/signals.pcx 258 184 01 21 12 -7 -19
-   -1 sprites/signals.pcx 290 184 01 21 4 -1 -19
-   -1 sprites/signals.pcx 306 184 01 24 4 -1 -22
-   -1 sprites/signals.pcx 322 184 01 23 4 1 -21
-   -1 sprites/signals.pcx 338 184 01 26 4 1 -24
-   -1 sprites/signals.pcx 354 184 01 21 13 -7 -19
-   -1 sprites/signals.pcx 386 184 01 21 10 -4 -19
-   -1 sprites/signals.pcx 402 184 01 21 13 -1 -19
-   -1 sprites/signals.pcx 434 184 01 21 10 -1 -19
-   -1 sprites/signals.pcx 450 184 01 21 11 -6 -19
-   -1 sprites/signals.pcx 466 184 01 23 8 -3 -21
-   -1 sprites/signals.pcx 482 184 01 21 11 0 -19
-   -1 sprites/signals.pcx 498 184 01 21 10 0 -19
-   -1 sprites/signals.pcx 514 184 01 21 10 0 -19
-   -1 sprites/signals.pcx 530 184 01 23 7 0 -21
-   -1 sprites/signals.pcx 546 184 01 21 11 -7 -19
-   -1 sprites/signals.pcx 562 184 01 21 11 -7 -19
-   -1 sprites/signals.pcx 578 184 01 21 4 1 -19
-   -1 sprites/signals.pcx 594 184 01 24 4 1 -22
-   -1 sprites/signals.pcx 610 184 01 23 4 -1 -21
-   -1 sprites/signals.pcx 626 184 01 26 4 -1 -24
-   -1 sprites/signals.pcx 642 184 01 21 12 -7 -19
-   -1 sprites/signals.pcx 674 184 01 21 9 -4 -19
-   -1 sprites/signals.pcx 690 184 01 21 12 0 -19
-   -1 sprites/signals.pcx 722 184 01 21 9 0 -19
-   -1 sprites/signals.pcx 738 184 01 21 11 -6 -19
-   -1 sprites/signals.pcx 754 184 01 23 8 -3 -21
-   -1 sprites/signals.pcx 770 184 01 21 11 0 -19
-   -1 sprites/signals.pcx 786 184 01 21 10 0 -19
-   -1 sprites/signals.pcx 2 232 01 21 10 0 -19
-   -1 sprites/signals.pcx 18 232 01 23 7 0 -21
-   -1 sprites/signals.pcx 34 232 01 21 11 -7 -19
-   -1 sprites/signals.pcx 50 232 01 21 11 -7 -19
-   -1 sprites/signals.pcx 66 232 01 21 4 1 -19
-   -1 sprites/signals.pcx 82 232 01 24 4 1 -22
-   -1 sprites/signals.pcx 98 232 01 23 4 -1 -21
-   -1 sprites/signals.pcx 114 232 01 26 4 -1 -24
-   -1 sprites/signals.pcx 130 232 01 21 12 -7 -19
-   -1 sprites/signals.pcx 162 232 01 21 9 -4 -19
-   -1 sprites/signals.pcx 178 232 01 21 12 0 -19
-   -1 sprites/signals.pcx 210 232 01 21 9 0 -19
-   -1 * 0	 07 85 01 \70 3B F2
-   -1 * 0	 07 86 01 \70 04 F1
-   -1 * 0	 05 04 F0
-   -1 sprites/signals.pcx 274 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 290 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 306 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 322 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 338 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 354 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 370 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 386 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 402 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 418 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 434 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 450 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 466 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 482 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 498 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 514 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 530 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 546 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 562 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 578 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 594 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 610 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 626 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 642 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 658 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 674 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 690 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 706 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 722 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 738 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 754 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 770 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 786 232 01 21 6 -2 -19
-   -1 sprites/signals.pcx 2 280 01 21 6 -2 -19
-   -1 sprites/signals.pcx 18 280 01 21 6 -2 -19
-   -1 sprites/signals.pcx 34 280 01 21 6 -2 -19
-   -1 sprites/signals.pcx 50 280 01 21 6 -2 -19
-   -1 sprites/signals.pcx 66 280 01 21 6 -2 -19
-   -1 sprites/signals.pcx 82 280 01 21 6 -2 -19
-   -1 sprites/signals.pcx 98 280 01 21 6 -2 -19
-   -1 sprites/signals.pcx 114 280 01 21 6 -2 -19
-   -1 sprites/signals.pcx 130 280 01 21 6 -2 -19
-   -1 sprites/signals.pcx 146 280 01 21 6 -2 -19
-   -1 sprites/signals.pcx 162 280 01 21 6 -2 -19
-   -1 sprites/signals.pcx 178 280 01 21 6 -2 -19
-   -1 sprites/signals.pcx 194 280 01 21 6 -2 -19
-   -1 sprites/signals.pcx 210 280 01 21 6 -2 -19
-   -1 sprites/signals.pcx 226 280 01 21 6 -2 -19
-   -1 sprites/signals.pcx 242 280 01 21 10 -7 -19
-   -1 sprites/signals.pcx 258 280 01 23 10 -8 -21
-   -1 sprites/signals.pcx 274 280 01 23 10 -7 -21
-   -1 sprites/signals.pcx 290 280 01 26 7 -5 -24
-   -1 sprites/signals.pcx 306 280 01 21 10 -7 -19
-   -1 sprites/signals.pcx 322 280 01 23 10 -6 -21
-   -1 sprites/signals.pcx 338 280 01 23 10 1 -21
-   -1 sprites/signals.pcx 354 280 01 26 7 2 -24
-   -1 sprites/signals.pcx 370 280 01 23 3 0 -21
-   -1 sprites/signals.pcx 386 280 01 26 3 0 -24
-   -1 sprites/signals.pcx 402 280 01 21 3 0 -19
-   -1 sprites/signals.pcx 418 280 01 24 3 0 -22
-   -1 sprites/signals.pcx 434 280 01 21 12 0 -19
-   -1 sprites/signals.pcx 466 280 01 24 9 0 -22
-   -1 sprites/signals.pcx 482 280 01 21 12 -9 -19
-   -1 sprites/signals.pcx 514 280 01 24 9 -6 -22
-   -1 sprites/signals.pcx 530 280 01 21 12 -9 -19
-   -1 sprites/signals.pcx 562 280 01 23 11 -9 -21
-   -1 sprites/signals.pcx 578 280 01 23 11 -7 -21
-   -1 sprites/signals.pcx 594 280 01 26 9 -5 -24
-   -1 sprites/signals.pcx 610 280 01 21 12 -7 -19
-   -1 sprites/signals.pcx 642 280 01 23 11 -6 -21
-   -1 sprites/signals.pcx 658 280 01 23 11 0 -21
-   -1 sprites/signals.pcx 674 280 01 26 9 0 -24
-   -1 sprites/signals.pcx 690 280 01 23 5 0 -21
-   -1 sprites/signals.pcx 706 280 01 26 5 0 -24
-   -1 sprites/signals.pcx 722 280 01 21 5 -2 -19
-   -1 sprites/signals.pcx 738 280 01 24 5 -2 -22
-   -1 sprites/signals.pcx 754 280 01 21 13 -1 -19
-   -1 sprites/signals.pcx 786 280 01 24 10 -1 -22
-   -1 sprites/signals.pcx 2 328 01 21 13 -9 -19
-   -1 sprites/signals.pcx 34 328 01 24 10 -6 -22
-   -1 sprites/signals.pcx 50 328 01 21 11 -8 -19
-   -1 sprites/signals.pcx 66 328 01 23 10 -8 -21
-   -1 sprites/signals.pcx 82 328 01 23 10 -7 -21
-   -1 sprites/signals.pcx 98 328 01 26 8 -5 -24
-   -1 sprites/signals.pcx 114 328 01 21 11 -7 -19
-   -1 sprites/signals.pcx 130 328 01 23 10 -6 -21
-   -1 sprites/signals.pcx 146 328 01 23 10 1 -21
-   -1 sprites/signals.pcx 162 328 01 26 8 1 -24
-   -1 sprites/signals.pcx 178 328 01 23 5 0 -21
-   -1 sprites/signals.pcx 194 328 01 26 5 0 -24
-   -1 sprites/signals.pcx 210 328 01 21 5 -2 -19
-   -1 sprites/signals.pcx 226 328 01 24 5 -2 -22
-   -1 sprites/signals.pcx 242 328 01 21 12 0 -19
-   -1 sprites/signals.pcx 274 328 01 24 9 0 -22
-   -1 sprites/signals.pcx 290 328 01 21 12 -9 -19
-   -1 sprites/signals.pcx 322 328 01 24 9 -6 -22
-   -1 sprites/signals.pcx 338 328 01 21 11 -8 -19
-   -1 sprites/signals.pcx 354 328 01 23 10 -8 -21
-   -1 sprites/signals.pcx 370 328 01 23 10 -7 -21
-   -1 sprites/signals.pcx 386 328 01 26 8 -5 -24
-   -1 sprites/signals.pcx 402 328 01 21 11 -7 -19
-   -1 sprites/signals.pcx 418 328 01 23 10 -6 -21
-   -1 sprites/signals.pcx 434 328 01 23 10 1 -21
-   -1 sprites/signals.pcx 450 328 01 26 8 1 -24
-   -1 sprites/signals.pcx 466 328 01 23 5 0 -21
-   -1 sprites/signals.pcx 482 328 01 26 5 0 -24
-   -1 sprites/signals.pcx 498 328 01 21 5 -2 -19
-   -1 sprites/signals.pcx 514 328 01 24 5 -2 -22
-   -1 sprites/signals.pcx 530 328 01 21 12 0 -19
-   -1 sprites/signals.pcx 562 328 01 24 9 0 -22
-   -1 sprites/signals.pcx 578 328 01 21 12 -9 -19
-   -1 sprites/signals.pcx 610 328 01 24 9 -6 -22
-   -1 sprites/signals.pcx 626 328 01 19 6 -2 -17
-   -1 sprites/signals.pcx 642 328 01 19 6 -2 -17
-   -1 sprites/signals.pcx 658 328 01 19 6 -2 -17
-   -1 sprites/signals.pcx 674 328 01 19 6 -2 -17
-   -1 sprites/signals.pcx 690 328 01 19 6 -2 -17
-   -1 sprites/signals.pcx 706 328 01 19 6 -2 -17
-   -1 sprites/signals.pcx 722 328 01 19 6 -2 -17
-   -1 sprites/signals.pcx 738 328 01 19 6 -2 -17
-   -1 sprites/signals.pcx 754 328 01 19 6 -2 -17
-   -1 sprites/signals.pcx 770 328 01 19 6 -2 -17
-   -1 sprites/signals.pcx 786 328 01 19 6 -2 -17
-   -1 sprites/signals.pcx 2 376 01 19 6 -2 -17
-   -1 sprites/signals.pcx 18 376 01 19 6 -2 -17
-   -1 sprites/signals.pcx 34 376 01 19 6 -2 -17
-   -1 sprites/signals.pcx 50 376 01 19 6 -2 -17
-   -1 sprites/signals.pcx 66 376 01 19 6 -2 -17
-   -1 sprites/signals.pcx 82 376 01 19 6 -2 -17
-   -1 sprites/signals.pcx 98 376 01 19 6 -2 -17
-   -1 sprites/signals.pcx 114 376 01 19 6 -2 -17
-   -1 sprites/signals.pcx 130 376 01 19 6 -2 -17
-   -1 sprites/signals.pcx 146 376 01 19 6 -2 -17
-   -1 sprites/signals.pcx 162 376 01 19 6 -2 -17
-   -1 sprites/signals.pcx 178 376 01 19 6 -2 -17
-   -1 sprites/signals.pcx 194 376 01 19 6 -2 -17
-   -1 sprites/signals.pcx 210 376 01 19 6 -2 -17
-   -1 sprites/signals.pcx 226 376 01 19 6 -2 -17
-   -1 sprites/signals.pcx 242 376 01 19 6 -2 -17
-   -1 sprites/signals.pcx 258 376 01 19 6 -2 -17
-   -1 sprites/signals.pcx 274 376 01 19 6 -2 -17
-   -1 sprites/signals.pcx 290 376 01 19 6 -2 -17
-   -1 sprites/signals.pcx 306 376 01 19 6 -2 -17
-   -1 sprites/signals.pcx 322 376 01 19 6 -2 -17
-   -1 sprites/signals.pcx 338 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 354 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 370 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 386 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 402 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 418 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 434 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 450 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 466 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 482 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 498 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 514 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 530 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 546 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 562 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 578 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 594 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 610 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 626 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 642 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 658 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 674 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 690 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 706 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 722 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 738 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 754 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 770 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 786 376 01 21 6 -2 -19
-   -1 sprites/signals.pcx 2 408 01 21 6 -2 -19
-   -1 sprites/signals.pcx 18 408 01 21 6 -2 -19
-   -1 sprites/signals.pcx 34 408 01 21 6 -2 -19
-   -1 sprites/signals.pcx 50 408 01 21 10 -7 -19
-   -1 sprites/signals.pcx 66 408 01 23 10 -8 -21
-   -1 sprites/signals.pcx 82 408 01 23 10 -7 -21
-   -1 sprites/signals.pcx 98 408 01 26 7 -5 -24
-   -1 sprites/signals.pcx 114 408 01 21 10 -7 -19
-   -1 sprites/signals.pcx 130 408 01 23 10 -6 -21
-   -1 sprites/signals.pcx 146 408 01 23 10 1 -21
-   -1 sprites/signals.pcx 162 408 01 26 7 2 -24
-   -1 sprites/signals.pcx 178 408 01 23 3 0 -21
-   -1 sprites/signals.pcx 194 408 01 26 3 0 -24
-   -1 sprites/signals.pcx 210 408 01 21 3 0 -19
-   -1 sprites/signals.pcx 226 408 01 24 3 0 -22
-   -1 sprites/signals.pcx 242 408 01 21 12 0 -19
-   -1 sprites/signals.pcx 274 408 01 24 9 0 -22
-   -1 sprites/signals.pcx 290 408 01 21 12 -9 -19
-   -1 sprites/signals.pcx 322 408 01 24 9 -6 -22
-   -1 sprites/signals.pcx 338 408 01 21 12 -9 -19
-   -1 sprites/signals.pcx 370 408 01 23 11 -9 -21
-   -1 sprites/signals.pcx 386 408 01 23 11 -7 -21
-   -1 sprites/signals.pcx 402 408 01 26 9 -5 -24
-   -1 sprites/signals.pcx 418 408 01 21 12 -7 -19
-   -1 sprites/signals.pcx 450 408 01 23 11 -6 -21
-   -1 sprites/signals.pcx 466 408 01 23 11 0 -21
-   -1 sprites/signals.pcx 482 408 01 26 9 0 -24
-   -1 sprites/signals.pcx 498 408 01 23 5 -1 -21
-   -1 sprites/signals.pcx 514 408 01 26 5 -1 -24
-   -1 sprites/signals.pcx 530 408 01 21 5 -1 -19
-   -1 sprites/signals.pcx 546 408 01 24 5 -1 -22
-   -1 sprites/signals.pcx 562 408 01 21 13 -1 -19
-   -1 sprites/signals.pcx 594 408 01 24 10 -1 -22
-   -1 sprites/signals.pcx 610 408 01 21 13 -9 -19
-   -1 sprites/signals.pcx 642 408 01 24 10 -6 -22
-   -1 sprites/signals.pcx 658 408 01 21 11 -8 -19
-   -1 sprites/signals.pcx 674 408 01 23 10 -8 -21
-   -1 sprites/signals.pcx 690 408 01 23 10 -7 -21
-   -1 sprites/signals.pcx 706 408 01 26 8 -5 -24
-   -1 sprites/signals.pcx 722 408 01 21 11 -7 -19
-   -1 sprites/signals.pcx 738 408 01 23 10 -6 -21
-   -1 sprites/signals.pcx 754 408 01 23 10 1 -21
-   -1 sprites/signals.pcx 770 408 01 26 8 1 -24
-   -1 sprites/signals.pcx 786 408 01 23 5 0 -21
-   -1 sprites/signals.pcx 2 456 01 26 5 0 -24
-   -1 sprites/signals.pcx 18 456 01 21 5 -2 -19
-   -1 sprites/signals.pcx 34 456 01 24 5 -2 -22
-   -1 sprites/signals.pcx 50 456 01 21 12 0 -19
-   -1 sprites/signals.pcx 82 456 01 24 9 0 -22
-   -1 sprites/signals.pcx 98 456 01 21 12 -9 -19
-   -1 sprites/signals.pcx 130 456 01 24 9 -6 -22
-   -1 sprites/signals.pcx 146 456 01 21 11 -8 -19
-   -1 sprites/signals.pcx 162 456 01 23 10 -8 -21
-   -1 sprites/signals.pcx 178 456 01 23 10 -7 -21
-   -1 sprites/signals.pcx 194 456 01 26 8 -5 -24
-   -1 sprites/signals.pcx 210 456 01 21 11 -7 -19
-   -1 sprites/signals.pcx 226 456 01 23 10 -6 -21
-   -1 sprites/signals.pcx 242 456 01 23 10 1 -21
-   -1 sprites/signals.pcx 258 456 01 26 8 1 -24
-   -1 sprites/signals.pcx 274 456 01 23 5 0 -21
-   -1 sprites/signals.pcx 290 456 01 26 5 0 -24
-   -1 sprites/signals.pcx 306 456 01 21 5 -2 -19
-   -1 sprites/signals.pcx 322 456 01 24 5 -2 -22
-   -1 sprites/signals.pcx 338 456 01 21 12 0 -19
-   -1 sprites/signals.pcx 370 456 01 24 9 0 -22
-   -1 sprites/signals.pcx 386 456 01 21 12 -9 -19
-   -1 sprites/signals.pcx 418 456 01 24 9 -6 -22
--- a/media/extra_grf/signals.pcx
+++ b/media/extra_grf/signals.pcx
--- a/media/extra_grf/sloped_tracks.nfo
+++ b/media/extra_grf/sloped_tracks.nfo
@@ -1,22 +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 "Sloped tracks"
-   -1 * 3	 05 0F 0C
-   -1 sprites/sloped_tracks.pcx 50 8 09 29 42 -19 -3
-   -1 sprites/sloped_tracks.pcx 98 8 09 13 41 -20 5
-   -1 sprites/sloped_tracks.pcx 146 8 09 14 42 -19 5
-   -1 sprites/sloped_tracks.pcx 194 8 09 29 42 -21 -3
-   -1 sprites/sloped_tracks.pcx 242 8 09 25 33 -15 -1
-   -1 sprites/sloped_tracks.pcx 290 8 09 10 33 -15 7
-   -1 sprites/sloped_tracks.pcx 338 8 09 10 34 -15 7
-   -1 sprites/sloped_tracks.pcx 386 8 09 25 34 -15 -1
-   -1 sprites/sloped_tracks.pcx 434 8 09 23 31 -13 -1
-   -1 sprites/sloped_tracks.pcx 482 8 09 10 32 -15 7
-   -1 sprites/sloped_tracks.pcx 530 8 09 10 31 -15 7
-   -1 sprites/sloped_tracks.pcx 578 8 09 23 31 -16 -1
--- a/media/extra_grf/sloped_tracks.pcx
+++ b/media/extra_grf/sloped_tracks.pcx
--- a/media/extra_grf/tramtracks.nfo
+++ b/media/extra_grf/tramtracks.nfo
@@ -1,123 +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 "Tram track graphics by PikkaBird"
-   -1 * 0	 05 0B 71
-   -1 sprites/tramtracks.pcx 18 8 09 13 20 0 4
-   -1 sprites/tramtracks.pcx 50 8 09 13 20 0 4
-   -1 sprites/tramtracks.pcx 82 8 03 36 64 -18 -8
-   -1 sprites/tramtracks.pcx 162 8 03 36 62 -16 -8
-   -1 sprites/tramtracks.pcx 242 8 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 322 8 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 402 8 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 482 8 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 562 8 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 642 8 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 722 8 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 2 56 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 82 56 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 162 56 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 242 56 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 322 56 09 39 64 -31 -8
-   -1 sprites/tramtracks.pcx 402 56 09 23 64 -31 0
-   -1 sprites/tramtracks.pcx 482 56 09 23 64 -31 0
-   -1 sprites/tramtracks.pcx 562 56 09 39 64 -31 -8
-   -1 sprites/tramtracks.pcx 642 56 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 722 56 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 2 120 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 82 120 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 162 120 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 242 120 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 322 120 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 402 120 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 482 120 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 562 120 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 642 120 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 722 120 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 2 168 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 82 168 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 162 168 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 242 168 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 322 168 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 402 168 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 482 168 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 562 168 09 39 64 -31 -8
-   -1 sprites/tramtracks.pcx 642 168 09 23 64 -31 0
-   -1 sprites/tramtracks.pcx 722 168 09 23 64 -31 0
-   -1 sprites/tramtracks.pcx 2 232 09 39 64 -31 -8
-   -1 sprites/tramtracks.pcx 82 232 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 162 232 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 242 232 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 322 232 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 402 232 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 482 232 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 562 232 09 20 20 0 0
-   -1 sprites/tramtracks.pcx 594 232 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 674 232 09 64 62 2 -49
-   -1 sprites/tramtracks.pcx 2 312 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 82 312 09 64 62 -62 -49
-   -1 sprites/tramtracks.pcx 162 312 09 64 62 -62 -49
-   -1 sprites/tramtracks.pcx 242 312 09 64 62 2 -49
-   -1 sprites/tramtracks.pcx 322 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 402 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 482 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 562 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 642 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 722 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 2 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 82 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 162 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 242 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 322 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 402 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 482 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 562 392 09 56 64 -31 -25
-   -1 sprites/tramtracks.pcx 642 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 722 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 2 472 09 56 64 -31 -25
-   -1 sprites/tramtracks.pcx 82 472 09 56 64 -31 -25
-   -1 sprites/tramtracks.pcx 162 472 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 242 472 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 322 472 09 56 64 -31 -25
-   -1 sprites/tramtracks.pcx 402 472 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 482 472 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 562 472 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 642 472 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 722 472 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 2 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 82 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 162 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 242 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 322 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 402 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 482 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 562 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 642 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 722 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 2 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 82 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 162 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 242 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 322 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 402 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 482 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 562 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 642 616 09 56 64 -31 -25
-   -1 sprites/tramtracks.pcx 722 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 2 696 09 56 64 -31 -25
-   -1 sprites/tramtracks.pcx 82 696 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 162 696 09 56 64 -31 -25
-   -1 sprites/tramtracks.pcx 242 696 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 322 696 09 56 64 -31 -25
-   -1 sprites/tramtracks.pcx 402 696 09 48 64 -31 -17
-   -1 sprites/tramtracks.pcx 482 696 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 562 696 09 31 64 -31 0
-   -1 sprites/tramtracks.pcx 642 696 09 39 64 -31 -8
-   -1 sprites/tramtracks.pcx 722 696 09 23 64 -31 0
-   -1 sprites/tramtracks.pcx 2 776 09 23 64 -31 0
-   -1 sprites/tramtracks.pcx 82 776 09 39 64 -31 -8
--- a/media/extra_grf/tramtracks.pcx
+++ b/media/extra_grf/tramtracks.pcx
--- a/media/mainicon.ico
+++ b/media/mainicon.ico
--- a/media/openttd.256.png
+++ b/media/openttd.256.png
--- a/media/openttd.desktop.in
+++ b/media/openttd.desktop.in
@@ -1,11 +0,0 @@
-# $Id$
-# http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.1.html
-[Desktop Entry]
-Type=Application
-Version=1.1
-Name=!!MENU_NAME!!
-Icon=openttd
-Exec=!!TTD!!
-Terminal=false
-Categories=!!MENU_GROUP!!
-Comment=A clone of Transport Tycoon Deluxe
--- a/media/openttd.desktop.translation.awk
+++ b/media/openttd.desktop.translation.awk
@@ -1,15 +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/>.
-
-#
-# Awk script to automatically generate a single comment line
-# for a translated desktop shortcut. If it does not exist there
-# is no output.
-#
-
-/##isocode/ { lang = $2; next }
-/STR_DESKTOP_SHORTCUT_COMMENT/ { sub("^[^:]*:", "", $0); print "Comment[" lang "]=" $0; next}
--- a/media/openttd.svg
+++ b/media/openttd.svg
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="256"
-   height="256"
-   id="svg2"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="openttd.svg">
-  <metadata
-     id="metadata42">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1177"
-     id="namedview40"
-     showgrid="false"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="163.74991"
-     inkscape:cy="132.32268"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 124 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="256 : 124 : 1"
-       inkscape:persp3d-origin="128 : 82.666667 : 1"
-       id="perspective44" />
-    <linearGradient
-       id="linearGradient3421">
-      <stop
-         style="stop-color:#fe7600;stop-opacity:1"
-         offset="0"
-         id="stop3423" />
-      <stop
-         style="stop-color:#f2b26d;stop-opacity:1"
-         offset="1"
-         id="stop3425" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3269">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop3271" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1"
-         id="stop3273" />
-    </linearGradient>
-    <linearGradient
-       x1="312.62323"
-       y1="468.58658"
-       x2="315.21729"
-       y2="471.18063"
-       id="linearGradient3275"
-       xlink:href="#linearGradient3269"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="312.62323"
-       y1="468.58658"
-       x2="315.21729"
-       y2="471.18063"
-       id="linearGradient3289"
-       xlink:href="#linearGradient3269"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="312.62323"
-       y1="468.58658"
-       x2="315.21729"
-       y2="471.18063"
-       id="linearGradient3308"
-       xlink:href="#linearGradient3269"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7071068,-0.7071068,0.7071068,0.7071068,-266.24277,420.94154)" />
-    <linearGradient
-       x1="312.62323"
-       y1="468.58658"
-       x2="315.21729"
-       y2="471.18063"
-       id="linearGradient3326"
-       xlink:href="#linearGradient3269"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7071068,-0.7071068,0.7071068,0.7071068,-266.24277,420.94154)" />
-    <linearGradient
-       x1="312.62323"
-       y1="468.58658"
-       x2="315.21729"
-       y2="471.18063"
-       id="linearGradient3336"
-       xlink:href="#linearGradient3269"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.3591922,-0.1487874)" />
-    <linearGradient
-       x1="312.62323"
-       y1="468.58658"
-       x2="315.21729"
-       y2="471.18063"
-       id="linearGradient3406"
-       xlink:href="#linearGradient3269"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.2643187,40.455238)" />
-    <linearGradient
-       x1="133.3282"
-       y1="156.16792"
-       x2="117.66125"
-       y2="78.463249"
-       id="linearGradient3431"
-       xlink:href="#linearGradient3421"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="133.3282"
-       y1="156.16792"
-       x2="117.66125"
-       y2="78.463249"
-       id="linearGradient3488"
-       xlink:href="#linearGradient3421"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(2,2)" />
-    <filter
-       id="filter3566"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur3568"
-         stdDeviation="1.2236964"
-         inkscape:collect="always" />
-    </filter>
-    <linearGradient
-       x1="136.3282"
-       y1="151.16792"
-       x2="117.66125"
-       y2="78.463249"
-       id="linearGradient3571"
-       xlink:href="#linearGradient3421"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <g
-     transform="translate(-246.4375,-405.5443)"
-     id="layer1">
-    <path
-       d="m 127.34375,3.46875 c -0.48316,0.02376 -0.94805,0.22615 -1.3125,0.59375 L 7.65625,122.40625 c -0.78094,0.7811 -0.78094,2.06266 0,2.84375 L 25.25,142.84375 5,163.09375 c -0.78094,0.7811 -0.78094,2.03141 0,2.8125 l 80.40625,80.40625 c 0.7811,0.78094 2.03141,0.78093 2.8125,0 l 20.25,-20.25 17.59375,17.59375 c 0.7811,0.78093 2.03141,0.78093 2.8125,0 l 17.5625,-17.5625 20.21875,20.21875 c 0.78108,0.78094 2.06265,0.78093 2.84375,0 l 80.375,-80.40625 c 0.78094,-0.78109 0.78094,-2.0314 0,-2.8125 L 229.65625,142.875 247.25,125.28125 c 0.78094,-0.7811 0.78094,-2.06265 0,-2.84375 L 128.875,4.0625 c -0.0421,-0.04625 -0.11001,-0.11415 -0.15625,-0.15625 -0.39876,-0.33006 -0.89184,-0.46126 -1.375,-0.4375 z m -6,43.5625 14.15625,0 0,19.75 c 0.01,0.435733 0.30048,0.815 0.71875,0.9375 2.36672,0.715663 4.34765,1.46009 5.9375,2.1875 1.57854,0.722523 3.76284,1.94 6.53125,3.65625 0.23423,0.144983 0.51508,0.19598 0.78125,0.125 0.26615,-0.07098 0.49406,-0.25764 0.625,-0.5 l 2.875,-5.40625 7.75,0 9.34375,36.21875 -13.625,3.90625 c -4.11145,-10.161057 -10.59377,-17.79909 -19.46875,-22.625 -0.31359,-0.166457 -0.69786,-0.15518 -1,0.03125 -0.30216,0.186431 -0.47688,0.52006 -0.46875,0.875 l 0,24.03125 c 0.01,0.43573 0.30048,0.815 0.71875,0.9375 10.93974,3.10986 18.88772,6.27714 23.75,9.4375 4.89952,3.1848 8.58915,7.0982 11.15625,11.71875 2.57543,4.63598 3.84364,9.41467 3.84375,14.375 -1.1e-4,5.33303 -1.49612,10.44021 -4.5625,15.40625 -3.05188,4.94228 -7.57932,9.1061 -13.59375,12.46875 -5.99929,3.35409 -12.74816,5.29505 -20.375,5.84375 -0.52771,0.0331 -0.93848,0.47125 -0.9375,1 l 0,19.25 -14.15625,0 0,-20.65625 c 0.0115,-0.47702 -0.31562,-0.89572 -0.78125,-1 -6.24994,-1.46738 -12.82661,-4.66999 -19.71875,-9.6875 -0.25021,-0.18733 -0.57446,-0.24211 -0.875,-0.15625 -0.300532,0.0859 -0.54278,0.30252 -0.65625,0.59375 l -3.75,9.25 -7.625,0 -7.875,-42.34375 14.3125,-3.4375 c 2.78387,6.00776 5.47545,10.86469 8.09375,14.4375 2.72545,3.71918 5.79951,6.95217 9.21875,9.6875 2.53873,2.0772 5.32819,3.64369 8.34375,4.6875 0.30262,0.0995 0.64703,0.0602 0.90625,-0.125 0.25923,-0.18516 0.40226,-0.49396 0.40625,-0.8125 l 0,-27.875 c 0.008,-0.43878 -0.2706,-0.83165 -0.6875,-0.96875 -11.9575,-4.0043 -20.14727,-7.50583 -24.4375,-10.375 C 91.88074,118.97403 88.49102,115.30727 86,110.8125 83.50306,106.30724 82.24999,101.8073 82.25,97.25 c -1e-5,-5.212767 1.5369,-10.24246 4.65625,-15.125 3.11104,-4.869387 7.41684,-8.74009 12.96875,-11.625 5.52685,-2.871687 12.35433,-4.48215 20.5,-4.8125 0.54002,-0.01694 0.96896,-0.45971 0.96875,-1 l 0,-17.65625 z m -2,37.375 c -3.80484,0.61143 -6.64239,1.484763 -8.125,2.53125 -2.55269,1.82341 -3.68754,3.817503 -3.6875,6.21875 -3e-5,1.99888 0.82821,3.916143 2.6875,5.90625 1.5957,1.70818 4.79074,3.41885 9.125,5.03125 l 0,-19.6875 z m 18.15625,55.125 0,22.40625 c 3.64443,-0.60429 6.6344,-1.65745 8.8125,-3.25 2.37481,-1.73646 3.46868,-3.90374 3.46875,-6.875 -7e-5,-2.6212 -0.83434,-4.7944 -2.625,-6.6875 -2.27356,-2.32082 -5.55946,-4.16441 -9.65625,-5.59375 z"
-       transform="translate(247,408.36218)"
-       style="fill:#000000;fill-opacity:0.69019608;fill-rule:evenodd;stroke:none;filter:url(#filter3566)"
-       id="path3453" />
-    <path
-       d="m 125.4375,3.46875 -118.375,118.375 118.375,118.375 118.40625,-118.375 L 125.4375,3.46875 z m -7.09375,40.5625 16.15625,0 0,20.75 c 2.39847,0.725255 4.41692,1.465836 6.0625,2.21875 1.64544,0.753136 3.86718,1.989686 6.65625,3.71875 l 3.15625,-5.9375 9.125,0 9.78125,37.90625 -15.375,4.4375 C 149.89001,96.694255 143.4247,89.040435 134.5,84.1875 l 0,24.03125 c 10.98855,3.12374 18.97973,6.29945 24,9.5625 5.02009,3.26318 8.85036,7.29338 11.5,12.0625 2.64944,4.76921 3.96864,9.71205 3.96875,14.84375 -1.1e-4,5.52222 -1.56729,10.83367 -4.71875,15.9375 -3.15166,5.10387 -7.80181,9.38205 -13.9375,12.8125 -6.13586,3.43045 -13.05918,5.41095 -20.8125,5.96875 l 0,20.25 -16.15625,0 0,-21.65625 c -6.41472,-1.50606 -13.12131,-4.79903 -20.09375,-9.875 l -4,9.875 -9.125,0 -8.21875,-44.09375 16,-3.84375 c 2.900524,6.35894 5.697538,11.34646 8.375,15 2.6774,3.65361 5.68442,6.8226 9.03125,9.5 2.45427,2.0081 5.13065,3.52723 8.03125,4.53125 l 0,-27.875 c -11.9927,-4.01609 -20.225144,-7.51572 -24.6875,-10.5 C 89.193843,117.73459 85.690854,113.94229 83.125,109.3125 80.559118,104.68285 79.249989,99.991365 79.25,95.25 c -9e-6,-5.410553 1.605147,-10.635971 4.8125,-15.65625 3.207321,-5.02008 7.654184,-9.01231 13.34375,-11.96875 5.68951,-2.956214 12.68204,-4.602705 20.9375,-4.9375 l 0,-18.65625 z m 0,37.15625 c -4.57399,0.613679 -7.82228,1.598881 -9.71875,2.9375 -2.73325,1.952387 -4.09379,4.29813 -4.09375,7.03125 -4e-5,2.287057 0.98853,4.4742 2.96875,6.59375 1.98014,2.119711 5.6004,4.09012 10.84375,5.875 l 0,-22.4375 z m 16.15625,54.875 0,25.125 c 4.35076,-0.55777 7.81241,-1.79097 10.40625,-3.6875 2.59369,-1.8965 3.87492,-4.45224 3.875,-7.6875 -8e-5,-2.84474 -0.95404,-5.31111 -2.90625,-7.375 -2.67751,-2.73317 -6.46645,-4.8689 -11.375,-6.375 z"
-       transform="translate(247,408.36218)"
-       style="fill:url(#linearGradient3571);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect3418" />
-    <rect
-       width="113.67383"
-       height="30.562906"
-       x="581.44257"
-       y="195.29802"
-       transform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,0,0)"
-       style="fill:#6ad636;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect3277" />
-    <path
-       d="m 271.41033,548.04524 -21.3701,21.3701 c -0.51722,0.5028 -0.72366,1.24514 -0.54025,1.94279 0.18341,0.69764 0.72825,1.24248 1.42588,1.42589 0.69765,0.1834 1.44,-0.023 1.9428,-0.54026 l 21.91555,-21.91555 -3.37388,-2.28297 z"
-       style="opacity:0.7;fill:url(#linearGradient3406);fill-opacity:1;fill-rule:evenodd;stroke:none"
-       id="path3404" />
-    <rect
-       width="167.41394"
-       height="167.41394"
-       x="554.57251"
-       y="27.848526"
-       transform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,0,0)"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect2251" />
-    <path
-       d="m 373.71159,410.23833 c -0.81035,-0.62925 -1.9654,-0.54334 -2.67374,0.19888 l -118.37411,118.3741 c -0.51722,0.5028 -0.72366,1.24514 -0.54025,1.94279 0.18341,0.69764 0.72825,1.24248 1.42588,1.42589 0.69765,0.1834 1.44,-0.023 1.9428,-0.54026 l 118.3741,-118.3741 c 0.42126,-0.40199 0.64643,-0.96759 0.61671,-1.54911 -0.0297,-0.58152 -0.31136,-1.12123 -0.77139,-1.47819 l 0,0 z"
-       style="opacity:0.7;fill:url(#linearGradient3336);fill-opacity:1;fill-rule:evenodd;stroke:none"
-       id="path3256" />
-    <rect
-       width="113.67384"
-       height="30.56292"
-       x="54.718613"
-       y="-752.58502"
-       transform="matrix(-0.7071068,0.7071068,-0.7071068,-0.7071068,0,0)"
-       style="fill:#6ad636;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.00000048;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect3279" />
-    <rect
-       width="11.142811"
-       height="14.090264"
-       x="602.29895"
-       y="203.53435"
-       transform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,0,0)"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect3291" />
-    <rect
-       width="11.142811"
-       height="8.5145016"
-       x="622.57172"
-       y="203.53435"
-       transform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,0,0)"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect3293" />
-    <path
-       d="m 308.55497,616.32265 -7.87916,-7.87915 9.96333,-9.96333 7.87916,7.87916"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       id="rect3295" />
-    <path
-       d="m 315.01081,622.77849 9.96332,-9.96333 7.87916,7.87916 -9.96333,9.96332"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       id="rect3297" />
-    <path
-       d="m 445.04627,584.86337 1.41421,1.41422 9.96579,9.96578 1.41421,1.41422 1.41421,-1.41422 6.47445,-6.47444 -2.82843,-2.82843 2.82843,-2.82843 -7.13736,-7.13736 -2.82843,2.82843 -2.82842,-2.82843 -6.47445,6.47445 -1.41421,1.41421 z m 5.65685,0 5.06023,-5.06023 7.13736,7.13736 -5.06023,5.06023 -7.13736,-7.13736 z"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
-       id="rect3347" />
-    <path
-       d="m 427.09359,605.64776 -7.87916,7.87915"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       id="rect3343" />
-    <path
-       d="m 433.11734,619.55066 -9.96333,-9.96333"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       id="path3352" />
-    <path
-       d="m 441.42857,591.31278 -7.87916,7.87916"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       id="path3364" />
-    <path
-       d="m 447.45232,605.21568 -9.96333,-9.96333"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       id="path3366" />
-    <path
-       d="m 296.30415,584.14518 -9.96332,9.96333"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       id="rect3380" />
-    <path
-       d="m 306.75446,602.36485 7.87915,7.87916"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       id="path3384" />
-  </g>
-</svg>
--- a/docs/palettes/palette.act
+++ b/docs/palettes/palette.act
--- a/os/debian/NEWS
+++ b/os/debian/NEWS
@@ -1,25 +0,0 @@
-openttd (1.0.0~rc3-2) unstable; urgency=low
-
-    The openttd package has been moved from contrib into main. Since the
-    OpenGFX free graphics set has been packaged for Debian, one can now run
-    OpenTTD without needing any of the resources from the original game
-    (though the original resources are still supported).
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 18 Mar 2010 13:09:35 +0100
-
-openttd (0.7.0-1) unstable; urgency=low
-
-    Handling of AI players has changed in 0.7.0. This package no longer
-    contains any AI players, so playing against the computer is not possible
-    out of the box any longer. However, you can easily download AI players
-    through the new "Content Downloading Service", after which playing with
-    computer players is possible.
-
-    Loading old savegames with computer players is supported (AI players will
-    be converted according to the current AI settings), but at this moment
-    there are no AIs that completely handle any existing infrastructure built
-    by the old AI, so starting a new game might be more fun (especially since
-    most of the new AIs are a lot less erratic).
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 13 Apr 2009 15:11:20 +0200
-
--- a/os/debian/README.Debian
+++ b/os/debian/README.Debian
@@ -1,41 +1,34 @@
-OpenTTD for Debian
+openttd for Debian
 ------------------

-To properly play this game, you need a base graphics and sound set.
-Currently, the graphics, sound and music files from the original
-Transport Tycoon Deluxe game (Windows and DOS versions) are supported,
-as well as the free graphics replacement set "OpenGFX", sound
-replacement set "OpenSFX" (which is in non-free due to a restrictive
-license) and the free music replacement set "OpenMSX".
+To properly play this game, original data files are needed.
+You should copy the data files from the original TTD into the data directory
+(/usr/share/games/openttd/data). You should copy these files:
+* trg1r.grf
+* trgcr.grf
+* trghr.grf
+* trgir.grf
+* trgtr.grf
+* sample.cat

-Normally, installing the openttd package should automatically install
-openttd-opengfx as well, allowing OpenTTD to run out of the box. If you
-want sound, you'll have to enable non-free sources and install the
-openttd-opensfx package manually (or install the original Transport
-Tyccon Deluxe sound files).
+-Music
+	For in game music (optional), you should copy all files in the gm/
+	subdir of your ttd installation to /usr/share/games/openttd/gm.  You
+	should also install timidity and a soundfont (freepats is packaged in
+	debian and works out of the box).

-The easiest way to install the OpenMSX music files is to use the in-game
-content download system, which should offer the latest version of the
-music files.
-
-To find out how to install the original Transport Tycoon Deluxe graphics
-sound files and music files, see readme.txt, section 4.1.
-
-Playing Music
-	In addition to installing a music set (see above), you'll also need
-	to install the timidity midi player, available in the timidity
-	package.
-
-	Remember that not all audio devices support multiple audiostreams
-	(music and sound), so you might have to use alsa software mixing or
-	pulseaudio.
+	Don't forget to use -m extmidi if you want music, and if you have
+	problems, remember that not all audio devices support multiple
+	audiostreams (music and sound), so you might have to use software
+	mixing. My VIA AC97 device cannot do hardware mixing, for example.

 -Scenarios
-	There are no scenarios included in this release. Scenarios can be
-	downloaded using OpenTTD's content service, which is available from
-	OpenTTD's main menu. If you have obtained a scenario through other
-	means, you can place it either in your ~/.openttd/scenario directory
-	or in the system-wide /usr/share/games/openttd/scenario directory.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 01 Feb 2010 10:42:11 +0100
+	There are a few scenarios included in this release. When you start
+	openttd it will look for scenarios in ~/.openttd/scenario, while the
+	premade scenarios are in /usr/share/games/openttd/data/scenario. You
+	have two options to use the scenarios.
+	* Navigate to /usr/share/games/openttd/data/scenario within openttd.
+	* Copy scenarios from /usr/share/games/openttd/data/scenario to
+	  ~/.openttd/scenario. We are looking into a better solution for this.

+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>, Tue, 25 Jan 2004 14:11:01 +0200
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,367 +1,86 @@
-openttd (1.0.5-0) unstable; urgency=low
+openttd (0.6~svn) unstable; urgency=low

-  * New upstream release 1.0.5
+  * Unreleased SVN version. Versioned to allow normal upgrades to released versions.

- -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 20 Nov 2010 21:00:00 +0000
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Mon, 26 Feb 2007 21:07:05 +0100

-openttd (1.0.5~rc2-0) unstable; urgency=low
+openttd (0.6.0~beta2-1) unstable; urgency=low

-  * New upstream release 1.0.5~rc2
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 14 Nov 2010 15:00:00 +0000
-
-openttd (1.0.5~rc1-0) unstable; urgency=low
-
-  * New upstream release 1.0.5-RC1
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 31 Oct 2010 15:00:00 +0000
-
-openttd (1.0.4-0) unstable; urgency=low
-
-  * New upstream release 1.0.4
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 14 Sep 2010 20:00:00 +0000
-
-openttd (1.0.4~rc1-0) unstable; urgency=low
-
-  * New upstream release 1.0.4-RC1
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 30 Aug 2010 20:00:00 +0000
-
-openttd (1.0.3-0) unstable; urgency=low
-
-  * New upstream release 1.0.3
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 01 Aug 2010 00:00:00 +0000
-
-openttd (1.0.3~rc1-0) unstable; urgency=low
-
-  * New upstream release 1.0.3-RC1
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 05 Jul 2010 17:37:21 +0000
-
-openttd (1.0.2-0) unstable; urgency=low
-
-  * New upstream release 1.0.2
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 19 Jun 2010 18:36:21 +0000
-
-openttd (1.0.2~rc1-0) unstable; urgency=low
-
-  * New upstream release 1.0.2-RC1
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 05 Jun 2010 23:36:21 +0000
-
-openttd (1.0.1-0) unstable; urgency=low
-
-  * New upstream release 1.0.1
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 01 May 2010 00:00:00 +0200
-
-openttd (1.0.1~rc2-0) unstable; urgency=low
-
-  * New upstream release 1.0.1-RC2
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 21 Apr 2010 21:36:21 +0200
-
-openttd (1.0.1~rc1-0) unstable; urgency=low
-
-  * New upstream release 1.0.1-RC1
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 17 Apr 2010 23:36:21 +0000
-
-openttd (1.0.0-1) unstable; urgency=low
-
-  * [30a2162] New upstream release 1.0.0. (Closes: #570104)
-  * [102698a] Make openttd-wrapper work with older mktemp versions.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 02 Apr 2010 23:36:21 +0200
-
-openttd (1.0.0~rc3-2) unstable; urgency=low
-
-  * [279c5ef] Recommend openttd-opengfx and suggest openttd-opensfx.
-  * [9330ad7] Update README.Debian concerning music files.
-  * [07bde24] Move openttd from contrib to main. (Closes: #560810)
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 18 Mar 2010 13:16:32 +0100
-
-openttd (1.0.0~rc3-1) unstable; urgency=low
-
-  * [412d153] New upstream release 1.0.0~rc3.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 18 Mar 2010 10:09:33 +0100
-
-openttd (1.0.0~rc2-1) unstable; urgency=low
-
-  * [9c99af4] New upstream release 1.0.0~rc2.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 04 Mar 2010 12:22:28 +0100
-
-openttd (1.0.0~rc1-1) unstable; urgency=low
-
-  * [fe4eb51] New upstream release 1.0.0~rc1.
-  * [6aa2be0] Note that the embedded md5 implementation has a different
-    license.
-  * [39eb336] Remove lintian override for empty gm directory.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 19 Feb 2010 13:00:53 +0100
-
-openttd (1.0.0~beta4-1) unstable; urgency=low
-
-  * [6718224] New upstream release 1.0.0~beta4.
-  * [7b0fa8d] Remove some more docs that we don't want in the package.
-  * [bb9d744] Use liblzo2 instead of an embedded minilzo version.
-  * [949c06b] Explicitly disable iconv support.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 19 Feb 2010 12:59:27 +0100
-
-openttd (0.7.5-4) unstable; urgency=low
-
-  * [174d0b1] Don't use deprecated < in Replaces.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 15 Feb 2010 00:35:33 +0100
-
-openttd (0.7.5-3) unstable; urgency=low
-
-  * [d12fc5a] Make openttd-data replace openttd (< 0.7.5-2).
-    (Closes: #569679)
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 14 Feb 2010 16:56:31 +0100
-
-openttd (0.7.5-2) unstable; urgency=low
-
-  [ Matthijs Kooijman ]
-  * [fbab21d] Switch to source format 3.0 (quilt).
-  * [85c0c7d] No longer check for (and complain about missing) datafiles
-    on installation and upgrades. (Closes: #524651, 562574)
-  * [827eb61] Split the architecture independent data into openttd-data.
-    (Closes: #492462)
-  * [6fbd9c7] Update README.Debian.
-  * [76a5148] Support cross compilation. (Closes: #550951)
-  * [2005bf8] Simplify the rules file, make debhelper do more stuff.
-  * [fc0500e] Remove some configure arguments.
-  * [8ca38bb] Explicitly enable or disable all of the dependencies.
-  * [e38fb3e] Let the upstream Makefile install documentation.
-  * [5954fcf] Update the watch file to the new upstream url scheme.
-  * [7249594] Fix typo in copyright file.
-  * [660fb61] Bump the Standards-Version to 3.8.4, with no changes
-    required.
-  * [f94ab89] Move the packaging git repository to git.debian.org.
-
- -- Jordi Mallach <jordi@debian.org>  Tue, 09 Feb 2010 21:40:24 +0100
-
-openttd (0.7.5-1) unstable; urgency=high
-
-  * [cdcb73a] Imported Upstream version 0.7.5. This release fixes
-    CVE-2009-4007.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 24 Dec 2009 00:55:45 +0100
-
-openttd (0.7.4-1) unstable; urgency=low
-
-  * [a2c297b0] Imported Upstream version 0.7.4
-  * [0232a645] Make Debian-specific patches executable.
-  * [76be04b] Switch the Debian packaging to git.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 15 Dec 2009 22:11:52 +0100
-
-openttd (0.7.3-1) unstable; urgency=low
-
-  [ Matthijs Kooijman ]
-  * New upstream release
-  * Use printf instead of echo -en in openttd-wrapper to make it POSIX
-    compatible (Closes: #547758).
-  * Remove three patches that are now included in upstream.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 01 Oct 2009 22:52:59 +0200
-
-openttd (0.7.2-1) unstable; urgency=low
-
-  [ Matthijs Kooijman ]
-  * New upstream release
-  * Bump Standards-Version to 3.8.3, with no changes required.
-  * Clean up the rules file a bit and add some lintian overrides.
-  * Explain why openttd is in contrib (Closes: #539381).
-  * Add the DM-Upload-Allowed control field.
-  * Re-add dpatch infrastructure.
-  * Fix the copyright file, since upstream only allows GPLv2, not later
-    versions.
-  * Add a section to the copyright file on the different license used by the
-    "Squirrel" programming language, which is shipped with OpenTTD since
-     0.7.0.
-  * Backport upstream r17226, which removes the deprecated Encoding entry from
-    the .desktop file.
-  * Add a wrapper script for openttd, which captures any stderr output and
-    displays it when openttd returns an error code (Closes: #533557).
-  * Recommend x11-utils, since we use xmessage for displaying errors. Don't
-    depend on it, since openttd will still run fine without it, you just won't
-    see any errors.
-  * Backport upstream r17227 and r17229, which prevents terminal escape codes
-    from ending up in the captured error output.
-  * Backport upstream r17240, which improves stderr output when files are
-    missing or corrupt.
-
- -- Jordi Mallach <jordi@debian.org>  Fri, 21 Aug 2009 15:27:26 +0200
-
-openttd (0.7.1-1) unstable; urgency=low
-
-  [ Matthijs Kooijman ]
-  * New upstream release.
-  * Link against libicu to enable right-to-left language support.
-
- -- Jordi Mallach <jordi@debian.org>  Tue, 09 Jun 2009 21:46:28 +0200
-
-openttd (0.7.0-1) unstable; urgency=low
-
-  [ Matthijs Kooijman ]
-  * New upstream release.
-  * Remove Debian specific desktop file, upstream provides one now.
-  * Add debian/watch file.
-
-  [ Jordi Mallach ]
-  * Bump Standards-Version to 3.8.1, with no changes required.
-  * Move to debhelper compat 7. Bump Build-Depends accordingly.
-  * Use dh_prep.
-  * Add "set -e" to config script.
-  * Remove a few extra doc files that get installed by upstream Makefile.
-  * Add more complete copyright information.
-
- -- Jordi Mallach <jordi@debian.org>  Wed, 15 Apr 2009 18:22:10 +0200
-
-openttd (0.6.3-1) unstable; urgency=low
-
-  [ Matthijs Kooijman ]
  * New upstream release.

-  [ Jordi Mallach ]
-  * Add Spanish Debconf template translation, after fixing its corrupted
-    encoding (thanks, Germana Oliveira, closes: #499214).
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Sun, 09 Dec 2007 22:05:05 +0100

- -- Jordi Mallach <jordi@debian.org>  Thu, 02 Oct 2008 16:59:03 +0200
-
-openttd (0.6.2-1) unstable; urgency=low
+openttd (0.6.0~beta1-1) unstable; urgency=low

  * New upstream release.
-    - Fixes remote crash vulnerability CVE-2008-3547. Closes: #493714

- -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 08 Aug 2008 11:07:05 +0200
-
-openttd (0.6.2~rc2-1) experimental; urgency=low
-
-  [ Matthijs Kooijman ]
-  * New upstream release.
-
-  [ Jordi Mallach ]
-  * Fix typo in README.Debian (lintian).
-  * Remove dpatch build-dep and the empty debian/patches dir.
-  * Don't ignore possible "make distclean" errors.
-
- -- Jordi Mallach <jordi@debian.org>  Sat, 26 Jul 2008 01:35:30 +0200
-
-openttd (0.6.2~rc1-1) experimental; urgency=low
-
-  [ Matthijs Kooijman ]
-  * New upstream release.
-
- -- Jordi Mallach <jordi@debian.org>  Thu, 24 Jul 2008 16:09:57 +0200
-
-openttd (0.6.1-1) unstable; urgency=low
-
-  [ Matthijs Kooijman ]
-  * New upstream release.
-  * Remove no_install_personal.dpatch, it is included upstream now.
-
- -- Jordi Mallach <jordi@debian.org>  Thu, 05 Jun 2008 00:47:36 +0200
-
-openttd (0.6.0-2) unstable; urgency=low
-
-  [ Jordi Mallach ]
-  * Rename XS-Vcs-* to the official Vcs-* fields.
-
-  [ Matthijs Kooijman ]
-  * Don't install anything into ~ during make install, this prevented
-    successful builds on some architectures. Fix imported from upstream.
-  * Put the homepage in its own Homepage field instead of in the description.
-  * Bump Standards-Version to 3.7.3
-
- -- Jordi Mallach <jordi@debian.org>  Thu, 03 Apr 2008 00:07:10 +0200
-
-openttd (0.6.0-1) unstable; urgency=low
-
-  [ Matthijs Kooijman ]
-  * New upstream release:
-    - Adds note about font-configuration for non-latin languages.
-      Closes: #462604
-  * Add .desktop file, provided by Andrea Colangelo.
-    Closes: #460073
-  * Add Finnish Debconf translation, provided by Esko Arajärvi.
-    Closes: #456956
-
-  [ Jordi Mallach ]
-  * Fixes and improvements for the .desktop file according to the spec.
-
- -- Jordi Mallach <jordi@debian.org>  Wed, 02 Apr 2008 14:04:40 +0200
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Sun, 18 Nov 2007 16:05:05 +0100

 openttd (0.5.3-1) unstable; urgency=low

-  [ Matthijs Kooijman ]
-  * New upstream release
+  * New upstream release.

- -- Jordi Mallach <jordi@debian.org>  Tue, 18 Sep 2007 12:05:28 +0200
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Sat, 15 Sep 2007 13:30:00 +0100
+
+openttd (0.5.3~rc3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Thu, 30 Aug 2007 23:30:00 +0100
+
+openttd (0.5.3~rc2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Sat,  7 Jul 2007 20:05:00 +0100
+
+openttd (0.5.3~rc1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Thu, 28 Jun 2007 18:00:00 +0100

 openttd (0.5.2-1) unstable; urgency=low

-  [ Jordi Mallach ]
  * New upstream release.
-  * Debconf translation updates:
-    - Catalan.

-  [ Christian Perrier ]
-  * Debconf templates and debian/control reviewed by the debian-l10n-
-    english team as part of the Smith review project.
-    Closes: #422183, #419096.
-  * Debconf translation updates:
-    - Swedish. Closes: #422780
-    - Basque. Closes: #422786
-    - Czech. Closes: #422809
-    - Galician. Closes: #422831
-    - German. Closes: #422908
-    - Tamil. Closes: #423079
-    - Russian. Closes: #423224
-    - Portuguese. Closes: #423413
-    - French. Closes: #424436
-    - Brazilian Portuguese. Closes: #425585
-    - Dutch. Closes: #425707
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Tue, 29 May 2007 20:00:00 +0100

- -- Jordi Mallach <jordi@debian.org>  Sat, 02 Jun 2007 06:24:34 +0200
+openttd (0.5.2~rc1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Wed, 16 May 2007 23:35:39 +0100

 openttd (0.5.1-1) unstable; urgency=low

-  [ Matthijs Kooijman ]
-  * New upstream release
-  * Add German and Swedish translations (Closes: #420258, #419097)
-  * Remove bogus fuzzy mark from the Catalan translation
+  * New upstream release.

-  [ Jordi Mallach ]
-  * debian/control: add XS-Vcs-Svn and XS-Vcs-Browser fields.
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Fri, 20 Apr 2007 21:45:32 +0100

- -- Jordi Mallach <jordi@debian.org>  Mon, 23 Apr 2007 21:03:06 +0200
+openttd (0.5.1~rc3-1) unstable; urgency=low

-openttd (0.5.0-2) unstable; urgency=low
+  * New upstream release.

-  * Upload to Debian.
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Tue, 17 Apr 2007 22:00:46 +0100

- -- Jordi Mallach <jordi@debian.org>  Sun, 11 Mar 2007 14:12:37 +0100
+openttd (0.5.1~rc2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Fri, 23 Mar 2007 23:45:46 +0100
+
+openttd (0.5.1~rc1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Wed, 20 Mar 2007 22:03:46 +0100

 openttd (0.5.0-1) unstable; urgency=low

-  [ Matthijs Kooijman ]
  * New upstream release

-  [ Jordi Mallach ]
-  * Depend on ${misc:Depends}, not debconf directly.
-
- -- Jordi Mallach <jordi@debian.org>  Thu,  8 Mar 2007 15:34:54 +0100
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Mon, 26 Feb 2007 21:07:05 +0100

 openttd (0.5.0~rc5-1) unstable; urgency=low

@@ -464,13 +183,13 @@ openttd (0.4.0.1-1) unstable; urgency=low

  * New upstream release

- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Mon, 23 May 2005 13:04:24 +0200
+ -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl>  Mon, 23 May 2005 13:04:24 +0200

 openttd (0.4.0-1) unstable; urgency=low

  * New upstream release

- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Mon, 16 May 2005 00:16:17 +0200
+ -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl>  Mon, 16 May 2005 00:16:17 +0200

 openttd (0.3.6-1) unstable; urgency=low

@@ -478,18 +197,18 @@ openttd (0.3.6-1) unstable; urgency=low
  * Modifed Makefile to install xpm icon and scenarios in /usr/share/games/openttd/
  * Added openttd.32.xpm, openttd.64.xpm was too big

- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Tue, 25 Jan 2005 19:21:08 +0100
+ -- root <root@katherina.student.utwente.nl>  Tue, 25 Jan 2005 19:21:08 +0100

 openttd (0.3.5-2) unstable; urgency=low

  * Fixed some lintian warnings.
  * Added openttd.64.xpm (icon for menu).

- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Mon, 27 Dec 2004 01:51:36 +0100
+ -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl>  Mon, 27 Dec 2004 01:51:36 +0100

 openttd (0.3.5-1) unstable; urgency=low

  * Initial Release.

- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Fri, 24 Dec 2004 02:58:47 +0100
+ -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl>  Fri, 24 Dec 2004 02:58:47 +0100

--- a/os/debian/compat
+++ b/os/debian/compat
@@ -1 +1 @@
-7
+4
--- a/Show More
+++ b/Show More