(svn r20267) -Release: 1.0.3

(svn r20265) [1.0] -Prepare: for 1.0.3
(svn r20261) [1.0] -Backport from trunk:
2026-07-16 07:39:52 +00:00 · 2010-07-31 21:04:47 +00:00 · 2010-07-31 20:55:34 +00:00 · 2010-07-31 18:27:54 +00:00 · 2010-07-24 15:43:33 +00:00 · 2010-07-17 17:48:02 +00:00
1051 changed files with 280593 additions and 201907 deletions
@@ -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
@@ -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
@@ -1,7 +1,14 @@
+# $Id$
+
+# This file is part of OpenTTD.
+# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = openttd
+PROJECT_NAME           = OpenTTD
 OUTPUT_DIRECTORY       = docs/source/
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
@@ -26,7 +33,6 @@ STRIP_FROM_INC_PATH    =
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
 MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
 INHERIT_DOCS           = YES
 DISTRIBUTE_GROUP_DOC   = NO
 TAB_SIZE               = 2
@@ -83,12 +89,11 @@ FILE_PATTERNS          = *.c \
                         *.cpp \
                         *.c++ \
                         *.h \
-                         *.hpp \
-                         table/*.h
+                         *.hpp
 RECURSIVE              = YES
 EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       =
+EXCLUDE_PATTERNS       = */3rdparty */.svn
 EXAMPLE_PATH           =
 EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = NO
@@ -190,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
@@ -1,3 +1,10 @@
+# $Id$
+
+# This file is part of OpenTTD.
+# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+
 #
 # Creation of bundles
 #
@@ -22,12 +29,16 @@ endif

 # An OSX application bundle needs the data files, lang files and openttd executable in a different location.
 ifdef OSXAPP
+AI_DIR   = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/ai
 DATA_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/data
 LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
+GM_DIR   = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/gm
 TTD_DIR  = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
 else
+AI_DIR   = $(BUNDLE_DIR)/ai
 DATA_DIR = $(BUNDLE_DIR)/data
 LANG_DIR = $(BUNDLE_DIR)/lang
+GM_DIR   = $(BUNDLE_DIR)/gm
 TTD_DIR  = $(BUNDLE_DIR)
 endif

@@ -39,25 +50,31 @@ bundle: all
 	$(Q)mkdir -p "$(BUNDLE_DIR)/media"
 	$(Q)mkdir -p "$(BUNDLE_DIR)/scripts"
 	$(Q)mkdir -p "$(TTD_DIR)"
+	$(Q)mkdir -p "$(AI_DIR)"
 	$(Q)mkdir -p "$(DATA_DIR)"
 	$(Q)mkdir -p "$(LANG_DIR)"
+	$(Q)mkdir -p "$(GM_DIR)"
 ifdef OSXAPP
 	$(Q)mkdir -p "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources"
 	$(Q)echo "APPL????" >                                          "$(BUNDLE_DIR)/$(OSXAPP)/Contents/PkgInfo"
 	$(Q)cp    "$(ROOT_DIR)/os/macosx/openttd.icns"                 "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/openttd.icns"
 	$(Q)$(ROOT_DIR)/os/macosx/plistgen.sh                          "$(BUNDLE_DIR)/$(OSXAPP)" "$(REV)"
-	$(Q)cp    "$(ROOT_DIR)/docs/OSX_install_instructions.txt"      "$(BUNDLE_DIR)/docs/"
 	$(Q)cp    "$(ROOT_DIR)/os/macosx/splash.png"                   "$(DATA_DIR)"
 endif
 	$(Q)cp "$(BIN_DIR)/$(TTD)"                "$(TTD_DIR)/"
+	$(Q)cp "$(BIN_DIR)/ai/"compat_*.nut       "$(AI_DIR)/"
 	$(Q)cp "$(BIN_DIR)/data/"*.grf            "$(DATA_DIR)/"
 	$(Q)cp "$(BIN_DIR)/data/"*.obg            "$(DATA_DIR)/"
+	$(Q)cp "$(BIN_DIR)/data/"*.obs            "$(DATA_DIR)/"
 	$(Q)cp "$(BIN_DIR)/data/opntitle.dat"     "$(DATA_DIR)/"
 	$(Q)cp "$(BIN_DIR)/lang/"*.lng            "$(LANG_DIR)/"
+	$(Q)cp "$(BIN_DIR)/gm/"*.obm              "$(GM_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/readme.txt"           "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/COPYING"              "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/known-bugs.txt"       "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/docs/obg_format.txt"  "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/docs/obm_format.txt"  "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/docs/obs_format.txt"  "$(BUNDLE_DIR)/docs/"
 	$(Q)cp "$(ROOT_DIR)/docs/multiplayer.txt" "$(BUNDLE_DIR)/docs/"
 	$(Q)cp "$(ROOT_DIR)/docs/32bpp.txt"       "$(BUNDLE_DIR)/docs/"
 	$(Q)cp "$(ROOT_DIR)/changelog.txt"        "$(BUNDLE_DIR)/"
@@ -71,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"
@@ -95,6 +113,11 @@ bundle_zip: bundle
 	$(Q)mkdir -p "$(BUNDLES_DIR)"
 	$(Q)cd "$(BUNDLE_DIR)" && zip -r $(shell if test -z "$(VERBOSE)"; then echo '-q'; fi) "$(BUNDLES_DIR)/$(BUNDLE_NAME).zip" .

+bundle_7z: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).7z'
+	$(Q)mkdir -p "$(BUNDLES_DIR)"
+	$(Q)cd "$(BUNDLE_DIR)" && 7z a "$(BUNDLES_DIR)/$(BUNDLE_NAME).7z" .
+
 bundle_gzip: bundle
 	@echo '[BUNDLE] Creating $(BUNDLE_NAME).tar.gz'
 	$(Q)mkdir -p "$(BUNDLES_DIR)/.gzip/$(BUNDLE_NAME)"
@@ -109,6 +132,13 @@ bundle_bzip2: bundle
 	$(Q)cd "$(BUNDLES_DIR)/.bzip2" && tar -jc$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.bz2" "$(BUNDLE_NAME)"
 	$(Q)rm -rf   "$(BUNDLES_DIR)/.bzip2"

+bundle_lzma: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).tar.lzma'
+	$(Q)mkdir -p "$(BUNDLES_DIR)/.lzma/$(BUNDLE_NAME)"
+	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.lzma/$(BUNDLE_NAME)/"
+	$(Q)cd "$(BUNDLES_DIR)/.lzma" && tar --lzma -c$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.lzma" "$(BUNDLE_NAME)"
+	$(Q)rm -rf   "$(BUNDLES_DIR)/.lzma"
+
 bundle_lha: bundle
 	@echo '[BUNDLE] Creating $(BUNDLE_NAME).lha'
 	$(Q)mkdir -p "$(BUNDLES_DIR)/.lha/$(BUNDLE_NAME)"
@@ -127,8 +157,8 @@ 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)cd $(ROOT_DIR)/os/win32/installer && makensis.exe //DVERSION_INCLUDE=version_$(PLATFORM).txt install.nsi
-	$(Q)mv $(ROOT_DIR)/os/win32/installer/*$(PLATFORM).exe "$(BUNDLES_DIR)/$(BUNDLE_NAME).exe"
+	$(Q)cd $(ROOT_DIR)/os/windows/installer && makensis.exe //DVERSION_INCLUDE=version_$(PLATFORM).txt install.nsi
+	$(Q)mv $(ROOT_DIR)/os/windows/installer/*$(PLATFORM).exe "$(BUNDLES_DIR)/$(BUNDLE_NAME).exe"

 ifdef OSXAPP
 install:
@@ -139,8 +169,10 @@ install: bundle
 	$(Q)install -d "$(INSTALL_BINARY_DIR)"
 	$(Q)install -d "$(INSTALL_ICON_DIR)"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/gm"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/ai"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/data"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/lang"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/gm"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/scripts"
 	$(Q)install -d "$(INSTALL_DOC_DIR)"
 ifeq ($(TTD), openttd.exe)
@@ -149,7 +181,9 @@ else
 	$(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)/${BINARY_NAME}"
 endif
 	$(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/ai/"* "$(INSTALL_DATA_DIR)/ai"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/data/"* "$(INSTALL_DATA_DIR)/data"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/gm/"* "$(INSTALL_DATA_DIR)/gm"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/scripts/"* "$(INSTALL_DATA_DIR)/scripts"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(INSTALL_DOC_DIR)"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/"*.txt "$(INSTALL_DOC_DIR)"
@@ -1,3 +1,10 @@
+# $Id$
+
+# This file is part of OpenTTD.
+# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+
 # Check if we want to show what we are doing
 ifdef VERBOSE
 	Q =
@@ -7,36 +14,37 @@ endif

 include Makefile.am

-SOURCE_LIST = !!SOURCE_LIST!!
+CONFIG_CACHE_PWD         = !!CONFIG_CACHE_PWD!!
 CONFIG_CACHE_SOURCE_LIST = !!CONFIG_CACHE_SOURCE_LIST!!
-CONFIG_CACHE_PWD = !!CONFIG_CACHE_PWD!!
-CONFIGURE_FILES = !!CONFIGURE_FILES!!
-LIPO = !!LIPO!!
-BIN_DIR = !!BIN_DIR!!
+BIN_DIR        = !!BIN_DIR!!
 ICON_THEME_DIR = !!ICON_THEME_DIR!!
-MAN_DIR = !!MAN_DIR!!
-MENU_DIR = !!MENU_DIR!!
-SRC_DIR = !!SRC_DIR!!
-ROOT_DIR = !!ROOT_DIR!!
-BUNDLE_DIR = "$(ROOT_DIR)/bundle"
-BUNDLES_DIR = "$(ROOT_DIR)/bundles"
-INSTALL_DIR = !!INSTALL_DIR!!
-INSTALL_BINARY_DIR = "$(INSTALL_DIR)/"!!BINARY_DIR!!
-INSTALL_MAN_DIR = "$(INSTALL_DIR)/$(MAN_DIR)"
-INSTALL_MENU_DIR = "$(INSTALL_DIR)/$(MENU_DIR)"
-INSTALL_ICON_DIR = "$(INSTALL_DIR)/"!!ICON_DIR!!
+MAN_DIR        = !!MAN_DIR!!
+MENU_DIR       = !!MENU_DIR!!
+SRC_DIR        = !!SRC_DIR!!
+ROOT_DIR       = !!ROOT_DIR!!
+BUNDLE_DIR     = "$(ROOT_DIR)/bundle"
+BUNDLES_DIR    = "$(ROOT_DIR)/bundles"
+INSTALL_DIR    = !!INSTALL_DIR!!
+INSTALL_BINARY_DIR     = "$(INSTALL_DIR)/"!!BINARY_DIR!!
+INSTALL_MAN_DIR        = "$(INSTALL_DIR)/$(MAN_DIR)"
+INSTALL_MENU_DIR       = "$(INSTALL_DIR)/$(MENU_DIR)"
+INSTALL_ICON_DIR       = "$(INSTALL_DIR)/"!!ICON_DIR!!
 INSTALL_ICON_THEME_DIR = "$(INSTALL_DIR)/$(ICON_THEME_DIR)"
-INSTALL_DATA_DIR = "$(INSTALL_DIR)/"!!DATA_DIR!!
-INSTALL_DOC_DIR = "$(INSTALL_DIR)/"!!DOC_DIR!!
+INSTALL_DATA_DIR       = "$(INSTALL_DIR)/"!!DATA_DIR!!
+INSTALL_DOC_DIR        = "$(INSTALL_DIR)/"!!DOC_DIR!!
+SOURCE_LIST     = !!SOURCE_LIST!!
+CONFIGURE_FILES = !!CONFIGURE_FILES!!
 BINARY_NAME = !!BINARY_NAME!!
-STRIP = !!STRIP!!
-TTD = !!TTD!!
-TTDS = $(SRC_DIRS:%=%/$(TTD))
-OS = !!OS!!
-OSXAPP = !!OSXAPP!!
-REVISION = !!REVISION!!
-AWK = !!AWK!!
-DISTCC = !!DISTCC!!
+STRIP       = !!STRIP!!
+TTD         = !!TTD!!
+TTDS        = $(SRC_DIRS:%=%/$(TTD))
+OS          = !!OS!!
+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 )
 RES := $(shell if [ ! -f $(CONFIG_CACHE_SOURCE_LIST) ] || [ -n "`cmp $(CONFIG_CACHE_SOURCE_LIST) $(SOURCE_LIST) 2>/dev/null`" ]; then cp $(SOURCE_LIST) $(CONFIG_CACHE_SOURCE_LIST); fi )
@@ -93,7 +101,7 @@ ifeq ($(shell if test -f config.cache; then echo 1; fi), 1)
 	@echo " Going to reconfigure with last known settings..."
 	@echo "----------------"
 # Make sure we don't lock config.cache
-	@$(shell cat config.cache | sed 's~\\ ~\\\\ ~g') || exit 1
+	@$(shell cat config.cache | sed 's@\\ @\\\\ @g') || exit 1
 	@echo "----------------"
 	@echo "Reconfig done. Please re-execute make."
 	@echo "----------------"
@@ -122,10 +130,22 @@ 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

 depend:
 	@for dir in $(SRC_DIRS); do \
@@ -143,6 +163,7 @@ run-prof: all

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

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

+.PHONY: test distclean mrproper clean
+
 include Makefile.bundle
@@ -1,22 +1,30 @@
-STRGEN       = !!STRGEN!!
-ENDIAN_CHECK = !!ENDIAN_CHECK!!
-SRC_DIR      = !!SRC_DIR!!
-LANG_DIR     = !!LANG_DIR!!
-BIN_DIR      = !!BIN_DIR!!
-LANGS_SRC    = $(shell ls $(LANG_DIR)/*.txt)
-LANGS        = $(LANGS_SRC:$(LANG_DIR)/%.txt=%.lng)
-CXX_BUILD    = !!CXX_BUILD!!
-CFLAGS_BUILD = !!CFLAGS_BUILD!!
-STRGEN_FLAGS = !!STRGEN_FLAGS!!
-STAGE        = !!STAGE!!
-LANG_SUPPRESS= !!LANG_SUPPRESS!!
-LANG_OBJS_DIR= !!LANG_OBJS_DIR!!
+# $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/>.
+
+STRGEN        = !!STRGEN!!
+ENDIAN_CHECK  = !!ENDIAN_CHECK!!
+SRC_DIR       = !!SRC_DIR!!
+LANG_DIR      = !!LANG_DIR!!
+BIN_DIR       = !!BIN_DIR!!
+LANGS_SRC     = $(shell ls $(LANG_DIR)/*.txt)
+LANGS         = $(LANGS_SRC:$(LANG_DIR)/%.txt=%.lng)
+CXX_BUILD     = !!CXX_BUILD!!
+CFLAGS_BUILD  = !!CFLAGS_BUILD!!
+LDFLAGS_BUILD = !!LDFLAGS_BUILD!!
+STRGEN_FLAGS  = !!STRGEN_FLAGS!!
+STAGE         = !!STAGE!!
+LANG_SUPPRESS = !!LANG_SUPPRESS!!
+LANG_OBJS_DIR = !!LANG_OBJS_DIR!!

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

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

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

 all: table/strings.h $(LANGS)

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

@@ -52,7 +60,7 @@ lang/english.txt: $(LANG_DIR)/english.txt

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

 table/strings.h: lang/english.txt $(STRGEN)
 	$(E) '$(STAGE) Generating $@'
@@ -80,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=%)'
@@ -1,3 +1,10 @@
+# $Id$
+
+# This file is part of OpenTTD.
+# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+
 #
 # Makefile for creating bundles of MSVC's binaries in the same way as we make
 # the zip bundles for ALL other OSes.
@@ -13,14 +20,14 @@ else
 	Q = @
 endif

-AWK = "awk"
-ROOT_DIR := $(shell pwd)
-BIN_DIR = "$(ROOT_DIR)/bin"
-SRC_DIR = "$(ROOT_DIR)/src"
-BUNDLE_DIR = "$(ROOT_DIR)/bundle"
+AWK         = "awk"
+ROOT_DIR   := $(shell pwd)
+BIN_DIR     = "$(ROOT_DIR)/bin"
+SRC_DIR     = "$(ROOT_DIR)/src"
+BUNDLE_DIR  = "$(ROOT_DIR)/bundle"
 BUNDLES_DIR = "$(ROOT_DIR)/bundles"
-TTD = "openttd.exe"
-TARGET := $(shell echo $(PLATFORM) | sed "s~win64~x64~;s~win32~Win32~")
+TTD         = openttd.exe
+TARGET     := $(shell echo $(PLATFORM) | sed "s@win64@x64@;s@win32@Win32@")

 all:
 	$(Q)cp objs/$(TARGET)/Release/$(TTD) $(BIN_DIR)/$(TTD)
@@ -1,34 +1,43 @@
-CC_HOST      = !!CC_HOST!!
-CXX_HOST     = !!CXX_HOST!!
-CC_BUILD     = !!CC_BUILD!!
-CXX_BUILD    = !!CXX_BUILD!!
-WINDRES      = !!WINDRES!!
-STRIP        = !!STRIP!!
-CC_CFLAGS    = !!CC_CFLAGS!!
-CFLAGS       = !!CFLAGS!!
-CFLAGS_BUILD = !!CFLAGS_BUILD!!
-LIBS         = !!LIBS!!
-LDFLAGS      = !!LDFLAGS!!
-ROOT_DIR     = !!ROOT_DIR!!
-BIN_DIR      = !!BIN_DIR!!
-LANG_DIR     = !!LANG_DIR!!
-SRC_OBJS_DIR = !!SRC_OBJS_DIR!!
-LANG_OBJS_DIR= !!LANG_OBJS_DIR!!
-SRC_DIR      = !!SRC_DIR!!
-SCRIPT_SRC_DIR=!!SCRIPT_SRC_DIR!!
-MEDIA_DIR    = !!MEDIA_DIR!!
-TTD          = !!TTD!!
-STRGEN       = !!STRGEN!!
-ENDIAN_CHECK = !!ENDIAN_CHECK!!
-ENDIAN_FORCE = !!ENDIAN_FORCE!!
-OS           = !!OS!!
-STAGE        = !!STAGE!!
-MAKEDEPEND   = !!MAKEDEPEND!!
-CFLAGS_MAKEDEP= !!CFLAGS_MAKEDEP!!
-SORT         = !!SORT!!
-REVISION     = !!REVISION!!
-AWK          = !!AWK!!
-GCC295       = !!GCC295!!
+# $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/>.
+
+CC_HOST        = !!CC_HOST!!
+CXX_HOST       = !!CXX_HOST!!
+CC_BUILD       = !!CC_BUILD!!
+CXX_BUILD      = !!CXX_BUILD!!
+WINDRES        = !!WINDRES!!
+STRIP          = !!STRIP!!
+CFLAGS         = !!CFLAGS!!
+CFLAGS_BUILD   = !!CFLAGS_BUILD!!
+CXXFLAGS       = !!CXXFLAGS!!
+CXXFLAGS_BUILD = !!CXXFLAGS_BUILD!!
+LIBS           = !!LIBS!!
+LDFLAGS        = !!LDFLAGS!!
+LDFLAGS_BUILD  = !!LDFLAGS_BUILD!!
+ROOT_DIR       = !!ROOT_DIR!!
+BIN_DIR        = !!BIN_DIR!!
+LANG_DIR       = !!LANG_DIR!!
+SRC_OBJS_DIR   = !!SRC_OBJS_DIR!!
+LANG_OBJS_DIR  = !!LANG_OBJS_DIR!!
+SRC_DIR        = !!SRC_DIR!!
+SCRIPT_SRC_DIR = !!SCRIPT_SRC_DIR!!
+MEDIA_DIR      = !!MEDIA_DIR!!
+TTD            = !!TTD!!
+STRGEN         = !!STRGEN!!
+ENDIAN_CHECK   = !!ENDIAN_CHECK!!
+DEPEND         = !!DEPEND!!
+ENDIAN_FORCE   = !!ENDIAN_FORCE!!
+OS             = !!OS!!
+STAGE          = !!STAGE!!
+MAKEDEPEND     = !!MAKEDEPEND!!
+CFLAGS_MAKEDEP = !!CFLAGS_MAKEDEP!!
+SORT           = !!SORT!!
+REVISION       = !!REVISION!!
+AWK            = !!AWK!!
 CONFIG_CACHE_COMPILER = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_COMPILER!!
 CONFIG_CACHE_LINKER   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_LINKER!!
 CONFIG_CACHE_ENDIAN   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_ENDIAN!!
@@ -49,24 +58,13 @@ 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)

-# This 'sed' basicly just removes 'const' from the line if it is a 2+D array
-# For more information, please check:
-#  http://maillist.openttd.org/pipermail/devs/2007-April/000284.html
-#  http://maillist.openttd.org/pipermail/devs/2007-February/000248.html
-GCC295_FIX=sed -r 's~^(\t*)(.*)( const )([A-Za-z0-9_ ]+(\[.*\]){2,})(( = \{)|(;))(.*)$$~\1\2 \4\6\8\9~g'
-# This 'sed' removes the 3rd '4' in the # lines of the -E output of
-#  gcc 2.95.3 and lower, as it should indicate that it is a C-linkage, but the
-#  compiler can't handle that information (just don't ask). So we remove it
-#  and then it compiles happily and without bitching :)
-# Furthermore gcc 2.95 has some trouble with protected and private when
-#  accessing the protected/private stuff of the enclosing class (or the
-#  super class of the enclosing class).
-GCC295_FIX_2=sed -e 's~\(^\# [0-9][0-9]* "[^"]*"[ 0-9]*\) 4$$~\1~g;s~private:~public:~g;s~protected:~public:~g'
-
 # Check if we want to show what we are doing
 ifdef VERBOSE
 	Q =
@@ -98,7 +96,7 @@ MODIFIED := $(shell echo "$(VERSIONS)" | cut -f 3 -d'	')
 ifdef REVISION
 # Use specified revision (which should be of the form "r000").
 REV := $(REVISION)
-REV_NR := $(shell echo $(REVISION) | sed "s~[^0-9]~~g")
+REV_NR := $(shell echo $(REVISION) | sed "s@[^0-9]@@g")
 else
 # Use autodetected revisions
 REV      := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
@@ -114,7 +112,7 @@ REV_NR := 0
 endif

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

@@ -143,18 +141,18 @@ endif

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

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

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

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

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

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

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

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

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

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

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

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

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

 $(BIN_DIR)/$(TTD): $(TTD)
 	$(Q)cp $< $@
@@ -275,15 +276,15 @@ endian_target.h: $(ENDIAN_CHECK) $(CONFIG_CACHE_ENDIAN)

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

 # Revision files

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

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

 FORCE:

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

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

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

 %.o:
 	@echo '$(STAGE) No such source-file: $(@:%.o=%).[c|cpp|mm|rc]'
@@ -0,0 +1,260 @@
+/* $Id$ */
+
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+AILog.Info("0.7 API compatability in effect:");
+AILog.Info(" - AITown::GetLastMonthProduction's behaviour has slightly changed.");
+AILog.Info(" - AISubsidy::GetDestination returns STATION_INVALID for awarded subsidies.");
+AILog.Info(" - AISubsidy::GetSource returns STATION_INVALID for awarded subsidies.");
+
+AISign.GetMaxSignID <- function()
+{
+	local list = AISignList();
+	local max_id = 0;
+	foreach (id, d in list) {
+		if (id > max_id) max_id = id;
+	}
+	return max_id;
+}
+
+AITile.GetHeight <- function(tile)
+{
+	if (!AIMap.IsValidTile(tile)) return -1;
+
+	return AITile.GetCornerHeight(tile, AITile.CORNER_N);
+}
+
+AIOrder.ChangeOrder <- function(vehicle_id, order_position, order_flags)
+{
+	return AIOrder.SetOrderFlags(vehicle_id, order_position, order_flags);
+}
+
+AIWaypoint.WAYPOINT_INVALID <- 0xFFFF;
+
+AISubsidy.SourceIsTown <- function(subsidy_id)
+{
+	if (!AISubsidy.IsValidSubsidy(subsidy_id) || AISubsidy.IsAwarded(subsidy_id)) return false;
+
+	return AISubsidy.GetSourceType(subsidy_id) == AISubsidy.SPT_TOWN;
+}
+
+AISubsidy.GetSource <- function(subsidy_id)
+{
+	if (!AISubsidy.IsValidSubsidy(subsidy_id)) return AIBaseStation.STATION_INVALID;
+
+	if (AISubsidy.IsAwarded(subsidy_id)) {
+		return AIBaseStation.STATION_INVALID;
+	}
+
+	return AISubsidy.GetSourceIndex(subsidy_id);
+}
+
+AISubsidy.DestinationIsTown <- function(subsidy_id)
+{
+	if (!AISubsidy.IsValidSubsidy(subsidy_id) || AISubsidy.IsAwarded(subsidy_id)) return false;
+
+	return AISubsidy.GetDestinationType(subsidy_id) == AISubsidy.SPT_TOWN;
+}
+
+AISubsidy.GetDestination <- function(subsidy_id)
+{
+	if (!AISubsidy.IsValidSubsidy(subsidy_id)) return AIBaseStation.STATION_INVALID;
+
+	if (AISubsidy.IsAwarded(subsidy_id)) {
+		return AIBaseStation.STATION_INVALID;
+	}
+
+	return AISubsidy.GetDestinationIndex(subsidy_id);
+}
+
+AITown.GetMaxProduction <- function(town_id, cargo_id)
+{
+	return AITown.GetLastMonthProduction(town_id, cargo_id);
+}
+
+AIRail.RemoveRailWaypoint <- function(tile)
+{
+	return AIRail.RemoveRailWaypointTileRect(tile, tile, true);
+}
+
+AIRail.RemoveRailStationTileRect <- function(tile, tile2)
+{
+	return AIRail.RemoveRailStationTileRectangle(tile, tile2, false);
+}
+
+AIVehicle.SkipToVehicleOrder <- function(vehicle_id, order_position)
+{
+	return AIOrder.SkipToOrder(vehicle_id, order_position);
+}
+
+AIEngine.IsValidEngine <- function(engine_id)
+{
+	return AIEngine.IsBuildable(engine_id);
+}
+
+AIEngine._GetName <- AIEngine.GetName;
+AIEngine.GetName <- function(engine_id)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return null;
+	return AIEngine._GetName(engine_id);
+}
+
+AIEngine._GetCargoType <- AIEngine.GetCargoType;
+AIEngine.GetCargoType <- function(engine_id)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return 255;
+	return AIEngine._GetCargoType(engine_id);
+}
+
+AIEngine._CanRefitCargo <- AIEngine.CanRefitCargo;
+AIEngine.CanRefitCargo <- function(engine_id, cargo_id)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return false;
+	return AIEngine._CanRefitCargo(engine_id, cargo_id);
+}
+
+AIEngine._CanPullCargo <- AIEngine.CanPullCargo;
+AIEngine.CanPullCargo <- function(engine_id, cargo_id)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return false;
+	return AIEngine._CanPullCargo(engine_id, cargo_id);
+}
+
+AIEngine._GetCapacity <- AIEngine.GetCapacity;
+AIEngine.GetCapacity <- function(engine_id)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return -1;
+	return AIEngine._GetCapacity(engine_id);
+}
+
+AIEngine._GetReliability <- AIEngine.GetReliability;
+AIEngine.GetReliability <- function(engine_id)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return -1;
+	return AIEngine._GetReliability(engine_id);
+}
+
+AIEngine._GetMaxSpeed <- AIEngine.GetMaxSpeed;
+AIEngine.GetMaxSpeed <- function(engine_id)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return -1;
+	return AIEngine._GetMaxSpeed(engine_id);
+}
+
+AIEngine._GetPrice <- AIEngine.GetPrice;
+AIEngine.GetPrice <- function(engine_id)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return -1;
+	return AIEngine._GetPrice(engine_id);
+}
+
+AIEngine._GetMaxAge <- AIEngine.GetMaxAge;
+AIEngine.GetMaxAge <- function(engine_id)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return -1;
+	return AIEngine._GetMaxAge(engine_id);
+}
+
+AIEngine._GetRunningCost <- AIEngine.GetRunningCost;
+AIEngine.GetRunningCost <- function(engine_id)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return -1;
+	return AIEngine._GetRunningCost(engine_id);
+}
+
+AIEngine._GetPower <- AIEngine.GetPower;
+AIEngine.GetPower <- function(engine_id)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return -1;
+	return AIEngine._GetPower(engine_id);
+}
+
+AIEngine._GetWeight <- AIEngine.GetWeight;
+AIEngine.GetWeight <- function(engine_id)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return -1;
+	return AIEngine._GetWeight(engine_id);
+}
+
+AIEngine._GetMaxTractiveEffort <- AIEngine.GetMaxTractiveEffort;
+AIEngine.GetMaxTractiveEffort <- function(engine_id)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return -1;
+	return AIEngine._GetMaxTractiveEffort(engine_id);
+}
+
+AIEngine._GetDesignDate <- AIEngine.GetDesignDate;
+AIEngine.GetDesignDate <- function(engine_id)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return -1;
+	return AIEngine._GetDesignDate(engine_id);
+}
+
+AIEngine._GetVehicleType <- AIEngine.GetVehicleType;
+AIEngine.GetVehicleType <- function(engine_id)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return AIVehicle.VT_INVALID;
+	return AIEngine._GetVehicleType(engine_id);
+}
+
+AIEngine._IsWagon <- AIEngine.IsWagon;
+AIEngine.IsWagon <- function(engine_id)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return false;
+	return AIEngine._IsWagon(engine_id);
+}
+
+AIEngine._CanRunOnRail <- AIEngine.CanRunOnRail;
+AIEngine.CanRunOnRail <- function(engine_id, track_rail_type)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return false;
+	return AIEngine._CanRunOnRail(engine_id, track_rail_type);
+}
+
+AIEngine._HasPowerOnRail <- AIEngine.HasPowerOnRail;
+AIEngine.HasPowerOnRail <- function(engine_id, track_rail_type)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return false;
+	return AIEngine._HasPowerOnRail(engine_id, track_rail_type);
+}
+
+AIEngine._GetRoadType <- AIEngine.GetRoadType;
+AIEngine.GetRoadType <- function(engine_id)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return AIRoad.ROADTYPE_INVALID;
+	return AIEngine._GetRoadType(engine_id);
+}
+
+AIEngine._GetRailType <- AIEngine.GetRailType;
+AIEngine.GetRailType <- function(engine_id)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return AIRail.RAILTYPE_INVALID;
+	return AIEngine._GetRailType(engine_id);
+}
+
+AIEngine._IsArticulated <- AIEngine.IsArticulated;
+AIEngine.IsArticulated <- function(engine_id)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return false;
+	return AIEngine._IsArticulated(engine_id);
+}
+
+AIEngine._GetPlaneType <- AIEngine.GetPlaneType;
+AIEngine.GetPlaneType <- function(engine_id)
+{
+	if (!AIEngine.IsBuildable(engine_id)) return -1;
+	return AIEngine._GetPlaneType(engine_id);
+}
+
+_AIWaypointList <- AIWaypointList;
+class AIWaypointList extends _AIWaypointList {
+	constructor()
+	{
+		::_AIWaypointList.constructor(AIWaypoint.WAYPOINT_RAIL);
+	}
+}
@@ -0,0 +1,8 @@
+/* $Id$ */
+
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
@@ -58,7 +58,7 @@ function Regression::TestInit()
 	}

 	list = AIList();
-	list.Sort(AIAbstractList.SORT_BY_VALUE, true);
+	list.Sort(AIAbstractList.SORT_BY_VALUE, AIAbstractList.SORT_ASCENDING);
 	print("");
 	print(" Value Ascending");
 	list.AddItem( 5, 10);
@@ -93,7 +93,7 @@ function Regression::TestInit()
 	}

 	list = AIList();
-	list.Sort(AIAbstractList.SORT_BY_ITEM, false);
+	list.Sort(AIAbstractList.SORT_BY_ITEM, AIAbstractList.SORT_DESCENDING);
 	print("");
 	print(" Item Descending");
 	list.AddItem( 5, 10);
@@ -128,7 +128,7 @@ function Regression::TestInit()
 	}

 	list = AIList();
-	list.Sort(AIAbstractList.SORT_BY_ITEM, true);
+	list.Sort(AIAbstractList.SORT_BY_ITEM, AIAbstractList.SORT_ASCENDING);
 	print("");
 	print(" Item Ascending");
 	list.AddItem( 5, 10);
@@ -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));
@@ -213,13 +213,15 @@ function Regression::Airport()
 	print("  GetAirportType():     " + AIAirport.GetAirportType(32116));

 	for (local i = -1; i < 10; i++) {
-		print("  IsValidAirportType(" + i + "):       " + AIAirport.IsValidAirportType(i));
-		print("  GetAirportWidth(" + i + "):          " + AIAirport.GetAirportWidth(i));
-		print("  GetAirportHeight(" + i + "):         " + AIAirport.GetAirportHeight(i));
-		print("  GetAirportCoverageRadius(" + i + "): " + AIAirport.GetAirportCoverageRadius(i));
+		print("  IsAirportInformationAvailable(" + i + "): " + AIAirport.IsAirportInformationAvailable(i));
+		print("  IsValidAirportType(" + i + "):            " + AIAirport.IsValidAirportType(i));
+		print("  GetAirportWidth(" + i + "):               " + AIAirport.GetAirportWidth(i));
+		print("  GetAirportHeight(" + i + "):              " + AIAirport.GetAirportHeight(i));
+		print("  GetAirportCoverageRadius(" + i + "):      " + AIAirport.GetAirportCoverageRadius(i));
 	}

 	print("  GetBankBalance():     " + AICompany.GetBankBalance(AICompany.COMPANY_SELF));
+	print("  GetPrice():           " + AIAirport.GetPrice(0));
 	print("  BuildAirport():       " + AIAirport.BuildAirport(32116, 0, AIStation.STATION_JOIN_ADJACENT));
 	print("  IsHangarTile():       " + AIAirport.IsHangarTile(32116));
 	print("  IsAirportTile():      " + AIAirport.IsAirportTile(32116));
@@ -256,12 +258,15 @@ function Regression::Bridge()
 	print("  Valid Bridges:        " + j);

 	print("  IsBridgeTile():       " + AIBridge.IsBridgeTile(33160));
+	print("  GetBridgeID():        " + AIBridge.GetBridgeID(33160));
 	print("  RemoveBridge():       " + AIBridge.RemoveBridge(33155));
 	print("  GetLastErrorString(): " + AIError.GetLastErrorString());
 	print("  GetOtherBridgeEnd():  " + AIBridge.GetOtherBridgeEnd(33160));
 	print("  BuildBridge():        " + AIBridge.BuildBridge(AIVehicle.VT_ROAD, 5, 33160, 33155));
 	print("  IsBridgeTile():       " + AIBridge.IsBridgeTile(33160));
+	print("  GetBridgeID():        " + AIBridge.GetBridgeID(33160));
 	print("  IsBridgeTile():       " + AIBridge.IsBridgeTile(33155));
+	print("  GetBridgeID():        " + AIBridge.GetBridgeID(33155));
 	print("  GetOtherBridgeEnd():  " + AIBridge.GetOtherBridgeEnd(33160));
 	print("  BuildBridge():        " + AIBridge.BuildBridge(AIVehicle.VT_ROAD, 5, 33160, 33155));
 	print("  GetLastErrorString(): " + AIError.GetLastErrorString());
@@ -329,6 +334,7 @@ function Regression::Cargo()
 		print("    GetCargoIncome(10, 10):  " + AICargo.GetCargoIncome(i, 10, 10));
 		print("    GetCargoIncome(100, 10): " + AICargo.GetCargoIncome(i, 100, 10));
 		print("    GetCargoIncome(10, 100): " + AICargo.GetCargoIncome(i, 10, 100));
+		print("    GetRoadVehicleTypeForCargo(): " + AIRoad.GetRoadVehicleTypeForCargo(i));
 	}
 }

@@ -498,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]]; }
@@ -540,7 +585,7 @@ function Regression::Industry()
 	print("--Industry--");
 	print("  GetIndustryCount():  " + AIIndustry.GetIndustryCount());
 	local list = AIIndustryList();
-	list.Sort(AIAbstractList.SORT_BY_ITEM, true);
+	list.Sort(AIAbstractList.SORT_BY_ITEM, AIAbstractList.SORT_ASCENDING);
 	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		if (AIIndustry.IsValidIndustry(i)) j++;
 		print("  Industry " + i);
@@ -631,6 +676,9 @@ function Regression::IndustryTypeList()
 		print("    GetName():               " + AIIndustryType.GetName(i));
 		print("    CanBuildIndustry():      " + AIIndustryType.CanBuildIndustry(i));
 		print("    CanProspectIndustry():   " + AIIndustryType.CanProspectIndustry(i));
+		print("    IsBuiltOnWater():        " + AIIndustryType.IsBuiltOnWater(i));
+		print("    HasHeliport():           " + AIIndustryType.HasHeliport(i));
+		print("    HasDock():               " + AIIndustryType.HasDock(i));
 	}
 }

@@ -659,7 +707,7 @@ function Regression::List()
 	print("  HasItem(1050): " + list.HasItem(1050));
 	print("  HasItem(1051): " + list.HasItem(1051));
 	print("  IsEmpty():     " + list.IsEmpty());
-	list.Sort(AIAbstractList.SORT_BY_ITEM, true);
+	list.Sort(AIAbstractList.SORT_BY_ITEM, AIAbstractList.SORT_ASCENDING);
 	print("  List Dump:");
 	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
@@ -737,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()
@@ -796,6 +874,20 @@ function Regression::Marine()
 	print("  IsCanalTile():        " + AIMarine.IsCanalTile(32127));
 	print("  GetBankBalance():     " + AICompany.GetBankBalance(AICompany.COMPANY_SELF));

+	local list = AIWaypointList(AIWaypoint.WAYPOINT_BUOY);
+	print("");
+	print("--AIWaypointList(BUOY)--");
+	print("  Count():             " + list.Count());
+	print("  Location ListDump:");
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
+		print("    " + AIWaypoint.GetLocation(i));
+	}
+	print("  HasWaypointType:");
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
+		print("    " + AIWaypoint.HasWaypointType(i, AIWaypoint.WAYPOINT_RAIL) + "  " + AIWaypoint.HasWaypointType(i, AIWaypoint.WAYPOINT_BUOY) + "  " + AIWaypoint.HasWaypointType(i, AIWaypoint.WAYPOINT_ANY));
+	}
+	print("");
+
 	print("  RemoveWaterDepot():   " + AIMarine.RemoveWaterDepot(28479));
 	print("  RemoveDock():         " + AIMarine.RemoveDock(29253));
 	print("  RemoveBuoy():         " + AIMarine.RemoveBuoy(28481));
@@ -819,14 +911,37 @@ function Regression::Order()
 	print("  GetOrderCount():       " + AIOrder.GetOrderCount(12));
 	print("  GetOrderDestination(): " + AIOrder.GetOrderDestination(12, 1));
 	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.AIOF_TRANSFER));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.AIOF_TRANSFER | AIOrder.AIOF_UNLOAD));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.AIOF_TRANSFER | AIOrder.AIOF_FULL_LOAD));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33417, AIOrder.AIOF_SERVICE_IF_NEEDED));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33417, AIOrder.AIOF_STOP_IN_DEPOT));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(0, AIOrder.AIOF_SERVICE_IF_NEEDED | AIOrder.AIOF_GOTO_NEAREST_DEPOT));
+	print("  IsValidConditionalOrder(): " + AIOrder.IsValidConditionalOrder(AIOrder.OC_LOAD_PERCENTAGE, AIOrder.CF_EQUALS));
+	print("  IsValidConditionalOrder(): " + AIOrder.IsValidConditionalOrder(AIOrder.OC_RELIABILITY, AIOrder.CF_IS_TRUE));
+	print("  IsValidConditionalOrder(): " + AIOrder.IsValidConditionalOrder(AIOrder.OC_REQUIRES_SERVICE, AIOrder.CF_IS_FALSE));
+	print("  IsValidConditionalOrder(): " + AIOrder.IsValidConditionalOrder(AIOrder.OC_AGE, AIOrder.CF_INVALID));
 	print("  IsValidVehicleOrder(): " + AIOrder.IsValidVehicleOrder(12, 1));
+	print("  IsGotoStationOrder():  " + AIOrder.IsGotoStationOrder(12, 1));
+	print("  IsGotoDepotOrder():    " + AIOrder.IsGotoDepotOrder(12, 1));
+	print("  IsGotoWaypointOrder(): " + AIOrder.IsGotoWaypointOrder(12, 1));
+	print("  IsConditionalOrder():  " + AIOrder.IsConditionalOrder(12, 1));
+	print("  IsCurrentOrderPartOfOrderList(): " + AIOrder.IsCurrentOrderPartOfOrderList(12));
 	print("  GetOrderFlags():       " + AIOrder.GetOrderFlags(12, 1));
 	print("  AppendOrder():         " + AIOrder.AppendOrder(12, 33416, AIOrder.AIOF_TRANSFER));
 	print("  InsertOrder():         " + AIOrder.InsertOrder(12, 0, 33416, AIOrder.AIOF_TRANSFER));
 	print("  GetOrderCount():       " + AIOrder.GetOrderCount(12));
 	print("  IsValidVehicleOrder(): " + AIOrder.IsValidVehicleOrder(12, 1));
+	print("  IsGotoStationOrder():  " + AIOrder.IsGotoStationOrder(12, 1));
+	print("  IsGotoDepotOrder():    " + AIOrder.IsGotoDepotOrder(12, 1));
+	print("  IsGotoWaypointOrder(): " + AIOrder.IsGotoWaypointOrder(12, 1));
+	print("  IsConditionalOrder():  " + AIOrder.IsConditionalOrder(12, 1));
+	print("  IsCurrentOrderPartOfOrderList(): " + AIOrder.IsCurrentOrderPartOfOrderList(12));
+	print("  GetOrderFlags():       " + AIOrder.GetOrderFlags(12, 0));
+	print("  GetOrderFlags():       " + AIOrder.GetOrderFlags(12, 1));
+	print("  GetOrderJumpTo():      " + AIOrder.GetOrderJumpTo(12, 1));
 	print("  RemoveOrder():         " + AIOrder.RemoveOrder(12, 0));
 	print("  SetOrderFlags():       " + AIOrder.SetOrderFlags(12, 0, AIOrder.AIOF_FULL_LOAD));
+	print("  GetOrderFlags():       " + AIOrder.GetOrderFlags(12, 0));
 	print("  GetOrderDestination(): " + AIOrder.GetOrderDestination(12, 0));
 	print("  CopyOrders():          " + AIOrder.CopyOrders(12, 1));
 	print("  CopyOrders():          " + AIOrder.CopyOrders(13, 12));
@@ -835,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("");
@@ -903,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));
 	}
 }

@@ -939,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));
@@ -946,7 +1072,7 @@ function Regression::Rail()
 	print("    IsRailStationTile():           " + AIRail.IsRailStationTile(7957));
 	print("    IsRailStationTile():           " + AIRail.IsRailStationTile(7958));
 	print("    IsRailStationTile():           " + AIRail.IsRailStationTile(7959));
-	print("    RemoveRailStationTileRect():   " + AIRail.RemoveRailStationTileRect(7959, 7959));
+	print("    RemoveRailStationTileRectangle():" + AIRail.RemoveRailStationTileRectangle(7959, 7959, false));
 	print("    IsRailStationTile():           " + AIRail.IsRailStationTile(7957));
 	print("    IsRailStationTile():           " + AIRail.IsRailStationTile(7958));
 	print("    IsRailStationTile():           " + AIRail.IsRailStationTile(7959));
@@ -1069,9 +1195,10 @@ function Regression::Sign()
 	print("  BuildSign(33409, 'Some other Sign'): " + sign_id);
 	print("  RemoveSign(" + sign_id + "):                       " + AISign.RemoveSign(sign_id));
 	print("");
-	print("  GetMaxSignID():    " + AISign.GetMaxSignID());
-	for (local i = -1; i < AISign.GetMaxSignID() + 1; i++) {
-		if (AISign.IsValidSign(i)) j++;
+	local list = AISignList();
+	list.Sort(AIAbstractList.SORT_BY_ITEM, AIAbstractList.SORT_ASCENDING);
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
+		j++;
 		print("  Sign " + i);
 		print("    IsValidSign():   " + AISign.IsValidSign(i));
 		print("    GetName():       " + AISign.GetName(i));
@@ -1182,10 +1309,10 @@ function Regression::TileList()
 	print("");
 	print("--TileList--");
 	print("  Count():             " + list.Count());
-	list.AddRectangle(41895 - 256 * 2, 256 * 2 + 41895 + 8);
+	list.AddRectangle(34436, 256 * 2 + 34436 + 8);
 	print("  Count():             " + list.Count());

-	list.Valuate(AITile.GetHeight);
+	list.Valuate(AITile.GetCornerHeight, AITile.CORNER_N);
 	print("  Height():            done");
 	print("  Count():             " + list.Count());
 	print("  ListDump:");
@@ -1193,6 +1320,30 @@ function Regression::TileList()
 		print("    " + i + " => " + list.GetValue(i));
 	}

+	list.Valuate(AITile.GetCornerHeight, AITile.CORNER_N);
+	print("  CornerHeight(North): done");
+	print("  Count():             " + list.Count());
+	print("  ListDump:");
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+
+	list.Valuate(AITile.GetMinHeight);
+	print("  MinHeight():         done");
+	print("  Count():             " + list.Count());
+	print("  ListDump:");
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+
+	list.Valuate(AITile.GetMaxHeight);
+	print("  MaxHeight():         done");
+	print("  Count():             " + list.Count());
+	print("  ListDump:");
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+
 	list.Valuate(AITile.GetSlope);
 	list.KeepValue(0);
 	print("  Slope():             done");
@@ -1203,6 +1354,8 @@ function Regression::TileList()
 		print("    " + i + " => " + list.GetValue(i));
 	}

+	list.Clear();
+	list.AddRectangle(41895 - 256 * 2, 256 * 2 + 41895 + 8);
 	list.Valuate(AITile.IsBuildable);
 	list.KeepValue(1);
 	print("  Buildable():         done");
@@ -1312,7 +1465,7 @@ function Regression::Town()
 	print("--Town--");
 	print("  GetTownCount():    " + AITown.GetTownCount());
 	local list = AITownList();
-	list.Sort(AIAbstractList.SORT_BY_ITEM, true);
+	list.Sort(AIAbstractList.SORT_BY_ITEM, AIAbstractList.SORT_ASCENDING);
 	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		if (AITown.IsValidTown(i)) j++;
 		print("  Town " + i);
@@ -1591,17 +1744,59 @@ function Regression::Vehicle()
 function Regression::PrintSubsidy(subsidy_id)
 {
 	print("      --Subsidy (" + subsidy_id + ") --");
-	print("        IsValidSubsidy():     " + AISubsidy.IsValidSubsidy(subsidy_id));
-	print("        IsAwarded():          " + AISubsidy.IsAwarded(subsidy_id));
-	print("        GetAwardedTo():       " + AISubsidy.GetAwardedTo(subsidy_id));
-	print("        GetExpireDate():      " + AISubsidy.GetExpireDate(subsidy_id));
-	print("        SourceIsTown():       " + AISubsidy.SourceIsTown(subsidy_id));
-	print("        GetSource():          " + AISubsidy.GetSource(subsidy_id));
-	print("        DestionationIsTown(): " + AISubsidy.DestinationIsTown(subsidy_id));
-	print("        GetDestionation():    " + AISubsidy.GetDestination(subsidy_id));
-	print("        GetCargoType():       " + AISubsidy.GetCargoType(subsidy_id));
+	print("        IsValidSubsidy():      " + AISubsidy.IsValidSubsidy(subsidy_id));
+	print("        IsAwarded():           " + AISubsidy.IsAwarded(subsidy_id));
+	print("        GetAwardedTo():        " + AISubsidy.GetAwardedTo(subsidy_id));
+	print("        GetExpireDate():       " + AISubsidy.GetExpireDate(subsidy_id));
+	print("        GetSourceType():       " + AISubsidy.GetSourceType(subsidy_id));
+	print("        GetSourceIndex():      " + AISubsidy.GetSourceIndex(subsidy_id));
+	print("        GetDestinationType():  " + AISubsidy.GetDestinationType(subsidy_id));
+	print("        GetDestinationIndex(): " + AISubsidy.GetDestinationIndex(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()
 {
@@ -1609,12 +1804,15 @@ function Regression::Start()
 	this.Std();
 	this.Base();
 	this.List();
+
+	/* Do this first as it gains maximum loan (which is faked to quite a lot). */
+	this.Company();
+
 	this.Airport();
 	this.Bridge();
 	this.BridgeList();
 	this.Cargo();
 	this.CargoList();
-	this.Company();
 	this.Engine();
 	this.EngineList();
 	this.Group();
@@ -1623,6 +1821,7 @@ function Regression::Start()
 	this.IndustryTypeList();
 	this.Map();
 	this.Marine();
+	this.Prices();
 	this.Rail();
 	this.RailTypeList();
 	this.Road();
@@ -1663,5 +1862,7 @@ function Regression::Start()
 		}
 	}
 	print("  IsEventWaiting:        false");
+
+	this.Math();
 }

@@ -6,6 +6,7 @@ class Regression extends AIInfo {
 	function GetShortName()   { return "REGR"; }
 	function GetDescription() { return "This runs regression-tests on all commands. On the same map the result should always be the same."; }
 	function GetVersion()     { return 1; }
+	function GetAPIVersion()  { return "1.0"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
 }
@@ -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.
@@ -4,11 +4,42 @@
 ; Tycoon Deluxe DOS CD.
 ;
 [metadata]
-name         = original_dos
-shortname    = TTDD
-version      = 1
-description  = Original Transport Tycoon Deluxe DOS edition graphics
-palette      = DOS
+name              = original_dos
+shortname         = TTDD
+version           = 1
+palette           = DOS
+description       = Original Transport Tycoon Deluxe DOS edition graphics.
+description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS uitgawe grafieke.
+description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الرسومية نسخة الدوس
+description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за DOS.
+description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a DOS.
+description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (verze pro DOS).
+description.da_DA = Originalgrafik fra Transport Tycoon Deluxe DOS-version.
+description.de_DE = Original Transport Tycoon Deluxe DOS Basisgrafiken.
+description.el_GR = Αρχικά γραφικά από το Transport Tycoon Deluxe έκδοση DOS.
+description.en_GB = Original Transport Tycoon Deluxe DOS edition graphics.
+description.en_US = Original Transport Tycoon Deluxe DOS edition graphics.
+description.es_ES = Gráficos originales de Transport Tycoon Deluxe versión DOS.
+description.et_ET = Algse Transport Tycoon Deluxe DOSi versiooni graafika.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe DOS grafiikat.
+description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version DOS).
+description.hr_HR = Originalna grafika za Transport Tycoon Deluxe DOS izdanje.
+description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS verziójának grafikája.
+description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi DOS.
+description.it_IT = Grafica originale di Transport Tycoon Deluxe, edizione DOS.
+description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for DOS.
+description.nl_NL = Originele graphics van de Transport Tycoon Deluxe DOS-versie.
+description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for DOS.
+description.pl_PL = Oryginalna edycja grafik dla Transport Tycoon Deluxe DOS.
+description.pt_PT = Gráficos originais da edição DOS de Transport Tycoon Deluxe.
+description.ro_RO = Setul grafic original al Transport Tycoon Deluxe pentru DOS.
+description.ru_RU = Оригинальная графика из Transport Tycoon Deluxe для DOS.
+description.sk_SK = Pôvodná grafika Transport Tycoon Deluxe (DOS).
+description.sl_SL = Originalna grafika Transport Tycoon Deluxe za različico DOS.
+description.sr_RS = Originalni skup grafika Transport Tycoon Deluxe DOS izdanja.
+description.sv_SE = Originalgrafiken från Transport Tycoon Deluxe, DOS-utgåvan.
+description.tr_TR = Orijinal Transport Tycoon Deluxe DOS sürümü grafikleri.
+description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版的圖形。

 [files]
 base         = TRG1.GRF
@@ -24,8 +55,8 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTDD.GRF = c886c7d5b38a93f2cb1cdc0d33472eb8
+OPENTTDD.GRF = 356cf9663aacb212fdbff609d99090d6

 [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.
@@ -0,0 +1,50 @@
+; $Id$
+;
+; This represents the original sounds as on the Transport
+; Tycoon Deluxe DOS CD.
+;
+[metadata]
+name              = original_dos
+shortname         = TTDO
+version           = 0
+description       = Original Transport Tycoon Deluxe DOS edition sounds.
+description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS uitgawe klanke.
+description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الصوتية نسخة الدوس
+description.bg_BG = Оригинални звуци на Transport Tycoon Deluxe за DOS.
+description.ca_ES = Sons originals de Transport Tycoon Deluxe per a DOS.
+description.cs_CZ = Původní sada zvuků Transport Tycoon Deluxe (verze pro DOS).
+description.da_DA = Originallyd fra Transport Tycoon Deluxe DOS-version.
+description.de_DE = Original Transport Tycoon Deluxe DOS Basissounds.
+description.el_GR = Αρχικοί ήχοι από το Transport Tycoon Deluxe έκδοση DOS.
+description.en_GB = Original Transport Tycoon Deluxe DOS edition sounds.
+description.en_US = Original Transport Tycoon Deluxe DOS edition sounds.
+description.es_ES = Sonidos originales de Transport Tycoon Deluxe versión DOS.
+description.et_ET = Algse Transport Tycoon Deluxe DOSi versiooni helid.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe DOS äänet.
+description.hr_HR = Originalni zvukovi za Transport Tycoon Deluxe DOS izdanje.
+description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS verziójának hangjai.
+description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version DOS).
+description.id_ID = Efek suara orisinil Transport Tycoon Deluxe versi DOS.
+description.it_IT = Suoni originali di Transport Tycoon Deluxe, edizione DOS.
+description.nb_NO = Originale lyder fra Transport Tycoon Deluxe for DOS.
+description.nl_NL = Originele geluiden van de Transport Tycoon Deluxe DOS-versie.
+description.nn_NO = Originale lydar frå Transport Tycoon Deluxe for DOS.
+description.pl_PL = Oryginalna edycja dźwięków dla Transport Tycoon Deluxe DOS.
+description.pt_PT = Sons originais da edição DOS de Transport Tycoon Deluxe.
+description.ro_RO = Setul de sunete original al Transport Tycoon Deluxe pentru DOS.
+description.ru_RU = Оригинальный набор звукового оформления из игры Transport Tycoon Deluxe для DOS.
+description.sk_SK = Pôvodné zvuky Transport Tycoon Deluxe (DOS).
+description.sl_SL = Originalni zvoki Transport Tycoon Deluxe različice DOS.
+description.sr_RS = Originalni skup zvukova Transport Tycoon Deluxe DOS izdanja.
+description.sv_SE = Originalljuden från Transport Tycoon Deluxe, DOS-utgåvan.
+description.tr_TR = Orijinal Transport Tycoon Deluxe DOS sürümü sesleri.
+description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版的音效。
+
+[files]
+samples      = SAMPLE.CAT
+
+[md5s]
+SAMPLE.CAT   = 422ea3dd074d2859bb51639a6e0e85da
+
+[origin]
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
@@ -4,11 +4,42 @@
 ; Tycoon Deluxe DOS CD. It contains one broken sprite.
 ;
 [metadata]
-name         = original_dos_de
-shortname    = TTDD
-version      = 0
-description  = Original Transport Tycoon Deluxe DOS (German) edition graphics
-palette      = DOS
+name              = original_dos_de
+shortname         = TTDD
+version           = 0
+palette           = DOS
+description       = Original Transport Tycoon Deluxe DOS (German) edition graphics.
+description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS (German) uitgawe grafieke.
+description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الالمانية نسخة الدوس
+description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за DOS (немски) .
+description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a DOS (Alemany).
+description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (německá verze pro DOS).
+description.da_DA = Originalgrafik fra Transport Tycoon Deluxe DOS (Tysk) version.
+description.de_DE = Original Transport Tycoon Deluxe DOS (Deutsch) Basisgrafiken.
+description.el_GR = Αρχικά γραφικά από το Transport Tycoon Deluxe έκδοση DOS (Γερμανικό).
+description.en_GB = Original Transport Tycoon Deluxe DOS (German) edition graphics.
+description.en_US = Original Transport Tycoon Deluxe DOS (German) edition graphics.
+description.es_ES = Gráficos originales de Transport Tycoon Deluxe versión DOS (Alemán).
+description.et_ET = Algse Transport Tycoon Deluxe DOSi (Saksa) versiooni graafika.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe DOS (Saksalainen) grafiikat.
+description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version DOS allemande).
+description.hr_HR = Originalna grafika za Transport Tycoon Deluxe DOS (Njemački) izdanje.
+description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS (német) verziójának grafikája.
+description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi DOS (Jerman).
+description.it_IT = Grafica originale di Transport Tycoon Deluxe (tedesco), edizione DOS.
+description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for DOS (tysk).
+description.nl_NL = Originele graphics van de Duitse Transport Tycoon Deluxe DOS-versie.
+description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for DOS (tysk).
+description.pl_PL = Oryginalna edycja grafik dla Transport Tycoon Deluxe DOS (German).
+description.pt_PT = Gráficos originais da edição DOS (Alemã) de Transport Tycoon Deluxe.
+description.ro_RO = Setul grafic original al Transport Tycoon Deluxe pentru DOS (ediţia germană).
+description.ru_RU = Оригинальная графика из немецкой версии Transport Tycoon Deluxe для DOS.
+description.sk_SK = Pôvodná grafika Transport Tycoon Deluxe (DOS) (v jazyku nemčina).
+description.sl_SL = Originalna grafika Transport Tycoon Deluxe za nemško različico DOS.
+description.sr_RS = Originalni skup grafika nemačkog Transport Tycoon Deluxe DOS izdanja.
+description.sv_SE = Originalgrafiken från Transport Tycoon Deluxe, DOS-utgåvan (tyska).
+description.tr_TR = Orijinal Transport Tycoon Deluxe DOS (Almanca) sürümü grafikleri.
+description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版 (德國版) 的圖形。

 [files]
 base         = TRG1.GRF
@@ -24,8 +55,8 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTDD.GRF = c886c7d5b38a93f2cb1cdc0d33472eb8
+OPENTTDD.GRF = 356cf9663aacb212fdbff609d99090d6

 [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.
@@ -1,14 +1,45 @@
 ; $Id$
 ;
 ; This represents the original graphics as on the Transport
-; Tycoon Deluxe for Windows.
+; Tycoon Deluxe for Windows CD.
 ;
 [metadata]
-name         = original_windows
-shortname    = TTDW
-version      = 0
-description  = Original Transport Tycoon Deluxe Windows edition graphics
-palette      = Windows
+name              = original_windows
+shortname         = TTDW
+version           = 0
+palette           = Windows
+description       = Original Transport Tycoon Deluxe Windows edition graphics.
+description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe grafieke.
+description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الرسومية نسخة وندوز
+description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за Windows.
+description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a Windows.
+description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (verze pro Windows).
+description.da_DA = Originalgrafik fra Transport Tycoon Deluxe Windows-version.
+description.de_DE = Original Transport Tycoon Deluxe Windows Basisgrafiken.
+description.el_GR = Αρχικά γραφικά από το Transport Tycoon Deluxe έκδοση Windows.
+description.en_GB = Original Transport Tycoon Deluxe Windows edition graphics.
+description.en_US = Original Transport Tycoon Deluxe Windows edition graphics.
+description.es_ES = Gráficos originales de Transport Tycoon Deluxe versión Windows.
+description.et_ET = Algse Transport Tycoon Deluxe Windowsi versiooni graafika.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe Windows grafiikat.
+description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version Windows).
+description.hr_HR = Originalna grafika za Transport Tycoon Deluxe Windows izdanje.
+description.hu_HU = Az eredeti Transport Tycoon Deluxe Windows verziójának grafikája.
+description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi Windows.
+description.it_IT = Grafica originale di Transport Tycoon Deluxe, edizione Windows.
+description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for Windows.
+description.nl_NL = Originele graphics van de Transport Tycoon Deluxe Windows-versie.
+description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for Windows.
+description.pl_PL = Oryginalna edycja grafik dla Transport Tycoon Deluxe Windows.
+description.pt_PT = Gráficos originais da edição Windows de Transport Tycoon Deluxe.
+description.ro_RO = Setul grafic original al Transport Tycoon Deluxe pentru Windows.
+description.ru_RU = Оригинальная графика из Transport Tycoon Deluxe для Windows.
+description.sk_SK = Pôvodná grafika Transport Tycoon Deluxe (Windows).
+description.sl_SL = Originalna grafika Transport Tycoon Deluxe za različico oken(windows).
+description.sr_RS = Originalni skup grafika Transport Tycoon Deluxe Windows izdanja.
+description.sv_SE = Originalgrafiken från Transport Tycoon Deluxe, Windows-utgåvan.
+description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü grafikleri.
+description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的圖形。

 [files]
 base         = TRG1R.GRF
@@ -24,8 +55,8 @@ TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
 TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
 TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
 TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTDW.GRF = b6689105405fa3ea34cb8a5543633d29
+OPENTTDW.GRF = 80346ea80de167068cfb975f93963941

 [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.
@@ -0,0 +1,50 @@
+; $Id$
+;
+; This represents the original sounds as on the Transport
+; Tycoon Deluxe for Windows CD.
+;
+[metadata]
+name              = original_windows
+shortname         = TTDO
+version           = 0
+description       = Original Transport Tycoon Deluxe Windows edition sounds.
+description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe klanke.
+description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الصوتية نسخة وندوز
+description.bg_BG = Оригинални звуци на Transport Tycoon Deluxe за Windows.
+description.ca_ES = Sons originals de Transport Tycoon Deluxe per a Windows.
+description.cs_CZ = Původní sada zvuků Transport Tycoon Deluxe (verze pro Windows).
+description.da_DA = Originallyd fra Transport Tycoon Deluxe Windows-version.
+description.de_DE = Original Transport Tycoon Deluxe Windows Basissounds.
+description.el_GR = Αρχικοί ήχοι από το Transport Tycoon Deluxe έκδοση Windows.
+description.en_GB = Original Transport Tycoon Deluxe Windows edition sounds.
+description.en_US = Original Transport Tycoon Deluxe Windows edition sounds.
+description.es_ES = Sonidos originales de Transport Tycoon Deluxe versión Windows.
+description.et_ET = Algse Transport Tycoon Deluxe Windowsi versiooni helid.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe Windows äänet.
+description.hr_HR = Originalni zvukovi za Transport Tycoon Deluxe Windows izdanje.
+description.hu_HU = Az eredeti Transport Tycoon Deluxe Windows verziójának hangjai.
+description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version Windows).
+description.id_ID = Efek suara orisinil Transport Tycoon Deluxe versi Windows.
+description.it_IT = Suoni originali di Transport Tycoon Deluxe, edizione Windows.
+description.nb_NO = Originale lyder fra Transport Tycoon Deluxe for Windows.
+description.nl_NL = Originele geluiden van de Transport Tycoon Deluxe Windows-versie.
+description.nn_NO = Originale lydar frå Transport Tycoon Deluxe for Windows.
+description.pl_PL = Oryginalna edycja dźwięków dla Transport Tycoon Deluxe Windows.
+description.pt_PT = Sons originais da edição Windows de Transport Tycoon Deluxe.
+description.ro_RO = Setul de sunete original al Transport Tycoon Deluxe pentru Windows.
+description.ru_RU = Оригинальный набор звукового оформления из игры Transport Tycoon Deluxe для Windows.
+description.sk_SK = Pôvodné zvuky Transport Tycoon Deluxe (Windows).
+description.sl_SL = Originalni zvoki Transport Tycoon Deluxe različice oken(windows).
+description.sr_RS = Originalni skup zvukova Transport Tycoon Deluxe Windows izdanja.
+description.sv_SE = Originalljuden från Transport Tycoon Deluxe, Windows-utgåvan.
+description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü sesleri.
+description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的音效。
+
+[files]
+samples      = SAMPLE.CAT
+
+[md5s]
+SAMPLE.CAT   = 9212e81e72badd4bbe1eaeae66458e10
+
+[origin]
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
@@ -0,0 +1,81 @@
+; $Id$
+;
+; This represents more or less nothingness
+;
+[metadata]
+name              = NoMusic
+shortname         = NULL
+version           = 0
+fallback          = true
+description       = A music pack without actual music.
+description.af_ZA = 'n Musiek stel sonder enige musiek.
+description.ar_EG = مجموعة موسيقى بدون موسيقى
+description.bg_BG = Празен музикален пакет.
+description.ca_ES = Un joc de música sense cap música.
+description.cs_CZ = Prázná hudební sada.
+description.da_DA = En musikpakke uden musik.
+description.de_DE = Ein Musikset ohne Musik.
+description.el_GR = Ένα πάκετο μουσικής χωρίς πραγματική μουσική.
+description.en_GB = A music pack without actual music.
+description.en_US = A music pack without actual music.
+description.es_ES = Un conjunto de música vacío.
+description.et_ET = Muusikakomplekt ilma igasuguse muusikata.
+description.fi_FI = Musiikkipaketti, jossa ei ole musiikkia.
+description.fr_FR = Un pack de musiques sans musiques.
+description.hr_HR = Muzički paket bez ikakve muzike.
+description.hu_HU = Zenei alapcsomag zene nélkül.
+description.id_ID = Paket musik tanpa berisi musik.
+description.it_IT = Un pacchetto musicale non contenente alcuna musica.
+description.nb_NO = En musikkpakke uten noe musikk.
+description.nl_NL = Een muziekset zonder muziek.
+description.nn_NO = Ei musikkpakke utan noko musikk.
+description.pl_PL = Zestaw utworów muzycznych nie zawierający żadnej muzyki.
+description.pt_PT = Um conjunto de música vazio.
+description.ro_RO = Un set de muzică fără muzică inclusă.
+description.ru_RU = "Пустой" набор музыкального оформления, не содержащий никакой музыки.
+description.sk_SK = Sada hudby neobsahujúca hudbu.
+description.sl_SL = Glasbeni paket z vključeno glasbo.
+description.sr_RS = Prazan skup muzičkih numera.
+description.sv_SE = Ett musikpaket utan någon musik.
+description.tr_TR = Müzik içermeyen boş bir müzik paketi.
+description.zh_TW = 不含任何音樂的音樂集。
+
+[files]
+theme =
+old_0 =
+old_1 =
+old_2 =
+old_3 =
+old_4 =
+old_5 =
+old_6 =
+old_7 =
+old_8 =
+old_9 =
+new_0 =
+new_1 =
+new_2 =
+new_3 =
+new_4 =
+new_5 =
+new_6 =
+new_7 =
+new_8 =
+new_9 =
+ezy_0 =
+ezy_1 =
+ezy_2 =
+ezy_3 =
+ezy_4 =
+ezy_5 =
+ezy_6 =
+ezy_7 =
+ezy_8 =
+ezy_9 =
+
+[md5s]
+
+[names]
+
+[origin]
+default      = This file was part of your OpenTTD installation.
@@ -0,0 +1,125 @@
+; $Id$
+;
+; This represents the original music as on the Transport
+; Tycoon Deluxe for Windows CD.
+;
+[metadata]
+name              = original_windows
+shortname         = TTDW
+version           = 1
+description       = Original Transport Tycoon Deluxe Windows edition music.
+description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe musiek.
+description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الموسيقية نسخة وندوز
+description.bg_BG = Оригинална музика на Transport Tycoon Deluxe за Windows.
+description.ca_ES = Música Original de Transport Tycoon Deluxe per a Windows.
+description.cs_CZ = Původní hudba Transport Tycoon Deluxe (verze pro Windows).
+description.da_DA = Originalmusik fra Transport Tycoon Deluxe Windows-version.
+description.de_DE = Original Transport Tycoon Deluxe Windows Musikset.
+description.el_GR = Αρχική μουσική από το Transport Tycoon Deluxe έκδοση Windows.
+description.en_GB = Original Transport Tycoon Deluxe Windows edition music.
+description.en_US = Original Transport Tycoon Deluxe Windows edition music.
+description.es_ES = Música original de Transport Tycoon Deluxe versión Windows.
+description.et_ET = Algse Transport Tycoon Deluxe Windowsi versiooni muusika.
+description.fi_FI = Alkuperäinen Transport Tycoon Deluxe Windows musiikki.
+description.fr_FR = Musiques originales de Transport Tycoon Deluxe (version Windows).
+description.hr_HR = Originalna muzika za Transport Tycoon Deluxe Windows izdanje.
+description.hu_HU = Az eredeti Transport Tycoon Deluxe Windows verziójának zenéje.
+description.id_ID = Musik pengiring orisinil Transport Tycoon Deluxe versi Windows.
+description.it_IT = Musica originale di Transport Tycoon Deluxe, edizione Windows.
+description.nb_NO = Original musikk fra Transport Tycoon Deluxe for Windows.
+description.nl_NL = Originele muziek van de Transport Tycoon Deluxe Windows-versie.
+description.nn_NO = Original musikk frå Transport Tycoon Deluxe for Windows.
+description.pl_PL = Oryginalna edycja utworów muzycznych w Transport Tycoon Deluxe Windows.
+description.pt_PT = Música original da edição Windows de Transport Tycoon Deluxe.
+description.ro_RO = Setul de muzică original al Transport Tycoon Deluxe pentru Windows.
+description.ru_RU = Оригинальный набор музыкального оформления из игры Transport Tycoon Deluxe.
+description.sk_SK = Pôvodná hudba z Transport Tycoon Deluxe (Windows).
+description.sl_SL = Originalna glasba Transport Tycoon Deluxe različice oken(windows).
+description.sr_RS = Originalni skup muzičkih numera Transport Tycoon Deluxe Windows izdanja.
+description.sv_SE = Originalmusiken från Transport Tycoon Deluxe, Windows-utgåvan.
+description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü müzikleri.
+description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的音樂。
+
+[files]
+theme = GM_TT00.GM
+old_0 = GM_TT02.GM
+old_1 = GM_TT06.GM
+old_2 = GM_TT03.GM
+old_3 = GM_TT12.GM
+old_4 = GM_TT08.GM
+old_5 = GM_TT13.GM
+old_6 = GM_TT14.GM
+old_7 = GM_TT10.GM
+old_8 =
+old_9 =
+new_0 = GM_TT04.GM
+new_1 = GM_TT01.GM
+new_2 = GM_TT05.GM
+new_3 = GM_TT15.GM
+new_4 = GM_TT11.GM
+new_5 = GM_TT16.GM
+new_6 = GM_TT09.GM
+new_7 =
+new_8 =
+new_9 =
+ezy_0 = GM_TT18.GM
+ezy_1 = GM_TT19.GM
+ezy_2 = GM_TT21.GM
+ezy_3 = GM_TT17.GM
+ezy_4 = GM_TT20.GM
+ezy_5 = GM_TT07.GM
+ezy_6 =
+ezy_7 =
+ezy_8 =
+ezy_9 =
+
+[md5s]
+GM_TT00.GM = 45cfec1b9d8c7a0ad45e755833cbf221
+GM_TT01.GM = ab14ed3392d848abd2a2e90a9d75d121
+GM_TT02.GM = dd4f696e4be5987ce738257b08b50171
+GM_TT03.GM = a1bfde23343df9e4063419bf29c166b8
+GM_TT04.GM = 4e6943aa0c455203d76c79389054747d
+GM_TT05.GM = cee281cb85a2e2343552d97640545a47
+GM_TT06.GM = 26d1de5efa8675f94065784e9d539e49
+GM_TT07.GM = 6f2691e17558f552ec4c565e4ab7139c
+GM_TT08.GM = a42bf2cb3340a822f1a69646fc7a487d
+GM_TT09.GM = eb35761a58a8df3c59ed8929cce13916
+GM_TT10.GM = 42fecd686720a785d20a78590c466a82
+GM_TT11.GM = 50ef1ef02e49d2112786dd45e69dc3ee
+GM_TT12.GM = 4ce707a0e0e72419f0681dd9bd95271b
+GM_TT13.GM = e765753be29d889ec818f38009103619
+GM_TT14.GM = 270e2d63bd32b95a4d007ce15a6ce45f
+GM_TT15.GM = 89e116a1c0c69f1845cc903a9bfbe460
+GM_TT16.GM = f824e2371b3bedfe61aad4b9c62dd6be
+GM_TT17.GM = 1b23eebb0796c1ab99cd97fa7082cf7b
+GM_TT18.GM = 15650de3bad645d0e88c4f5c7a2df92a
+GM_TT19.GM = 7aec079e15bd09588660b85545ac4dfc
+GM_TT20.GM = 1509097889dee617aa1e9a1738a5a930
+GM_TT21.GM = a8d0aaad02e1a762d8d54cf81da56bab
+
+[names]
+GM_TT00.GM = Tycoon DELUXE Theme
+GM_TT01.GM = Snarl Up
+GM_TT02.GM = Easy Driver
+GM_TT03.GM = Little Red Diesel
+GM_TT04.GM = City Groove
+GM_TT05.GM = Aliens Ate My Railway
+GM_TT06.GM = Stoke It
+GM_TT07.GM = Don't Walk!
+GM_TT08.GM = Sawyer's Tune
+GM_TT09.GM = Fell Apart On Me
+GM_TT10.GM = Can't Get There From Here
+GM_TT11.GM = Hard Drivin'
+GM_TT12.GM = Road Hog
+GM_TT13.GM = Hold That Train!
+GM_TT14.GM = Broomer's Oil Rag
+GM_TT15.GM = Goss Groove
+GM_TT16.GM = Small Town
+GM_TT17.GM = Cruise Control
+GM_TT18.GM = Stroll On
+GM_TT19.GM = Funk Central
+GM_TT20.GM = Jammit
+GM_TT21.GM = Movin' On
+
+[origin]
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
@@ -1,5 +1,20 @@
 #!/bin/sh

+# $Id$
+
+# This file is part of OpenTTD.
+# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+
+check_path_characters() {
+	if [ -n "`echo $ROOT_DIR | grep '[^-_A-Za-z0-9\/\\\.:]'`" ]; then
+		echo "WARNING: The path contains a non-alphanumeric character that might cause"
+		echo "         failures in subsequent build stages. Any failures with the build"
+		echo "         will most likely be caused by this."
+	fi
+}
+
 CONFIGURE_EXECUTABLE="$_"
 # On *nix systems those two are equal when ./configure is done
 if [ "$0" != "$CONFIGURE_EXECUTABLE" ]; then
@@ -14,9 +29,16 @@ if [ "$0" != "$CONFIGURE_EXECUTABLE" ]; then
 fi
 # Find out where configure is (in what dir)
 ROOT_DIR="`dirname $0`"
-ROOT_DIR="`cd $ROOT_DIR && pwd`"
+# For MSYS/MinGW we want to know the FULL path. This as that path is generated
+# once you call an outside binary. Having the same path for the rest is needed
+# for dependency checking.
+# pwd -W returns said FULL path, but doesn't exist on others so fall back.
+ROOT_DIR="`cd $ROOT_DIR && (pwd -W 2>/dev/null || pwd 2>/dev/null)`"

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

 . $ROOT_DIR/config.lib
@@ -37,10 +59,11 @@ if [ "$1" = "--reconfig" ] || [ "$1" = "--reconfigure" ]; then
 		exit 1
 	fi
 	# Make sure we don't lock config.cache
-	cat config.cache | sed 's~\\ ~\\\\ ~g' > cache.tmp
+	cat config.cache | sed 's@\\ @\\\\ @g' > cache.tmp
 	sh cache.tmp
+	RET=$?
 	rm -f cache.tmp
-	exit $?
+	exit $RET
 fi

 set_default
@@ -57,9 +80,10 @@ fi
 TTD="openttd$EXE"
 STRGEN="strgen$EXE"
 ENDIAN_CHECK="endian_check$EXE"
+DEPEND="depend$EXE"

 if [ -z "$sort" ]; then
-	PIPE_SORT="sed s~a~a~"
+	PIPE_SORT="sed s@a@a@"
 else
 	PIPE_SORT="$sort"
 fi
@@ -70,7 +94,7 @@ if [ ! -f "$LANG_DIR/english.txt" ]; then
 fi

 # Read the source.list and process it
-SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | $awk '
+AWKCOMMAND='
 	{  }
 	/^(	*)#end/  { if (deep == skip) { skip -= 1; } deep -= 1; next; }
 	/^(	*)#else/ { if (deep == skip) { skip -= 1; } else if (deep - 1 == skip) { skip += 1; } next; }
@@ -89,11 +113,13 @@ SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | $awk '
 		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")              { next; }
+		if ($0 == "BEOS"        && "'$os'" != "BEOS" &&
+		                                       "'$os'" != "HAIKU") { next; }
 		if ($0 == "WIN32"       && "'$os'" != "MINGW" &&
-		                "'$os'" != "CYGWIN" && "'$os'" != "MSVC" ) { next; }
+		                 "'$os'" != "CYGWIN" && "'$os'" != "MSVC") { next; }
 		if ($0 == "MORPHOS"     && "'$os'" != "MORPHOS")           { next; }
 		if ($0 == "WINCE"       && "'$os'" != "WINCE")             { next; }
 		if ($0 == "MSVC"        && "'$os'" != "MSVC")              { next; }
@@ -115,17 +141,21 @@ SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | $awk '
 			print $0;
 		}
 	}
-' | $PIPE_SORT`"
+'

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

 # In makefiles, we always use -u for sort
 if [ -z "$sort" ]; then
-	sort="sed s~a~a~"
+	sort="sed s@a@a@"
 else
 	sort="$sort -u"
 fi
@@ -135,3 +165,5 @@ CONFIGURE_FILES="$ROOT_DIR/configure $ROOT_DIR/config.lib $ROOT_DIR/Makefile.in
 generate_main
 generate_lang
 generate_src
+
+check_path_characters
@@ -27,7 +27,7 @@ OpenTTD palette. Upon load of the PNG, the mask is loaded too, and overrides
 the RGB (not the Alpha) of the original PNG image, and replacing it with a
 8bpp color remapped and converted to 32bpp.

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

@@ -10,7 +10,7 @@ OpenTTD includes projects for MSVC 2005.NET and MSVC 2008.NET. Both will
 compile out of the box, providing you have the required libraries/headers;
 which ones, see below. There is no support for VS6 or MSVC 2002, or
 MSVC 2003.NET. You are therefore strongly encouraged to either upgrade to
-MSVC 2005 Express (free) or use GCC.
+MSVC 2008 Express (free) or use GCC.


 1) REQUIRED FILES
@@ -36,16 +36,16 @@ You need an SVN-client to download the source from subversion:
 2) INCLUDES AND LIBRARIES
 -------------------------
 Put the newly downloaded files in the VC lib\ and include\ directories; where
-"C:\Program Files\Microsoft Visual Studio 8\VC" is your location of Visual C.
+"C:\Program Files\Microsoft Visual Studio 9.0\VC" is your location of Visual C.
 If you are compiling for an x64 system, use the include\ and lib\ directories
 from the win64/ folder.

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

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

 Custom directories might be recommended, check 2.2)

@@ -76,14 +76,7 @@ list, above all others, otherwise compilation will most likely fail!!

 3) TTD GRAPHICS FILES
 ---------------------
-Copy the following files from Transport Tycoon Deluxe to the bin/data folder
-
-	* sample.cat
-	* trg1r.grf
-	* trgcr.grf
-	* trghr.grf
-	* trgir.grf
-	* trgtr.grf
+See section 4.1 of readme.txt for the required 3rdparty files and how to install them.


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

 An up-to-date version of this README can be found on the wiki:
-http://wiki.openttd.org/index.php/MicrosoftVisualCExpress
+http://wiki.openttd.org/Microsoft_Visual_C%2B%2B_2008_Express_Editions
@@ -11,12 +11,13 @@
 <body>

 <h3><a name="Landscape">Landscape</a></h3>
- <p>Seven attributes (counting &quot;<span style="font-weight: bold;">type_height</span>&quot;) hold the informations about a tile.<BR>
+ <p>Eight attributes (counting &quot;<span style="font-weight: bold;">type_height</span>&quot;) hold the informations about a tile.<BR>
  These attributes are referred to as
  "<span style="font-weight: bold;">type_height</span>",
  "<span style="font-weight: bold;">m1</span>", "<span style="font-weight: bold;">m2</span>",
  "<span style="font-weight: bold;">m3</span>", "<span style="font-weight: bold;">m4</span>",
-  "<span style="font-weight: bold;">m5</span>" and "<span style="font-weight: bold;">m6</span>".<BR>
+  "<span style="font-weight: bold;">m5</span>", "<span style="font-weight: bold;">m6</span>"
+  and "<span style="font-weight: bold;">m7</span>".<BR>
  The most important value is the class of a tile, stored in the upper 4 bits
  of the <span style="font-weight: bold;">type_height</span> attribute. The lower 4 bits are used to encode the height and
  slope data.
@@ -52,11 +53,10 @@
 </p>

  The <a name="OwnershipInfo">owner of a tile</a>, as frequently associated with attribute m1,
-  can be either players (human or AI) or "Game entities".
+  can be either companies (human or AI) or "Game entities".
  They are identified using:
  <table border="1">
-   <tr><td><tt>00</tt>&nbsp; </td><td align=left>current player</td></tr>
-   <tr><td><tt>01..08</tt>&nbsp; </td><td align=left>AI or network players</td></tr>
+   <tr><td><tt>00..0E</tt>&nbsp; </td><td align=left>Normal companies</td></tr>
   <tr><td><tt>0F</tt>&nbsp; </td><td align=left>a town owns the tile</td></tr>
   <tr><td><tt>10</tt>&nbsp; </td><td align=left>nobody owns the tile</td></tr>
   <tr><td><tt>11</tt>&nbsp; </td><td align=left>"water" owns the tile</td></tr>
@@ -81,6 +81,7 @@
     <li>m1: <a href="#OwnershipInfo">owner</a> of the tile (normally <tt>10</tt>)</li>
     <li>m2: see fields</li>
     <li>m3 bits 3..0: see fields</li>
+     <li>m3 bit 4: set if the tile is covered with snow</li>
     <li>m4 bits 7..5: type of hedge on the SW border of the tile (1 through 6, or 0=none)</li>
     <li>m4 bits 4..2: same as 7..5, but for the SE border</li>
     <li>m5 bits 7..5: update counter, incremented on every periodic processing for tile types,
@@ -183,7 +184,7 @@
   <td>
    <ul>
     <li>m1: <a href="#OwnershipInfo">owner</a> of the tile</li>
-     <li>m2: see waypoint and signals</li>
+     <li>m2: see signals</li>
     <li>m3 bits 7..4: see signals</li>
     <li>m3 bits 3..0 = <a name="TrackType">track type</a>:
      <table>
@@ -452,27 +453,9 @@
       <li>m2 bit 11: opposite track is reserved, too</li>
      </ul>
     </li>
-     <li>m5 bit 7 set, bit 6 clear: checkpoint
-      <ul>
-       <li>m2: index into the array of waypoints.</li>
-       <li>m5 bit 0:
-        <table>
-         <tr>
-          <td><tt>0</tt>&nbsp; </td>
-          <td>in X direction</td>
-         </tr>
-
-         <tr>
-          <td><tt>1</tt>&nbsp; </td>
-          <td>in Y direction</td>
-         </tr>
-        </table>
-       </li>
-       <li>m5 bit 4: pbs reservation state</li>
-      </ul>
-     </li>
     <li>m5 bit 7 set, bit 6 set: railway depot
      <ul>
+       <li>m2: Depot index</li>
       <li>m5 bits 1..0: exit towards
        <table>
         <tr>
@@ -619,7 +602,7 @@
          </table>
         </li>
         <li>m5 bit 5: set if crossing lights are on</li>
-         <li>m6 bits 4..0: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
+         <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
         <li>m5 bit 4: pbs reservation state</li>
        </ul>
       </li>
@@ -628,6 +611,7 @@
     <li>m5 bit 7 set, bit 6 clear: road depot
      <ul>
       <li>m1: <a href="#OwnershipInfo">owner</a> of the depot</li>
+       <li>m2: Depot index</li>
       <li>m5 bits 3..0: exit towards:
        <table>
         <tr>
@@ -740,8 +724,7 @@
   <td>
    <ul>
     <li>m1: <a href="#OwnershipInfo">owner</a> (normally <tt>10</tt>)</li>
-     <li>m2 bits 7..6: ground density
-     <li>m2 bits 5..4: ground
+     <li>m2 bits 8..6: ground
      <table>

       <tr>
@@ -763,8 +746,14 @@
        <td align=left><tt>3</tt>&nbsp; </td>
        <td>on shore (density must be 3)</td>
       </tr>
+
+       <tr>
+        <td align=left><tt>4</tt>&nbsp; </td>
+        <td>on snow with rough land underneed</td>
+       </tr>
      </table>
     </li>
+     <li>m2 bits 5..4: ground density</li>
     <li>m2 bits 3..0: update counter, incremented on every periodic processing.<br>
          on wraparound the growth status is updated (or, if it's <tt>3</tt>, a random action is taken)</li>
     <li>m3 bits 7..0: type of trees:
@@ -835,9 +824,9 @@
    <ul>
     <li>m1: <a href="#OwnershipInfo">owner</a> of the station</li>
     <li>m2: index into the array of stations</li>
-     <li>m3 bits 7..4: persistent random data for newstations (train station)</li>
+     <li>m3 bits 7..4: persistent random data for newstations (railway stations/waypoints)</li>
     <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of tram tracks (road stop)</li>
-     <li>m3 bits 3..0: <a href="#TrackType">track type</a> for railway stations</li>
+     <li>m3 bits 3..0: <a href="#TrackType">track type</a> for railway stations/waypoints</li>
     <li>m3 bits 1..0: water class for buoys and water part of docks</li>
     <li>m4: custom station id; 0 means standard graphics</li>
     <li>m5: graphics index (range from 0..255 for each station type):
@@ -865,6 +854,22 @@
        </td>
       </tr>

+       <tr>
+        <td nowrap valign=top><tt>00</tt>..<tt>01</tt></td>
+        <td align=left>waypoints
+         <table>
+          <tr>
+           <td><tt>00</tt>&nbsp; </td>
+           <td align=left>in X direction</td>
+          </tr>
+          <tr>
+           <td><tt>01</tt>&nbsp; </td>
+           <td align=left>in Y direction</td>
+          </tr>
+         </table>
+        </td>
+       </tr>
+
       <tr>
        <td nowrap valign=top><tt>00</tt>..<tt>8F</tt></td>
        <td align=left>all airports</td>
@@ -872,7 +877,7 @@

       <tr>
        <td nowrap valign=top><tt>00</tt>..<tt>05</tt>&nbsp; </td>
-        <td align=left>road stops:
+        <td align=left>road stops
         <table>
          <tr>
           <td><tt>00</tt>&nbsp; </td>
@@ -935,13 +940,13 @@
       </tr>
      </table>
     </li>
-     <li>m6 bits 5..3: the station type (rail, airport, truck, bus, oilrig, dock, buoy)</li>
-     <li>m6 bit 2: pbs reservation state for railway stations</li>
+     <li>m6 bits 5..3: the station type (rail, airport, truck, bus, oilrig, dock, buoy, waypoint)</li>
+     <li>m6 bit 2: pbs reservation state for railway stations/waypoints</li>

     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
     <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road (road stops)</li>
     <li>m7 bits 7..6: present road types (road stops)</li>
-     <li>m7: animation frame (train station)</li>
+     <li>m7: animation frame (railway stations/waypoints)</li>
    </ul>
   </td>
  </tr>
@@ -955,6 +960,7 @@
   <td>
    <ul>
     <li>m1: <a href="#OwnershipInfo">owner</a> (for sea, rivers, and coasts normally <tt>11</tt>)</li>
+     <li>m2: Depot index (for depots only)</li>
     <li>m3 bits 1..0 : Water class (sea, canal or river)
     <li>m4: Random data for canal or river tiles</li>
     <li>m5: tile type:
@@ -68,7 +68,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></td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOO</span>X <span class="free">OOOO</span></td>
      <td class="bits">XXXX XX<span class="free">OO</span></td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits">XX<span class="free">OO OO</span>XX</td>
@@ -79,19 +79,19 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
      <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO</span> XXXX</td>
+      <td class="bits"><span class="free">OOO</span>X XXXX</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">XX<span class="free">OO OO</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
    <tr>
-      <td rowspan=4>1</td>
+      <td rowspan=3>1</td>
      <td class="caption">rail</td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="option">~~~</span>X XXXX</td>
      <td class="bits"><span class="free">OOOO</span> XXXX <span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO</span> <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>
@@ -112,24 +112,13 @@ the array so you can quickly see what is used and what is not.
      <td class="caption">depot</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO</span> <span class="option">~~</span>XX</td>
+      <td class="bits">XXXX XXXX XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO</span> XXXX</td>
      <td class="bits"><span class="free">OOOO</span> XXXX</td>
      <td class="bits">XX<span class="free">O</span>X <span class="free">O</span>XXX</td>
      <td class="bits">XX<span class="free">OO OO</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
-    <tr>
-      <td class="caption">waypoint</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO</span> <span class="option">~~</span>XX</td>
-      <td class="bits"><span class="free">OOOO</span> XXXX</td>
-      <td class="bits">XX<span class="free">O</span>X <span class="free">OOO</span>X</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-    </tr>
    <tr>
      <td rowspan=3>2</td>
      <td class="caption">road</td>
@@ -147,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>
@@ -181,7 +170,7 @@ the array so you can quickly see what is used and what is not.
      <td class="caption">trees</td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span> XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO OOO</span>X XXXX XXXX</td>
      <td class="bits"><span class="option">~~</span>XX XXXX</td>
      <td class="bits">XXXX XX<span class="free">OO</span></td>
      <td class="bits">XX<span class="free">OO O</span>XXX</td>
@@ -189,27 +178,38 @@ the array so you can quickly see what is used and what is not.
      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
    <tr>
-      <td rowspan=6>5</td>
+      <td rowspan=7>5</td>
      <td class="caption">rail station</td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="option">~~~</span>X XXXX</td>
      <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits">XXXX <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>
      <td class="bits">XXXX XXXX</td>
    </tr>
+    <tr>
+      <td class="caption">rail waypoint</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
+    </tr>
    <tr>
      <td class="caption">road stop</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
+      <td class="bits">XXXX <span class="free">OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="option">~~~~ ~</span>XXX</td>
      <td class="bits"><span class="free">OO</span>XX XXXX</td>
-      <td class="bits">XXXX X<span class="free">O</span>XX</td>
+      <td class="bits">XX<span class="free">O</span>X XXXX</td>
    </tr>
    <tr>
      <td class="caption">dock</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>
@@ -282,7 +282,7 @@ the array so you can quickly see what is used and what is not.
      <td class="caption">shipdepot</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
+      <td class="bits">XXXX XXXX XXXX XXXX</td>
      <td class="bits"><span class="free">OOOO OO</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">-inherit-</td>
@@ -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>
@@ -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'

@@ -26,12 +26,20 @@
 [metadata]
 ; the name of the pack, preferably less than 16 characters
 name         = example
-; the short name (4 characters), used to identify this set within NewGRFs
+; the short name (4 characters), used to identify this set
 shortname    = XMPL
 ; the version of this graphics set (read as single integer)
 version      = 0
 ; a fairly short description of the set
+; By adding '.<iso code>' you can translate the description.
+; Note that OpenTTD first tries the full ISO code, then the first
+; two characters and then uses the fallback (no '.<iso code>').
+; The ISO code matching is case sensitive!
+; So en_US will be used for en_GB if no en_GB translation is added.
+; As a result the below example has 'howdie' for en_US and en_GB but
+; 'foo' for all other languages.
 description  = foo
+description.en_US = howdie
 ; palette used by the set; either DOS or Windows
 palette      = DOS

@@ -49,6 +57,8 @@ tropical     = TRGH.GRF
 ; GRF file with extra toyland sprites
 toyland      = TRGT.GRF
 ; NewGRF file using Actions 5, 7, 9 and A to replace sprites
+; Must use a GRF ID starting with FF so it cannot be selected from
+; the in-game NewGRF list and (thus) be loaded twice.
 extra        = OPENTTDD.GRF

 ; The md5s section lists the MD5 checksum for the files that replace them.
@@ -0,0 +1,106 @@
+;
+; Example file for the OpenTTD Base Music replacement sets.
+; This file consists of basically two different parts:
+;  * metadata
+;  * information about the files/songs
+;
+; Metadata contains information about the name and version
+; of the music set.
+;
+; == Getting started ==
+; - you can't add comments after values
+; - you have to fill the MD5 checksum for each file
+; - you may not miss any of the metadata or files items
+; - `openttd -h` lists all music replacement sets it found to be correct
+; - `openttd -d grf=1` shows warnings/errors when parsing an .obm file
+; - `openttd -M <name>` starts OpenTTD with the given set (case sensitive)
+; - adding `musicset = <name>` to the misc section of openttd.cfg makes
+;   OpenTTD start with that sound set by default
+; - there is a command line tool for all platforms called md5sum that can
+;   create the MD5 checksum you need.
+; - all files specified in this file are search relatively to the path where
+;   this file is found, i.e. if the sound files are in a subdir you have
+;   to add that subdir to the names in this file to! It will NOT search for
+;   a file named like specified in here.
+
+[metadata]
+; the name of the pack, preferably less than 16 characters
+name         = example
+; the short name (4 characters), used to identify this set
+shortname    = XMPL
+; the version of this sound set (read as single integer)
+version      = 0
+; a fairly short description of the set
+; By adding '.<iso code>' you can translate the description.
+; Note that OpenTTD first tries the full ISO code, then the first
+; two characters and then uses the fallback (no '.<iso code>').
+; The ISO code matching is case sensitive!
+; So en_US will be used for en_GB if no en_GB translation is added.
+; As a result the below example has 'howdie' for en_US and en_GB but
+; 'foo' for all other languages.
+description  = foo
+description.en_US = howdie
+
+; The files section lists the files that replace songs.
+; The file names are case sensitive.
+; You can have empty file names; in that case no song will be loaded
+; for that 'entry'.
+[files]
+; The theme song for OpenTTD
+theme = THEME_SONG.GM
+; The songs in the 'old style' category
+old_0 =
+old_1 =
+old_2 =
+old_3 =
+old_4 =
+old_5 =
+old_6 =
+old_7 =
+old_8 =
+old_9 =
+; The songs in the 'new style' category
+new_0 =
+new_1 =
+new_2 =
+new_3 =
+new_4 =
+new_5 =
+new_6 =
+new_7 =
+new_8 =
+new_9 =
+; The songs in the 'ezy street' category
+ezy_0 =
+ezy_1 =
+ezy_2 =
+ezy_3 =
+ezy_4 =
+ezy_5 =
+ezy_6 =
+ezy_7 =
+ezy_8 =
+ezy_9 =
+
+; The names section lists the song names for the given file name.
+; Note that the list of files is case sensitive. Each file listed in the
+; files section must be listed here with it's song name, otherwise you
+; will get a lot of warnings when starting OpenTTD.
+[names]
+THEME_SONG.GM = Tycoon DELUXE Theme
+
+; The md5s section lists the MD5 checksum for the files that replace them.
+; Note that the list of files is case sensitive. Each file listed in the
+; files section must be listed here with it's MD5 checksum, otherwise you
+; will get a lot of warnings when starting OpenTTD.
+[md5s]
+THEME_SONG.GM = 45cfec1b9d8c7a0ad45e755833cbf221
+
+; The origin section provides the possibility to put and extra line into
+; the warning that a file is missing/corrupt. This can be used to tell
+; them where to find it. It works on the filename specified in the
+; files section and if that is not found it will fall back to the default
+; as shown below here.
+[origin]
+default       = You can find it on your Transport Tycoon Deluxe CD-ROM.
+THEME_SONG.GM  = You can find it also on your Transport Tycoon Deluxe CD-ROM.
@@ -0,0 +1,64 @@
+;
+; Example file for the OpenTTD Base Sound replacement sets.
+; This file consists of basically two different parts:
+;  * metadata
+;  * information about the files
+;
+; Metadata contains information about the name and version
+; of the sound set.
+;
+; == Getting started ==
+; - you can't add comments after values
+; - you have to fill the MD5 checksum for each file
+; - you may not miss any of the metadata or files items
+; - `openttd -h` lists all sound replacements sets it found to be correct
+; - `openttd -d grf=1` shows warnings/errors when parsing an .obs file
+; - `openttd -S <name>` starts OpenTTD with the given set (case sensitive)
+; - adding `soundsset = <name>` to the misc section of openttd.cfg makes
+;   OpenTTD start with that sound set by default
+; - there is a command line tool for all platforms called md5sum that can
+;   create the MD5 checksum you need.
+; - all files specified in this file are search relatively to the path where
+;   this file is found, i.e. if the sound files are in a subdir you have
+;   to add that subdir to the names in this file to! It will NOT search for
+;   a file named like specified in here.
+
+[metadata]
+; the name of the pack, preferably less than 16 characters
+name         = example
+; the short name (4 characters), used to identify this set
+shortname    = XMPL
+; the version of this sound set (read as single integer)
+version      = 0
+; a fairly short description of the set
+; By adding '.<iso code>' you can translate the description.
+; Note that OpenTTD first tries the full ISO code, then the first
+; two characters and then uses the fallback (no '.<iso code>').
+; The ISO code matching is case sensitive!
+; So en_US will be used for en_GB if no en_GB translation is added.
+; As a result the below example has 'howdie' for en_US and en_GB but
+; 'foo' for all other languages.
+description  = foo
+description.en_US = howdie
+
+; The files section lists the files that replace sprites.
+; The file names are case sensitive.
+[files]
+; The file with the samples. Must contain exactly 73 samples.
+samples      = SAMPLES.CAT
+
+; The md5s section lists the MD5 checksum for the files that replace them.
+; Note that the list of files is case sensitive. Each file listed in the
+; files section must be listed here with it's MD5 checksum, otherwise you
+; will get a lot of warnings when starting OpenTTD.
+[md5s]
+SAMPLES.CAT  = 422ea3dd074d2859bb51639a6e0e85da
+
+; The origin section provides the possibility to put and extra line into
+; the warning that a file is missing/corrupt. This can be used to tell
+; them where to find it. It works on the filename specified in the
+; files section and if that is not found it will fall back to the default
+; as shown below here.
+[origin]
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+SAMPLES.CAT  = You can find it also on your Transport Tycoon Deluxe CD-ROM.
@@ -1,6 +1,6 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd Feb 05, 2009
+.Dd Apr 01, 2010
 .Dt OPENTTD 6
 .Sh NAME
 .Nm openttd
@@ -8,10 +8,9 @@
 .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[, ...]]
+.Op Fl d Ar [level | cat=lvl[,...]]
 .Op Fl D Ar [host][:port]
 .Op Fl g Ar [savegame]
 .Op Fl G Ar seed
@@ -19,26 +18,28 @@
 .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
 .Op Fl r Ar widthxheight
 .Op Fl s Ar driver
+.Op Fl S Ar soundset
 .Op Fl t Ar year
 .Op Fl v Ar driver
 .Sh OPTIONS
 .Bl -tag -width ".Fl n Ar host[:port][#player]"
-.It Fl a Ar ai
-Set the AI, see
-.Fl h
 .It Fl b Ar blitter
 Set the blitter, see
 .Fl h
+for a full list
 .It Fl c Ar config_file
 Use 'config_file' instead of 'openttd.cfg'
 .It Fl d Ar [level]
 Set debug verbosity for all categories to
 .Ar level
 or 1 if omitted
-.It Fl d Ar cat=level[, ...]
+.It Fl d Ar cat=level[,...]
 Set debug verbosity for a specific category
 .It Fl D Ar [host][:port]
 Start a dedicated server. Sets network debug level to 6. If you want to change this, use
@@ -50,38 +51,59 @@ Seed the pseudo random number generator
 .It Fl e
 Start in world editor mode
 .It Fl f
-Fork into background (dedicated only, see
+Fork into background (dedicated server only, see
 .Fl D )
 .It Fl g Ar [savegame]
 Load
 .Ar savegame
-at start or start a new game if omitted
+at start or start a new game if omitted. The
+.Ar savegame
+must be either absolute or relative to the current path or one of the search paths.
 .It Fl h
-Display a summary of all options and available AIs, blitters, drivers and graphic sets
+Display a summary of all options and lists all the available AIs, blitters, sound, music and video drivers, graphics sets and sound sets.
 .It Fl i Ar palette
-Set the palette, see
-.Fl h
+Set the palette. '0' for the DOS palette, '1' for the Windows palette and '2' to autodetect (default).
+.sp
+The palette depends where the base graphics set originated from. If it came from the Transport Tycoon Deluxe for DOS it has the DOS palette, if it came from the Windows version of Transport Tycoon Deluxe it has the Windows palette. All others likely have the Windows palette as that is the most used palette.
 .It Fl I Ar graphicsset
 Set the graphics set, see
 .Fl h
+for a full list
 .It Fl l Ar host[:port]
 Redirect DEBUG(), See
 .Fl D
 .It Fl m Ar driver
 Set the music driver, see
 .Fl h
+for a full list
+.It Fl M Ar musicset
+Set the music set, see
+.Fl h
+for a full list
 .It Fl n Ar host[:port][#player]
-Join a network game, optionally specify player to play as and port to connect to
+Join a network game, optionally specify a port to connect to and player to play as
+.It Fl p Ar password
+Password used to join server. Only useful with
+.Fl n
+.It Fl P Ar password
+Password used to join company. Only useful with
+.Fl n
 .It Fl r Ar widthxheight
 Set the resolution
 .It Fl s Ar driver
 Set the sound driver, see
 .Fl h
+for a full list
+.It Fl S Ar soundset
+Set the sound set, see
+.Fl h
+for a full list
 .It Fl t Ar year
 Set the starting year
 .It Fl v Ar driver
 Set the video driver, see
 .Fl h
+for a full list
 .It Fl x
 Do not automatically save to config file on exit
 .El
@@ -2,6 +2,12 @@

 # $Id$

+# This file is part of OpenTTD.
+# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+
+
 # Arguments given? Show help text.
 if [ "$#" != "0" ]; then
 	cat <<EOF
@@ -86,17 +92,17 @@ elif [ -d "$ROOT_DIR/.git" ]; then
 	fi
 	HASH=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null`
 	REV="g`echo $HASH | cut -c1-8`"
-	BRANCH=`git branch|grep '[*]' | sed 's~\* ~~;s~^master$~~'`
-	REV_NR=`LC_ALL=C git log --pretty=format:%s "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s~.*(svn r\([0-9]*\)).*~\1~"`
+	BRANCH=`git branch|grep '[*]' | sed 's@\* @@;s@^master$@@'`
+	REV_NR=`LC_ALL=C git log --pretty=format:%s "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
 elif [ -d "$ROOT_DIR/.hg" ]; then
 	# We are a hg checkout
 	if [ -n "`hg status \"$SRC_DIR\" | grep -v '^?'`" ]; then
 		MODIFIED="2"
 	fi
-	HASH=`LC_ALL=C hg parents 2>/dev/null | head -n 1 | cut -d: -f3`
+	HASH=`LC_ALL=C hg parents --template="{node}"`
 	REV="h`echo $HASH | cut -c1-8`"
-	BRANCH=`hg branch | sed 's~^default$~~'`
-	REV_NR=`LC_ALL=C hg log -r $HASH:0 -k "svn" -l 1 --template "{desc}\n" "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s~.*(svn r\([0-9]*\)).*~\1~"`
+	BRANCH=`hg branch | sed 's@^default$@@'`
+	REV_NR=`LC_ALL=C hg log -r $HASH:0 -k "svn" -l 1 --template "{desc}\n" "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
 else
 	# We don't know
 	MODIFIED="1"
@@ -1,5 +1,18 @@
-README
+OpenTTD's known bugs
+Last updated:    2010-08-01
+Release version: 1.0.3
 ------------------------------------------------------------------------
+
+
+Table of Contents:
+------------------
+1) About
+2) Known bugs in the this stable release
+3) Known bugs that will not be solved
+
+
+1) About:
+-- ------
 All bugs listed below are marked as known. Please do not submit any bugs
 that are the same as these. If you do, do not act surprised, because
 we WILL flame you!!
@@ -8,21 +21,160 @@ Of course if you have more knowledge about any of these bugs, have more
 specifics, we welcome you to report them. React to the given bug indicated
 by the number below on http://bugs.openttd.org.

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

-Bugs for 0.7.0-beta2
------------------------------------------------------------------------
-URL: http://bugs.openttd.org
+2) Known bugs in the this stable release:
+-- --------------------------------------
+The following bugs are known to exist in this stable release and
+we intend to fix them. Some bugs are known but are not fixable or
+fixing them would cause further problems. Those bugs can be found
+in the "Known bugs that will not be solved" section.

- 2689	Capacity ordering of articulated vehicle in build vehicle window is wrong
- 2616	Cloning creates vehicles with invalid subcargos
+The bugs in this section all refer to a ticket in our bug tracking system
+that you can find at: http://bugs.openttd.org
+If the bugs are closed but still listed here it means that the bug is fixed
+and that the nightlies and next major release will not have that bug.
+
+- 3938	DirectMusic not properly resetting state causing music to sound wrong
+- 3935	Under some circumstances two road vehicles can leave road stop simultaniously
+- 3816	Console text does not always fit at 640x480
+- 3746	Console output with right-to-left texts in left-to-right texts is not correct
+- 3714	Some corrupted savegames can cause crashes
+- 3651	[OSX] Crash when selecting full screen
+- 3648	[OSX] Crash when selecting music
+- 3637	Second highest competing station gets penalised twice
+- 3546	Ignoring signals might crash trains
+- 3447	[OSX] SDL port is unuseable
+- 2782	[OSX] Port hopelessly outdated
 - 2585	[OSX] OS' mouse pointer showing
- 2427	Vehicle owner gets paid for whole cargo feeder share
- 1944	Road vehicles not picking empty drivethrough platform
- 1762	Strange Autoreplace behaviour
- 1495	Long vehicles might block multistop drivethrough stations
- 1473	Lost trains ignore exit signals
- 1140	[OSX] Not smooth moving map with touchpad
- 1072	Text overflows in several windows
-  119	Clipping problems with vehicles on slopes
+- 2484	[OSX] Cannot enter CJK characters
+
+
+3) Known bugs that will not be solved:
+-- -----------------------------------
+This section lists all known bugs that we do not intend to fix and the
+reasons why we think that fixing them is infeasible. We might make some
+minor improvements that reduce the scope of these bugs, but we will not
+be able to completely fix them.
+
+No suitable AI can be found
+	If you have no AIs and an AI is started the so-called 'dummy' AI will
+	be loaded. This AI does nothing but writing a message on the AI debug
+	window and showing a red warning. There are basically two solutions
+	for this problem: you must change the settings so no AI is started,
+	this is done in the difficulty settings window. The other solution is
+	acquiring (downloading) some AI. The easiest way to do this is via
+	the "Check Online Content" button in the main (intro) menu or via
+	"AI Settings" -> "Select AI" -> "Check Online Content" which is also
+	accessed via the main menu.
+
+Clipping problems [FS#119]
+	In some cases sprites are not drawn as one would expect. Examples of
+	this are aircraft that might be hidden below the runway or trees that
+	in some cases are rendered over vehicles.
+	The primary cause of this problem is that OpenTTD does not have enough
+	data (like a 3D model) to properly determine what needs to be drawn in
+	front of what. OpenTTD has bounding boxes but in lots of cases they
+	are either too big or too small and then cause problems with what
+	needs to be drawn in front of what. Also some visual tricks are used.
+	For example trains at 8 pixels high, the catenary needs to be drawn
+	above that. When you want to draw bridges on top of that, which are
+	only one height level (= 8 pixels) higher, you are getting into some
+	big problems.
+	We can not change the height levels; it would require us to either
+	redraw all vehicle or all landscape graphics. Doing so would mean we
+	leave the Transport Tycoon graphics, which in effect means OpenTTD
+	will not be a Transport Tycoon clone anymore.
+
+Lost trains ignore (block) exit signals [FS#1473]
+	If trains are lost they ignore block exit signals, blocking junctions
+	with presignals. This is caused because the path finders cannot tell
+	where the train needs to go. As such a random direction is chosen at
+	each junction. This causes the trains to occasionally to make choices
+	that are unwanted from a player's point of view.
+	This will not be fixed because lost trains are in almost all cases a
+	network problem, e.g. a train can never reach a specific place. This
+	makes the impact of fixing the bug enormously small against the
+	amount of work needed to write a system that prevents the lost trains
+	from taking the wrong direction.
+
+Vehicle owner of last transfer leg gets paid for all [FS#2427]
+	When you make a transfer system that switches vehicle owners. This
+	is only possible with 'industry stations', e.g. the oil rig station
+	the owner of the vehicle that does the final delivery gets paid for
+	the whole trip. It is not shared amongst the different vehicle
+	owners that have participated in transporting the cargo.
+	This sharing is not done because it would enormously increase the
+	memory and CPU usage in big games for something that is happening
+	in only one corner case. We think it is not worth the effort until
+	sharing of stations is an official feature.
+
+Forbid 90 degree turns does not work for crossing PBS paths [FS#2737]
+	When you run a train through itself on a X junction with PBS turned on
+	the train will not obey the 'forbid 90 degree turns' setting. This is
+	due to the fact that we can not be sure that the setting was turned
+	off when the track was reserved, which means that we assume it was
+	turned on and that the setting does not hold at the time. We made it
+	this way to allow one to change the setting in-game, but it breaks
+	slightly when you are running your train through itself. Running a
+	train through means that your network is broken and is thus a user
+	error which OpenTTD tries to graciously handle.
+	Fixing this bug means that we need to record whether this particular
+	setting was turned on or off at the time the reservation was made. This
+	means adding quite a bit of data to the savegame for solving an issue
+	that is basically an user error. We think it is not worth the effort.
+
+Duplicate (station) names after renaming [FS#3204]
+	After renaming stations one can create duplicate station names. This
+	is done giving a station the same custom name as another station with
+	an automatically generated name.
+	The major part of this problem is that station names are translatable.
+	Meaning that a station is called e.g. '<TOWN> Central' in English and
+	'<TOWN> Centraal' in Dutch. This means that in network games the
+	renaming of a town could cause the rename to succeed on some clients
+	and fail at others. This creates an inconsistent game state that will
+	be seen as a 'desync'. Secondly the custom names are intended to fall
+	completely outside of the '<TOWN> <name>' naming of stations, so when
+	you rename a town all station names are updated accordingly.
+	As a result the decision has been made that all custom names are only
+	compared to the other custom names in the same class and not compared
+	to the automatically generated names.
+
+Extreme CPU usage/hangs when using SDL and PulseAudio [FS#3294]
+OpenTTD hangs/freezes when closing, OpenTTD is slow, OpenTTD uses a lot of CPU
+	OpenTTD can be extremely slow/use a lot of CPU when the sound is
+	played via SDL and then through PulseAudio's ALSA wrapper. Under the
+	same configuration OpenTTD, or rather SDL, might hang when exiting
+	the game. This problem is seen most in Ubuntu 9.04 and higher.
+
+	This is because recent versions of the PulseAudio sound server are
+	configured to use timer-based audio scheduling rather than
+	interrupt-based audio scheduling. Configuring PulseAudio to force
+	use of interrupt-based scheduling may resolve sound problems for
+	some users. Under recent versions of Ubuntu Linux (9.04 and higher)
+	this can be accomplished by changing the following line in the
+	/etc/pulse/default.pa file:
+		load-module module-udev-detect
+	to
+		load-module module-udev-detect tsched=0
+	Note that PulseAudio must be restarted for changes to take effect.
+	Older versions of PulseAudio may use the module-hal-detect module
+	instead. Adding tsched=0 to the end of that line will have a similar
+	effect.
+
+	Another possible solution is selecting the "pulse" backend of SDL
+	by either using "SDL_AUDIODRIVER=pulse openttd" at the command
+	prompt or installing the 'libsdl1.2debian-pulseaudio' package from
+	Ubuntu's Universe repository. For other distributions a similar
+	package needs to be installed.
+
+OpenTTD not properly resizing with SDL on X [FS#3305]
+	Under some X window managers OpenTTD's window does not properly
+	resize. You will either end up with a black bar at the right/bottom
+	side of the window or you cannot see the right/bottom of the window,
+	e.g you cannot see the status bar. The problem is that OpenTTD does
+	not always receive a resize event from SDL making it impossible for
+	OpenTTD to know that the window was resized; sometimes moving the
+	window will solve the problem.
+	Window managers that are known to exhibit this behaviour are KDE's
+	and GNOME's. With the XFCE's and LXDE's window managers the resize
+	event is sent when the user releases the mouse.
@@ -1,12 +1,11 @@
 # $Id$
 # http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.1.html
 [Desktop Entry]
-Encoding=UTF-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
@@ -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}
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="256"
+   height="256"
+   id="svg2"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="openttd.svg">
+  <metadata
+     id="metadata42">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1177"
+     id="namedview40"
+     showgrid="false"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="163.74991"
+     inkscape:cy="132.32268"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 124 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="256 : 124 : 1"
+       inkscape:persp3d-origin="128 : 82.666667 : 1"
+       id="perspective44" />
+    <linearGradient
+       id="linearGradient3421">
+      <stop
+         style="stop-color:#fe7600;stop-opacity:1"
+         offset="0"
+         id="stop3423" />
+      <stop
+         style="stop-color:#f2b26d;stop-opacity:1"
+         offset="1"
+         id="stop3425" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3269">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop3271" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1"
+         id="stop3273" />
+    </linearGradient>
+    <linearGradient
+       x1="312.62323"
+       y1="468.58658"
+       x2="315.21729"
+       y2="471.18063"
+       id="linearGradient3275"
+       xlink:href="#linearGradient3269"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="312.62323"
+       y1="468.58658"
+       x2="315.21729"
+       y2="471.18063"
+       id="linearGradient3289"
+       xlink:href="#linearGradient3269"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="312.62323"
+       y1="468.58658"
+       x2="315.21729"
+       y2="471.18063"
+       id="linearGradient3308"
+       xlink:href="#linearGradient3269"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7071068,-0.7071068,0.7071068,0.7071068,-266.24277,420.94154)" />
+    <linearGradient
+       x1="312.62323"
+       y1="468.58658"
+       x2="315.21729"
+       y2="471.18063"
+       id="linearGradient3326"
+       xlink:href="#linearGradient3269"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7071068,-0.7071068,0.7071068,0.7071068,-266.24277,420.94154)" />
+    <linearGradient
+       x1="312.62323"
+       y1="468.58658"
+       x2="315.21729"
+       y2="471.18063"
+       id="linearGradient3336"
+       xlink:href="#linearGradient3269"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.3591922,-0.1487874)" />
+    <linearGradient
+       x1="312.62323"
+       y1="468.58658"
+       x2="315.21729"
+       y2="471.18063"
+       id="linearGradient3406"
+       xlink:href="#linearGradient3269"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-2.2643187,40.455238)" />
+    <linearGradient
+       x1="133.3282"
+       y1="156.16792"
+       x2="117.66125"
+       y2="78.463249"
+       id="linearGradient3431"
+       xlink:href="#linearGradient3421"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="133.3282"
+       y1="156.16792"
+       x2="117.66125"
+       y2="78.463249"
+       id="linearGradient3488"
+       xlink:href="#linearGradient3421"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(2,2)" />
+    <filter
+       id="filter3566"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur3568"
+         stdDeviation="1.2236964"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       x1="136.3282"
+       y1="151.16792"
+       x2="117.66125"
+       y2="78.463249"
+       id="linearGradient3571"
+       xlink:href="#linearGradient3421"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     transform="translate(-246.4375,-405.5443)"
+     id="layer1">
+    <path
+       d="m 127.34375,3.46875 c -0.48316,0.02376 -0.94805,0.22615 -1.3125,0.59375 L 7.65625,122.40625 c -0.78094,0.7811 -0.78094,2.06266 0,2.84375 L 25.25,142.84375 5,163.09375 c -0.78094,0.7811 -0.78094,2.03141 0,2.8125 l 80.40625,80.40625 c 0.7811,0.78094 2.03141,0.78093 2.8125,0 l 20.25,-20.25 17.59375,17.59375 c 0.7811,0.78093 2.03141,0.78093 2.8125,0 l 17.5625,-17.5625 20.21875,20.21875 c 0.78108,0.78094 2.06265,0.78093 2.84375,0 l 80.375,-80.40625 c 0.78094,-0.78109 0.78094,-2.0314 0,-2.8125 L 229.65625,142.875 247.25,125.28125 c 0.78094,-0.7811 0.78094,-2.06265 0,-2.84375 L 128.875,4.0625 c -0.0421,-0.04625 -0.11001,-0.11415 -0.15625,-0.15625 -0.39876,-0.33006 -0.89184,-0.46126 -1.375,-0.4375 z m -6,43.5625 14.15625,0 0,19.75 c 0.01,0.435733 0.30048,0.815 0.71875,0.9375 2.36672,0.715663 4.34765,1.46009 5.9375,2.1875 1.57854,0.722523 3.76284,1.94 6.53125,3.65625 0.23423,0.144983 0.51508,0.19598 0.78125,0.125 0.26615,-0.07098 0.49406,-0.25764 0.625,-0.5 l 2.875,-5.40625 7.75,0 9.34375,36.21875 -13.625,3.90625 c -4.11145,-10.161057 -10.59377,-17.79909 -19.46875,-22.625 -0.31359,-0.166457 -0.69786,-0.15518 -1,0.03125 -0.30216,0.186431 -0.47688,0.52006 -0.46875,0.875 l 0,24.03125 c 0.01,0.43573 0.30048,0.815 0.71875,0.9375 10.93974,3.10986 18.88772,6.27714 23.75,9.4375 4.89952,3.1848 8.58915,7.0982 11.15625,11.71875 2.57543,4.63598 3.84364,9.41467 3.84375,14.375 -1.1e-4,5.33303 -1.49612,10.44021 -4.5625,15.40625 -3.05188,4.94228 -7.57932,9.1061 -13.59375,12.46875 -5.99929,3.35409 -12.74816,5.29505 -20.375,5.84375 -0.52771,0.0331 -0.93848,0.47125 -0.9375,1 l 0,19.25 -14.15625,0 0,-20.65625 c 0.0115,-0.47702 -0.31562,-0.89572 -0.78125,-1 -6.24994,-1.46738 -12.82661,-4.66999 -19.71875,-9.6875 -0.25021,-0.18733 -0.57446,-0.24211 -0.875,-0.15625 -0.300532,0.0859 -0.54278,0.30252 -0.65625,0.59375 l -3.75,9.25 -7.625,0 -7.875,-42.34375 14.3125,-3.4375 c 2.78387,6.00776 5.47545,10.86469 8.09375,14.4375 2.72545,3.71918 5.79951,6.95217 9.21875,9.6875 2.53873,2.0772 5.32819,3.64369 8.34375,4.6875 0.30262,0.0995 0.64703,0.0602 0.90625,-0.125 0.25923,-0.18516 0.40226,-0.49396 0.40625,-0.8125 l 0,-27.875 c 0.008,-0.43878 -0.2706,-0.83165 -0.6875,-0.96875 -11.9575,-4.0043 -20.14727,-7.50583 -24.4375,-10.375 C 91.88074,118.97403 88.49102,115.30727 86,110.8125 83.50306,106.30724 82.24999,101.8073 82.25,97.25 c -1e-5,-5.212767 1.5369,-10.24246 4.65625,-15.125 3.11104,-4.869387 7.41684,-8.74009 12.96875,-11.625 5.52685,-2.871687 12.35433,-4.48215 20.5,-4.8125 0.54002,-0.01694 0.96896,-0.45971 0.96875,-1 l 0,-17.65625 z m -2,37.375 c -3.80484,0.61143 -6.64239,1.484763 -8.125,2.53125 -2.55269,1.82341 -3.68754,3.817503 -3.6875,6.21875 -3e-5,1.99888 0.82821,3.916143 2.6875,5.90625 1.5957,1.70818 4.79074,3.41885 9.125,5.03125 l 0,-19.6875 z m 18.15625,55.125 0,22.40625 c 3.64443,-0.60429 6.6344,-1.65745 8.8125,-3.25 2.37481,-1.73646 3.46868,-3.90374 3.46875,-6.875 -7e-5,-2.6212 -0.83434,-4.7944 -2.625,-6.6875 -2.27356,-2.32082 -5.55946,-4.16441 -9.65625,-5.59375 z"
+       transform="translate(247,408.36218)"
+       style="fill:#000000;fill-opacity:0.69019608;fill-rule:evenodd;stroke:none;filter:url(#filter3566)"
+       id="path3453" />
+    <path
+       d="m 125.4375,3.46875 -118.375,118.375 118.375,118.375 118.40625,-118.375 L 125.4375,3.46875 z m -7.09375,40.5625 16.15625,0 0,20.75 c 2.39847,0.725255 4.41692,1.465836 6.0625,2.21875 1.64544,0.753136 3.86718,1.989686 6.65625,3.71875 l 3.15625,-5.9375 9.125,0 9.78125,37.90625 -15.375,4.4375 C 149.89001,96.694255 143.4247,89.040435 134.5,84.1875 l 0,24.03125 c 10.98855,3.12374 18.97973,6.29945 24,9.5625 5.02009,3.26318 8.85036,7.29338 11.5,12.0625 2.64944,4.76921 3.96864,9.71205 3.96875,14.84375 -1.1e-4,5.52222 -1.56729,10.83367 -4.71875,15.9375 -3.15166,5.10387 -7.80181,9.38205 -13.9375,12.8125 -6.13586,3.43045 -13.05918,5.41095 -20.8125,5.96875 l 0,20.25 -16.15625,0 0,-21.65625 c -6.41472,-1.50606 -13.12131,-4.79903 -20.09375,-9.875 l -4,9.875 -9.125,0 -8.21875,-44.09375 16,-3.84375 c 2.900524,6.35894 5.697538,11.34646 8.375,15 2.6774,3.65361 5.68442,6.8226 9.03125,9.5 2.45427,2.0081 5.13065,3.52723 8.03125,4.53125 l 0,-27.875 c -11.9927,-4.01609 -20.225144,-7.51572 -24.6875,-10.5 C 89.193843,117.73459 85.690854,113.94229 83.125,109.3125 80.559118,104.68285 79.249989,99.991365 79.25,95.25 c -9e-6,-5.410553 1.605147,-10.635971 4.8125,-15.65625 3.207321,-5.02008 7.654184,-9.01231 13.34375,-11.96875 5.68951,-2.956214 12.68204,-4.602705 20.9375,-4.9375 l 0,-18.65625 z m 0,37.15625 c -4.57399,0.613679 -7.82228,1.598881 -9.71875,2.9375 -2.73325,1.952387 -4.09379,4.29813 -4.09375,7.03125 -4e-5,2.287057 0.98853,4.4742 2.96875,6.59375 1.98014,2.119711 5.6004,4.09012 10.84375,5.875 l 0,-22.4375 z m 16.15625,54.875 0,25.125 c 4.35076,-0.55777 7.81241,-1.79097 10.40625,-3.6875 2.59369,-1.8965 3.87492,-4.45224 3.875,-7.6875 -8e-5,-2.84474 -0.95404,-5.31111 -2.90625,-7.375 -2.67751,-2.73317 -6.46645,-4.8689 -11.375,-6.375 z"
+       transform="translate(247,408.36218)"
+       style="fill:url(#linearGradient3571);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect3418" />
+    <rect
+       width="113.67383"
+       height="30.562906"
+       x="581.44257"
+       y="195.29802"
+       transform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,0,0)"
+       style="fill:#6ad636;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect3277" />
+    <path
+       d="m 271.41033,548.04524 -21.3701,21.3701 c -0.51722,0.5028 -0.72366,1.24514 -0.54025,1.94279 0.18341,0.69764 0.72825,1.24248 1.42588,1.42589 0.69765,0.1834 1.44,-0.023 1.9428,-0.54026 l 21.91555,-21.91555 -3.37388,-2.28297 z"
+       style="opacity:0.7;fill:url(#linearGradient3406);fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path3404" />
+    <rect
+       width="167.41394"
+       height="167.41394"
+       x="554.57251"
+       y="27.848526"
+       transform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,0,0)"
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect2251" />
+    <path
+       d="m 373.71159,410.23833 c -0.81035,-0.62925 -1.9654,-0.54334 -2.67374,0.19888 l -118.37411,118.3741 c -0.51722,0.5028 -0.72366,1.24514 -0.54025,1.94279 0.18341,0.69764 0.72825,1.24248 1.42588,1.42589 0.69765,0.1834 1.44,-0.023 1.9428,-0.54026 l 118.3741,-118.3741 c 0.42126,-0.40199 0.64643,-0.96759 0.61671,-1.54911 -0.0297,-0.58152 -0.31136,-1.12123 -0.77139,-1.47819 l 0,0 z"
+       style="opacity:0.7;fill:url(#linearGradient3336);fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path3256" />
+    <rect
+       width="113.67384"
+       height="30.56292"
+       x="54.718613"
+       y="-752.58502"
+       transform="matrix(-0.7071068,0.7071068,-0.7071068,-0.7071068,0,0)"
+       style="fill:#6ad636;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.00000048;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect3279" />
+    <rect
+       width="11.142811"
+       height="14.090264"
+       x="602.29895"
+       y="203.53435"
+       transform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,0,0)"
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect3291" />
+    <rect
+       width="11.142811"
+       height="8.5145016"
+       x="622.57172"
+       y="203.53435"
+       transform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,0,0)"
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect3293" />
+    <path
+       d="m 308.55497,616.32265 -7.87916,-7.87915 9.96333,-9.96333 7.87916,7.87916"
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       id="rect3295" />
+    <path
+       d="m 315.01081,622.77849 9.96332,-9.96333 7.87916,7.87916 -9.96333,9.96332"
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       id="rect3297" />
+    <path
+       d="m 445.04627,584.86337 1.41421,1.41422 9.96579,9.96578 1.41421,1.41422 1.41421,-1.41422 6.47445,-6.47444 -2.82843,-2.82843 2.82843,-2.82843 -7.13736,-7.13736 -2.82843,2.82843 -2.82842,-2.82843 -6.47445,6.47445 -1.41421,1.41421 z m 5.65685,0 5.06023,-5.06023 7.13736,7.13736 -5.06023,5.06023 -7.13736,-7.13736 z"
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="rect3347" />
+    <path
+       d="m 427.09359,605.64776 -7.87916,7.87915"
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       id="rect3343" />
+    <path
+       d="m 433.11734,619.55066 -9.96333,-9.96333"
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       id="path3352" />
+    <path
+       d="m 441.42857,591.31278 -7.87916,7.87916"
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       id="path3364" />
+    <path
+       d="m 447.45232,605.21568 -9.96333,-9.96333"
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       id="path3366" />
+    <path
+       d="m 296.30415,584.14518 -9.96332,9.96333"
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       id="rect3380" />
+    <path
+       d="m 306.75446,602.36485 7.87915,7.87916"
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       id="path3384" />
+  </g>
+</svg>
@@ -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
+
@@ -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
@@ -1,21 +1,202 @@
-openttd (0.7~svn-1) UNRELEASED; urgency=low
+openttd (1.0.3-0) unstable; urgency=low

-  * Unreleased SVN version. Versioned to allow normal upgrades to released
+  * 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>  Wed, 03 Sep 2008 18:56:04 +0200
+ -- Jordi Mallach <jordi@debian.org>  Fri, 21 Aug 2009 15:27:26 +0200

-openttd (0.7.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, 10 Mar 2009 00:33:05 +0100
+ -- Jordi Mallach <jordi@debian.org>  Tue, 09 Jun 2009 21:46:28 +0200

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

+  [ Matthijs Kooijman ]
  * New upstream release.
+  * Remove Debian specific desktop file, upstream provides one now.
+  * Add debian/watch file.

- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 16 Feb 2009 23:07:05 +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.
+
+ -- Jordi Mallach <jordi@debian.org>  Wed, 15 Apr 2009 18:22:10 +0200

 openttd (0.6.3-1) unstable; urgency=low

@@ -24,7 +205,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

@@ -1 +1 @@
-4
+7
@@ -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
@@ -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.
@@ -1,25 +1,77 @@
-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.

-   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.
+OpenTTD License:

-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License version 2.0 as
+	published by the Free Software Foundation;

-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.

-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+	You should have received a copy of the GNU General Public License
+	along with this package; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+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.
@@ -1,3 +0,0 @@
-readme.txt
-docs/Manual.txt
-docs/multiplayer.txt
@@ -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.
@@ -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"
@@ -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"
@@ -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
@@ -0,0 +1 @@
+run-openttd-wrapper.patch
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] templates
@@ -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ó."
@@ -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."
@@ -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ö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ö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 "
-"über die benö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ötigt zur Ausführung Daten-Dateien aus dem Originalspiel "
-#~ "»Transport Tycoon Deluxe«. Sie sollten diese Daten-Dateien installieren, "
-#~ "bevor Sie das Spiel spielen können. Lesen Sie README.Debian für weitere "
-#~ "Details darüber, welche Dateien wohin kopiert werden müssen."
@@ -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."
@@ -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."
-
@@ -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."
@@ -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."
@@ -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 . "
@@ -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."
@@ -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."
@@ -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 приведена информация о том, "
-"какие файлы нужны и где они лежат."
@@ -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."
@@ -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 "
-"டெபியன் கோப்பை பார்க்கவும்."
@@ -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 ""
@@ -1,8 +0,0 @@
-#! /bin/sh
-
-set -e
-
-
-. /usr/share/debconf/confmodule
-
-#DEBHELPER#
@@ -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"

-
-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
@@ -0,0 +1 @@
+3.0 (quilt)
@@ -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.
@@ -0,0 +1,5 @@
+version=3
+
+options=downloadurlmangle=s/(.*)\/index.html$/\1\/openttd-\1-source.tar.gz/ \
+http://master.binaries.openttd.org/releases/ \
+(\d+(?:\.\d+)*)/index.html
@@ -0,0 +1,21 @@
+@echo off
+if "%1" == "" goto err
+if "%2" == "" goto err
+
+echo Downloading NoSound...
+
+%1\wget http://binaries.openttd.org/installer/nosound-NOSOUND_VERSION.7z -O %2/data/nosound.7z
+
+echo Extracting NoSound...
+
+%1\7za x -y -O%2/data %2/data/nosound.7z
+del %1\data\nosound.7z /n
+
+echo NoSound has been installed.
+goto end
+
+:err
+echo This batch file is only intended for use by the OpenTTD installer.
+echo Please visit www.openttd.org for details on downloading NoSound.
+
+:end
@@ -0,0 +1,21 @@
+@echo off
+if "%1" == "" goto err
+if "%2" == "" goto err
+
+echo Downloading OpenGFX...
+
+%1\wget http://binaries.openttd.org/installer/opengfx-OPENGFX_VERSION.7z -O %2/data/opengfx.7z
+
+echo Extracting OpenGFX...
+
+%1\7za x -y -O%2/data %2/data/opengfx.7z
+del %1\data\opengfx.7z /n
+
+echo OpenGFX has been installed.
+goto end
+
+:err
+echo This batch file is only intended for use by the OpenTTD installer.
+echo Please visit www.openttd.org for details on downloading OpenGFX.
+
+:end
@@ -0,0 +1,21 @@
+@echo off
+if "%1" == "" goto err
+if "%2" == "" goto err
+
+echo Downloading OpenSFX...
+
+%1\wget http://binaries.openttd.org/installer/opensfx-OPENSFX_VERSION.7z -O %2/data/opensfx.7z
+
+echo Extracting OpenSFX...
+
+%1\7za x -y -O%2/data %2/data/opensfx.7z
+del %1\data\opensfx.7z /n
+
+echo OpenSFX has been installed.
+goto end
+
+:err
+echo This batch file is only intended for use by the OpenTTD installer.
+echo Please visit www.openttd.org for details on downloading OpenSFX.
+
+:end
@@ -0,0 +1,85 @@
+@echo off
+
+set OPENTTD_VERSION=1.0.3
+set OPENSFX_VERSION=0.8.0
+set NOSOUND_VERSION=0.8.0
+set OPENGFX_VERSION=0.7.0
+
+echo To make the installer, you must have the WarpIN compiler (wic) installed and in
+echo your path, as well as wget and unzip. This file will download the various DLLs
+echo to be distributed with the installer. If you do not want to continue, please
+echo press CTRL-C now.
+echo.
+pause
+
+cd ..\..\..\bundle
+
+if not exist SDL12.dll goto getsdl
+if not exist FSLib.dll goto getsdl
+goto libc
+
+:getsdl
+
+wget http://www.os2site.com/sw/dev/sdl/sdl-1.2.10-bin-20080804.zip -O dl.zip
+unzip -j dl.zip SDL/FSLib.dll SDL/SDL12.dll
+del dl.zip
+
+:libc
+
+if exist libc063.dll goto gcc
+
+wget ftp://ftp.netlabs.org/pub/gcc/libc-0.6.3-csd3.zip -O dl.zip
+unzip -j dl.zip libc063.dll
+del dl.zip
+
+:gcc
+
+if exist gcc442.dll goto tools
+
+wget http://www.owenrudge.net/various/gcc442.zip -O dl.zip
+unzip -j dl.zip gcc442.dll
+del dl.zip
+
+:tools
+
+cd ..\os\os2\installer
+if exist tools goto opengfx
+
+mkdir tools
+cd tools
+
+wget http://download.smedley.info/wget-1.11.4-os2-20090315.zip -O dl.zip
+unzip -j dl.zip wget/bin/wget.exe
+del dl.zip
+
+wget ftp://ftp.os4.su/moveton/p7zip-9.04-bin-os2.zip -O dl.zip
+unzip -j dl.zip bin/7za.exe dll/ilibca.dll
+del dl.zip
+
+cd ..
+
+:opengfx
+
+if exist opengfx goto opensfx
+
+mkdir opengfx
+sed s/OPENGFX_VERSION/%OPENGFX_VERSION%/ < download_opengfx.cmd > opengfx\download_opengfx.cmd
+copy remove_opengfx.cmd opengfx
+
+:opensfx
+if exist opensfx goto nosound
+
+mkdir opensfx
+sed s/OPENSFX_VERSION/%OPENSFX_VERSION%/ < download_opensfx.cmd > opensfx\download_opensfx.cmd
+copy remove_opensfx.cmd opensfx
+
+:nosound
+
+mkdir nosound
+sed s/NOSOUND_VERSION/%NOSOUND_VERSION%/ < download_nosound.cmd > nosound\download_nosound.cmd
+copy remove_nosound.cmd nosound
+
+:end
+
+if exist openttd-%OPENTTD_VERSION%-os2.exe del openttd-%OPENTTD_VERSION%-os2.exe
+wic -a openttd-%OPENTTD_VERSION%-os2.exe 1 -c../../../bundle -r * 2 -ctools -r * 3 -copengfx -r * 4 -copensfx -r * 5 -cnosound -r * -U -s openttd.wis
@@ -0,0 +1,106 @@
+<WARPIN>
+<HEAD>
+<TITLE>OpenTTD</TITLE>
+
+<!-- Please remember to increment the build number for each package
+     when releasing a new stable version, particularly if there are
+     also release candidates sharing the major/minor versions:
+
+     e.g., 0\7\1\16279 for 0.7.1-RC1,
+           0\7\1\16365 for 0.7.1-RC2,
+           0\7\1\16540 for 0.7.1 final
+-->
+
+<PCK INDEX="1"
+      PACKAGEID="OpenTTD\OpenTTD\OpenTTD\1\0\0\18862"
+      TARGET="$(WARPIN_DEFAULTAPPSPATH)\OpenTTD"
+      SELECT
+      TITLE="OpenTTD"
+      LONGFILENAMES
+      BASE
+      >OpenTTD is an open source transport simulation game</PCK>
+
+<PCK INDEX="2"
+      PACKAGEID="OpenTTD\OpenTTD\Downloader\1\0\0\18862"
+      TARGET="$(WARPIN_DEFAULTAPPSPATH)\OpenTTD"
+      SELECT
+      TITLE="Download tools"
+      REQUIRES=1
+      FIXED
+      >Tools required for downloading the OpenGFX/SFX packs</PCK>
+
+<PCK INDEX="3"
+      PACKAGEID="OpenTTD\OpenTTD\OpenGFX\1\0\0\18862"
+      TARGET="$(WARPIN_DEFAULTAPPSPATH)\OpenTTD"
+      SELECT
+      TITLE="OpenGFX"
+      LONGFILENAMES
+      REQUIRES=2
+      EXECUTE="$(3)\download_opengfx.cmd | $(1) $(/1)"
+      DEEXECUTE="$(3)\remove_opengfx.cmd | $(1) $(/1)"
+      FIXED
+      >Downloads the OpenGFX graphics pack for OpenTTD</PCK>
+
+<PCK INDEX="4"
+      PACKAGEID="OpenTTD\OpenTTD\OpenSFX\1\0\0\18862"
+      TARGET="$(WARPIN_DEFAULTAPPSPATH)\OpenTTD"
+      SELECT
+      TITLE="OpenSFX"
+      LONGFILENAMES
+      REQUIRES=2
+      EXECUTE="$(4)\download_opensfx.cmd | $(1) $(/1)"
+      DEEXECUTE="$(4)\remove_opensfx.cmd | $(1) $(/1)"
+      FIXED
+      >Downloads the OpenSFX sound effects pack for OpenTTD</PCK>
+
+<PCK INDEX="5"
+      PACKAGEID="OpenTTD\OpenTTD\NoSound\1\0\0\18862"
+      TARGET="$(WARPIN_DEFAULTAPPSPATH)\OpenTTD"
+      SELECT
+      TITLE="NoSound"
+      LONGFILENAMES
+      REQUIRES=2
+      EXECUTE="$(5)\download_nosound.cmd | $(1) $(/1)"
+      DEEXECUTE="$(5)\remove_nosound.cmd | $(1) $(/1)"
+      FIXED
+      >Downloads the NoSound pack for OpenTTD, to disable sound effects</PCK>
+
+</HEAD>
+
+<BODY>
+<!-- page 1: introductory page -->
+<PAGE INDEX="1" TYPE="README">
+<NEXTBUTTON TARGET=2>~Next</NEXTBUTTON>
+<README EXTRACTFROMPCK="1">README.TXT</README>
+<TEXT>Welcome to the OpenTTD installer. This program will install OpenTTD 1.0 on your system. Before we begin the installation process, please take a moment to read the following document.
+
+Select "Next" to continue, or "Cancel" to abort installation.</TEXT>
+</PAGE>
+
+<!-- page 2: licence page -->
+<PAGE INDEX="2" TYPE="README">
+<NEXTBUTTON TARGET=3>~Next</NEXTBUTTON>
+<README EXTRACTFROMPCK="1">COPYING</README>
+<TEXT>OpenTTD is licenced under the GNU General Public License. The text of the licence is below.
+
+Select "Next" if you agree to this licence.
+Select "Cancel" to abort installation.</TEXT>
+</PAGE>
+
+<!-- The TYPE=CONTAINER will list the packages which can be installed. -->
+<PAGE INDEX="3" TYPE="CONTAINER">
+<NEXTBUTTON TARGET="4">~Next</NEXTBUTTON>
+<TEXT>On this page, you may choose which components to install. If you don't own Transport Tycoon Deluxe, you will need to download OpenGFX (3MiB) and OpenSFX (10MiB).</TEXT>
+</PAGE>
+
+<!-- Display another TEXT page to inform the user
+         that installation will begin. We use the TARGET=0
+        with the NEXTBUTTON tag which starts installation. -->
+
+<PAGE INDEX="4" TYPE="TEXT">
+<NEXTBUTTON TARGET="0">I~nstall</NEXTBUTTON>
+<TEXT>
+Press "Install" to begin installing OpenTTD.</TEXT>
+</PAGE>
+</BODY>
+</WARPIN>
@@ -0,0 +1,15 @@
+@echo off
+if "%1" == "" goto err
+
+echo Removing NoSound...
+
+del %1\data\nosound\*.* /n
+rmdir %1\data\nosound
+
+echo NoSound has been removed.
+goto end
+
+:err
+echo This batch file is only intended for use by the OpenTTD installer.
+
+:end
@@ -0,0 +1,15 @@
+@echo off
+if "%1" == "" goto err
+
+echo Removing OpenGFX...
+
+del %1\data\opengfx\*.* /n
+rmdir %1\data\opengfx
+
+echo OpenGFX has been removed.
+goto end
+
+:err
+echo This batch file is only intended for use by the OpenTTD installer.
+
+:end
@@ -0,0 +1,15 @@
+@echo off
+if "%1" == "" goto err
+
+echo Removing OpenSFX...
+
+del %1\data\opensfx\*.* /n
+rmdir %1\data\opensfx
+
+echo OpenSFX has been removed.
+goto end
+
+:err
+echo This batch file is only intended for use by the OpenTTD installer.
+
+:end
@@ -2,15 +2,18 @@
 #-------------------------------------------------------------------------------
 # spec file for the openttd rpm package
 #
-# Copyright (c) 2007-2009 The OpenTTD developers
+# Copyright (c) 2007-2010 The OpenTTD developers
 #
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself
 #
+# Note: for (at least) CentOS '#' comments end '\' continue command on new line.
+#       So place all '#' commented parameters of e.g. configure to the end.
+#
 #-------------------------------------------------------------------------------

 Name:          openttd
-Version:       0.7.0
+Version:       1.0.3
 Release:       1%{?dist}

 Group:         Amusements/Games
@@ -18,13 +21,12 @@ License:       GPLv2
 URL:           http://www.openttd.org
 Summary:       OpenTTD is an Open Source clone of Chris Sawyer's Transport Tycoon Deluxe

-Source:        %{name}-%{version}.tar.bz2
+Source:        %{name}-%{version}-source.tar.bz2

 Requires:      fontconfig
-Requires:      libicu
-Requires:      libpng
 Requires:      SDL
 Requires:      zlib
+BuildRequires: gcc-c++
 BuildRequires: fontconfig-devel
 BuildRequires: libpng-devel
 BuildRequires: libicu-devel
@@ -35,33 +37,32 @@ BuildRequires: zlib-devel
 Requires:      freetype
 BuildRequires: freetype-devel
 %endif
-%if %{_vendor}=="MandrakeSoft" || %{_vendor}=="mandriva"
-Requires:      freetype2
-BuildRequires: libfreetype6-devel
-%endif
 %if %{_vendor}=="redhat" || %{_vendor}=="fedora"
 Requires:      freetype
 BuildRequires: freetype-devel
 BuildRequires: desktop-file-utils
 %endif
-%if %{_vendor}=="suse"
+%if %{_vendor}=="suse" || %{_vendor}=="mandriva"
 Requires:      freetype2
 BuildRequires: freetype2-devel
 %endif
+%if %{_vendor}=="suse"
+BuildRequires: update-desktop-files
+%endif
+
+# recommends works for suse (not sles9) and mandriva, only
+%if 0%{?suse_version} > 910  || %{_vendor}=="mandriva"
+Recommends:	opengfx
+# for 0.8.0
+#Recommends:	opensfx
+%endif

 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-buildroot

 %description
 OpenTTD is a reimplementation of the Microprose game "Transport Tycoon Deluxe"
-with lots of new features and enhancements. To play the game you need to copy
-the following 6 data files from your Transport Tycoon Deluxe CD to the game
-data directory in %{_datadir}/games/%{name}/data:
-
-From the Windows version of TTD you need:
-sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf
-
-Or if you have the DOS version you need:
-sample.cat TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF
+with lots of new features and enhancements. To play the game you need either
+the original data from the game or install the recommend package OpenGFX.

 OpenTTD is licensed under the GNU General Public License version 2.0. For more
 information, see the file 'COPYING' included with every release and source
@@ -71,49 +72,71 @@ download of the game.
 %setup -q

 %build
+# suse sle <10 has no support for makedepend
+%if 0%{?sles_version} == 9 || 0%{?sles_version} == 10
+%define 	do_makedepend	0
+%else
+%define 	do_makedepend	1
+%endif
 ./configure \
-	--revision=%{version} \
 	--prefix-dir="%{_prefix}" \
-	--binary-dir="bin" \
 	--binary-name="%{name}" \
+	--enable-strip \
+	--binary-dir="bin" \
+	--data-dir="share/%{name}" \
+	--with-makedepend="%{do_makedepend}" \
+#	--revision="%{ver}%{?prever:-%{prever}}" \
+#	--enable-debug=0 \
+#	--with-sdl \
+#	--with-zlib \
+#	--with-png \
+#	--with-freetype \
+#	--with-fontconfig \
+#	--with-icu \
+#	--menu_group="Game;" \
 #	--menu-name="OpenTTD" \
-#	--data-dir="share\games\%{name}" \
 #	--doc-dir="share\doc\%{name}" \
 #	--icon-dir="share/pixmaps" \
 #	--icon-theme-dir="share/icons/hicolor" \
 #	--man-dir="share/man/man6" \
-#	--menu-dir="share/applications" \
-	--enable-debug=0 \
-#	--menu_group="Game;" \
-	--with-sdl \
-	--with-zlib \
-	--with-png \
-	--with-freetype \
-	--with-fontconfig \
-	--with-icu \
-	--enable-strip
+#	--menu-dir="share/applications"
+
 make %{?_smp_mflags}

 %install
-rm -rf "%{buildroot}"
 make install INSTALL_DIR="%{buildroot}"

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

 %clean
-rm -rf "%{buildroot}"
+#rm -rf "%{buildroot}"

 %post
 # Update the icon cache (vendor specific)
-%if %{_vendor}=="MandrakeSoft" || %{_vendor}=="mandriva"
+%if %{_vendor}=="mandriva"
 %update_icon_cache hicolor
 %endif

@@ -126,7 +149,7 @@ fi

 %postun
 # Update the icon cache (vendor specific)
-%if %{_vendor}=="MandrakeSoft" || %{_vendor}=="mandriva"
+%if %{_vendor}=="mandriva"
 %update_icon_cache hicolor
 %endif

@@ -140,37 +163,39 @@ fi
 %files
 %defattr(-, root, games, -)
 %dir %{_datadir}/doc/%{name}
-%dir %{_datadir}/games/%{name}
-%dir %{_datadir}/games/%{name}/lang
-%dir %{_datadir}/games/%{name}/data
-%dir %{_datadir}/games/%{name}/gm
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/lang
+%dir %{_datadir}/%{name}/data
+%dir %{_datadir}/%{name}/gm
+%dir %{_datadir}/%{name}/scripts
 %attr(755, root, games) %{_bindir}/%{name}
 %{_datadir}/doc/%{name}/*
-%{_datadir}/games/%{name}/lang/*
-%{_datadir}/games/%{name}/data/*
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/%{name}/lang/*
+%{_datadir}/%{name}/data/*
+%{_datadir}/%{name}/scripts/*
+%{_datadir}/applications/*%{name}.desktop
 %{_datadir}/pixmaps/*
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
-%doc %{_mandir}/man6/%{name}.6.gz
+%{_datadir}/icons/*
+%doc %{_mandir}/man6/%{name}.6.*

 %changelog
-* Mon Oct 20 2008 Benedikt Brüggemeier <skidd13@openttd.org>
+* Sat Sep 26 2009 Marcel Gmür <ammler@openttdcoop.org> - 0.7.2
+- no subfolder games for datadir
+- cleanup: no post and postun anymore
+- Recommends: opengfx (for suse and mandriva)
+- add SUSE support

+* Mon Oct 20 2008 Benedikt Brüggemeier <skidd13@openttd.org>
 - Added libicu dependency

 * Thu Sep 23 2008 Benedikt Brüggemeier <skidd13@openttd.org>
-
 - Merged both versions of the spec file

 * Fri Aug 29 2008 Jonathan Coome <maedhros@openttd.org>
-
 - Rewrite spec file from scratch.

 * Sat Aug 02 2008 Benedikt Brüggemeier <skidd13@openttd.org>
-
 - Updated spec file

 * Thu Mar 27 2008 Denis Burlaka <burlaka@yandex.ru>
-
 - Universal spec file
-
@@ -1,30 +0,0 @@
-; Ini file generated by the HM NIS Edit IO designer.
-[Settings]
-NumFields=3
-CancelEnabled=0
-
-[Field 1]
-Type=Groupbox
-Text=UNICODE support
-Left=8
-Right=292
-Top=0
-Bottom=75
-
-[Field 2]
-Type=Label
-Text=This version of OpenTTD has support for UNICODE, allowing users to use non-ASCII character sets such as Russian or Japanese.\r\nSelecting such a language will result in an unusable and garbled interface. You will need to specify a font that has support for these characters in openttd.cfg, or alternatively use an appropiate grf file.\r\n\r\nFor more information please refer to the readme or the wiki.
-Left=13
-Right=284
-Top=9
-Bottom=65
-
-[Field 3]
-Type=Link
-Text=OpenTTD wiki
-Left=238
-Right=284
-Top=64
-Bottom=72
-State=http://wiki.openttd.org/index.php/Unicode
-
@@ -1,11 +1,22 @@
+# Version numbers to update
+!define APPV_MAJOR 1
+!define APPV_MINOR 0
+!define APPV_MAINT 3
+!define APPV_BUILD 1
+!define APPV_EXTRA ""
+
 !define APPNAME "OpenTTD"   ; Define application name
-!define APPVERSION "0.7.0"  ; Define application version
-!define INSTALLERVERSION 55 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"  ; Define application version
+!define APPVERSIONINTERNAL "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}.${APPV_BUILD}" ; Define application version in X.X.X.X
+!define INSTALLERVERSION ${APPV_MAJOR}${APPV_MINOR}${APPV_MAINT}${APPV_BUILD}
 !include ${VERSION_INCLUDE}

 !define APPURLLINK "http://www.openttd.org"
 !define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}"
-!define APPVERSIONINTERNAL "${APPVERSION}.0" ; Needs to be of the format X.X.X.X
+
+!define OPENGFX_BASE_VERSION "0.7.0"
+!define OPENSFX_BASE_VERSION "0.8.0"
+!define OPENMSX_BASE_VERSION "1.0.0"

 !define MUI_ICON "..\..\..\media\openttd.ico"
 !define MUI_UNICON "..\..\..\media\openttd.ico"
@@ -19,7 +30,7 @@ SetCompressor LZMA
 ; Version Info
 Var AddWinPrePopulate
 VIProductVersion "${APPVERSIONINTERNAL}"
-VIAddVersionKey "ProductName" "OpenTTD Installer ${APPBITS} bits version ${EXTRA_VERSION}"
+VIAddVersionKey "ProductName" "OpenTTD ${APPBITS}-bit Installer for Windows ${EXTRA_VERSION}"
 VIAddVersionKey "Comments" "Installs ${APPNAMEANDVERSION}"
 VIAddVersionKey "CompanyName" "OpenTTD Developers"
 VIAddVersionKey "FileDescription" "Installs ${APPNAMEANDVERSION}"
@@ -28,7 +39,7 @@ VIAddVersionKey "InternalName" "InstOpenTTD-${APPARCH}"
 VIAddVersionKey "FileVersion" "${APPVERSION}-${APPARCH}"
 VIAddVersionKey "LegalCopyright" " "
 ; Main Install settings
-Name "${APPNAMEANDVERSION} ${APPBITS} bits version ${EXTRA_VERSION}"
+Name "${APPNAMEANDVERSION} ${APPBITS}-bit for Windows ${EXTRA_VERSION}"

 ; NOTE: Keep trailing backslash!
 InstallDirRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Install Folder"
@@ -42,17 +53,15 @@ Var SHORTCUTS
 Var CDDRIVE

 ; Modern interface settings
-!include "MUI.nsh"
+!include "MUI2.nsh"
+!include "InstallOptions.nsh"

 !define MUI_ABORTWARNING
 !define MUI_WELCOMEPAGE_TITLE_3LINES
 !insertmacro MUI_PAGE_WELCOME
-
-!define MUI_LICENSEPAGE_RADIOBUTTONS
-!insertmacro MUI_DEFAULT MUI_LICENSEPAGE_RADIOBUTTONS_TEXT_ACCEPT "I &accept this agreement"
-!insertmacro MUI_DEFAULT MUI_LICENSEPAGE_RADIOBUTTONS_TEXT_DECLINE "I &do not accept this agreement"
 !insertmacro MUI_PAGE_LICENSE "..\..\..\COPYING"

+!define MUI_COMPONENTSPAGE_SMALLDESC
 !insertmacro MUI_PAGE_COMPONENTS

 ;---------------------------------
@@ -71,14 +80,10 @@ Page custom SelectCDEnter SelectCDExit ": TTD folder"

 !insertmacro MUI_PAGE_INSTFILES

-;-----------------------------------------------------
-; New custom page to show UNICODE and MSLU information
-Page custom ShowWarningsPage
-
 !define MUI_FINISHPAGE_TITLE_3LINES
 !define MUI_FINISHPAGE_RUN_TEXT "Run ${APPNAMEANDVERSION} now!"
 !define MUI_FINISHPAGE_RUN "$INSTDIR\openttd.exe"
-!define MUI_FINISHPAGE_LINK "Visit the OpenTTD site for latest news, FAQs and downloads"
+!define MUI_FINISHPAGE_LINK "Visit the OpenTTD site for the latest news, FAQs and downloads"
 !define MUI_FINISHPAGE_LINK_LOCATION "${APPURLLINK}"
 !define MUI_FINISHPAGE_NOREBOOTSUPPORT
 !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\readme.txt"
@@ -105,25 +110,35 @@ Section "!OpenTTD" Section1

 	; Copy language files
 	SetOutPath "$INSTDIR\lang\"
-	File ${PATH_ROOT}bin\lang\*.lng
+	File ${PATH_ROOT}bin\lang\english.lng
+
+	; Copy AI files
+	SetOutPath "$INSTDIR\ai\"
+	File ${PATH_ROOT}bin\ai\compat_*.nut

 	; Copy data files
 	SetOutPath "$INSTDIR\data\"
 	File ${PATH_ROOT}bin\data\*.grf
 	File ${PATH_ROOT}bin\data\*.obg
+	File ${PATH_ROOT}bin\data\*.obs
 	File ${PATH_ROOT}bin\data\opntitle.dat
-	; Copy scenario files (don't choke if they don't exist)
-	SetOutPath "$INSTDIR\scenario\"
-	File /nonfatal ${PATH_ROOT}bin\scenario\*.scn

-	; Copy heightmap files (don't choke if they don't exist)
-	SetOutPath "$INSTDIR\scenario\heightmap\"
-	File /nonfatal ${PATH_ROOT}bin\scenario\heightmap\*.*
+	; Copy the music base metadata files
+	SetOutPath "$INSTDIR\gm\"
+	File ${PATH_ROOT}bin\gm\*.obm

 	; Copy the scripts
 	SetOutPath "$INSTDIR\scripts\"
 	File ${PATH_ROOT}bin\scripts\*.*

+	; Copy some documention files
+	SetOutPath "$INSTDIR\docs\"
+	File ${PATH_ROOT}docs\obg_format.txt
+	File ${PATH_ROOT}docs\obm_format.txt
+	File ${PATH_ROOT}docs\obs_format.txt
+	File ${PATH_ROOT}docs\multiplayer.txt
+	File ${PATH_ROOT}docs\32bpp.txt
+
 	; Copy the rest of the stuff
 	SetOutPath "$INSTDIR\"

@@ -140,7 +155,6 @@ Section "!OpenTTD" Section1
 	; Delete old files from the main dir. they are now placed in data/ and lang/
 	Delete "$INSTDIR\*.lng"
 	Delete "$INSTDIR\*.grf"
-	Delete "$INSTDIR\*.obg"
 	Delete "$INSTDIR\sample.cat"
 	Delete "$INSTDIR\ttd.exe"

@@ -170,9 +184,84 @@ Section "!OpenTTD" Section1
 	!insertmacro MUI_STARTMENU_WRITE_END
 SectionEnd

+;--------------------------------------------------------------
+; OpenTTD translation install section. Copies only translations
+Section "OpenTTD translations" Section6
+	; Overwrite files by default, but don't complain on failure
+	SetOverwrite try
+
+	; Copy language files
+	SetOutPath "$INSTDIR\lang\"
+	File ${PATH_ROOT}bin\lang\*.lng
+SectionEnd
+
+;----------------------------------------------------------------------------------
+; OpenGFX files install section. Downloads OpenGFX and installs it
+Section "Download OpenGFX (free graphics set)" Section3
+	SetOverwrite try
+
+	NSISdl::download "http://binaries.openttd.org/installer/opengfx-${OPENGFX_BASE_VERSION}.7z" "$INSTDIR\data\opengfx.7z"
+	Pop $R0 ;Get the return value
+	StrCmp $R0 "success" +3
+		MessageBox MB_OK "Downloading of OpenGFX failed"
+		Goto Done
+
+	; Let's extract the files
+	SetOutPath "$INSTDIR\data\"
+	NSIS7z::Extract "$INSTDIR\data\opengfx.7z"
+
+	Delete "$INSTDIR\data\opengfx.7z"
+	SetOutPath "$INSTDIR\"
+Done:
+
+SectionEnd
+
+;----------------------------------------------------------------------------------
+; OpenSFX files install section. Downloads OpenSFX and installs it
+Section "Download OpenSFX (free sound set)" Section4
+	SetOverwrite try
+
+	NSISdl::download "http://binaries.openttd.org/installer/opensfx-${OPENSFX_BASE_VERSION}.7z" "$INSTDIR\data\opensfx.7z"
+	Pop $R0 ;Get the return value
+	StrCmp $R0 "success" +3
+		MessageBox MB_OK "Downloading of OpenSFX failed"
+		Goto Done
+
+	; Let's extract the files
+	SetOutPath "$INSTDIR\data\"
+	NSIS7z::Extract "$INSTDIR\data\opensfx.7z"
+
+	Delete "$INSTDIR\data\opensfx.7z"
+	SetOutPath "$INSTDIR\"
+Done:
+
+SectionEnd
+
+;----------------------------------------------------------------------------------
+; OpenMSX files install section. Downloads OpenMSX and installs it
+Section "Download OpenMSX (free music set)" Section5
+	SetOverwrite try
+
+	NSISdl::download "http://binaries.openttd.org/installer/openmsx-${OPENMSX_BASE_VERSION}.7z" "$INSTDIR\gm\openmsx.7z"
+	Pop $R0 ;Get the return value
+	StrCmp $R0 "success" +3
+		MessageBox MB_OK "Downloading of OpenMSX failed"
+		Goto Done
+
+	; Let's extract the files
+	SetOutPath "$INSTDIR\gm\"
+	NSIS7z::Extract "$INSTDIR\gm\openmsx.7z"
+
+	Delete "$INSTDIR\gm\openmsx.7z"
+	SetOutPath "$INSTDIR\"
+Done:
+
+SectionEnd
+
 ;----------------------------------------------------------------------------------
 ; TTDLX files install section. Copies all needed TTDLX files from CD or install dir
-Section "Copy Game Graphics" Section2
+Section /o "Copy data from Transport Tycoon Deluxe CD-ROM" Section2
+	SetOverwrite try
 	; Let's copy the files with size approximation
 	SetOutPath "$INSTDIR\gm"
 	CopyFiles "$CDDRIVE\gm\*.gm" "$INSTDIR\gm\" 1028
@@ -201,8 +290,12 @@ SectionEnd

 ; Modern install component descriptions
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-	!insertmacro MUI_DESCRIPTION_TEXT ${Section1} "OpenTTD is a fully functional clone of TTD and is very playable."
-	!insertmacro MUI_DESCRIPTION_TEXT ${Section2} "Copies the game graphics. Requires TTD (for Windows)."
+	!insertmacro MUI_DESCRIPTION_TEXT ${Section1} "Minimal OpenTTD installation in English. You need at least one of the game graphics and sound sets installed."
+	!insertmacro MUI_DESCRIPTION_TEXT ${Section6} "Translations of OpenTTD."
+	!insertmacro MUI_DESCRIPTION_TEXT ${Section3} "Download the free OpenGFX game graphics set. This download is about 3 MiB."
+	!insertmacro MUI_DESCRIPTION_TEXT ${Section4} "Download the free OpenSFX game sound set. This download is about 10 MiB."
+	!insertmacro MUI_DESCRIPTION_TEXT ${Section5} "Download the free OpenMSX game music set. This download is about 200 KiB."
+	!insertmacro MUI_DESCRIPTION_TEXT ${Section2} "Copies the game graphics, sounds and music from the Transport Tycoon Deluxe CD."
 !insertmacro MUI_FUNCTION_DESCRIPTION_END

 ;-----------------------------------------------
@@ -261,6 +354,9 @@ Section "Uninstall"
 	Delete "$INSTDIR\cached_sprites.*"
 	Delete "$INSTDIR\save\autosave\network*.tmp" ; temporary network file

+	; AI files
+	Delete "$INSTDIR\ai\compat_*.nut"
+
 	; Data files
 	Delete "$INSTDIR\data\opntitle.dat"

@@ -279,6 +375,9 @@ Section "Uninstall"
 	Delete "$INSTDIR\data\orig_win.obg"
 	Delete "$INSTDIR\data\orig_dos.obg"
 	Delete "$INSTDIR\data\orig_dos_de.obg"
+	Delete "$INSTDIR\data\orig_win.obs"
+	Delete "$INSTDIR\data\orig_dos.obs"
+	Delete "$INSTDIR\data\no_sound.obs"

 	Delete "$INSTDIR\data\sample.cat"
 	; Windows Data files
@@ -297,18 +396,36 @@ Section "Uninstall"
 	; Music
 	Delete "$INSTDIR\gm\*.gm"

+	; Downloaded OpenGFX/OpenSFX/OpenMSX
+	Delete "$INSTDIR\data\opengfx\*"
+	RMDir  "$INSTDIR\data\opengfx"
+	Delete "$INSTDIR\data\opensfx\*"
+	RMDir  "$INSTDIR\data\opensfx"
+	Delete "$INSTDIR\gm\openmsx\*"
+	RMDir  "$INSTDIR\gm\openmsx"
+
 	; Language files
 	Delete "$INSTDIR\lang\*.lng"

 	; Scripts
 	Delete "$INSTDIR\scripts\*.*"

+	; Documentation
+	Delete "$INSTDIR\docs\*.*"
+
+	; Base sets for music
+	Delete "$INSTDIR\gm\orig_win.obm"
+	Delete "$INSTDIR\gm\no_music.obm"
+
 	; Remove remaining directories
 	RMDir "$SMPROGRAMS\$SHORTCUTS\Extras\"
 	RMDir "$SMPROGRAMS\$SHORTCUTS"
+	RMDir "$INSTDIR\ai"
+	RMDir "$INSTDIR\data"
 	RMDir "$INSTDIR\gm"
 	RMDir "$INSTDIR\lang"
-	RMDir "$INSTDIR\data"
+	RMDir "$INSTDIR\scripts"
+	RMDir "$INSTDIR\docs"
 	RMDir "$INSTDIR"

 SectionEnd
@@ -327,7 +444,7 @@ NoAbort:

 	GetTempFileName $R0
 	!insertmacro MUI_HEADER_TEXT "Locate TTD" "Setup needs the location of Transport Tycoon Deluxe in order to continue."
-	!insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "CDFinder.ini" "CDFinder"
+	!insertmacro INSTALLOPTIONS_EXTRACT_AS "CDFinder.ini" "CDFinder"

 	ClearErrors
 	; Now, let's populate $CDDRIVE
@@ -342,18 +459,18 @@ NoTTD:
 	StrCpy $AddWinPrePopulate "Setup couldn't find TTD. Please enter the path where the graphics files from TTD are stored and press Next to continue."
 TruFinish:
 	ClearErrors
-	!insertmacro MUI_INSTALLOPTIONS_WRITE "CDFinder" "Field 2" "State" $CDDRIVE          ; TTDLX path
-	!insertmacro MUI_INSTALLOPTIONS_WRITE "CDFinder" "Field 3" "Text" $AddWinPrePopulate ; Caption
+	!insertmacro INSTALLOPTIONS_WRITE "CDFinder" "Field 2" "State" $CDDRIVE          ; TTDLX path
+	!insertmacro INSTALLOPTIONS_WRITE "CDFinder" "Field 3" "Text" $AddWinPrePopulate ; Caption
 DoneCD:
 	; Initialize the dialog *AFTER* we've changed the text otherwise we won't see the changes
-	!insertmacro MUI_INSTALLOPTIONS_INITDIALOG "CDFinder"
-	!insertmacro MUI_INSTALLOPTIONS_SHOW
+	!insertmacro INSTALLOPTIONS_INITDIALOG "CDFinder"
+	!insertmacro INSTALLOPTIONS_SHOW
 FunctionEnd

 ;----------------------------------------------------------------
 ; Custom page function when 'next' is selected for the TTDLX path
 Function SelectCDExit
-	!insertmacro MUI_INSTALLOPTIONS_READ $CDDRIVE "CDFinder" "Field 2" "State"
+	!insertmacro INSTALLOPTIONS_READ $CDDRIVE "CDFinder" "Field 2" "State"
 	; If trg1r.grf does not exist at the path, retry with DOS version
 	IfFileExists $CDDRIVE\trg1r.grf "" DosCD
 	IfFileExists $CDDRIVE\trgir.grf "" NoCD
@@ -363,39 +480,11 @@ DosCD:
 	IfFileExists $CDDRIVE\TRGI.GRF "" NoCD
 	IfFileExists $CDDRIVE\SAMPLE.CAT hasCD NoCD
 NoCD:
-	MessageBox MB_OK "Setup cannot continue without the Transport Tycoon Deluxe Location!"
+	MessageBox MB_OK "Setup cannot continue without the Transport Tycoon Deluxe location!"
 	Abort
 hasCD:
 FunctionEnd

-;----------------------------------------------------------------------------------
-; Disable the "Back" button on finish page if the installer is run on Win9x systems
-Function DisableBack
-	Call GetWindowsVersion
-	Pop $R0
-	StrCmp $R0 "win9x" 0 WinNT
-	!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "BackEnabled" "0"
-WinNT:
-	ClearErrors
-FunctionEnd
-
-;----------------------------------------------------------------------------------
-; Custom page function to show notices for running OpenTTD (only for win32 systems)
-; We have extracted this custom page as Notice in the .onInit function
-Function ShowWarningsPage
-	Call GetWindowsVersion
-	Pop $R0
-	; Don't show the UNICODE notice if the installer is run on Win9x systems
-	StrCmp $R0 "win9x" 0 WinNT
-	Abort
-WinNT:
-	!insertmacro MUI_HEADER_TEXT "Installation Complete" "Important notices for OpenTTD usage."
-	!insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "notice.ini" "Notice"
-	!insertmacro MUI_INSTALLOPTIONS_INITDIALOG "Notice"
-	ClearErrors
-	!insertmacro MUI_INSTALLOPTIONS_SHOW
-FunctionEnd
-
 ;-------------------------------------------------------------------------------
 ; Determine windows version, returns "win9x" if Win9x/Me or "winnt" on the stack
 Function GetWindowsVersion
@@ -419,12 +508,12 @@ Function CheckProcessorArchitecture
 	IntCmp $R0 64 Win64 0
 	ClearErrors
 	IntCmp ${APPBITS} 64 0 Done
-	MessageBox MB_OKCANCEL|MB_ICONSTOP "You want to install the 64 bits OpenTTD on a 32 bits Operating System. This is not going to work. Please download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
+	MessageBox MB_OKCANCEL|MB_ICONSTOP "You are trying to install the 64-bit OpenTTD on a 32-bit operating system. This is not going to work. Please download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
 	GoTo Done
 Win64:
 	ClearErrors
 	IntCmp ${APPBITS} 64 Done 0
-	MessageBox MB_OKCANCEL|MB_ICONINFORMATION "You want to install the 32 bits OpenTTD on a 64 bits Operating System. This is not adviced, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
+	MessageBox MB_OKCANCEL|MB_ICONINFORMATION "You are trying to install the 32-bit OpenTTD on a 64-bit operating system. This is not advised, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
 	GoTo Done
 Abort:
 	Quit
@@ -440,12 +529,12 @@ Function CheckWindowsVersion
 	StrCmp $R0 "win9x" 0 WinNT
 	ClearErrors
 	StrCmp ${APPARCH} "win9x" Done 0
-	MessageBox MB_OKCANCEL|MB_ICONSTOP "You want to install the Windows 2000, XP and Vista version on Windows 95, 98 or ME. This is will not work. Please download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
+	MessageBox MB_OKCANCEL|MB_ICONSTOP "You are trying to install the Windows 2000, XP and Vista version on Windows 95, 98 or ME. This is will not work. Please download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
 	GoTo Done
 WinNT:
 	ClearErrors
 	StrCmp ${APPARCH} "win9x" 0 Done
-	MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "You want to install the Windows 95, 98 and ME version on Windows 2000, XP or Vista. This is not adviced, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
+	MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "You are trying to install the Windows 95, 98 and ME version on Windows 2000, XP or Vista. This is not advised, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
 Abort:
 	Quit
 Done:
@@ -455,10 +544,14 @@ Var OLDVERSION
 Var UninstallString

 ;-----------------------------------------------------------------------------------
-; NSIS Initialize function, determin if we are going to install/upgrade or uninstall
+; NSIS Initialize function, determine if we are going to install/upgrade or uninstall
 Function .onInit
 	StrCpy $SHORTCUTS "OpenTTD"

+	SectionSetSize ${Section3} 6144
+	SectionSetSize ${Section4} 13312
+	SectionSetSize ${Section5} 1024
+
 	SectionSetFlags 0 17

 	; Starts Setup - let's look for an older version of OpenTTD
@@ -480,13 +573,16 @@ WelcomeToSetup:
 		"Welcome to ${APPNAMEANDVERSION} Setup.$\n \
 		This will allow you to upgrade from version $OLDVERSION."
 	SectionSetFlags ${Section2} 0x80 ; set bit 7
+	SectionSetFlags ${Section3} 0x80 ; set bit 7
+	SectionSetFlags ${Section4} 0x80 ; set bit 7
+	SectionSetFlags ${Section5} 0x80 ; set bit 7
 	Goto FinishCallback

 VersionsAreEqual:
 	ReadRegStr $UninstallString HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "UninstallString"
 	IfFileExists "$UninstallString" "" FinishCallback
 	MessageBox MB_YESNO|MB_ICONQUESTION \
-		"Setup detected ${APPNAMEANDVERSION} on your system. That's the version this program will install.$\n \
+		"Setup detected ${APPNAMEANDVERSION} on your system. This is the same version that this program will install.$\n \
 		Are you trying to uninstall it?" \
 		IDYES DoUninstall IDNO FinishCallback
 DoUninstall: ; You have the same version as this installer.  This allows you to uninstall.
@@ -1,5 +1,5 @@
 !define APPBITS 32          ; Define number of bits for the architecture
-!define EXTRA_VERSION "for Windows 2000, XP and Vista"
+!define EXTRA_VERSION "2000, XP, Vista and 7"
 !define APPARCH "win32"     ; Define the application architecture
 !define BINARY_DIR "${PATH_ROOT}objs\win32\Release"
 InstallDir "$PROGRAMFILES32\OpenTTD\"
@@ -1,5 +1,5 @@
 !define APPBITS 64          ; Define number of bits for the architecture
-!define EXTRA_VERSION "for Windows XP and Vista"
+!define EXTRA_VERSION "XP, Vista and 7"
 !define APPARCH "win64"     ; Define the application architecture
 !define BINARY_DIR "${PATH_ROOT}objs\x64\Release"
 InstallDir "$PROGRAMFILES64\OpenTTD\"
@@ -1,5 +1,5 @@
 !define APPBITS 32          ; Define number of bits for the architecture
-!define EXTRA_VERSION "for Windows 95, 98 and ME"
+!define EXTRA_VERSION "95, 98 and ME"
 !define APPARCH "win9x"     ; Define the application architecture
 !define BINARY_DIR "${PATH_ROOT}bin"
 InstallDir "$PROGRAMFILES32\OpenTTD\"
@@ -1,5 +1,12 @@
 Option Explicit

+' $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/>.
+
 Dim FSO
 Set FSO = CreateObject("Scripting.FileSystemObject")

@@ -16,10 +23,10 @@ End Sub

 Sub UpdateFile(modified, revision, version, cur_date, filename)
 	FSO.CopyFile filename & ".in", filename
-	FindReplaceInFile filename, "@@MODIFIED@@", modified
-	FindReplaceInFile filename, "@@REVISION@@", revision
-	FindReplaceInFile filename, "@@VERSION@@", version
-	FindReplaceInFile filename, "@@DATE@@", cur_date
+	FindReplaceInFile filename, "!!MODIFIED!!", modified
+	FindReplaceInFile filename, "!!REVISION!!", revision
+	FindReplaceInFile filename, "!!VERSION!!", version
+	FindReplaceInFile filename, "!!DATE!!", cur_date
 End Sub

 Sub UpdateFiles(version)
@@ -32,12 +39,13 @@ Sub UpdateFiles(version)
 		modified = Mid(version, InStrRev(version, Chr(9)) + 1)
 		version  = Mid(version, 1, InStr(version, Chr(9)) - 1)
 	Else
+		version = "1.0.3"
 		revision = 0
 		modified = 1
 	End If

 	UpdateFile modified, revision, version, cur_date, "../src/rev.cpp"
-	UpdateFile modified, revision, version, cur_date, "../src/ottdres.rc"
+	UpdateFile modified, revision, version, cur_date, "../src/os/windows/ottdres.rc"
 End Sub

 Function ReadRegistryKey(shive, subkey, valuename, architecture)
@@ -89,7 +97,7 @@ Function DetermineSVNVersion()
 	Dim sTortoise
 	' First, try with 32-bit architecture
 	sTortoise = ReadRegistryKey("HKLM", "SOFTWARE\TortoiseSVN", "Directory", 32)
-	If sTortoise = "" Then
+	If sTortoise = "" Or IsNull(sTortoise) Then
 		' No 32-bit version of TortoiseSVN installed, try 64-bit version (doesn't hurt on 32-bit machines, it returns nothing or is ignored)
 		sTortoise = ReadRegistryKey("HKLM", "SOFTWARE\TortoiseSVN", "Directory", 64)
 	End If
@@ -279,6 +287,6 @@ End Function

 Dim version
 version = DetermineSVNVersion
-If Not (IsCachedVersion(version) And CheckFile("../src/rev.cpp") And CheckFile("../src/ottdres.rc")) Then
+If Not (IsCachedVersion(version) And CheckFile("../src/rev.cpp") And CheckFile("../src/os/windows/ottdres.rc")) Then
 	UpdateFiles version
 End If
@@ -1,5 +1,12 @@
 #!/bin/bash

+# $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/>.
+
 # This file generates all project files based on sources.list, so everyone who
 #  can start a bash process, can update the project files.

@@ -33,6 +40,7 @@ sdl_config="1"
 png_config="1"
 os="MSVC"
 enable_dedicated="0"
+enable_ai="1"
 with_cocoa="0"
 enable_directmusic="1"
 with_threads="1"
@@ -87,6 +95,7 @@ load_main_data() {
 			if ($0 == "PSP"         && "'$os'" != "PSP")               { next; }
 			if ($0 == "DOS"         && "'$os'" != "DOS")               { next; }
 			if ($0 == "DEDICATED"   && "'$enable_dedicated'" != "1")   { next; }
+			if ($0 == "AI"          && "'$enable_ai'" == "0")          { next; }
 			if ($0 == "COCOA"       && "'$with_cocoa'" == "0")         { next; }
 			if ($0 == "BEOS"        && "'$os'" != "BEOS")              { next; }
 			if ($0 == "WIN32"       && "'$os'" != "MINGW" &&
@@ -152,8 +161,8 @@ load_lang_data() {
 				<Tool
 					Name=\"VCCustomBuildTool\"
 					Description=\"Generating "$i" language file\"
-					CommandLine=\"..\\objs\\strgen\\strgen.exe -s ..\\src\\lang -d ..\\bin\\lang &quot;\$(InputPath)&quot;&#x0D;&#x0A;\"
-					AdditionalDependencies=\"\"
+					CommandLine=\"..\\objs\\strgen\\strgen.exe -s ..\\src\\lang -d ..\\bin\\lang &quot;\$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;\"
+					AdditionalDependencies=\"..\\src\\lang\\english.txt;..\\objs\\strgen\\strgen.exe\"
 					Outputs=\"..\\bin\\lang\\"$i".lng\"
 				/>
 			</FileConfiguration>
@@ -1,5 +1,12 @@
 Option Explicit

+' $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/>.
+
 Dim FSO
 Set FSO = CreateObject("Scripting.FileSystemObject")

@@ -151,6 +158,7 @@ Function load_main_data(filename)
 						line = "WIN32" Or _
 						line = "MSVC" Or _
 						line = "DIRECTMUSIC" Or _
+						line = "AI" Or _
 						line = "HAVE_THREAD" _
 					) Then skip = skip + 1
 					deep = deep + 1
@@ -202,8 +210,8 @@ Function load_lang_data(dir)
 			& vbCrLf & "				<Tool" _
 			& vbCrLf & "					Name=" & Chr(34) & "VCCustomBuildTool" & Chr(34) _
 			& vbCrLf & "					Description=" & Chr(34) & "Generating " & file & " language file" & Chr(34) _
-			& vbCrLf & "					CommandLine=" & Chr(34) & "..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;" & Chr(34) _
-			& vbCrLf & "					AdditionalDependencies=" & Chr(34) & Chr(34) _
+			& vbCrLf & "					CommandLine=" & Chr(34) & "..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;" & Chr(34) _
+			& vbCrLf & "					AdditionalDependencies=" & Chr(34) & "..\src\lang\english.txt;..\objs\strgen\strgen.exe" & Chr(34) _
 			& vbCrLf & "					Outputs=" & Chr(34) & "..\bin\lang\" & file & ".lng" & Chr(34) _
 			& vbCrLf & "				/>" _
 			& vbCrLf & "			</FileConfiguration>" _
--- a/Show More
+++ b/Show More