(svn r21064) -Release: 1.0.5-RC1

(svn r21063) [1.0] -Prepare for 1.0.5-RC1
(svn r21061) [1.0] -Backport from trunk:
2025-08-16 19:19:09 +00:00 · 2010-10-31 14:50:43 +00:00 · 2010-10-31 14:46:34 +00:00 · 2010-10-31 13:54:09 +00:00 · 2010-10-27 20:24:01 +00:00 · 2010-10-27 20:17:45 +00:00
659 changed files with 61383 additions and 35592 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,46 @@
-Makefile*
 bin/*
-bundle/*
-!bin/data/chars.grf
+!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.grf
-!bin/scenario/README
-!bin/scripts*
-config.*
+!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,11 +1,26 @@
+syntax: glob
+
 bin/lang/*
-bin/opentd*
+bin/openttd*
+bin/*.cfg
 bundle/*
-config.cache.*
+bundles/*
+config.cache*
 config.log
 config.pwd
+docs/aidocs/*
+docs/source/*
 Makefile
 Makefile.am
-media/openttd.desktop*
+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/7
+++ b/7
@@ -89,8 +89,7 @@ FILE_PATTERNS          = *.c \
                         *.cpp \
                         *.c++ \
                         *.h \
-                         *.hpp \
-                         table/*.h
+                         *.hpp
 RECURSIVE              = YES
 EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
@@ -196,8 +195,8 @@ EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           =
 INCLUDE_FILE_PATTERNS  =
-PREDEFINED             =
-EXPAND_AS_DEFINED      = DEF_COMMAND
+PREDEFINED             = ENABLE_NETWORK ENABLE_AI WITH_ZLIB WITH_LZO WITH_PNG WITH_FONTCONFIG WITH_FREETYPE WITH_ICU UNICODE _UNICODE
+EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
@@ -88,7 +88,8 @@ endif
 	$(Q)cp "$(BIN_DIR)/scripts/"*             "$(BUNDLE_DIR)/scripts/"
 ifdef MENU_DIR
 	$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
-	$(Q)cat "$(ROOT_DIR)/media/openttd.desktop" | sed s/=openttd/=$(BINARY_NAME)/g > "$(ROOT_DIR)/media/openttd.desktop.install"
+	$(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"
@@ -138,6 +139,13 @@ bundle_lzma: bundle
 	$(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)"
@@ -155,7 +163,7 @@ bundle_dmg: bundle
 bundle_exe: all
 	@echo '[BUNDLE] Creating $(BUNDLE_NAME).exe'
 	$(Q)mkdir -p "$(BUNDLES_DIR)"
-	$(Q)unix2dos "$(ROOT_DIR)/docs/"* "$(ROOT_DIR)/readme.txt" "$(ROOT_DIR)/COPYING" "$(ROOT_DIR)/changelog.txt" "$(ROOT_DIR)/known-bugs.txt"
+	$(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"

--- a/Makefile.grf.in
+++ b/Makefile.grf.in
@@ -0,0 +1,94 @@
+# $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
@@ -43,6 +43,7 @@ OSXAPP      = !!OSXAPP!!
 LIPO        = !!LIPO!!
 REVISION    = !!REVISION!!
 AWK         = !!AWK!!
+SORT        = !!SORT!!
 DISTCC      = !!DISTCC!!

 RES := $(shell if [ ! -f $(CONFIG_CACHE_PWD) ] || [ "`pwd`" != "`cat $(CONFIG_CACHE_PWD)`" ]; then echo "`pwd`" > $(CONFIG_CACHE_PWD); fi )
@@ -53,7 +54,7 @@ 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; \
+		$(MAKE) -C $$dir all || exit 1; \
 	done
 ifdef LIPO
 # Lipo is an OSX thing. If it is defined, it means we are building for universal,
@@ -129,10 +130,25 @@ mrproper:
 	done
 	$(Q)rm -rf objs
 	$(Q)rm -f Makefile Makefile.am Makefile.bundle
-	$(Q)rm -f media/openttd.desktop
+	$(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 -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 \
@@ -150,6 +166,7 @@ run-prof: all

 regression: all
 	$(Q)cd !!BIN_DIR!! && sh ai/regression/run.sh
+test: regression

 %.o:
 	@for dir in $(SRC_DIRS); do \
@@ -161,4 +178,6 @@ regression: all
 		$(MAKE) -C $$dir $@; \
 	done

+.PHONY: test distclean mrproper clean
+
 include Makefile.bundle
--- a/Makefile.lang.in
+++ b/Makefile.lang.in
@@ -88,6 +88,7 @@ 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.src.in
+++ b/Makefile.src.in
@@ -58,7 +58,10 @@ 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) -I $(SCRIPT_SRC_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)

--- a/bin/ai/regression/regression.nut
+++ b/bin/ai/regression/regression.nut
@@ -192,9 +192,9 @@ function Regression::Base()
 	print("  RandRange(2): " + AIBase.RandRange(2));
 	print("  RandRange(2): " + AIBase.RandRange(2));
 	print("  RandRange(2): " + AIBase.RandRange(2));
-	print("  RandRange(9): " + AIBase.RandRange(9));
-	print("  RandRange(9): " + AIBase.RandRange(9));
-	print("  RandRange(9): " + AIBase.RandRange(9));
+	print("  RandRange(1000000): " + AIBase.RandRange(1000000)); // 32 bit tests
+	print("  RandRange(1000000): " + AIBase.RandRange(1000000));
+	print("  RandRange(1000000): " + AIBase.RandRange(1000000));
 	print("  Chance(1, 2): " + AIBase.Chance(1, 2));
 	print("  Chance(1, 2): " + AIBase.Chance(1, 2));
 	print("  Chance(1, 2): " + AIBase.Chance(1, 2));
@@ -504,6 +504,45 @@ function Regression::EngineList()
 	}
 }

+function Regression::Prices()
+{
+	print("");
+	print("--Prices--");
+	print(" -Rail-");
+	print("  0,BT_TRACK:    " + AIRail.GetBuildCost(0, AIRail.BT_TRACK));
+	print("  0,BT_SIGNAL:   " + AIRail.GetBuildCost(0, AIRail.BT_SIGNAL));
+	print("  0,BT_DEPOT:    " + AIRail.GetBuildCost(0, AIRail.BT_DEPOT));
+	print("  0,BT_STATION:  " + AIRail.GetBuildCost(0, AIRail.BT_STATION));
+	print("  0,BT_WAYPOINT: " + AIRail.GetBuildCost(0, AIRail.BT_WAYPOINT));
+	print("  1,BT_TRACK:    " + AIRail.GetBuildCost(1, AIRail.BT_TRACK));
+	print("  1,BT_SIGNAL:   " + AIRail.GetBuildCost(1, AIRail.BT_SIGNAL));
+	print("  1,BT_DEPOT:    " + AIRail.GetBuildCost(1, AIRail.BT_DEPOT));
+	print("  1,BT_STATION:  " + AIRail.GetBuildCost(1, AIRail.BT_STATION));
+	print("  1,BT_WAYPOINT: " + AIRail.GetBuildCost(1, AIRail.BT_WAYPOINT));
+	print(" -Road-");
+	print("  ROADTYPE_ROAD,BT_ROAD:       " + AIRoad.GetBuildCost(AIRoad.ROADTYPE_ROAD, AIRoad.BT_ROAD));
+	print("  ROADTYPE_ROAD,BT_DEPOT:      " + AIRoad.GetBuildCost(AIRoad.ROADTYPE_ROAD, AIRoad.BT_DEPOT));
+	print("  ROADTYPE_ROAD,BT_BUS_STOP:   " + AIRoad.GetBuildCost(AIRoad.ROADTYPE_ROAD, AIRoad.BT_BUS_STOP));
+	print("  ROADTYPE_ROAD,BT_TRUCK_STOP: " + AIRoad.GetBuildCost(AIRoad.ROADTYPE_ROAD, AIRoad.BT_TRUCK_STOP));
+	print("  ROADTYPE_TRAM,BT_ROAD:       " + AIRoad.GetBuildCost(AIRoad.ROADTYPE_TRAM, AIRoad.BT_ROAD));
+	print("  ROADTYPE_TRAM,BT_DEPOT:      " + AIRoad.GetBuildCost(AIRoad.ROADTYPE_TRAM, AIRoad.BT_DEPOT));
+	print("  ROADTYPE_TRAM,BT_BUS_STOP:   " + AIRoad.GetBuildCost(AIRoad.ROADTYPE_TRAM, AIRoad.BT_BUS_STOP));
+	print("  ROADTYPE_TRAM,BT_TRUCK_STOP: " + AIRoad.GetBuildCost(AIRoad.ROADTYPE_TRAM, AIRoad.BT_TRUCK_STOP));
+	print(" -Water-");
+	print("  BT_DOCK:  " + AIMarine.GetBuildCost(AIMarine.BT_DOCK));
+	print("  BT_DEPOT: " + AIMarine.GetBuildCost(AIMarine.BT_DEPOT));
+	print("  BT_BUOY:  " + AIMarine.GetBuildCost(AIMarine.BT_BUOY));
+	print(" -Tile-");
+	print("  BT_FOUNDATION:   " + AITile.GetBuildCost(AITile.BT_FOUNDATION));
+	print("  BT_TERRAFORM:    " + AITile.GetBuildCost(AITile.BT_TERRAFORM));
+	print("  BT_BUILD_TREES:  " + AITile.GetBuildCost(AITile.BT_BUILD_TREES));
+	print("  BT_CLEAR_GRASS:  " + AITile.GetBuildCost(AITile.BT_CLEAR_GRASS));
+	print("  BT_CLEAR_ROUGH:  " + AITile.GetBuildCost(AITile.BT_CLEAR_ROUGH));
+	print("  BT_CLEAR_ROCKY:  " + AITile.GetBuildCost(AITile.BT_CLEAR_ROCKY));
+	print("  BT_CLEAR_FIELDS: " + AITile.GetBuildCost(AITile.BT_CLEAR_FIELDS));
+	print("  BT_CLEAR_HOUSE:  " + AITile.GetBuildCost(AITile.BT_CLEAR_HOUSE));
+}
+
 function cost_callback(old_path, new_tile, new_direction, self) { if (old_path == null) return 0; return old_path.GetCost() + 1; }
 function estimate_callback(tile, direction, goals, self) { return goals[0] - tile; }
 function neighbours_callback(path, cur_tile, self) { return [[cur_tile + 1, 1]]; }
@@ -746,6 +785,36 @@ function Regression::List()

 	list.Clear();
 	print("  IsEmpty():     " + list.IsEmpty());
+
+	for (local i = 0; i < 10; i++) {
+		list.AddItem(i, 5 + i / 2);
+	}
+
+	local it = list.Begin();
+	print("    " + it + " => " + list.GetValue(it) + "  (" + list.HasNext() + ")");
+	list.Sort(list.SORT_BY_VALUE, list.SORT_ASCENDING);
+	it = list.Next();
+	print("    " + it + " => " + list.GetValue(it) + "  (" + list.HasNext() + ")");
+
+	it = list.Begin();
+	print("    " + it + " => " + list.GetValue(it) + "  (" + list.HasNext() + ")");
+
+	list.SetValue(it + 1, -5);
+	it = list.Next();
+	print("    " + it + " => " + list.GetValue(it) + "  (" + list.HasNext() + ")");
+
+	list.RemoveValue(list.GetValue(it) + 1);
+	it = list.Next();
+	print("    " + it + " => " + list.GetValue(it) + "  (" + list.HasNext() + ")");
+
+	list.RemoveAboveValue(list.GetValue(it));
+	it = list.Next();
+	print("    " + it + " => " + list.GetValue(it) + "  (" + list.HasNext() + ")");
+
+	while (list.HasNext()) {
+		it = list.Next();
+		print("    " + it + " => " + list.GetValue(it));
+	}
 }

 function Regression::Map()
@@ -881,6 +950,15 @@ function Regression::Order()
 	print("  UnshareOrders():       " + AIOrder.UnshareOrders(13));
 	print("  AppendOrder():         " + AIOrder.AppendOrder(12, 33421, AIOrder.AIOF_NONE));

+	print("  GetStopLocation():     " + AIOrder.GetStopLocation(13, 0));
+	print("  BuildVehicle():        " + AIVehicle.BuildVehicle(23596, 8));
+	print("  BuildRailStation():    " + AIRail.BuildRailStation(7958, AIRail.RAILTRACK_NE_SW, 1, 1, AIStation.STATION_NEW));
+	print("  AppendOrder():         " + AIOrder.AppendOrder(20, 7958, AIOrder.AIOF_NONE));
+	print("  GetOrderCount():       " + AIOrder.GetOrderCount(20));
+	print("  GetStopLocation():     " + AIOrder.GetStopLocation(20, 0));
+	print("  SetStopLocation():     " + AIOrder.SetStopLocation(20, 0, AIOrder.STOPLOCATION_MIDDLE));
+	print("  GetStopLocation():     " + AIOrder.GetStopLocation(20, 0));
+
 	local list = AIStationList_Vehicle(12);

 	print("");
@@ -949,6 +1027,7 @@ function Regression::RailTypeList()
 	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    RailType:                " + i);
 		print("    IsRailTypeAvailable():   " + AIRail.IsRailTypeAvailable(i));
+		print("    GetMaxSpeed():           " + AIRail.GetMaxSpeed(i));
 	}
 }

@@ -985,6 +1064,7 @@ function Regression::Rail()
 		print("        " + i + " => " + list.GetValue(i));
 	}
 	print("    RemoveDepot():                 " + AITile.DemolishTile(33411));
+	print("    BuildRailDepot():              " + AIRail.BuildRailDepot(23596, 23597));

 	print("  Station");
 	print("    BuildRailStation():            " + AIRail.BuildRailStation(0, AIRail.RAILTRACK_NE_SW, 1, 1, AIStation.STATION_NEW));
@@ -1675,6 +1755,48 @@ function Regression::PrintSubsidy(subsidy_id)
 	print("        GetCargoType():        " + AISubsidy.GetCargoType(subsidy_id));
 }

+function Regression::Math()
+{
+	print("");
+	print("--Math--");
+	print("  -2147483648 < -2147483647:   " + (-2147483648 < -2147483647));
+	print("  -2147483648 < -1         :   " + (-2147483648 < -1         ));
+	print("  -2147483648 <  0         :   " + (-2147483648 <  0         ));
+	print("  -2147483648 <  1         :   " + (-2147483648 <  1         ));
+	print("  -2147483648 <  2147483647:   " + (-2147483648 <  2147483647));
+
+	print("  -2147483647 < -2147483648:   " + (-2147483647 < -2147483648));
+	print("  -1          < -2147483648:   " + (-1          < -2147483648));
+	print("   0          < -2147483648:   " + ( 0          < -2147483648));
+	print("   1          < -2147483648:   " + ( 1          < -2147483648));
+	print("   2147483647 < -2147483648:   " + ( 2147483647 < -2147483648));
+
+	print("  -1          >  2147483647:   " + (-1          >  2147483647));
+	print("  -1          >  1         :   " + (-1          >  1         ));
+	print("  -1          >  0         :   " + (-1          >  0         ));
+	print("  -1          > -1         :   " + (-1          > -1         ));
+	print("  -1          > -2147483648:   " + (-1          > -2147483648));
+
+	print("   1          >  2147483647:   " + ( 1          >  2147483647));
+	print("   1          >  1         :   " + ( 1          >  1         ));
+	print("   1          >  0         :   " + ( 1          >  0         ));
+	print("   1          > -1         :   " + ( 1          > -1         ));
+	print("   1          > -2147483648:   " + ( 1          > -2147483648));
+
+	print("   2147483647 >  2147483646:   " + ( 2147483647 >  2147483646));
+	print("   2147483647 >  1         :   " + ( 2147483647 >  1         ));
+	print("   2147483647 >  0         :   " + ( 2147483647 >  0         ));
+	print("   2147483647 > -1         :   " + ( 2147483647 > -1         ));
+	print("   2147483647 > -2147483648:   " + ( 2147483647 > -2147483648));
+
+	print("   2147483646 >  2147483647:   " + ( 2147483646 >  2147483647));
+	print("   1          >  2147483647:   " + ( 1          >  2147483647));
+	print("   0          >  2147483647:   " + ( 0          >  2147483647));
+	print("  -1          >  2147483647:   " + (-1          >  2147483647));
+	print("  -2147483648 >  2147483647:   " + (-2147483648 >  2147483647));
+
+	print("   13725      > -2147483648:   " + ( 13725      > -2147483648));
+}

 function Regression::Start()
 {
@@ -1699,6 +1821,7 @@ function Regression::Start()
 	this.IndustryTypeList();
 	this.Map();
 	this.Marine();
+	this.Prices();
 	this.Rail();
 	this.RailTypeList();
 	this.Road();
@@ -1739,5 +1862,7 @@ function Regression::Start()
 		}
 	}
 	print("  IsEventWaiting:        false");
+
+	this.Math();
 }

--- a/bin/ai/regression/regression.txt
+++ b/bin/ai/regression/regression.txt
@@ -96,10 +96,10 @@
  RandRange(1): 0
  RandRange(2): 0
  RandRange(2): 0
-  RandRange(2): 1
-  RandRange(9): 6
-  RandRange(9): 7
-  RandRange(9): 4
+  RandRange(2): 0
+  RandRange(1000000): 987346
+  RandRange(1000000): 781750
+  RandRange(1000000): 191841
  Chance(1, 2): true
  Chance(1, 2): false
  Chance(1, 2): false
@@ -569,6 +569,14 @@
  []:
    4000 => 50
  IsEmpty():     true
+    0 => 5  (true)
+ERROR: Next() is invalid as Begin() is never called
+ERROR: HasNext() is invalid as Begin() is never called
+    0 => 5  (false)
+    0 => 5  (true)
+    2 => 6  (true)
+    3 => 6  (true)
+    9 => 0  (false)

 --Company--
  SetName():            true
@@ -584,7 +592,7 @@
  GetBankBalance():            100000
  GetName():                   (null : 0x00000000)
  GetLoanAmount():             100000
-  GetMaxLoanAmount():          2000000000
+  GetMaxLoanAmount():          500000
  GetLoanInterval():           10000
  SetLoanAmount(1):            false
  SetLoanAmount(100):          false
@@ -596,8 +604,8 @@
  GetBankBalance():            40000
  GetLoanAmount():             40000
  SetLoanAmount(10000):        true
-  GetBankBalance():            2000000000
-  GetLoanAmount():             2000000000
+  GetBankBalance():            500000
+  GetLoanAmount():             500000
  GetCompanyHQ():              -1
  BuildCompanyHQ():            true
  GetCompanyHQ():              33151
@@ -681,7 +689,7 @@
  GetAirportWidth(9):               -1
  GetAirportHeight(9):              -1
  GetAirportCoverageRadius(9):      -1
-  GetBankBalance():     1999999790
+  GetBankBalance():     499790
  GetPrice():           5400
  BuildAirport():       true
  IsHangarTile():       false
@@ -691,11 +699,11 @@
  IsHangarTile():       true
  IsAirportTile():      true
  GetAirportType():     0
-  GetBankBalance():     1999989890
+  GetBankBalance():     489890
  RemoveAirport():      true
  IsHangarTile():       false
  IsAirportTile():      false
-  GetBankBalance():     1999989626
+  GetBankBalance():     489626
  BuildAirport():       true

 --Bridge--
@@ -2140,201 +2148,201 @@
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 57
-    IsValidEngine():    true
-    GetName():          Passenger Carriage
-    GetCargoType():     0
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
    CanRefitCargo():    false
-    GetCapacity():      45
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1447
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        25
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      2
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 58
-    IsValidEngine():    true
-    GetName():          Mail Van
-    GetCargoType():     2
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
    CanRefitCargo():    false
-    GetCapacity():      35
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1335
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        21
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      2
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 59
-    IsValidEngine():    true
-    GetName():          Coal Truck
-    GetCargoType():     1
-    CanRefitCargo():    true
-    GetCapacity():      35
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
+    CanRefitCargo():    false
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1031
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        18
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      2
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 60
-    IsValidEngine():    true
-    GetName():          Oil Tanker
-    GetCargoType():     3
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
    CanRefitCargo():    false
-    GetCapacity():      35
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1171
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        24
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      2
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 61
-    IsValidEngine():    true
-    GetName():          Livestock Van
-    GetCargoType():     4
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
    CanRefitCargo():    false
-    GetCapacity():      30
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1125
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        20
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      2
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 62
-    IsValidEngine():    true
-    GetName():          Goods Van
-    GetCargoType():     5
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
    CanRefitCargo():    false
-    GetCapacity():      30
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1113
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        21
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      2
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 63
-    IsValidEngine():    true
-    GetName():          Grain Hopper
-    GetCargoType():     6
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
    CanRefitCargo():    false
-    GetCapacity():      35
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1066
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        19
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      2
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 64
-    IsValidEngine():    true
-    GetName():          Wood Truck
-    GetCargoType():     7
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
    CanRefitCargo():    false
-    GetCapacity():      35
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1060
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        16
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      2
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 65
-    IsValidEngine():    true
-    GetName():          Iron Ore Hopper
-    GetCargoType():     8
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
    CanRefitCargo():    false
-    GetCapacity():      35
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1048
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        19
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      2
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 66
-    IsValidEngine():    true
-    GetName():          Steel Truck
-    GetCargoType():     9
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
    CanRefitCargo():    false
-    GetCapacity():      25
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1148
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        18
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      2
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 67
-    IsValidEngine():    true
-    GetName():          Armoured Van
-    GetCargoType():     10
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
    CanRefitCargo():    false
-    GetCapacity():      25
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1494
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        30
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      2
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 68
@@ -2716,201 +2724,201 @@
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 89
-    IsValidEngine():    true
-    GetName():          Passenger Carriage
-    GetCargoType():     0
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
    CanRefitCargo():    false
-    GetCapacity():      47
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1447
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        25
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      3
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 90
-    IsValidEngine():    true
-    GetName():          Mail Van
-    GetCargoType():     2
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
    CanRefitCargo():    false
-    GetCapacity():      37
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1335
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        21
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      3
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 91
-    IsValidEngine():    true
-    GetName():          Coal Truck
-    GetCargoType():     1
-    CanRefitCargo():    true
-    GetCapacity():      37
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
+    CanRefitCargo():    false
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1031
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        18
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      3
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 92
-    IsValidEngine():    true
-    GetName():          Oil Tanker
-    GetCargoType():     3
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
    CanRefitCargo():    false
-    GetCapacity():      37
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1171
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        24
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      3
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 93
-    IsValidEngine():    true
-    GetName():          Livestock Van
-    GetCargoType():     4
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
    CanRefitCargo():    false
-    GetCapacity():      32
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1125
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        20
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      3
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 94
-    IsValidEngine():    true
-    GetName():          Goods Van
-    GetCargoType():     5
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
    CanRefitCargo():    false
-    GetCapacity():      32
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1113
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        21
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      3
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 95
-    IsValidEngine():    true
-    GetName():          Grain Hopper
-    GetCargoType():     6
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
    CanRefitCargo():    false
-    GetCapacity():      37
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1066
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        19
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      3
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 96
-    IsValidEngine():    true
-    GetName():          Wood Truck
-    GetCargoType():     7
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
    CanRefitCargo():    false
-    GetCapacity():      37
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1060
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        16
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      3
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 97
-    IsValidEngine():    true
-    GetName():          Iron Ore Hopper
-    GetCargoType():     8
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
    CanRefitCargo():    false
-    GetCapacity():      37
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1048
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        19
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      3
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 98
-    IsValidEngine():    true
-    GetName():          Steel Truck
-    GetCargoType():     9
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
    CanRefitCargo():    false
-    GetCapacity():      27
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1148
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        18
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      3
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 99
-    IsValidEngine():    true
-    GetName():          Armoured Van
-    GetCargoType():     10
+    IsValidEngine():    false
+    GetName():          (null : 0x00000000)
+    GetCargoType():     255
    CanRefitCargo():    false
-    GetCapacity():      27
+    GetCapacity():      -1
    GetReliability():   -1
-    GetMaxSpeed():      0
-    GetPrice():         1494
+    GetMaxSpeed():      -1
+    GetPrice():         -1
    GetMaxAge():        -1
-    GetRunningCost():   0
+    GetRunningCost():   -1
    GetPower():         -1
-    GetWeight():        30
+    GetWeight():        -1
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   0
-    GetRailType():      3
+    GetVehicleType():   255
+    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 100
@@ -4990,7 +4998,7 @@
    CanRefitCargo():    false
    GetCapacity():      25
    GetReliability():   58
-    GetMaxSpeed():      238
+    GetMaxSpeed():      236
    GetPrice():         28710
    GetMaxAge():        7320
    GetRunningCost():   2390
@@ -5008,7 +5016,7 @@
    CanRefitCargo():    false
    GetCapacity():      65
    GetReliability():   95
-    GetMaxSpeed():      238
+    GetMaxSpeed():      236
    GetPrice():         30761
    GetMaxAge():        8784
    GetRunningCost():   2812
@@ -5062,7 +5070,7 @@
    CanRefitCargo():    false
    GetCapacity():      30
    GetReliability():   77
-    GetMaxSpeed():      238
+    GetMaxSpeed():      236
    GetPrice():         30761
    GetMaxAge():        10980
    GetRunningCost():   2756
@@ -5739,7 +5747,7 @@
    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
-  Valid Engines:        53
+  Valid Engines:        31

 --EngineList--
  Count():             11
@@ -7085,7 +7093,7 @@
  IsBuoyTile():         false
  IsLockTile():         false
  IsCanalTile():        false
-  GetBankBalance():     1999980703
+  GetBankBalance():     479851
  BuildWaterDepot():    true
  BuildDock():          true
  BuildBuoy():          true
@@ -7098,7 +7106,7 @@
  IsBuoyTile():         true
  IsLockTile():         true
  IsCanalTile():        true
-  GetBankBalance():     1999951154
+  GetBankBalance():     450302

 --AIWaypointList(BUOY)--
  Count():             1
@@ -7117,10 +7125,45 @@
  IsBuoyTile():         false
  IsLockTile():         false
  IsCanalTile():        false
-  GetBankBalance():     1999928509
+  GetBankBalance():     427657
  BuildWaterDepot():    true
  BuildDock():          true

+--Prices--
+ -Rail-
+  0,BT_TRACK:    75
+  0,BT_SIGNAL:   48
+  0,BT_DEPOT:    450
+  0,BT_STATION:  285
+  0,BT_WAYPOINT: 450
+  1,BT_TRACK:    -1
+  1,BT_SIGNAL:   -1
+  1,BT_DEPOT:    -1
+  1,BT_STATION:  -1
+  1,BT_WAYPOINT: -1
+ -Road-
+  ROADTYPE_ROAD,BT_ROAD:       71
+  ROADTYPE_ROAD,BT_DEPOT:      375
+  ROADTYPE_ROAD,BT_BUS_STOP:   150
+  ROADTYPE_ROAD,BT_TRUCK_STOP: 150
+  ROADTYPE_TRAM,BT_ROAD:       -1
+  ROADTYPE_TRAM,BT_DEPOT:      -1
+  ROADTYPE_TRAM,BT_BUS_STOP:   -1
+  ROADTYPE_TRAM,BT_TRUCK_STOP: -1
+ -Water-
+  BT_DOCK:  262
+  BT_DEPOT: 525
+  BT_BUOY:  262
+ -Tile-
+  BT_FOUNDATION:   187
+  BT_TERRAFORM:    187
+  BT_BUILD_TREES:  15
+  BT_CLEAR_GRASS:  15
+  BT_CLEAR_ROUGH:  30
+  BT_CLEAR_ROCKY:  150
+  BT_CLEAR_FIELDS: 375
+  BT_CLEAR_HOUSE:  1200
+
 --Rail--
    IsRailTile():                  false
    BuildRailTrack():              true
@@ -7144,6 +7187,7 @@
      Depot distance from (0,0) ListDump:
        33411 => 261
    RemoveDepot():                 true
+    BuildRailDepot():              true
  Station
    BuildRailStation():            false
    BuildRailStation():            true
@@ -7164,6 +7208,7 @@
  ListDump:
    RailType:                0
    IsRailTypeAvailable():   true
+    GetMaxSpeed():           0

 --Road--
  Road
@@ -8002,7 +8047,7 @@
    GetPopulation(): 737
    GetLocation():   6446
    GetHouseCount(): 26
-    GetRating():     5
+    GetRating():     6
  Town 11
    IsValidTown():   true
    GetName():       Fort Frindston
@@ -8037,7 +8082,7 @@
    GetPopulation(): 807
    GetLocation():   42338
    GetHouseCount(): 33
-    GetRating():     5
+    GetRating():     6
  Town 16
    IsValidTown():   true
    GetName():       Kennville
@@ -8072,7 +8117,7 @@
    GetPopulation(): 437
    GetLocation():   22585
    GetHouseCount(): 15
-    GetRating():     5
+    GetRating():     6
  Town 21
    IsValidTown():   true
    GetName():       Franinghead
@@ -8530,6 +8575,14 @@
  ShareOrders():         true
  UnshareOrders():       true
  AppendOrder():         true
+  GetStopLocation():     -1
+  BuildVehicle():        20
+  BuildRailStation():    true
+  AppendOrder():         true
+  GetOrderCount():       1
+  GetStopLocation():     2
+  SetStopLocation():     true
+  GetStopLocation():     1

 --StationList_Vehicle--
  Count():             2
@@ -8556,9 +8609,11 @@
    4 => 0

 --VehicleList_Station--
-  Count():             0
+  Count():             1
  Location ListDump:
+    20 => 23596
  foreach():
+    20 => 23596

  First Subsidy Test
      --Subsidy (0) --
@@ -8575,4 +8630,37 @@
    GetEventType:        6
      Unknown Event
  IsEventWaiting:        false
+
+--Math--
+  -2147483648 < -2147483647:   true
+  -2147483648 < -1         :   true
+  -2147483648 <  0         :   true
+  -2147483648 <  1         :   true
+  -2147483648 <  2147483647:   true
+  -2147483647 < -2147483648:   false
+  -1          < -2147483648:   false
+   0          < -2147483648:   false
+   1          < -2147483648:   false
+   2147483647 < -2147483648:   false
+  -1          >  2147483647:   false
+  -1          >  1         :   false
+  -1          >  0         :   false
+  -1          > -1         :   false
+  -1          > -2147483648:   true
+   1          >  2147483647:   false
+   1          >  1         :   false
+   1          >  0         :   true
+   1          > -1         :   true
+   1          > -2147483648:   true
+   2147483647 >  2147483646:   true
+   2147483647 >  1         :   true
+   2147483647 >  0         :   true
+   2147483647 > -1         :   true
+   2147483647 > -2147483648:   true
+   2147483646 >  2147483647:   false
+   1          >  2147483647:   false
+   0          >  2147483647:   false
+  -1          >  2147483647:   false
+  -2147483648 >  2147483647:   false
+   13725      > -2147483648:   true
 ERROR: The AI died unexpectedly.
--- a/bin/data/no_sound.obs
+++ b/bin/data/no_sound.obs
@@ -0,0 +1,49 @@
+; $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
@@ -7,8 +7,39 @@
 name              = original_dos
 shortname         = TTDD
 version           = 1
-description  = Original Transport Tycoon Deluxe DOS edition graphics
 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
@@ -24,8 +55,8 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTDD.GRF = 356cf9663aacb212fdbff609d99090d6
+OPENTTDD.GRF = 177d3eeda710bb6f1b93955fdd3754fa

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTDD.GRF = This file was part of your installation.
+OPENTTDD.GRF = This file was part of your OpenTTD installation.
--- a/bin/data/orig_dos.obs
+++ b/bin/data/orig_dos.obs
@@ -7,7 +7,38 @@
 name              = original_dos
 shortname         = TTDO
 version           = 0
-description  = Original Transport Tycoon Deluxe DOS edition sounds
+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
--- a/bin/data/orig_dos_de.obg
+++ b/bin/data/orig_dos_de.obg
@@ -7,8 +7,39 @@
 name              = original_dos_de
 shortname         = TTDD
 version           = 0
-description  = Original Transport Tycoon Deluxe DOS (German) edition graphics
 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
@@ -24,8 +55,8 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTDD.GRF = 356cf9663aacb212fdbff609d99090d6
+OPENTTDD.GRF = 177d3eeda710bb6f1b93955fdd3754fa

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTDD.GRF = This file was part of your installation.
+OPENTTDD.GRF = This file was part of your OpenTTD installation.
--- a/bin/data/orig_win.obg
+++ b/bin/data/orig_win.obg
@@ -7,8 +7,39 @@
 name              = original_windows
 shortname         = TTDW
 version           = 0
-description  = Original Transport Tycoon Deluxe Windows edition graphics
 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
@@ -24,8 +55,8 @@ TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
 TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
 TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
 TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTDW.GRF = 80346ea80de167068cfb975f93963941
+OPENTTDW.GRF = 7f67abbead5b77b86c375d4f9a7b1a29

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTDW.GRF = This file was part of your installation.
+OPENTTDW.GRF = This file was part of your OpenTTD installation.
--- a/bin/data/orig_win.obs
+++ b/bin/data/orig_win.obs
@@ -7,7 +7,38 @@
 name              = original_windows
 shortname         = TTDO
 version           = 0
-description  = Original Transport Tycoon Deluxe Windows edition sounds
+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
--- a/bin/gm/no_music.obm
+++ b/bin/gm/no_music.obm
@@ -4,9 +4,41 @@
 ;
 [metadata]
 name              = NoMusic
-shortname    = NOMU
+shortname         = NULL
 version           = 0
-description  = A music pack without actual music
+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 =
@@ -46,3 +78,4 @@ ezy_9 =
 [names]

 [origin]
+default      = This file was part of your OpenTTD installation.
--- a/bin/gm/orig_win.obm
+++ b/bin/gm/orig_win.obm
@@ -7,7 +7,38 @@
 name              = original_windows
 shortname         = TTDW
 version           = 1
-description  = Original Transport Tycoon Deluxe Windows edition music
+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
@@ -18,7 +49,7 @@ old_3 = GM_TT12.GM
 old_4 = GM_TT08.GM
 old_5 = GM_TT13.GM
 old_6 = GM_TT14.GM
-old_7 = GM_TT19.GM
+old_7 = GM_TT10.GM
 old_8 =
 old_9 =
 new_0 = GM_TT04.GM
--- a/changelog.txt
+++ b/changelog.txt
--- a/config.lib
+++ b/config.lib
@@ -11,7 +11,7 @@ log() {
 }

 set_default() {
-	released_version=""
+	released_version="1.0.5-RC1"

 	ignore_extra_parameters="0"
 	# We set all kinds of defaults for params. Later on the user can override
@@ -51,6 +51,7 @@ set_default() {
 	enable_lto="0"
 	enable_dedicated="0"
 	enable_network="1"
+	enable_ai="1"
 	enable_static="1"
 	enable_translator="0"
 	enable_unicode="1"
@@ -67,6 +68,7 @@ set_default() {
 	with_sdl="1"
 	with_cocoa="1"
 	with_zlib="1"
+	with_lzo2="1"
 	with_png="1"
 	enable_builtin_depend="1"
 	with_makedepend="0"
@@ -121,6 +123,7 @@ set_default() {
 		enable_lto
 		enable_dedicated
 		enable_network
+		enable_ai
 		enable_static
 		enable_translator
 		enable_unicode
@@ -136,6 +139,7 @@ set_default() {
 		with_sdl
 		with_cocoa
 		with_zlib
+		with_lzo2
 		with_png
 		enable_builtin_depend
 		with_makedepend
@@ -272,8 +276,12 @@ detect_params() {
 			--enable-ipo=*)               enable_lto="$optarg";;
 			--enable-dedicated)           enable_dedicated="1";;
 			--enable-dedicated=*)         enable_dedicated="$optarg";;
+			--enable-network)             enable_network="2";;
 			--enable-network=*)           enable_network="$optarg";;
 			--disable-network)            enable_network="0";;
+			--enable-ai)                  enable_ai="2";;
+			--enable-ai=*)                enable_ai="$optarg";;
+			--disable-ai)                 enable_ai="0";;
 			--disable-static)             enable_static="0";;
 			--enable-static)              enable_static="2";;
 			--enable-static=*)            enable_static="$optarg";;
@@ -319,6 +327,13 @@ detect_params() {
 			--without-zlib)               with_zlib="0";;
 			--with-zlib=*)                with_zlib="$optarg";;

+			--with-lzo2)                  with_lzo2="2";;
+			--without-lzo2)               with_lzo2="0";;
+			--with-lzo2=*)                with_lzo2="$optarg";;
+			--with-liblzo2)               with_lzo2="2";;
+			--without-liblzo2)            with_lzo2="0";;
+			--with-liblzo2=*)             with_lzo2="$optarg";;
+
 			--with-png)                   with_png="2";;
 			--without-png)                with_png="0";;
 			--with-png=*)                 with_png="$optarg";;
@@ -703,6 +718,14 @@ check_params() {
 		log 1 "checking network... disabled"
 	fi

+	if [ "$enable_ai" != "0" ]; then
+		log 1 "checking ai... found"
+		SCRIPT_SRC_DIR="$ROOT_DIR/src/3rdparty/squirrel/include"
+	else
+		log 1 "checking ai... disabled"
+		SCRIPT_SRC_DIR=""
+	fi
+
 	if [ "$enable_translator" != "0" ]; then
 		log 1 "checking translator... debug"
 		# -t shows TODO items, normally they are muted
@@ -718,15 +741,6 @@ check_params() {
 		log 1 "checking assert... disabled"
 	fi

-	SCRIPT_SRC_DIR="$ROOT_DIR/src/3rdparty/squirrel/include"
-	if [ ! -d "$SCRIPT_SRC_DIR" ]; then
-		log 1 "checking 3rdparty... NOT FOUND"
-		log 1 "ERROR: please make sure you have src/3rdparty/squirrel"
-		log 1 "ERROR: you can find the source at svn://svn.openttd.org/3rdparty/squirrel"
-		exit 1
-	fi
-	log 1 "checking 3rdparty... found"
-
 	pre_detect_with_zlib=$with_zlib
 	detect_zlib

@@ -744,6 +758,22 @@ check_params() {
 		fi
 	fi

+	pre_detect_with_lzo2=$with_lzo2
+	detect_lzo2
+
+	if [ "$with_lzo2" = "0" ] || [ -z "$lzo2" ]; then
+		log 1 "WARNING: liblzo2 was not detected or disabled"
+		log 1 "WARNING: OpenTTD doesn't require liblzo2, but it does mean that"
+		log 1 "WARNING: loading old savegames/scenarios will be disabled."
+		if [ "$pre_detect_with_lzo2" = "0" ]; then
+			log 1 "WARNING: We strongly suggest you to install liblzo2."
+		else
+			log 1 "configure: error: no liblzo2 detected"
+			log 1 " If you want to compile without liblzo2 use --without-liblzo2 as parameter"
+			exit
+		fi
+	fi
+
 	detect_png
 	detect_freetype
 	detect_fontconfig
@@ -988,7 +1018,7 @@ check_params() {
 	fi

 	if [ "$personal_dir" = "1" ]; then
-		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ] || [ "$os" = "DOS" ]; then
+		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ] || [ "$os" = "DOS" ] || [ "$os" = "HAIKU" ]; then
 			personal_dir="OpenTTD"
 		elif [ "$os" = "OSX" ]; then
 			personal_dir="Documents/OpenTTD"
@@ -1120,8 +1150,8 @@ make_compiler_cflags() {
 		# Enable some things only for certain GCC versions
 		cc_version=`$1 -dumpversion | cut -c 1,3`

-		if [ $cc_version -lt 30 ]; then
-			log 1 "configure: error: gcc older than 3.0 can't compile OpenTTD because of its poor template support"
+		if [ $cc_version -lt 33 ]; then
+			log 1 "configure: error: gcc older than 3.3 can't compile OpenTTD because of its poor template support"
 			exit 1
 		fi

@@ -1390,11 +1420,22 @@ make_cflags_and_ldflags() {
 		CFLAGS="$CFLAGS -DWITH_ZLIB"
 	fi

+	if [ "$with_lzo2" != "0" ]; then
+		if [ "$enable_static" != "0" ] && [ "$os" != "OSX" ]; then
+			LIBS="$LIBS $lzo2"
+		else
+			LIBS="$LIBS -llzo2"
+		fi
+		CFLAGS="$CFLAGS -DWITH_LZO"
+	fi
+
 	# 64bit machines need -D_SQ64
 	if [ "$cpu_type" = "64" ] && [ "$enable_universal" = "0" ]; then
 		CFLAGS="$CFLAGS -D_SQ64"
 	fi
-	CFLAGS="$CFLAGS -I$SCRIPT_SRC_DIR"
+	if [ "$enable_ai" != "0" ]; then
+		CFLAGS="$CFLAGS -I$SCRIPT_SRC_DIR -DENABLE_AI"
+	fi

 	if [ -n "$png_config" ]; then
 		CFLAGS="$CFLAGS -DWITH_PNG"
@@ -1608,7 +1649,7 @@ check_compiler() {
 		fi
 		machine=`eval $compiler $9 2>/dev/null`
 		ret=$?
-		eval "$2=$compiler"
+		eval "$2=\"$compiler\""

 		log 2 "executing $compiler $9"
 		log 2 "  returned $machine"
@@ -1629,7 +1670,7 @@ check_compiler() {
 		# Check for manual compiler
 		machine=`$4 $9 2>/dev/null`
 		ret=$?
-		eval "$2=$4"
+		eval "$2=\"$4\""

 		log 2 "executing $4 $9"
 		log 2 "  returned $machine"
@@ -1646,7 +1687,7 @@ check_compiler() {
 		if [ -n "$5" ]; then
 			machine=`$5 $9 2>/dev/null`
 			ret=$?
-			eval "$2=$5"
+			eval "$2=\"$5\""

 			log 2 "executing $5 $9"
 			log 2 "  returned $machine"
@@ -1665,7 +1706,7 @@ check_compiler() {
 			# No $5, so try '$6'
 			machine=`$6 $9 2>/dev/null`
 			ret=$?
-			eval "$2=$6"
+			eval "$2=\"$6\""

 			log 2 "executing $6 $9"
 			log 2 "  returned $machine"
@@ -1675,7 +1716,7 @@ check_compiler() {
 				# Maybe '$7'?
 				machine=`$7 $9 2>/dev/null`
 				ret=$?
-				eval "$2=$7"
+				eval "$2=\"$7\""

 				log 2 "executing $7 $9"
 				log 2 "  returned $machine"
@@ -2236,10 +2277,11 @@ detect_library() {
 	# $1 - config-param ($with_zlib value)
 	# $2 - library name ('zlib', sets $zlib)
 	# $3 - static library name (libz.a)
-	# $4 - header name (zlib.h)
-	# $5 - force static (if non-empty)
+	# $4 - header directory ()
+	# $5 - header name (zlib.h)
+	# $6 - force static (if non-empty)

-	if [ -n "$5" ]; then force_static="1"; fi
+	if [ -n "$6" ]; then force_static="1"; fi

 	# 0 means no, 1 is auto-detect, 2 is force
 	if [ "$1" = "0" ]; then
@@ -2252,15 +2294,29 @@ detect_library() {
 	log 2 "detecting $2"

 	if [ "$1" = "1" ] || [ "$1" = "" ] || [ "$1" = "2" ]; then
-		eval "$2=`ls -1 /usr/include/*.h 2>/dev/null | egrep \"\/$4\$\"`"
+		eval "$2=`ls -1 /usr/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
 		eval "res=\$$2"
 		if [ -z "$res" ]; then
-			log 2 "  trying /usr/include/$4... no"
-			eval "$2=`ls -1 /usr/local/include/*.h 2>/dev/null | egrep \"\/$4\$\"`"
+			log 2 "  trying /usr/include/$4$5... no"
+			eval "$2=`ls -1 /usr/local/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
 		fi
 		eval "res=\$$2"
 		if [ -z "$res" ]; then
-			log 2 "  trying /usr/local/include/$4... no"
+			log 2 "  trying /usr/local/include/$4$5... no"
+		fi
+		if [ -z "$res" ] && [ "$os" = "NETBSD" ]; then
+			eval "$2=`ls -1 /usr/pkg/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
+			eval "res=\$$2"
+			if [ -z "$res" ]; then
+				log 2 "  trying /usr/pkg/include/$4$5... no"
+			fi
+		fi
+		if [ -z "$res" ] && [ "$os" = "HAIKU" ]; then
+			eval "$2=`ls -1 /boot/common/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
+			eval "res=\$$2"
+			if [ -z "$res" ]; then
+				log 2 "  trying /boot/common/include/$4$5... no"
+			fi
 		fi

 		eval "res=\$$2"
@@ -2323,11 +2379,15 @@ detect_library() {
 }

 detect_zlib() {
-	detect_library "$with_zlib" "zlib" "libz.a" "zlib.h"
+	detect_library "$with_zlib" "zlib" "libz.a" "" "zlib.h"
+}
+
+detect_lzo2() {
+	detect_library "$with_lzo2" "lzo2" "liblzo2.a" "lzo/" "lzo1x.h"
 }

 detect_libtimidity() {
-	detect_library "$with_libtimidity" "libtimidity" "libtimidity.a" "timidity.h"
+	detect_library "$with_libtimidity" "libtimidity" "libtimidity.a" "" "timidity.h"
 }

 detect_png() {
@@ -2820,6 +2880,7 @@ make_sed() {
 		s@!!SOURCE_LIST!!@$SOURCE_LIST@g;
 		s@!!SRC_OBJS_DIR!!@$SRC_OBJS_DIR@g;
 		s@!!LANG_OBJS_DIR!!@$LANG_OBJS_DIR@g;
+		s@!!GRF_OBJS_DIR!!@$GRF_OBJS_DIR@g;
 		s@!!SRC_DIR!!@$SRC_DIR@g;
 		s@!!SCRIPT_SRC_DIR!!@$SCRIPT_SRC_DIR@g;
 		s@!!OSXAPP!!@$OSXAPP@g;
@@ -2945,6 +3006,20 @@ generate_lang() {
 	echo "LANG_DIRS += $LANG_OBJS_DIR" >> Makefile.am
 }

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

@@ -3108,11 +3183,13 @@ showhelp() {
 	echo "  --with-midi=midi               define which midi-player to use"
 	echo "  --with-midi-arg=arg            define which args to use for the"
 	echo "                                 midi-player"
-	echo "  --with-allegrol[=allegro-config]"
+	echo "  --with-libtimidity             enables libtimidity support"
+	echo "  --with-allegro[=allegro-config]"
 	echo "                                 enables Allegro video driver support"
 	echo "  --with-cocoa                   enables COCOA video driver (OSX ONLY)"
 	echo "  --with-sdl[=sdl-config]        enables SDL video driver support"
 	echo "  --with-zlib[=zlib.a]           enables zlib support"
+	echo "  --with-liblzo2[=liblzo2.a]     enables liblzo2 support"
 	echo "  --with-png[=libpng-config]     enables libpng support"
 	echo "  --with-freetype[=freetype-config]"
 	echo "                                 enables libfreetype support"
@@ -3125,6 +3202,8 @@ showhelp() {
 	echo "  --with-psp-config[=psp-config] enables psp-config support (PSP ONLY)"
 	echo "  --disable-builtin-depend       disable use of builtin deps finder"
 	echo "  --with-makedepend[=makedepend] enables makedepend support"
+	echo "  --with-ccache                  enables ccache support"
+	echo "  --with-distcc                  enables distcc support"
 	echo ""
 	echo "Some influential environment variables:"
 	echo "  CC                             C compiler command"
--- a/5
+++ b/5
@@ -47,6 +47,7 @@ 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"
@@ -113,6 +114,7 @@ AWKCOMMAND='
 		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" &&
@@ -159,10 +161,11 @@ else
 	sort="$sort -u"
 fi

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

 generate_main
 generate_lang
+generate_grf
 generate_src

 check_path_characters
--- a/docs/landscape_grid.html
+++ b/docs/landscape_grid.html
@@ -91,7 +91,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="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> <span class="option">~~</span>XX</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>
@@ -102,7 +102,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits"><span class="free">OOOO</span> XXXX XXXX XXXX</td>
-      <td class="bits">XXXX <span class="option">~~</span>XX</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>
@@ -113,7 +113,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO</span> <span class="option">~~</span>XX</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 OO</span>XX</td>
@@ -136,7 +136,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">XXXX <span class="option">~~</span>XX</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>
@@ -146,7 +146,7 @@ the array so you can quickly see what is used and what is not.
      <td class="caption">road depot</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">XXXX XXXX XXXX XXXX</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">XX<span class="free">OO OO</span>XX</td>
@@ -183,7 +183,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="option">~~~</span>X XXXX</td>
      <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits">XXXX <span class="option">~~</span>XX</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>
@@ -206,7 +206,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">XXXX <span class="free">OOOO</span></td>
-      <td class="bits"><span class="option">~~~~ ~~~~</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>
@@ -217,7 +217,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits"><span class="free">OOOO OO</span>XX</td>
-      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="option">~~~~ ~</span>XXX</td>
      <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
@@ -228,7 +228,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="option">~~~~ ~~~~</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>
@@ -239,7 +239,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits"><span class="free">OOOO OO</span>XX</td>
-      <td class="bits"><span class="option">~~~~ ~~~~</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>
@@ -250,7 +250,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="option">~~~~ ~~~~</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>
@@ -308,7 +308,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="option">~~~</span>X XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits">XXXX <span class="option">~~</span>XX</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">XX<span class="free">OO OO</span>XX</td>
--- 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 then one server
+ - If there were more than one server
   - select one in the list below the buttons
   - click on 'join game'

--- a/docs/openttd.6
+++ b/docs/openttd.6
@@ -1,6 +1,6 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd Jun 10, 2009
+.Dd Apr 01, 2010
 .Dt OPENTTD 6
 .Sh NAME
 .Nm openttd
@@ -8,7 +8,6 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl efhx
-.Op Fl a Ar ai
 .Op Fl b Ar blitter
 .Op Fl c Ar config_file
 .Op Fl d Ar [level | cat=lvl[,...]]
@@ -19,6 +18,7 @@
 .Op Fl I Ar graphicsset
 .Op Fl l Ar host[:port]
 .Op Fl m Ar driver
+.Op Fl M Ar musicset
 .Op Fl n Ar host[:port][#player]
 .Op Fl p Ar password
 .Op Fl P Ar password
@@ -29,10 +29,6 @@
 .Op Fl v Ar driver
 .Sh OPTIONS
 .Bl -tag -width ".Fl n Ar host[:port][#player]"
-.It Fl a Ar ai
-Set the AI, see
-.Fl h
-for a full list
 .It Fl b Ar blitter
 Set the blitter, see
 .Fl h
@@ -80,6 +76,10 @@ Redirect DEBUG(), See
 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
--- a/docs/palettes/openttd.gpl
+++ b/docs/palettes/openttd.gpl
@@ -0,0 +1,260 @@
+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/docs/palettes/palette.act
+++ b/docs/palettes/palette.act
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2010-01-05
-Release version: 1.0.0-beta2
+Last updated:    2010-10-31
+Release version: 1.0.5-RC1
 ------------------------------------------------------------------------


@@ -34,12 +34,26 @@ 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
- 3194	[OSX] Full screen strobing/flickering
 - 2782	[OSX] Port hopelessly outdated
 - 2585	[OSX] OS' mouse pointer showing
 - 2484	[OSX] Cannot enter CJK characters
- 1140	[OSX] Not smooth moving map with touchpad


 3) Known bugs that will not be solved:
@@ -60,6 +74,38 @@ No suitable AI can be found
 	"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
@@ -78,6 +124,14 @@ Clipping problems [FS#119]
 	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
@@ -133,6 +187,7 @@ Duplicate (station) names after renaming [FS#3204]
 	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
@@ -144,7 +199,7 @@ Extreme CPU usage/hangs when using SDL and PulseAudio [FS#3294]
 	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/pulsa/default.pa file:
+	/etc/pulse/default.pa file:
 		load-module module-udev-detect
 	to
 		load-module module-udev-detect tsched=0
@@ -170,3 +225,49 @@ OpenTTD not properly resizing with SDL on X [FS#3305]
 	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.
--- 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
@@ -0,0 +1,25 @@
+//
+// $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
@@ -0,0 +1,18 @@
+//
+// $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
@@ -0,0 +1,65 @@
+//
+// $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
@@ -0,0 +1,75 @@
+//
+// $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
@@ -0,0 +1,630 @@
+//
+// $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
@@ -0,0 +1,58 @@
+//
+// $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
@@ -0,0 +1,135 @@
+//
+// $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
@@ -0,0 +1,46 @@
+//
+// $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
@@ -0,0 +1,377 @@
+//
+// $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
@@ -0,0 +1,16 @@
+//
+// $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
@@ -0,0 +1,124 @@
+// 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
@@ -0,0 +1,175 @@
+//
+// $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
@@ -0,0 +1,13 @@
+//
+// $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
@@ -0,0 +1,18 @@
+//
+// $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
@@ -0,0 +1,79 @@
+//
+// $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
@@ -0,0 +1,493 @@
+//
+// $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
@@ -0,0 +1,22 @@
+//
+// $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
@@ -0,0 +1,123 @@
+//
+// $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/openttd.desktop.in
+++ b/media/openttd.desktop.in
@@ -4,8 +4,8 @@
 Type=Application
 Version=1.1
 Name=!!MENU_NAME!!
-Comment=A clone of Transport Tycoon Deluxe
 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
@@ -0,0 +1,15 @@
+# $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/os/debian/NEWS
+++ b/os/debian/NEWS
@@ -0,0 +1,25 @@
+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,31 +1,41 @@
-openttd for Debian
+OpenTTD for Debian
 ------------------

-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
+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".

-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).
+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).

-	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.
+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.

 -Scenarios
 	There are no scenarios included in this release. Scenarios can be
-	downloaded separately from the OpenTTD website and all over the
-	internet. Place scenarios in your ~/.openttd/scenario directory to
-	use them.
+	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

- -- Matthijs Kooijman <matthijs@stdin.nl>, Tue, 25 Jan 2004 14:11:01 +0200
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,136 +1,220 @@
-openttd (1.0~svn-1) UNRELEASED; urgency=low
+openttd (1.0.5~rc1-0) unstable; urgency=low

-  * Unreleased SVN version. Versioned to allow normal upgrades to released
+  * 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.

- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 24 Dec 2009 01:02:03 +0100
+ -- Jordi Mallach <jordi@debian.org>  Fri, 21 Aug 2009 15:27:26 +0200

-openttd (1.0.0~beta2) unstable; urgency=low
+openttd (0.7.1-1) unstable; urgency=low

+  [ Matthijs Kooijman ]
  * New upstream release.
+  * Link against libicu to enable right-to-left language support.

- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 05 Jan 2010 21:36:51 +0100
+ -- Jordi Mallach <jordi@debian.org>  Tue, 09 Jun 2009 21:46:28 +0200

+openttd (0.7.0-1) unstable; urgency=low

-openttd (1.0.0~beta1) unstable; urgency=low
-
+  [ Matthijs Kooijman ]
  * New upstream release.
+  * Remove Debian specific desktop file, upstream provides one now.
+  * Add debian/watch file.

- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 24 Dec 2009 01:01:01 +0100
+  [ 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.

-openttd (0.7.5) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 23 Dec 2009 20:52:34 +0100
-
-openttd (0.7.5~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 14 Dec 2009 19:28:37 +0100
-
-openttd (0.7.4) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 01 Dec 2009 01:23:45 +0100
-
-openttd (0.7.4~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 15 Nov 2009 16:30:07 +0100
-
-openttd (0.7.3) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 01 Oct 2009 12:35:47 +0200
-
-openttd (0.7.3~RC2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 24 Sep 2009 21:30:43 +0200
-
-openttd (0.7.3~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 13 Sep 2009 10:25:56 +0200
-
-openttd (0.7.2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 01 Aug 2009 00:19:43 +0200
-
-openttd (0.7.2~RC2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 21 Jul 2009 20:25:56 +0200
-
-openttd (0.7.2~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 15 Jul 2009 22:25:56 +0200
-
-openttd (0.7.1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 09 Jun 2009 01:34:56 +0200
-
-openttd (0.7.1~RC3) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 03 Jun 2009 15:34:56 +0200
-
-openttd (0.7.1~RC2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 21 Mar 2009 14:34:56 +0200
-
-openttd (0.7.1~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 11 Mar 2009 17:34:56 +0200
-
-openttd (0.7.0) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 01 Apr 2009 13:37:42 +0000
-
-openttd (0.7.0~RC2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 23 Mar 2009 00:42:00 +0200
-
-openttd (0.7.0~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 16 Mar 2009 00:07:00 +0200
-
-openttd (0.7.0~beta2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 10 Mar 2009 00:33:05 +0100
-
-openttd (0.7.0~beta1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 16 Feb 2009 23:07:05 +0100
+ -- Jordi Mallach <jordi@debian.org>  Wed, 15 Apr 2009 18:22:10 +0200

 openttd (0.6.3-1) unstable; urgency=low

@@ -139,7 +223,7 @@ openttd (0.6.3-1) unstable; urgency=low

  [ Jordi Mallach ]
  * Add Spanish Debconf template translation, after fixing its corrupted
-    encoding.
+    encoding (thanks, Germana Oliveira, closes: #499214).

 -- Jordi Mallach <jordi@debian.org>  Thu, 02 Oct 2008 16:59:03 +0200

@@ -185,7 +269,7 @@ openttd (0.6.0-2) unstable; urgency=low
  [ 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 it's own Homepage field instead of in the description.
+  * 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
--- a/os/debian/compat
+++ b/os/debian/compat
@@ -1 +1 @@
-4
+7
--- a/os/debian/config
+++ b/os/debian/config
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-FILES="trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf sample.cat"
-DATADIR=/usr/share/games/openttd/data
-
-MISSING="No"
-for FILE in $FILES; do
-	# Check if all the files needed are here.
-	if [ ! -e $DATADIR/$FILE ]; then
-		MISSING="Yes"
-		break
-	fi;
-done
-
-if [ $MISSING = "Yes" ]; then
-	db_input high openttd/datafiles || true
-	db_go
-fi
--- a/os/debian/control
+++ b/os/debian/control
@@ -1,21 +1,37 @@
 Source: openttd
-Section: contrib/games
+Section: games
 Priority: optional
 Maintainer: Matthijs Kooijman <matthijs@stdin.nl>
 Uploaders: Jordi Mallach <jordi@debian.org>
-Build-Depends: debhelper (>= 4.0.0), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev
-Standards-Version: 3.7.3
-Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/openttd/trunk/
-Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/openttd/trunk
+DM-Upload-Allowed: yes
+Build-Depends: debhelper (>= 7.0.50), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev, libicu-dev, liblzo2-dev
+Standards-Version: 3.8.4
+Vcs-Browser: http://git.debian.org/?p=collab-maint/openttd.git
+Vcs-Git: git://git.debian.org/collab-maint/openttd.git
 Homepage: http://www.openttd.org/

 Package: openttd
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: timidity, freepats
+Recommends: openttd-opengfx, x11-utils
+Replaces: openttd-data
+Conflicts: openttd-data
+Suggests: openttd-opensfx, timidity, freepats
 Description: reimplementation of Transport Tycoon Deluxe with enhancements
 OpenTTD is a reimplementation of the Microprose game "Transport
- Tycoon Deluxe" with lots of new features and enhancements. The data
- files of the original Transport Tycoon Deluxe for Windows are
- mandatory to play the game. They must be manually copied to the game
- data directory (see README.Debian for details).
+ Tycoon Deluxe" with lots of new features and enhancements.
+ .
+ OpenTTD is playable with the free graphics files from the openttd-opengfx
+ package and optional sound files from the openttd-opensfx package (which is in
+ non-free). Alternatively, OpenTTD can use the graphics files from the original
+ Transport Tycoon Deluxe game (See README.Debian on how to set this up).
+
+Package: openttd-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: openttd (= ${binary:Version}), ${misc:Depends}
+Description: debugging symbols for openttd
+ This package contains the debugging symbols for OpenTTD, the reimplementation
+ of the Micropose game "Transport Tycoon Deluxe" with lots of new features and
+ enhancements.
--- a/os/debian/copyright
+++ b/os/debian/copyright
@@ -1,16 +1,16 @@
-This package was debianized by Matthijs Kooijman <m.kooijman@student.utwente.nl>
+This package was debianized by Matthijs Kooijman <matthijs@stdin.nl>
 on Wed, 15 Sep 2004 00:24:01 +0200.

-It was downloaded from http://sourceforge.net/projects/openttd
-
 Upstream author: Ludvig Strigeus (ludde) and many others.
+Upstream homepage: http://www.openttd.org

-License:
+Copyright © 2004-2009 Ludvig Strigeous and others.
+
+OpenTTD License:

 	This program 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; either version 2 of the License, or
-   (at your option) any later version.
+	it under the terms of the GNU General Public License version 2.0 as
+	published by the Free Software Foundation;

 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,5 +21,57 @@ License:
 	along with this package; if not, write to the Free Software
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA

-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+This package contains an embedded version of the "Squirrel" programming
+language, which is shipped under the following license:
+
+	Copyright (c) 2003-2009 Alberto Demichelis
+
+	This software is provided 'as-is', without any
+	express or implied warranty. In no event will the
+	authors be held liable for any damages arising from
+	the use of this software.
+
+	Permission is granted to anyone to use this software
+	for any purpose, including commercial applications,
+	and to alter it and redistribute it freely, subject
+	to the following restrictions:
+
+		1. The origin of this software must not be
+		misrepresented; you must not claim that
+		you wrote the original software. If you
+		use this software in a product, an
+		acknowledgment in the product
+		documentation would be appreciated but is
+		not required.
+
+		2. Altered source versions must be plainly
+		marked as such, and must not be
+		misrepresented as being the original
+		software.
+
+		3. This notice may not be removed or
+		altered from any source distribution.
+
+This package contains an implementation of the md5 hash algorithm, which
+is shipped under the following license:
+
+	Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
+
+	This software is provided 'as-is', without any express or implied
+	warranty.  In no event will the authors be held liable for any damages
+	arising from the use of this software.
+
+	Permission is granted to anyone to use this software for any purpose,
+	including commercial applications, and to alter it and redistribute it
+	freely, subject to the following restrictions:
+
+	1. The origin of this software must not be misrepresented; you must not
+	   claim that you wrote the original software. If you use this software
+	   in a product, an acknowledgment in the product documentation would be
+	   appreciated but is not required.
+	2. Altered source versions must be plainly marked as such, and must not be
+	   misrepresented as being the original software.
+	3. This notice may not be removed or altered from any source distribution.
--- a/os/debian/docs
+++ b/os/debian/docs
@@ -1,2 +0,0 @@
-readme.txt
-docs/multiplayer.txt
--- a/os/debian/gbp.conf
+++ b/os/debian/gbp.conf
@@ -0,0 +1,13 @@
+[DEFAULT]
+# Use pristine-tar
+pristine-tar = True
+
+[git-dch]
+# We use metaheaders in commit messages.
+meta = True
+# Put git commit ids in the debian changelog.
+id-length = 7
+
+[git-import-orig]
+# Use a custom commit message for upstream imports.
+import-msg = New upstream release %(version)s.
--- a/os/debian/menu
+++ b/os/debian/menu
@@ -1,2 +1,2 @@
 ?package(openttd):needs="X11" section="Games/Simulation" title="OpenTTD"\
-command="/usr/games/openttd" icon="/usr/share/pixmaps/openttd.32.xpm"
+command="/usr/share/games/openttd/openttd-wrapper" icon="/usr/share/pixmaps/openttd.32.xpm"
--- a/os/debian/openttd-wrapper
+++ b/os/debian/openttd-wrapper
@@ -0,0 +1,28 @@
+#!/bin/sh
+# This is a wrapper script that checks openttd's exit status and
+# displays its stderr output
+
+# Get a file to capture stderr to. Use the deprecated -t option, so this
+# works on the old mktemp from the mktemp package (which has been
+# replaced by the version from the coreutils package).
+TMPFILE=`mktemp -t openttd.errout.XXXXXXXXX`
+
+if [ ! -w "$TMPFILE" ]; then
+	xmessage "Could not create temporary file for error messages. Not starting OpenTTD."
+	exit 1;
+fi
+
+# Capture stderr
+openttd "$@" 2> "$TMPFILE"
+ERRCODE=$?
+if [ "$ERRCODE" -ne 0 ]; then
+	CODEMSG="OpenTTD returned with error code $ERRCODE."
+	if [ -s "$TMPFILE" ]; then
+		MESSAGE="$CODEMSG The following error messages were produced:\n\n"
+		printf "$MESSAGE" | cat - "$TMPFILE" | fold -s | xmessage -file -
+	else
+		xmessage "$CODEMSG No error messages were produced."
+	fi
+fi
+
+rm -f "$TMPFILE"
--- a/os/debian/patches/run-openttd-wrapper.patch
+++ b/os/debian/patches/run-openttd-wrapper.patch
@@ -0,0 +1,20 @@
+From: Matthijs Kooijman <matthijs@stdin.nl>
+Subject: Use a wrapper script for running openttd
+
+The wrapper script captures stderr from openttd and displays this in
+case of an error. This patch makes the the .desktop file call the
+wrapper instead of the openttd binary directly.
+
+Index: media/openttd.desktop.in
+===================================================================
+--- a/media/openttd.desktop.in	(revision 20124)
+++ b/media/openttd.desktop.in	(working copy)
+@@ -5,7 +5,7 @@
+ Version=1.1
+ Name=!!MENU_NAME!!
+ Icon=openttd
+-Exec=!!TTD!!
+Exec=/usr/share/games/openttd/openttd-wrapper
+ Terminal=false
+ Categories=!!MENU_GROUP!!
+ Comment=A clone of Transport Tycoon Deluxe
--- a/os/debian/patches/series
+++ b/os/debian/patches/series
@@ -0,0 +1 @@
+run-openttd-wrapper.patch
--- a/os/debian/po/POTFILES.in
+++ b/os/debian/po/POTFILES.in
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] templates
--- a/os/debian/po/ca.po
+++ b/os/debian/po/ca.po
@@ -1,40 +0,0 @@
-# Catalan translation of openttd's Debconf templates.
-# Copyright © 2007 Software in the Public Interest, Inc.
-# This file is distributed under the same license as the openttd package.
-# Jordi Mallach <jordi@debian.org>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd 0.5.2-1\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-06-01 00:45+0200\n"
-"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
-"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Es necessiten els fitxers de dades"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Per a funcionar, OpenTTD necessita els fitxers de dades del joc "
-"Transport Tycoon Deluxe original."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr "Vegeu el fitxer /usr/share/doc/openttd/README.Debian per a obtenir-ne més detalls sobre els fitxers necessaris i la seua ubicació."
--- a/os/debian/po/cs.po
+++ b/os/debian/po/cs.po
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 10:52+0200\n"
-"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
-"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Vyžadovány datové soubory"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Pro svůj běh vyžaduje OpenTTD datové soubory z původní hry Transport Tycoon "
-"Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Podrobnosti o vyžadovaných souborech a jejich umístění naleznete v souboru /"
-"usr/share/doc/openttd/README.Debian."
--- a/os/debian/po/de.po
+++ b/os/debian/po/de.po
@@ -1,55 +0,0 @@
-# Translation of openttd debconf templates to German
-# Copyright (C) Helge Kreutzmann <debian@helgefjell.de>, 2007.
-# This file is distributed under the same license as the openttd package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd 0.5.0-2\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 21:21+0200\n"
-"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
-"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Ben<65>tigte Datendateien"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Zum Betrieb ben<65>tigt OpenTTD Datendateien aus dem Originalspiel Transport "
-"Tycoon Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Lesen Sie die Datei /usr/share/doc/openttd/README.Debian f<>r weitere Details "
-"<22>ber die ben<65>tigten Dateien und ihren Ort."
-
-#~ msgid "You need to install data files"
-#~ msgstr "Sie m<>ssen Daten-Dateien installieren"
-
-#~ msgid ""
-#~ "OpenTTD needs the data files from the original Transport Tycoon Deluxe "
-#~ "game to run. You should install these data files before you can play the "
-#~ "game. See README.Debian for more details on which files need to be copied "
-#~ "where."
-#~ msgstr ""
-#~ "OpenTTD ben<65>tigt zur Ausf<73>hrung Daten-Dateien aus dem Originalspiel "
-#~ "<22>Transport Tycoon Deluxe<78>. Sie sollten diese Daten-Dateien installieren, "
-#~ "bevor Sie das Spiel spielen k<>nnen. Lesen Sie README.Debian f<>r weitere "
-#~ "Details dar<61>ber, welche Dateien wohin kopiert werden m<>ssen."
--- a/os/debian/po/eu.po
+++ b/os/debian/po/eu.po
@@ -1,42 +0,0 @@
-# OpenTTD debconf template basque translation
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Piarres eobide <pi@beobide.net>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenTTD Debconf\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 09:55+0200\n"
-"Last-Translator: Piarres eobide <pi@beobide.net>\n"
-"Language-Team: Euskara <Librezale@librezale.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Datu fitxategiak behar dira"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Funtziona dezan, OpenTTD-ek jatorrizko 'Transport Tycoon Deluxe' jokoaren "
-"datu fitxategiak behar ditu."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"/usr/share/doc/openttd/README.Debian fitxategia begiratu beharrezko "
-"fitategien eta bere kokapenari buruz xehetasun gehiago ikusteko."
--- a/os/debian/po/fi.po
+++ b/os/debian/po/fi.po
@@ -1,32 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd_0.5.3-1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-19 04:33+0200\n"
-"PO-Revision-Date: 2007-12-18 20:01+0200\n"
-"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
-"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Finnish\n"
-"X-Poedit-Country: Finland\n"
-
-#. Type: error
-#. Description
-#: ../templates:1001
-msgid "Data files needed"
-msgstr "Datatiedostoja puuttuu"
-
-#. Type: error
-#. Description
-#: ../templates:1001
-msgid "For its operation, OpenTTD needs the data files from the original Transport Tycoon Deluxe game."
-msgstr "OpenTTD tarvitsee toimiakseen datatiedostoja alkuperäisestä Transport Tycoon Deluxe -pelistä."
-
-#. Type: error
-#. Description
-#: ../templates:1001
-msgid "See the /usr/share/doc/openttd/README.Debian file for more details about the needed files and their location."
-msgstr "Tiedostossa /usr/share/doc/openttd/README.Debian on (englanniksi) lisätietoja tarvittavista tiedostoista ja niiden sijainnista."
-
--- a/os/debian/po/fr.po
+++ b/os/debian/po/fr.po
@@ -1,42 +0,0 @@
-# debian-l10n-french translation of 0.5.1-1.
-# Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Ivan Buresi <err747@free.fr>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: 0.5.1-1\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 11:41+0200\n"
-"Last-Translator: Ivan Buresi <err747@free.fr>\n"
-"Language-Team: debian-l10n-french <debian-l10n-french@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Fichiers de données indispensables"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Pour fonctionner correctement, OpenTTD a besoin des fichiers de données du "
-"jeu « Transport Tycoon Deluxe » original."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Veuillez lire le fichier /usr/share/doc/openttd/README.Debian pour plus "
-"d'informations sur les fichiers requis et leur emplacement."
--- a/os/debian/po/gl.po
+++ b/os/debian/po/gl.po
@@ -1,41 +0,0 @@
-# Galician translation of openttd's debconf templates
-# This file is distributed under the same license as the openttd package.
-# Jacobo Tarrio <jtarrio@debian.org>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 13:12+0200\n"
-"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
-"Language-Team: Galician <proxecto@trasno.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Precísase de ficheiros de datos"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Para o seu funcionamento, OpenTTD precisa dos ficheiros de datos do xogo "
-"Transport Tycoon Deluxe orixinal."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Consulte o ficheiro /usr/share/doc/openttd/README.Debian para máis "
-"información sobre os ficheiros necesarios e as súas ubicacións."
--- a/os/debian/po/nl.po
+++ b/os/debian/po/nl.po
@@ -1,43 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-16 19:25+0100\n"
-"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
-"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Dutch\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Databestanden zijn vereist"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Om te werken heeft OpenTTD de databestanden van het oorspronkelijkee "
-"'Transport Tycoon Deluxe'-spel nodig."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Meer informatie over de vereiste bestanden en hun locatie vindt u in /usr/"
-"share/doc/openttd/README.Debian . "
--- a/os/debian/po/pt.po
+++ b/os/debian/po/pt.po
@@ -1,42 +0,0 @@
-# Portuguese translation of openttd's debconf messages.
-# Copyright (C) 2007
-# This file is distributed under the same license as the openttd package.
-# Ricardo Silva <ardoric@gmail.com>, 2007
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-09 09:37+0100\n"
-"Last-Translator: Ricardo Silva <ardoric@gmail.com>\n"
-"Language-Team: Portuguese <traduz@debianpt.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "São necessários ficheiros de dados"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Para esta operação o OpenTTD precisa dos ficheiros de dados do jogo original "
-"Transport Tycool Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Veja o ficheiro /usr/share/doc/openttd/README.Debian para mais detalhes "
-"sobre os ficheiros que são necessários e a sua localização."
--- a/os/debian/po/pt_BR.po
+++ b/os/debian/po/pt_BR.po
@@ -1,43 +0,0 @@
-# openttd Brazilian Portuguese translation
-# Copyright (C) 2007, Eder L. Marques
-# This file is distributed under the same license as the openttd package.
-# Eder L. Marques <frolic@debian-ce.org>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd 0.5.0-2\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 11:00-0300\n"
-"Last-Translator: Eder L. Marques <frolic@debian-ce.org>\n"
-"Language-Team: l10n Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"pt_BR utf-8\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Arquivos de dados necessários"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Para sua operação, o OpenTTD necessita dos arquivos de dados do jogo "
-"Transport Tycoon Deluxe original."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Veja o arquivo /usr/share/doc/openttd/README.Debian para maiores detalhes "
-"sobre os arquivos necessários e suas localizações."
--- a/os/debian/po/ru.po
+++ b/os/debian/po/ru.po
@@ -1,45 +0,0 @@
-# translation of openttd_debconf_ru.po to Russian
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Yuri Kozlov <kozlov.y@gmail.com>, 2007.
-msgid ""
-msgstr ""
-"Project-Id-Version: 0.5.1-1\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-10 21:45+0400\n"
-"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
-"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Необходимы файлы данных"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Для работы OpenTTD требуются файлы данных от оригинальной игры Transport "
-"Tycoon Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"В файле /usr/share/doc/openttd/README.Debian приведена информация о том, "
-"какие файлы нужны и где они лежат."
--- a/os/debian/po/sv.po
+++ b/os/debian/po/sv.po
@@ -1,56 +0,0 @@
-# Swedish translation for openttd debconf template.
-# Copyright (C) 2007 Free Software Foundation, Inc.
-# This file is distributed under the same license as the openttd package.
-# Daniel Nylander <po@danielnylander.se>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 09:47+0100\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
-"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Datafiler behövs"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"För att fungera behöva OpenTTD datafilerna från det ursprungliga spelet "
-"Transport Tycoon Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Se filen /usr/share/doc/openttd/README.Debian för mer information om de "
-"nödvändiga filera och var de finns någonstans."
-
-#~ msgid "You need to install data files"
-#~ msgstr "Du behöver installera datafilerna"
-
-#~ msgid ""
-#~ "OpenTTD needs the data files from the original Transport Tycoon Deluxe "
-#~ "game to run. You should install these data files before you can play the "
-#~ "game. See README.Debian for more details on which files need to be copied "
-#~ "where."
-#~ msgstr ""
-#~ "OpenTTD behöver datafilerna från det ursprungliga spelet Transport Tycoon "
-#~ "Deluxe för att kunna köras. Du måste installera dessa datafiler innan du "
-#~ "kan spela spelet. Se README.Debian för fler detaljer om vilka filer som "
-#~ "behöver kopieras."
--- a/os/debian/po/ta.po
+++ b/os/debian/po/ta.po
@@ -1,43 +0,0 @@
-# translation of openttd.po to TAMIL
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Dr.T.Vasudevan <agnihot3@gmail.com>, 2007.
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 15:04+0530\n"
-"Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
-"Language-Team: TAMIL <ubuntu-l10n-tam@lists.ubuntu.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "தேவையான தரவு கோப்புகள்"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"இயங்குவதற்கு ஓபன் டிடிடி(OpenTTD) க்கு ட்ரான்ஸ்போர்ட் டைகூன் டீலக்ஸ் விளையாட்டிலிருந்து "
-"தரவு கோப்புகள் தேவை."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"தேவையான கோப்புகள் அவற்றின் இடம்  ஆகியவற்றை அறிய /usr/share/doc/openttd/README "
-"டெபியன் கோப்பை பார்க்கவும்."
--- a/os/debian/po/templates.pot
+++ b/os/debian/po/templates.pot
@@ -1,39 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
--- a/os/debian/postinst
+++ b/os/debian/postinst
@@ -1,8 +0,0 @@
-#! /bin/sh
-
-set -e
-
-
-. /usr/share/debconf/confmodule
-
-#DEBHELPER#
--- a/os/debian/rules
+++ b/os/debian/rules
@@ -1,88 +1,47 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# Makefile to build the openttd debian package.

-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# Use debhelper default for all targets (but some are overridden below).
+%:
+	dh $@

-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
+DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif

-	touch configure-stamp
+# Pass custom options to configure. Since it's not autoconf but a custom
+# script, some of the option names are slightly different. We also need
+# to be explicit about the dependencies, in case we're not running in a
+# clean build root.
+override_dh_auto_configure:
+	./configure $(CROSS) --prefix-dir=/usr --install-dir=debian/openttd --without-allegro --with-zlib --with-sdl --with-png --with-freetype --with-fontconfig --with-icu --with-liblzo2 --without-iconv --disable-strip CFLAGS="$(CFLAGS) -g" LDFLAGS="$(LDFLAGS) -Wl,-as-needed"

-
-build: configure build-stamp
-build-stamp:
-	dh_testdir
-
-	# Add here commands to compile the package.
-	
-	./configure --prefix-dir=/usr --binary-dir=games --data-dir=share/games/openttd --icon-dir=share/pixmaps --personal-dir=.openttd --install-dir=debian/openttd
-	$(MAKE)
-
-	#/usr/bin/docbook-to-man debian/openttd.sgml > openttd.1
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	# We check for Makefile presence, because clean is called at the
-	# start of the build process (before configure) where we don't
-	# have a Makefile yet.
-	[ ! -f Makefile ] || $(MAKE) mrproper
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/openttd.
+# Do some extra installation
+override_dh_auto_install:
 	$(MAKE) install

-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+	# Install the wrapper and make it executable
+	install -d debian/openttd/usr/share/games/openttd/
+	install -m755 debian/openttd-wrapper debian/openttd/usr/share/games/openttd/

-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs changelog.txt
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-	dh_installmenu
-	dh_installdebconf
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman docs/openttd.6
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	# Since 0.7.0, upstream Makefile installs some unwanted stuff.
+	-rm $(CURDIR)/debian/openttd/usr/share/doc/openttd/COPYING
+	-rm $(CURDIR)/debian/openttd/usr/share/doc/openttd/changelog.txt
+	-rm $(CURDIR)/debian/openttd/usr/share/doc/openttd/ob*_format.txt

-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+# Don't do testing. Because the OpenTTD Makefile always does dependency
+# generation (even on invalid targets), dh_auto_test thinks there is a
+# "test" target, while there isn't.
+override_dh_auto_test:
+
+# Call mrproper. Again, dh_auto_clean thinks there is a distclean
+# target, while there isn't.
+override_dh_auto_clean:
+	[ ! -f Makefile ] || $(MAKE) mrproper
+
+# We want to strip the debug informatiton into the -dbg package.
+override_dh_strip:
+	dh_strip --dbg-package=openttd-dbg
--- a/os/debian/source/format
+++ b/os/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--- a/os/debian/templates
+++ b/os/debian/templates
@@ -1,16 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# for an advice to debian-l10n-english@lists.debian.org
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-Template: openttd/datafiles
-Type: error
-_Description: Data files needed
- For its operation, OpenTTD needs the data files from the original
- Transport Tycoon Deluxe game.
- .
- See the /usr/share/doc/openttd/README.Debian file for more details
- about the needed files and their location.
--- a/Show More
+++ b/Show More