(svn r12182) -Release 0.6.0-beta4

.gitignore

@@ -1,6 +1,5 @@
 Makefile*
 bin/*
-bundle/*
 !bin/data/chars.grf
 !bin/data/openttdd.grf
 !bin/data/openttdw.grf

.hgignore

@@ -1,11 +0,0 @@
-bin/lang/*
-bin/opentd*
-bundle/*
-config.cache.*
-config.log
-config.pwd
-Makefile
-Makefile.am
-media/openttd.desktop*
-objs/*
-src/rev.cpp

Doxyfile

@@ -1,7 +1,7 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = OpenTTD
+PROJECT_NAME           = openttd
 OUTPUT_DIRECTORY       = docs/source/
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
@@ -76,7 +76,7 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = ./src/
+INPUT                  = ./
 FILE_PATTERNS          = *.c \
                          *.cc \
                          *.cxx \
@@ -158,7 +158,7 @@ RTF_EXTENSIONS_FILE    =
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
-GENERATE_MAN           = NO
+GENERATE_MAN           = YES
 MAN_OUTPUT             = man
 MAN_EXTENSION          = .3
 MAN_LINKS              = NO

Makefile.bundle.in

@@ -1,183 +0,0 @@
-#
-# Creation of bundles
-#
-
-# The revision is needed for the bundle name and creating an OSX application bundle.
-ifdef REVISION
-REV := $(REVISION)
-else
-# Detect the revision
-VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh")
-REV      := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
-endif
-
-# Make sure we have something in REV
-ifeq ($(REV),)
-REV := norev000
-endif
-
-ifndef BUNDLE_NAME
-BUNDLE_NAME = openttd-custom-$(REV)-$(OS)
-endif
-
-# An OSX application bundle needs the data files, lang files and openttd executable in a different location.
-ifdef OSXAPP
-DATA_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/data
-LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
-TTD_DIR  = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
-else
-DATA_DIR = $(BUNDLE_DIR)/data
-LANG_DIR = $(BUNDLE_DIR)/lang
-TTD_DIR  = $(BUNDLE_DIR)
-endif
-
-bundle: all
-	@echo '[BUNDLE] Constructing bundle'
-	$(Q)rm -rf   "$(BUNDLE_DIR)"
-	$(Q)mkdir -p "$(BUNDLE_DIR)"
-	$(Q)mkdir -p "$(BUNDLE_DIR)/docs"
-	$(Q)mkdir -p "$(BUNDLE_DIR)/media"
-	$(Q)mkdir -p "$(BUNDLE_DIR)/scripts"
-	$(Q)mkdir -p "$(TTD_DIR)"
-	$(Q)mkdir -p "$(DATA_DIR)"
-	$(Q)mkdir -p "$(LANG_DIR)"
-ifdef OSXAPP
-	$(Q)mkdir -p "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources"
-	$(Q)echo "APPL????" >                                          "$(BUNDLE_DIR)/$(OSXAPP)/Contents/PkgInfo"
-	$(Q)cp    "$(ROOT_DIR)/os/macosx/openttd.icns"                 "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/openttd.icns"
-	$(Q)$(ROOT_DIR)/os/macosx/plistgen.sh                          "$(BUNDLE_DIR)/$(OSXAPP)" "$(REV)"
-	$(Q)cp    "$(ROOT_DIR)/docs/OSX_install_instructions.txt"      "$(BUNDLE_DIR)/docs/"
-	$(Q)cp    "$(ROOT_DIR)/os/macosx/splash.png"                   "$(DATA_DIR)"
-endif
-	$(Q)cp "$(BIN_DIR)/$(TTD)"                "$(TTD_DIR)/"
-	$(Q)cp "$(BIN_DIR)/data/"*.grf            "$(DATA_DIR)/"
-	$(Q)cp "$(BIN_DIR)/data/"*.obg            "$(DATA_DIR)/"
-	$(Q)cp "$(BIN_DIR)/data/opntitle.dat"     "$(DATA_DIR)/"
-	$(Q)cp "$(BIN_DIR)/lang/"*.lng            "$(LANG_DIR)/"
-	$(Q)cp "$(ROOT_DIR)/readme.txt"           "$(BUNDLE_DIR)/"
-	$(Q)cp "$(ROOT_DIR)/COPYING"              "$(BUNDLE_DIR)/"
-	$(Q)cp "$(ROOT_DIR)/known-bugs.txt"       "$(BUNDLE_DIR)/"
-	$(Q)cp "$(ROOT_DIR)/docs/obg_format.txt"  "$(BUNDLE_DIR)/docs/"
-	$(Q)cp "$(ROOT_DIR)/docs/multiplayer.txt" "$(BUNDLE_DIR)/docs/"
-	$(Q)cp "$(ROOT_DIR)/docs/32bpp.txt"       "$(BUNDLE_DIR)/docs/"
-	$(Q)cp "$(ROOT_DIR)/changelog.txt"        "$(BUNDLE_DIR)/"
-ifdef MAN_DIR
-	$(Q)mkdir -p "$(BUNDLE_DIR)/man/"
-	$(Q)cp "$(ROOT_DIR)/docs/openttd.6"       "$(BUNDLE_DIR)/man/"
-	$(Q)gzip -9 "$(BUNDLE_DIR)/man/openttd.6"
-endif
-	$(Q)cp "$(ROOT_DIR)/media/openttd.32.xpm" "$(BUNDLE_DIR)/media/"
-	$(Q)cp "$(ROOT_DIR)/media/openttd."*.png  "$(BUNDLE_DIR)/media/"
-	$(Q)cp "$(BIN_DIR)/scripts/"*             "$(BUNDLE_DIR)/scripts/"
-ifdef MENU_DIR
-	$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
-	$(Q)cat "$(ROOT_DIR)/media/openttd.desktop" | sed s/=openttd/=$(BINARY_NAME)/g > "$(ROOT_DIR)/media/openttd.desktop.install"
-endif
-ifeq ($(TTD), openttd.exe)
-	$(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/readme.txt" "$(BUNDLE_DIR)/COPYING" "$(BUNDLE_DIR)/changelog.txt" "$(BUNDLE_DIR)/known-bugs.txt"
-ifeq ($(OS), DOS)
-	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi.txt"   "$(BUNDLE_DIR)/docs/"
-ifndef STRIP
-	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi.exe"   "$(TTD_DIR)/"
-endif
-endif
-endif
-
-### Packing the current bundle into several compressed file formats ###
-#
-# Zips & dmgs do not contain a root folder, i.e. they have files in the root of the zip/dmg.
-# gzip, bzip2 and lha archives have a root folder, with the same name as the bundle.
-#
-# One can supply a custom name by adding BUNDLE_NAME:=<name> to the make command.
-#
-bundle_zip: bundle
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).zip'
-	$(Q)mkdir -p "$(BUNDLES_DIR)"
-	$(Q)cd "$(BUNDLE_DIR)" && zip -r $(shell if test -z "$(VERBOSE)"; then echo '-q'; fi) "$(BUNDLES_DIR)/$(BUNDLE_NAME).zip" .
-
-bundle_gzip: bundle
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).tar.gz'
-	$(Q)mkdir -p "$(BUNDLES_DIR)/.gzip/$(BUNDLE_NAME)"
-	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.gzip/$(BUNDLE_NAME)/"
-	$(Q)cd "$(BUNDLES_DIR)/.gzip" && tar -zc$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.gz" "$(BUNDLE_NAME)"
-	$(Q)rm -rf   "$(BUNDLES_DIR)/.gzip"
-
-bundle_bzip2: bundle
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).tar.bz2'
-	$(Q)mkdir -p "$(BUNDLES_DIR)/.bzip2/$(BUNDLE_NAME)"
-	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.bzip2/$(BUNDLE_NAME)/"
-	$(Q)cd "$(BUNDLES_DIR)/.bzip2" && tar -jc$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.bz2" "$(BUNDLE_NAME)"
-	$(Q)rm -rf   "$(BUNDLES_DIR)/.bzip2"
-
-bundle_lha: bundle
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).lha'
-	$(Q)mkdir -p "$(BUNDLES_DIR)/.lha/$(BUNDLE_NAME)"
-	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.lha/$(BUNDLE_NAME)/"
-	$(Q)cd "$(BUNDLES_DIR)/.lha" && lha ao6 "$(BUNDLES_DIR)/$(BUNDLE_NAME).lha" "$(BUNDLE_NAME)"
-	$(Q)rm -rf   "$(BUNDLES_DIR)/.lha"
-
-bundle_dmg: bundle
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).dmg'
-	$(Q)mkdir -p "$(BUNDLES_DIR)/OpenTTD $(REV)"
-	$(Q)cp -R "$(BUNDLE_DIR)/" "$(BUNDLES_DIR)/OpenTTD $(REV)"
-	$(Q)hdiutil create -ov -format UDZO -srcfolder "$(BUNDLES_DIR)/OpenTTD $(REV)" "$(BUNDLES_DIR)/$(BUNDLE_NAME).dmg"
-	$(Q)rm -fr "$(BUNDLES_DIR)/OpenTTD $(REV)"
-
-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"
-
-ifdef OSXAPP
-install:
-	@echo '[INSTALL] Cannot install the OSX Application Bundle'
-else
-install: bundle
-	@echo '[INSTALL] Installing OpenTTD'
-	$(Q)install -d "$(INSTALL_BINARY_DIR)"
-	$(Q)install -d "$(INSTALL_ICON_DIR)"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/gm"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/data"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/lang"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/scripts"
-	$(Q)install -d "$(INSTALL_DOC_DIR)"
-ifeq ($(TTD), openttd.exe)
-	$(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)/${BINARY_NAME}.exe"
-else
-	$(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)/${BINARY_NAME}"
-endif
-	$(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/data/"* "$(INSTALL_DATA_DIR)/data"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/scripts/"* "$(INSTALL_DATA_DIR)/scripts"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(INSTALL_DOC_DIR)"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/"*.txt "$(INSTALL_DOC_DIR)"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/COPYING" "$(INSTALL_DOC_DIR)"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.32.xpm" "$(INSTALL_ICON_DIR)/${BINARY_NAME}.32.xpm"
-ifdef ICON_THEME_DIR
-	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)"
-	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/16x16/apps"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.16.png" "$(INSTALL_ICON_THEME_DIR)/16x16/apps/${BINARY_NAME}.png"
-	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/32x32/apps"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.32.png" "$(INSTALL_ICON_THEME_DIR)/32x32/apps/${BINARY_NAME}.png"
-	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/48x48/apps"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.48.png" "$(INSTALL_ICON_THEME_DIR)/48x48/apps/${BINARY_NAME}.png"
-	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/64x64/apps"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.64.png" "$(INSTALL_ICON_THEME_DIR)/64x64/apps/${BINARY_NAME}.png"
-	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/128x128/apps"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.128.png" "$(INSTALL_ICON_THEME_DIR)/128x128/apps/${BINARY_NAME}.png"
-	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/256x256/apps"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.256.png" "$(INSTALL_ICON_THEME_DIR)/256x256/apps/${BINARY_NAME}.png"
-else
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/"*.png "$(INSTALL_ICON_DIR)"
-endif
-ifdef MAN_DIR
-	$(Q)install -d "$(INSTALL_MAN_DIR)"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/man/openttd.6.gz" "$(INSTALL_MAN_DIR)/${BINARY_NAME}.6.gz"
-endif
-ifdef MENU_DIR
-	$(Q)install -d "$(INSTALL_MENU_DIR)"
-	$(Q)install -m 644 "$(ROOT_DIR)/media/openttd.desktop.install" "$(INSTALL_MENU_DIR)/${BINARY_NAME}.desktop"
-endif
-endif # OSXAPP

Makefile.in

@@ -1,3 +1,5 @@
+# Auto-generated file -- DO NOT EDIT
+
 # Check if we want to show what we are doing
 ifdef VERBOSE
 	Q =
@@ -9,27 +11,18 @@ include Makefile.am
 
 SOURCE_LIST = !!SOURCE_LIST!!
 CONFIG_CACHE_SOURCE_LIST = !!CONFIG_CACHE_SOURCE_LIST!!
-CONFIG_CACHE_PWD = !!CONFIG_CACHE_PWD!!
 CONFIGURE_FILES = !!CONFIGURE_FILES!!
 LIPO = !!LIPO!!
 BIN_DIR = !!BIN_DIR!!
-ICON_THEME_DIR = !!ICON_THEME_DIR!!
-MAN_DIR = !!MAN_DIR!!
-MENU_DIR = !!MENU_DIR!!
 SRC_DIR = !!SRC_DIR!!
 ROOT_DIR = !!ROOT_DIR!!
 BUNDLE_DIR = "$(ROOT_DIR)/bundle"
 BUNDLES_DIR = "$(ROOT_DIR)/bundles"
 INSTALL_DIR = !!INSTALL_DIR!!
 INSTALL_BINARY_DIR = "$(INSTALL_DIR)/"!!BINARY_DIR!!
-INSTALL_MAN_DIR = "$(INSTALL_DIR)/$(MAN_DIR)"
-INSTALL_MENU_DIR = "$(INSTALL_DIR)/$(MENU_DIR)"
 INSTALL_ICON_DIR = "$(INSTALL_DIR)/"!!ICON_DIR!!
-INSTALL_ICON_THEME_DIR = "$(INSTALL_DIR)/$(ICON_THEME_DIR)"
 INSTALL_DATA_DIR = "$(INSTALL_DIR)/"!!DATA_DIR!!
-INSTALL_DOC_DIR = "$(INSTALL_DIR)/"!!DOC_DIR!!
-BINARY_NAME = !!BINARY_NAME!!
-STRIP = !!STRIP!!
+INSTALL_PERSONAL_DIR = !!PERSONAL_DIR!!
 TTD = !!TTD!!
 TTDS = $(SRC_DIRS:%=%/$(TTD))
 OS = !!OS!!
@@ -38,10 +31,9 @@ REVISION = !!REVISION!!
 AWK = !!AWK!!
 DISTCC = !!DISTCC!!
 
-RES := $(shell if [ ! -f $(CONFIG_CACHE_PWD) ] || [ "`pwd`" != "`cat $(CONFIG_CACHE_PWD)`" ]; then echo "`pwd`" > $(CONFIG_CACHE_PWD); fi )
-RES := $(shell if [ ! -f $(CONFIG_CACHE_SOURCE_LIST) ] || [ -n "`cmp $(CONFIG_CACHE_SOURCE_LIST) $(SOURCE_LIST) 2>/dev/null`" ]; then cp $(SOURCE_LIST) $(CONFIG_CACHE_SOURCE_LIST); fi )
+RES := $(shell if ! [ -f $(CONFIG_CACHE_SOURCE_LIST) ] || [ -n "`cmp $(CONFIG_CACHE_SOURCE_LIST) $(SOURCE_LIST)`" ]; then cp $(SOURCE_LIST) $(CONFIG_CACHE_SOURCE_LIST); fi )
 
-all: config.pwd config.cache
+all: config.cache
 ifdef DISTCC
 	@if [ -z "`echo '$(MFLAGS)' | grep '\-j'`" ]; then echo; echo "WARNING: you enabled distcc support, but you don't seem to be using the -jN paramter"; echo; fi
 endif
@@ -80,22 +72,16 @@ help:
 	@echo "  bundle_lha    create the lha installation bundle"
 	@echo "  bundle_dmg    create the dmg installation bundle"
 
-config.pwd: $(CONFIG_CACHE_PWD)
-	$(MAKE) reconfigure
-
 config.cache: $(CONFIG_CACHE_SOURCE_LIST) $(CONFIGURE_FILES)
-	$(MAKE) reconfigure
-
-reconfigure:
 ifeq ($(shell if test -f config.cache; then echo 1; fi), 1)
 	@echo "----------------"
 	@echo "The system detected that source.list or any configure file is altered."
 	@echo " Going to reconfigure with last known settings..."
 	@echo "----------------"
 # Make sure we don't lock config.cache
-	@$(shell cat config.cache | sed 's@\\ @\\\\ @g') || exit 1
+	@$(shell cat config.cache | sed 's/\\ /\\\\ /g') || exit 1
 	@echo "----------------"
-	@echo "Reconfig done. Please re-execute make."
+	@echo "Reconfig done. Now compiling..."
 	@echo "----------------"
 else
 	@echo "----------------"
@@ -121,9 +107,8 @@ mrproper:
 		rm -f $$dir/Makefile; \
 	done
 	$(Q)rm -rf objs
-	$(Q)rm -f Makefile Makefile.am Makefile.bundle
-	$(Q)rm -f media/openttd.desktop
-	$(Q)rm -f $(CONFIG_CACHE_SOURCE_LIST) config.cache config.pwd config.log $(CONFIG_CACHE_PWD)
+	$(Q)rm -f Makefile Makefile.am
+	$(Q)rm -f $(CONFIG_CACHE_SOURCE_LIST) config.cache config.log
 	$(Q)rm -rf $(BUNDLE_DIR)
 	$(Q)rm -rf $(BUNDLES_DIR)
 
@@ -141,9 +126,6 @@ run-gdb: all
 run-prof: all
 	$(Q)cd !!BIN_DIR!! && ./!!TTD!! $(OPENTTD_ARGS) && gprof !!TTD!! | less
 
-regression: all
-	$(Q)cd !!BIN_DIR!! && sh ai/regression/run.sh
-
 %.o:
 	@for dir in $(SRC_DIRS); do \
 		$(MAKE) -C $$dir $(@:src/%=%); \
@@ -154,4 +136,145 @@ regression: all
 		$(MAKE) -C $$dir $@; \
 	done
 
-include Makefile.bundle
+#
+# Creation of bundles
+#
+
+# The revision is needed for the bundle name and creating an OSX application bundle.
+ifdef REVISION
+REV := $(REVISION)
+else
+# Are we a SVN dir?
+ifeq ($(shell if test -d $(SRC_DIR)/.svn; then echo 1; fi), 1)
+# Find if the local source if modified
+REV_MODIFIED := $(shell svnversion $(SRC_DIR) | sed -n 's/.*\(M\).*/\1/p' )
+# Find the revision like: rXXXX-branch
+REV := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^URL:.*branches/ { split($$2, a, "/"); BRANCH="-"a[5] } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }')
+endif
+endif
+# Make sure we have something in REV
+ifeq ($(REV),)
+REV := norev000
+endif
+
+ifndef BUNDLE_NAME
+BUNDLE_NAME = OTTD-$(OS)-custom-$(REV)
+endif
+
+# An OSX application bundle needs the data files, lang files and openttd executable in a different location.
+ifdef OSXAPP
+DATA_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/data
+LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
+TTD_DIR  = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
+else
+DATA_DIR = $(BUNDLE_DIR)/data
+LANG_DIR = $(BUNDLE_DIR)/lang
+TTD_DIR  = $(BUNDLE_DIR)
+endif
+
+bundle: all
+	@echo '[BUNDLE] Constructing bundle'
+	$(Q)rm -rf   "${BUNDLE_DIR}"
+	$(Q)mkdir -p "${BUNDLE_DIR}"
+	$(Q)mkdir -p "$(BUNDLE_DIR)/docs"
+	$(Q)mkdir -p "$(BUNDLE_DIR)/scenario"
+	$(Q)mkdir -p "$(BUNDLE_DIR)/scenario/heightmap"
+	$(Q)mkdir -p "$(BUNDLE_DIR)/media"
+	$(Q)mkdir -p "$(TTD_DIR)"
+	$(Q)mkdir -p "$(DATA_DIR)"
+	$(Q)mkdir -p "$(LANG_DIR)"
+ifdef OSXAPP
+	$(Q)mkdir -p "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources"
+	$(Q)echo "APPL????" >                                          "$(BUNDLE_DIR)/$(OSXAPP)/Contents/PkgInfo"
+	$(Q)cp    "$(ROOT_DIR)/os/macosx/openttd.icns"                 "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/openttd.icns"
+	$(Q)$(ROOT_DIR)/os/macosx/plistgen.sh                          "${BUNDLE_DIR}/$(OSXAPP)" "$(REV)"
+	$(Q)cp    "$(ROOT_DIR)/docs/OSX_install_instructions.txt"      "$(BUNDLE_DIR)/docs/"
+	$(Q)cp    "$(ROOT_DIR)/os/macosx/splash.png"                   "$(DATA_DIR)"
+endif
+	$(Q)cp "$(BIN_DIR)/$(TTD)"                "$(TTD_DIR)/"
+	$(Q)cp "$(BIN_DIR)/data/"*.grf            "$(DATA_DIR)/"
+	$(Q)cp "$(BIN_DIR)/data/opntitle.dat"     "$(DATA_DIR)/"
+	$(Q)cp "$(BIN_DIR)/lang/"*.lng            "$(LANG_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/readme.txt"           "$(BUNDLE_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/COPYING"              "$(BUNDLE_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/known-bugs.txt"       "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/docs/multiplayer.txt" "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/docs/32bpp.txt"       "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/changelog.txt"        "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/media/openttd.64.png" "$(BUNDLE_DIR)/media/"
+	$(Q)cp "$(ROOT_DIR)/media/openttd.32.xpm" "$(BUNDLE_DIR)/media/"
+	$(Q)cp "$(ROOT_DIR)/media/openttd.32.bmp" "$(BUNDLE_DIR)/media/"
+ifeq ($(shell if test -n "`ls -l \"$(BIN_DIR)/scenario/\"*.scn 2> /dev/null`"; then echo 1; fi), 1)
+	$(Q)cp "$(BIN_DIR)/scenario/"*.scn        "$(BUNDLE_DIR)/scenario/"
+endif
+ifeq ($(shell if test -n "`ls -l \"$(BIN_DIR)/scenario/heightmaps/\"* 2>/dev/null`"; then echo 1; fi), 1)
+	$(Q)cp "$(BIN_DIR)/scenario/heightmaps/"* "$(BUNDLE_DIR)/scenario/heightmap/"
+endif
+ifeq ($(TTD), openttd.exe)
+	$(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/readme.txt" "$(BUNDLE_DIR)/COPYING"
+endif
+
+### Packing the current bundle into several compressed file formats ###
+#
+# Zips & dmgs do not contain a root folder, i.e. they have files in the root of the zip/dmg.
+# gzip, bzip2 and lha archives have a root folder, with the same name as the bundle.
+#
+# One can supply a custom name by adding BUNDLE_NAME:=<name> to the make command.
+#
+bundle_zip: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).zip'
+	$(Q)mkdir -p "$(BUNDLES_DIR)"
+	$(Q)cd "$(BUNDLE_DIR)" && zip -r $(shell if test -z "$(VERBOSE)"; then echo '-q'; fi) "$(BUNDLES_DIR)/$(BUNDLE_NAME).zip" .
+
+bundle_gzip: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).tar.gz'
+	$(Q)mkdir -p "$(BUNDLES_DIR)/.gzip/$(BUNDLE_NAME)"
+	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.gzip/$(BUNDLE_NAME)/"
+	$(Q)cd "$(BUNDLES_DIR)/.gzip" && tar -zc$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.gz" "$(BUNDLE_NAME)"
+	$(Q)rm -rf   "$(BUNDLES_DIR)/.gzip"
+
+bundle_bzip2: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).tar.bz2'
+	$(Q)mkdir -p "$(BUNDLES_DIR)/.bzip2/$(BUNDLE_NAME)"
+	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.bzip2/$(BUNDLE_NAME)/"
+	$(Q)cd "$(BUNDLES_DIR)/.bzip2" && tar -jc$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.bz2" "$(BUNDLE_NAME)"
+	$(Q)rm -rf   "$(BUNDLES_DIR)/.bzip2"
+
+bundle_lha: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).lha'
+	$(Q)mkdir -p "$(BUNDLES_DIR)/.lha/$(BUNDLE_NAME)"
+	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.lha/$(BUNDLE_NAME)/"
+	$(Q)cd "$(BUNDLES_DIR)/.lha" && lha ao6 "$(BUNDLES_DIR)/$(BUNDLE_NAME).lha" "$(BUNDLE_NAME)"
+	$(Q)rm -rf   "$(BUNDLES_DIR)/.lha"
+
+bundle_dmg: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).dmg'
+	$(Q)mkdir -p "$(BUNDLES_DIR)/OpenTTD $(REV)"
+	$(Q)cp -R "$(BUNDLE_DIR)/" "$(BUNDLES_DIR)/OpenTTD $(REV)"
+	$(Q)hdiutil create -ov -format UDZO -srcfolder "$(BUNDLES_DIR)/OpenTTD $(REV)" "$(BUNDLES_DIR)/$(BUNDLE_NAME).dmg"
+	$(Q)rm -fr "$(BUNDLES_DIR)/OpenTTD $(REV)"
+
+ifdef OSXAPP
+install:
+	@echo '[INSTALL] Cannot install the OSX Application Bundle'
+else
+install: bundle
+	@echo '[INSTALL] Installing OpenTTD'
+	$(Q)install -d "$(INSTALL_BINARY_DIR)"
+	$(Q)install -d "$(INSTALL_ICON_DIR)"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/gm"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/data"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/lang"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/docs"
+	$(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/data/"* "$(INSTALL_DATA_DIR)/data"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(INSTALL_DATA_DIR)/docs"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/media/"* "$(INSTALL_ICON_DIR)"
+ifdef INSTALL_PERSONAL_DIR
+	$(Q)mkdir -p ~/"$(INSTALL_PERSONAL_DIR)"
+	$(Q)cp -R "$(BUNDLE_DIR)/scenario" ~/"$(INSTALL_PERSONAL_DIR)"
+else
+	$(Q)cp -R "$(BUNDLE_DIR)/scenario" "$(INSTALL_DATA_DIR)"
+endif # INSTALL_PERSONAL_DIR
+endif # OSXAPP

Makefile.lang.in

@@ -1,3 +1,5 @@
+# Auto-generated file -- DO NOT EDIT
+
 STRGEN       = !!STRGEN!!
 ENDIAN_CHECK = !!ENDIAN_CHECK!!
 SRC_DIR      = !!SRC_DIR!!

Makefile.msvc

@@ -1,28 +0,0 @@
-#
-# Makefile for creating bundles of MSVC's binaries in the same way as we make
-# the zip bundles for ALL other OSes.
-#
-# Usage: make -f Makefile.msvc PLATFORM=[Win32|x64] BUNDLE_NAME=openttd-<version>-win[32|64]
-#   or   make -f Makefile.msvc PLATFORM=[Win32|x64] BUNDLE_NAME=OTTD-win[32|64]-nightly-<revision>
-#
-
-# Check if we want to show what we are doing
-ifdef VERBOSE
-	Q =
-else
-	Q = @
-endif
-
-AWK = "awk"
-ROOT_DIR := $(shell pwd)
-BIN_DIR = "$(ROOT_DIR)/bin"
-SRC_DIR = "$(ROOT_DIR)/src"
-BUNDLE_DIR = "$(ROOT_DIR)/bundle"
-BUNDLES_DIR = "$(ROOT_DIR)/bundles"
-TTD = openttd.exe
-TARGET := $(shell echo $(PLATFORM) | sed "s@win64@x64@;s@win32@Win32@")
-
-all:
-	$(Q)cp objs/$(TARGET)/Release/$(TTD) $(BIN_DIR)/$(TTD)
-
-include Makefile.bundle.in

Makefile.src.in

@@ -1,20 +1,21 @@
+# Auto-generated file -- DO NOT EDIT
+
 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!!
@@ -27,6 +28,7 @@ CFLAGS_MAKEDEP= !!CFLAGS_MAKEDEP!!
 SORT         = !!SORT!!
 REVISION     = !!REVISION!!
 AWK          = !!AWK!!
+GCC295       = !!GCC295!!
 CONFIG_CACHE_COMPILER = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_COMPILER!!
 CONFIG_CACHE_LINKER   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_LINKER!!
 CONFIG_CACHE_ENDIAN   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_ENDIAN!!
@@ -41,16 +43,29 @@ OBJS     := $(OBJS_C) $(OBJS_CPP) $(OBJS_MM) $(OBJS_RC)
 SRCS     := !!SRCS!!
 
 # All C-files depend on those 3 files
-FILE_DEP := $(CONFIG_CACHE_COMPILER) endian_target.h
+FILE_DEP := $(CONFIG_CACHE_COMPILER) $(LANG_OBJS_DIR)/table/strings.h endian_target.h
 # Create all dirs and subdirs
 RES      := $(shell mkdir -p $(BIN_DIR) $(sort $(dir $(OBJS))))
 
 # Make sure endian_target.h is reasable as if it was in the src/ dir
 CFLAGS += -I $(SRC_OBJS_DIR) -I $(LANG_OBJS_DIR)
-CFLAGS_MAKEDEP += -I $(SRC_OBJS_DIR) -I $(LANG_OBJS_DIR) -I $(SCRIPT_SRC_DIR)
 
 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 =
@@ -74,38 +89,50 @@ $(LANG_OBJS_DIR)/$(STRGEN):
 $(LANG_OBJS_DIR)/table/strings.h: $(LANG_DIR)/english.txt $(LANG_OBJS_DIR)/$(STRGEN)
 	$(MAKE) -C $(LANG_OBJS_DIR) table/strings.h
 
-# Always run version detection, so we always have an accurate modified
-# flag
-VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh")
-MODIFIED := $(shell echo "$(VERSIONS)" | cut -f 3 -d'	')
-
+# Make the revision number
 ifdef REVISION
-# Use specified revision (which should be of the form "r000").
 REV := $(REVISION)
-REV_NR := $(shell echo $(REVISION) | sed "s@[^0-9]@@g")
+REV_NR := $(shell echo $(REVISION) | sed "s/[^0-9]//g")
 else
-# Use autodetected revisions
-REV      := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
-REV_NR   := $(shell echo "$(VERSIONS)" | cut -f 2 -d'	')
+# Are we a SVN dir?
+ifeq ($(shell if test -d $(SRC_DIR)/.svn; then echo 1; fi), 1)
+# Find if the local source if modified
+REV_MODIFIED := $(shell svnversion $(SRC_DIR) | sed -n 's/.*\(M\).*/\1/p' )
+# Find the revision like: rXXXX-branch
+REV := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^URL:.*branch/ { split($$2, a, "/"); BRANCH="-"a[5] } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }')
+REV_NR := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^Last Changed Rev:/ { print $$4 }')
+else
+# Are we a git dir?
+ifeq ($(shell if test -d $(SRC_DIR)/../.git; then echo 1; fi), 1)
+# Find the revision like: gXXXXM-branch
+REV := g$(shell if head=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null`; then echo "$$head" | cut -c1-8; fi)$(shell if cd "$(SRC_DIR)/.." && git diff-index HEAD src | read dummy; then echo M; fi)$(shell git branch|grep '[*]' | sed 's/\* /-/;s/^-master$$//')
+REV_NR := $(shell LC_ALL=C cd "$(SRC_DIR)/.." && git log --pretty=format:%s src | grep -m 1 "^(svn r[0-9]*)" | sed "s/.*(svn r\([0-9]*\)).*/\1/" )
+else
+# Are we a hg (Mercurial) dir?
+ifeq ($(shell if test -d $(SRC_DIR)/../.hg; then echo 1; fi), 1)
+# Find the revision like: hXXXXM-branch
+REV := h$(shell if head=`LC_ALL=C hg tip 2>/dev/null`; then echo "$$head" | head -n 1 | cut -c19-26; fi)$(shell if hg status $(SRC_DIR) | grep -v '^?' | read dummy; then echo M; fi)$(shell hg branch | sed 's/^/-/;s/^-default$$//')
+REV_NR := $(shell LC_ALL=C hg log -k "svn" -l 1 --template "{desc}\n" $(SRC_DIR) | grep -m 1 "^(svn r[0-9]*)" | sed "s/.*(svn r\([0-9]*\)).*/\1/" )
+endif
+endif
+endif
 endif
 
-# Make sure we have something in REV and REV_NR
+# Make sure we have something in REV
 ifeq ($(REV),)
 REV := norev000
-endif
-ifeq ($(REV_NR),)
 REV_NR := 0
 endif
 
 # This helps to recompile if flags change
-RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CFLAGS)" ]; then echo "$(CFLAGS)" > $(CONFIG_CACHE_COMPILER); fi )
+RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CC_CFLAGS) $(CFLAGS)" ]; then echo "$(CC_CFLAGS) $(CFLAGS)" > $(CONFIG_CACHE_COMPILER); fi )
 RES := $(shell if [ "`cat $(CONFIG_CACHE_LINKER) 2>/dev/null`" != "$(LDFLAGS) $(LIBS)" ]; then echo "$(LDFLAGS) $(LIBS)" > $(CONFIG_CACHE_LINKER); fi )
 RES := $(shell if [ "`cat $(CONFIG_CACHE_ENDIAN) 2>/dev/null`" != "$(ENDIAN_FORCE)" ]; then echo "$(ENDIAN_FORCE)" > $(CONFIG_CACHE_ENDIAN); fi )
 
 # If there is a change in the source-file-list, make sure we recheck the deps
 RES := $(shell if [ "`cat $(CONFIG_CACHE_SOURCE) 2>/dev/null`" != "$(SRCS)" ]; then echo "$(SRCS)" > $(CONFIG_CACHE_SOURCE); fi )
 # If there is a change in the revision, make sure we recompile rev.cpp
-RES := $(shell if [ "`cat $(CONFIG_CACHE_VERSION) 2>/dev/null`" != "$(REV) $(MODIFIED)" ]; then echo "$(REV) $(MODIFIED)" > $(CONFIG_CACHE_VERSION); fi )
+RES := $(shell if [ "`cat $(CONFIG_CACHE_VERSION) 2>/dev/null`" != "$(REV)" ]; then echo "$(REV)" > $(CONFIG_CACHE_VERSION); fi )
 
 ifndef MAKEDEPEND
 # The slow, but always correct, dep-check
@@ -127,15 +154,15 @@ 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) $(CC_CFLAGS) $(CFLAGS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:%.d=%.o):#' > $@
 
 $(OBJS_CPP:%.o=%.d): %.d: $(SRC_DIR)/%.cpp $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
+	$(Q)$(CXX_HOST) $(CFLAGS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:%.d=%.o):#' > $@
 
 $(OBJS_MM:%.o=%.d): %.d: $(SRC_DIR)/%.mm $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.mm=%.mm)'
-	$(Q)$(CC_HOST) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
+	$(Q)$(CC_HOST) $(CFLAGS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:%.d=%.o):#' > $@
 
 $(OBJS_RC:%.o=%.d): %.d: $(SRC_DIR)/%.rc $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.mm=%.mm)'
@@ -166,7 +193,7 @@ endif
 
 # Convert x:/... paths to /x/... for mingw
 ifeq ($(OS), MINGW)
-	@cat Makefile.dep.tmp | sed 's@/\([a-zA-Z]\):\/@\/\1\/@g' > Makefile.dep.tmp.mingw
+	@cat Makefile.dep.tmp | sed 's@\([a-zA-Z]\):\/@\/\1\/@g' > Makefile.dep.tmp.mingw
 	@cp Makefile.dep.tmp.mingw Makefile.dep.tmp
 	@rm -f Makefile.dep.tmp.mingw
 endif
@@ -176,10 +203,10 @@ endif
 	@$(AWK) '                           \
 	/^# DO NOT/ { print $$0 ; next}     \
 	/^#/ {next}                         \
-	/: / {                               \
+	/:/ {                               \
 		left = NF - 1;                    \
 		for (n = 2; n <= NF; n++) {       \
-			if (match($$n, "^$(ROOT_DIR)") == 0) { \
+			if (match($$n, "^$(SRC_DIR)") == 0) { \
 				$$n = "";                     \
 				left--;                       \
 			}                               \
@@ -195,24 +222,32 @@ endif
 	{                                   \
 		print $$0                         \
 	}                                   \
-	' < Makefile.dep.tmp | sed 's@  *@ @g;s@ $$@@' | $(SORT) > Makefile.dep
+	' < Makefile.dep.tmp | sed 's/  */ /g;s/ $$//' | $(SORT) > Makefile.dep
 
 	$(Q)rm -f Makefile.dep.tmp Makefile.dep.tmp.bak
 
 endif
 
-# Avoid problems with deps if a .h/.hpp/.hpp.sq file is deleted without the deps
+# Avoid problems with deps if a .h/.hpp file is deleted without the deps
 #  being updated. Now the Makefile continues, the deps are recreated
 #  and all will be fine.
-%.h %.hpp %.hpp.sq:
+%.h %.hpp:
 	@true
 
 
 # Compile all the files according to the targets
 
+$(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 $@ $<
+
 $(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
 
 $(OBJS_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.mm=%.mm)'
@@ -237,10 +272,6 @@ else
 endif
 ifdef STRIP
 	$(Q)$(STRIP) $@
-ifeq ($(OS), DOS)
-	$(E) '$(STAGE) Adding CWSDPMI stub to $@'
-	$(Q)$(ROOT_DIR)/os/dos/make_dos_binary_selfcontained.sh $(SRC_OBJS_DIR)/$@
-endif
 endif
 
 # The targets to compile the endian-code
@@ -256,10 +287,10 @@ $(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
 # Revision files
 
 $(SRC_DIR)/rev.cpp: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/rev.cpp.in
-	$(Q)cat $(SRC_DIR)/rev.cpp.in      | sed "s@\!\!REVISION\!\!@$(REV_NR)@g;s@!!VERSION!!@$(REV)@g;s@!!MODIFIED!!@$(MODIFIED)@g;s@!!DATE!!@`date +%d.%m.%y`@g" > $(SRC_DIR)/rev.cpp
+	$(Q)cat $(SRC_DIR)/rev.cpp.in      | sed "s#@@REVISION@@#$(REV_NR)#g;s#@@VERSION@@#$(REV)#g;s#@@DATE@@#`date +%d.%m.%y`#g" > $(SRC_DIR)/rev.cpp
 
 $(SRC_DIR)/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
+	$(Q)cat $(SRC_DIR)/ottdres.rc.in | sed "s#@@REVISION@@#$(REV_NR)#g;s#@@VERSION@@#$(REV)#g;s#@@DATE@@#`date +%d.%m.%y`#g" > $(SRC_DIR)/ottdres.rc
 
 FORCE:
 

bin/ai/regression/completeness.sh

@@ -1,69 +0,0 @@
-#!/bin/sh
-
-# $Id$
-
-if ! [ -f ai/regression/regression.nut ]; then
-	echo "Make sure you are in the root of OpenTTD before starting this script."
-	exit 1
-fi
-
-cat ai/regression/regression.nut | tr ';' '\n' | awk '
-/^function/ {
-	for (local in locals) {
-		delete locals[local]
-	}
-	if (match($0, "function Regression::Start") || match($0, "function Regression::Stop")) next
-	locals["this"] = "AIControllerSquirrel"
-}
-
-/local/ {
-	gsub(".*local", "local")
-	if (match($4, "^AI")) {
-		sub("\\(.*", "", $4)
-		locals[$2] = $4
-	}
-}
-
-/Valuate/ {
-	gsub(".*Valuate\\(", "")
-	gsub("\\).*", "")
-	gsub(",.*", "")
-	gsub("\\.", "::")
-	print $0
-}
-
-/\./ {
-	for (local in locals) {
-		if (match($0, local ".")) {
-			fname = substr($0, index($0, local "."))
-			sub("\\(.*", "", fname)
-			sub("\\.", "::", fname)
-			sub(local, locals[local], fname)
-			print fname
-			if (match(locals[local], "List")) {
-				sub(locals[local], "AIAbstractList", fname)
-				print fname
-			}
-		}
-	}
-	# We want to remove everything before the FIRST occurence of AI.
-	# If we do not remove any other occurences of AI from the string
-	# we will remove everything before the LAST occurence of AI, so
-	# do some little magic to make it work the way we want.
-	sub("AI", "AXXXXY")
-	gsub("AI", "AXXXXX")
-	sub(".*AXXXXY", "AI")
-	if (match($0, "^AI") && match($0, ".")) {
-		sub("\\(.*", "", $0)
-		sub("\\.", "::", $0)
-		print $0
-	}
-}
-' | sed 's/	//g' | sort | uniq > tmp.in_regression
-
-grep 'DefSQ.*Method' ../src/ai/api/*.hpp.sq | grep -v 'AIError::' | grep -v 'AIAbstractList::Valuate' | grep -v '::GetClassName' | sed 's/^[^,]*, &//g;s/,[^,]*//g' | sort > tmp.in_api
-
-diff -u tmp.in_regression tmp.in_api | grep -v '^+++' | grep '^+' | sed 's/^+//'
-
-rm -f tmp.in_regression tmp.in_api
-

bin/ai/regression/regression.cfg

@@ -1,17 +0,0 @@
-[misc]
-display_opt = SHOW_TOWN_NAMES|SHOW_STATION_NAMES|SHOW_SIGNS|WAYPOINTS
-language = english.lng
-
-[gui]
-autosave = off
-
-[game_creation]
-town_name = english
-
-[ai_players]
-none =
-regression =
-
-[vehicle]
-road_side = right
-plane_speed = 2

bin/ai/regression/regression_info.nut

@@ -1,14 +0,0 @@
-/* $Id$ */
-
-class Regression extends AIInfo {
-	function GetAuthor()      { return "OpenTTD NoAI Developers Team"; }
-	function GetName()        { return "Regression"; }
-	function GetShortName()   { return "REGR"; }
-	function GetDescription() { return "This runs regression-tests on all commands. On the same map the result should always be the same."; }
-	function GetVersion()     { return 1; }
-	function GetDate()        { return "2007-03-18"; }
-	function CreateInstance() { return "Regression"; }
-}
-
-RegisterAI(Regression());
-

bin/ai/regression/require.nut

@@ -1,4 +0,0 @@
-/* $Id$ */
-
-print("  Required this file");
-

bin/ai/regression/run.sh

@@ -1,51 +0,0 @@
-#!/bin/sh
-
-# $Id$
-
-if ! [ -f ai/regression/regression.nut ]; then
-	echo "Make sure you are in the root of OpenTTD before starting this script."
-	exit 1
-fi
-
-cp ai/regression/regression.nut ai/regression/main.nut
-cp ai/regression/regression_info.nut ai/regression/info.nut
-
-if [ -f scripts/game_start.scr ]; then
-	mv scripts/game_start.scr scripts/game_start.scr.regression
-fi
-
-params=""
-gdb=""
-if [ "$1" != "-r" ]; then
-	params="-snull -mnull -vnull:ticks=30000"
-fi
-if [ "$1" = "-g" ]; then
-	gdb="gdb --ex run --args "
-fi
-if [ -n "$gdb" ]; then
-	$gdb ./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav
-else
-	./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav -d ai=2 2>&1 | awk '{ gsub("0x(\\(nil\\)|0+)", "0x00000000", $0); gsub("^dbg: \\[ai\\]", "", $0); gsub("^ ", "ERROR: ", $0); gsub("ERROR: \\[1\\] ", "", $0); gsub("\\[P\\] ", "", $0); print $0; }' > tmp.regression
-fi
-
-if [ -z "$gdb" ]; then
-	res="`diff -ub ai/regression/regression.txt tmp.regression`"
-	if [ -z "$res" ]; then
-		echo "Regression test passed!"
-	else
-		echo "Regression test failed! Difference:"
-		echo "$res"
-	fi
-	echo ""
-	echo "Regression test done"
-fi
-
-rm -f ai/regression/main.nut ai/regression/info.nut
-
-if [ -f scripts/game_start.scr.regression ]; then
-	mv scripts/game_start.scr.regression scripts/game_start.scr
-fi
-
-if [ "$1" != "-k" ]; then
-	rm -f tmp.regression
-fi

bin/data/orig_dos.obg

@@ -1,31 +0,0 @@
-; $Id$
-;
-; This represents the original graphics as on the non-German Transport
-; Tycoon Deluxe DOS CD.
-;
-[metadata]
-name         = original_dos
-shortname    = TTDD
-version      = 1
-description  = Original Transport Tycoon Deluxe DOS edition graphics
-palette      = DOS
-
-[files]
-base         = TRG1.GRF
-logos        = TRGI.GRF
-arctic       = TRGC.GRF
-tropical     = TRGH.GRF
-toyland      = TRGT.GRF
-extra        = OPENTTDD.GRF
-
-[md5s]
-TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
-TRGC.GRF     = ed446637e034104c5559b32c18afe78d
-TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTDD.GRF = c886c7d5b38a93f2cb1cdc0d33472eb8
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTDD.GRF = This file was part of your installation.

bin/data/orig_dos_de.obg

@@ -1,31 +0,0 @@
-; $Id$
-;
-; This represents the original graphics as on the German Transport
-; Tycoon Deluxe DOS CD. It contains one broken sprite.
-;
-[metadata]
-name         = original_dos_de
-shortname    = TTDD
-version      = 0
-description  = Original Transport Tycoon Deluxe DOS (German) edition graphics
-palette      = DOS
-
-[files]
-base         = TRG1.GRF
-logos        = TRGI.GRF
-arctic       = TRGC.GRF
-tropical     = TRGH.GRF
-toyland      = TRGT.GRF
-extra        = OPENTTDD.GRF
-
-[md5s]
-TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
-TRGC.GRF     = ed446637e034104c5559b32c18afe78d
-TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTDD.GRF = c886c7d5b38a93f2cb1cdc0d33472eb8
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTDD.GRF = This file was part of your installation.

bin/data/orig_win.obg

@@ -1,31 +0,0 @@
-; $Id$
-;
-; This represents the original graphics as on the Transport
-; Tycoon Deluxe for Windows CD.
-;
-[metadata]
-name         = original_windows
-shortname    = TTDW
-version      = 0
-description  = Original Transport Tycoon Deluxe Windows edition graphics
-palette      = Windows
-
-[files]
-base         = TRG1R.GRF
-logos        = TRGIR.GRF
-arctic       = TRGCR.GRF
-tropical     = TRGHR.GRF
-toyland      = TRGTR.GRF
-extra        = OPENTTDW.GRF
-
-[md5s]
-TRG1R.GRF    = b04ce593d8c5016e07473a743d7d3358
-TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
-TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
-TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
-TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTDW.GRF = b6689105405fa3ea34cb8a5543633d29
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTDW.GRF = This file was part of your installation.

bin/scenario/README

@@ -0,0 +1,4 @@
+You can place you scenarios in this dir.
+
+This file is really here to make the Makefile happy, it should be modified to
+properly handle scenarios (or maybe even not at all...).

bin/scripts/game_start.scr.example

@@ -1,2 +0,0 @@
-start_ai MyAI
-

bin/scripts/on_server_connect.scr.example

@@ -1,2 +0,0 @@
-# Show a MOTD
-say "Welcome..."

bin/scripts/readme.txt

@@ -10,8 +10,6 @@ local scripts:
    should be used to set client optimization settings:
  - 'on_client.scr' is executed when you join a server [all clients]
 
- - 'on_server_connect.scr' is executed on the server when a client has joined (MOTD)
-
    should be used to set the servers port/ip and/or server optimization settings/patches:
  - 'pre_server.scr' is executed before the servers tcp stack is started [in-game only]
  - 'pre_dedicated.scr' is executed before the servers tcp stack is started [dedicated only]

configure

@@ -1,13 +1,5 @@
 #!/bin/sh
 
-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
@@ -22,17 +14,10 @@ if [ "$0" != "$CONFIGURE_EXECUTABLE" ]; then
 fi
 # Find out where configure is (in what dir)
 ROOT_DIR="`dirname $0`"
-# For MSYS/MinGW we want to know the FULL path. This as that path is generated
-# once you call an outside binary. Having the same path for the rest is needed
-# for dependency checking.
-# pwd -W returns said FULL path, but doesn't exist on others so fall back.
-ROOT_DIR="`cd $ROOT_DIR && (pwd -W 2>/dev/null || pwd 2>/dev/null)`"
+ROOT_DIR="`cd $ROOT_DIR && pwd`"
 
-check_path_characters
-
-# Same here as for the ROOT_DIR above
-PWD="`pwd -W 2>/dev/null || pwd 2>/dev/null`"
-PREFIX="$PWD/bin"
+PWD="`pwd`"
+PREFIX="`pwd`/bin"
 
 . $ROOT_DIR/config.lib
 
@@ -47,16 +32,15 @@ MEDIA_DIR="$ROOT_DIR/media"
 SOURCE_LIST="$ROOT_DIR/source.list"
 
 if [ "$1" = "--reconfig" ] || [ "$1" = "--reconfigure" ]; then
-	if [ ! -f "config.cache" ]; then
+	if ! [ -f "config.cache" ]; then
 		echo "can't reconfigure, because never configured before"
 		exit 1
 	fi
 	# Make sure we don't lock config.cache
-	cat config.cache | sed 's@\\ @\\\\ @g' > cache.tmp
+	cat config.cache | sed 's/\\ /\\\\ /g' > cache.tmp
 	sh cache.tmp
-	RET=$?
 	rm -f cache.tmp
-	exit $RET
+	exit $?
 fi
 
 set_default
@@ -66,7 +50,7 @@ save_params
 make_cflags_and_ldflags
 
 EXE=""
-if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "OS2" ] || [ "$os" = "DOS" ] || [ "$os" = "WINCE" ]; then
+if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "OS2" ] || [ "$os" = "WINCE" ]; then
 	EXE=".exe"
 fi
 
@@ -75,18 +59,18 @@ STRGEN="strgen$EXE"
 ENDIAN_CHECK="endian_check$EXE"
 
 if [ -z "$sort" ]; then
-	PIPE_SORT="sed s@a@a@"
+	PIPE_SORT="sed s/a/a/"
 else
 	PIPE_SORT="$sort"
 fi
 
-if [ ! -f "$LANG_DIR/english.txt" ]; then
+if ! [ -f "$LANG_DIR/english.txt" ]; then
 	echo "Languages not found in $LANG_DIR. Can't continue without it."
 	echo "Please make sure the dir exists and contains at least english.txt"
 fi
 
 # Read the source.list and process it
-AWKCOMMAND='
+SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | $awk '
 	{  }
 	/^(	*)#end/  { if (deep == skip) { skip -= 1; } deep -= 1; next; }
 	/^(	*)#else/ { if (deep == skip) { skip -= 1; } else if (deep - 1 == skip) { skip += 1; } next; }
@@ -98,7 +82,6 @@ AWKCOMMAND='
 
 		deep += 1;
 
-		if ($0 == "ALLEGRO"     && "'$allegro_config'" == "")      { next; }
 		if ($0 == "SDL"         && "'$sdl_config'" == "")          { next; }
 		if ($0 == "PNG"         && "'$png_config'" == "")          { next; }
 		if ($0 == "OSX"         && "'$os'" != "OSX")               { next; }
@@ -106,16 +89,14 @@ AWKCOMMAND='
 		if ($0 == "PSP"         && "'$os'" != "PSP")               { next; }
 		if ($0 == "DEDICATED"   && "'$enable_dedicated'" != "1")   { next; }
 		if ($0 == "COCOA"       && "'$with_cocoa'" == "0")         { next; }
-		if ($0 == "DOS"         && "'$os'" != "DOS")               { next; }
 		if ($0 == "BEOS"        && "'$os'" != "BEOS")              { next; }
 		if ($0 == "WIN32"       && "'$os'" != "MINGW" &&
 		                "'$os'" != "CYGWIN" && "'$os'" != "MSVC" ) { next; }
-		if ($0 == "MORPHOS"     && "'$os'" != "MORPHOS")           { next; }
 		if ($0 == "WINCE"       && "'$os'" != "WINCE")             { next; }
 		if ($0 == "MSVC"        && "'$os'" != "MSVC")              { next; }
 		if ($0 == "DIRECTMUSIC" && "'$with_direct_music'" == "0")  { next; }
 		if ($0 == "LIBTIMIDITY" && "'$libtimidity'" == "" )        { next; }
-		if ($0 == "HAVE_THREAD" && "'$with_threads'" == "0")       { next; }
+		if ($0 == "NO_THREADS"  && "'$with_threads'" == "0")       { next; }
 
 		skip += 1;
 
@@ -131,29 +112,23 @@ AWKCOMMAND='
 			print $0;
 		}
 	}
-'
+' | $PIPE_SORT`"
 
-# Read the source.list and process it
-# Please escape ALL " within ` because e.g. "" terminates the string in some sh implementations
-SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | $awk \"$AWKCOMMAND\" | $PIPE_SORT`"
-
-OBJS_C="`  echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.c$/   { gsub(\".c$\",   \".o\", $0); print $0; }'`"
-OBJS_CPP="`echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.cpp$/ { gsub(\".cpp$\", \".o\", $0); print $0; }'`"
-OBJS_MM="` echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.mm$/  { gsub(\".mm$\",  \".o\", $0); print $0; }'`"
-OBJS_RC="` echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.rc$/  { gsub(\".rc$\",  \".o\", $0); print $0; }'`"
-SRCS="`    echo \"$SRCS\" | $awk ' { ORS = \" \" } { print $0; }'`"
+OBJS_C="`  echo \"$SRCS\" | $awk ' { ORS = " " } /\.c$/   { gsub(".c$",   ".o", $0); print $0; }'`"
+OBJS_CPP="`echo \"$SRCS\" | $awk ' { ORS = " " } /\.cpp$/ { gsub(".cpp$", ".o", $0); print $0; }'`"
+OBJS_MM="` echo \"$SRCS\" | $awk ' { ORS = " " } /\.mm$/  { gsub(".mm$",  ".o", $0); print $0; }'`"
+OBJS_RC="` echo \"$SRCS\" | $awk ' { ORS = " " } /\.rc$/  { gsub(".rc$",  ".o", $0); print $0; }'`"
+SRCS="`    echo \"$SRCS\" | $awk ' { ORS = " " } { print $0; }'`"
 
 # In makefiles, we always use -u for sort
 if [ -z "$sort" ]; then
-	sort="sed s@a@a@"
+	sort="sed s/a/a/"
 else
 	sort="$sort -u"
 fi
 
-CONFIGURE_FILES="$ROOT_DIR/configure $ROOT_DIR/config.lib $ROOT_DIR/Makefile.in $ROOT_DIR/Makefile.lang.in $ROOT_DIR/Makefile.src.in $ROOT_DIR/Makefile.bundle.in"
+CONFIGURE_FILES="$ROOT_DIR/configure $ROOT_DIR/config.lib $ROOT_DIR/Makefile.in $ROOT_DIR/Makefile.lang.in $ROOT_DIR/Makefile.src.in"
 
 generate_main
 generate_lang
 generate_src
-
-check_path_characters

docs/HOWTO_compile_lang_files.txt

@@ -1,15 +1,14 @@
 STRGEN USAGE
 ------------
 This guide is only interesting for people who want to alter something
-themselves without access to translator.openttd.org. Please note that
+themselves without access to WT2 (translator2.openttd.org). Please note that
 your compiled language file will only be compatible with the OpenTTD version
 you have downloaded english.txt, the master language file, for. While this is
 not always true, namely when changes in the code have not touched language
 files, your safest bet is to assume this 'limitation'.
 As a first step you need to compile strgen. This is as easy as typing
-'make strgen'. You can download the precompile strgen from:
-http://www.openttd.org/download-strgen
-
+'make strgen'. You can also download a precompiled binary from a release,
+nightly, etc.
 strgen takes as argument a txt file and translates it to a lng file, allowing
 it to be used inside OpenTTD. strgen needs the master language file
 english.txt to work. Below are some examples of strgen usage.

docs/Readme_Windows_MSVC.txt

@@ -20,7 +20,7 @@ downloading; mostly because the DirectX SDK and Platform SDK are about
 500MB each.
 Download the following files:
 
-	* openttd-useful.zip (http://binaries.openttd.org/extra/openttd-useful/)
+	* openttd-useful.zip (http://sf.net/project/showfiles.php?group_id=103924&package_id=114307)
 	* DirectX 8.1 SDK (http://neuron.tuke.sk/~mizanin/eng/Dx81sdk-include-lib.rar) (or alternatively the latest DirectX SDK from Microsoft)
 	* MS Windows Platform SDK (http://www.microsoft.com/downloads/details.aspx?FamilyId=A55B6B43-E24F-4EA3-A93E-40C0EC4F68E5&displaylang=en)
 	* afxres.h (http://www-d0.fnal.gov/d0dist/dist/packages/d0ve/devel/windows/AFXRES.H)
@@ -29,8 +29,8 @@ Download the following files:
 
 You need an SVN-client to download the source from subversion:
 
-	* CLI Subversion (http://subversion.tigris.org/)
-	* GUI TortoiseSVN (http://tortoisesvn.tigris.org/)
+	* CLI Subversion (http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91)
+	* GUI TortoiseSVN (http://tortoisesvn.tigris.org/download.html)
 
 
 2) INCLUDES AND LIBRARIES

docs/landscape.html

@@ -376,40 +376,30 @@
          </tr>
         </table>
         <ul>
-         <li>m2 bit 7: Signal 0 and 1: set = semaphore signals, clear = light signals</li>
-         <li>m2 bit 3: Signal 2 and 3: set = semaphore signals, clear = light signals</li>
-         <li>m2 bits 6..4: type of signal 0 and 1 (same values as m2 bits 2..0)</li>
-         <li>m2 bits 2..0: type of signal 2 and 3
+         <li>m2 bit 6: Signal 0 and 1: set = semaphore signals, clear = light signals</li>
+         <li>m2 bit 2: Signal 2 and 3: set = semaphore signals, clear = light signals</li>
+         <li>m2 bits 5..4: type of signal 0 and 1 (same values as m2 bits 1..0)</li>
+         <li>m2 bits 1..0: type of signal 2 and 3
           <table>
            <tr>
-            <td nowrap="nowrap" valign="top"><tt>000</tt>: </td>
+            <td nowrap="nowrap" valign="top"><tt>00</tt>: </td>
             <td align="left">normal signals</td>
            </tr>
 
            <tr>
-            <td nowrap="nowrap" valign="top"><tt>001</tt>: </td>
+            <td nowrap="nowrap" valign="top"><tt>01</tt>: </td>
             <td align="left">pre-signals</td>
            </tr>
 
            <tr>
-            <td nowrap="nowrap" valign="top"><tt>010</tt>: </td>
+            <td nowrap="nowrap" valign="top"><tt>10</tt>: </td>
             <td align="left">exit-signals</td>
            </tr>
 
            <tr>
-            <td nowrap="nowrap" valign="top"><tt>011</tt>: </td>
+            <td nowrap="nowrap" valign="top"><tt>11</tt>: </td>
             <td align="left">combo-signals</td>
            </tr>
-
-           <tr>
-            <td nowrap="nowrap" valign="top"><tt>100</tt>: </td>
-            <td align="left">pbs signals</td>
-           </tr>
-
-           <tr>
-            <td nowrap="nowrap" valign="top"><tt>101</tt>: </td>
-            <td align="left">no-entry signals</td>
-           </tr>
           </table>
          </li>
 
@@ -417,39 +407,6 @@
          <li>m4 bits 7..4: bit clear = signal 3..0 shows red</li>
         </ul>
        </li>
-       <li>m2 bits 8..10: track reserved for pbs
-         <table>
-          <tr>
-            <td><tt>0</tt>&nbsp; </td>
-            <td>not reserved</td>
-          </tr>
-          <tr>
-            <td><tt>1</tt>&nbsp; </td>
-            <td>X direction</td>
-          </tr>
-          <tr>
-            <td><tt>2</tt>&nbsp; </td>
-            <td>Y direction</td>
-          </tr>
-          <tr>
-            <td><tt>3</tt>&nbsp; </td>
-            <td>north corner (W-E)</td>
-          </tr>
-          <tr>
-            <td><tt>4</tt>&nbsp; </td>
-            <td>south corner (W-E)</td>
-          </tr>
-          <tr>
-            <td><tt>5</tt>&nbsp; </td>
-            <td>west corner (N-S)</td>
-          </tr>
-          <tr>
-            <td><tt>6</tt>&nbsp; </td>
-            <td>east corner (N-S)</td>
-          </tr>
-         </table>
-       </li>
-       <li>m2 bit 11: opposite track is reserved, too</li>
       </ul>
      </li>
      <li>m5 bit 7 set, bit 6 clear: checkpoint
@@ -468,7 +425,6 @@
          </tr>
         </table>
        </li>
-       <li>m5 bit 4: pbs reservation state</li>
       </ul>
      </li>
      <li>m5 bit 7 set, bit 6 set: railway depot
@@ -496,7 +452,6 @@
          </tr>
         </table>
        </li>
-       <li>m5 bit 4: pbs reservation state</li>
       </ul>
      </li>
      <li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
@@ -513,9 +468,8 @@
    <td valign=top nowrap>&nbsp;</td>
    <td>
     <ul>
-     <li>m2: Index into the array of towns (owning town for town roads; closest town otherwise, INVALID_TOWN if there is no town or we are creating a town)</li>
-     <li>m7 bit 5 set = on snow or desert</li>
-     <li>m7 bits 7..6: present road types
+     <li>m3 bit 7 set = on snow or desert</li>
+     <li>m7 bits 7..5: present road types
       <table>
        <tr>
         <td>bit 0&nbsp; </td>
@@ -526,11 +480,17 @@
         <td>bit 1&nbsp; </td>
         <td>tram</td>
        </tr>
+
+       <tr>
+        <td>bit 2&nbsp; </td>
+        <td>reserved</td>
+       </tr>
       </table>
      </li>
      <li>m5 bits 7 clear: road or level-crossing
       <ul>
-       <li>m6 bits 5..3:
+       <li>m2: Index into the array of towns, 0 for non-town roads</li>
+       <li>m3 bits 6..4:
         <table>
          <tr>
           <td><tt>0</tt>&nbsp; </td>
@@ -562,12 +522,13 @@
          </tr>
         </table>
        </li>
-       <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of road type 1 (tram); OWNER_NONE (<tt>10</tt>) is stored as OWNER_TOWN (<tt>0F</tt>)
+       <li>m5 bits 3..0: <a href="#OwnershipInfo">owner</a> of road type 1 (tram); OWNER_NONE (<tt>10</tt>) is stored as OWNER_TOWN (<tt>0F</tt>)
+       <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road type 2 (reserved)
        <li>m5 bit 6 clear: road
         <ul>
          <li>m1: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
-         <li>m7 bits 3..0: counter for the roadworks</li>
-         <li>m5 bits 3..0: road layout road type 0 (normal road): bit set = road piece present:
+         <li>m3 bits 3..0: counter for the roadworks</li>
+         <li>m4 bits 3..0: road layout road type 0 (normal road): bit set = road piece present:
           <table>
            <tr>
             <td align=left>bit 0: </td>
@@ -587,7 +548,8 @@
            </tr>
           </table>
          </li>
-         <li>m3 bits 0..3: road layout road type 1 (tram)</li>
+         <li>m4 bits 7..4: road layout road type 1 (tram)</li>
+         <li>m6 bits 5..2: road layout road type 2 (reserved)</li>
          <li>m5 bits 5..4: bits to disallow vehicles to go a specific direction
           <table>
            <tr>
@@ -606,7 +568,7 @@
         <ul>
          <li>m1: <a href="#OwnershipInfo">owner</a> of the railway track</li>
          <li>m3 bits 3..0: <a href="#TrackType">railway track type</a></li>
-         <li>m5 bit 0: direction
+         <li>m4 bit 6: direction
           <table>
            <tr>
             <td align=left><tt>0</tt>&nbsp; </td>
@@ -618,9 +580,8 @@
            </tr>
           </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>m5 bit 4: pbs reservation state</li>
+          <li>m4 bit 5: set if crossing lights are on</li>
+         <li>m4 bits 4..0: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
         </ul>
        </li>
       </ul>
@@ -673,7 +634,7 @@
       <ul>
        <li> set : House is complete
         <ul>
-         <li>m5 : Age of house in years, clamped at 255</li>
+         <li>m5 : year of house construction (relative to 1920); clamped to 0..255 (1920..2175)</li>
         </ul>
        </li>
        <li> clear : House is in construction
@@ -685,7 +646,6 @@
        </li>
       </ul>
      <li>m3 bit 6 : bit 8 of house type (m4), allowing 512 different types.</li>
-     <li>m3 bit 5 : bit 6 of current animation frame (see m6)</li>
      <li>m3 bits 4..0 : triggers activated <a href="#newhouses">(newhouses)</a></li>
      <li>m4 : <a href="landscape_externals.html">town building type</a> (with m3[6] bit)</li>
      <li>m5 : see m3 bit 7</li>
@@ -693,7 +653,8 @@
       <ul>
        <li>If <a href="#newhouses">newhouses</a> is activated
         <ul>
-         <li>bits 7..2 : Current animation frame (bits 5..0); bit 6 in m3</li>
+         <li>bits 7..3 : Current animation frame</li>
+         <li>bit 2 : free</li>
         </ul>
        </li>
        <li>Standard behaviour
@@ -835,9 +796,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: <a href="#OwnershipInfo">owner</a> of tram tracks (road stop)</li>
+     <li>m3 bits 7..4: persistent random data for newstations</li>
      <li>m3 bits 3..0: <a href="#TrackType">track type</a> for railway stations</li>
+     <li>m3 bits 2..0: present road types for road stops</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):
@@ -936,12 +897,8 @@
       </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 bit 2: 1 when a drive through road stop is built over a town owned road, otherwise 0</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>
     </ul>
    </td>
   </tr>
@@ -1077,7 +1034,6 @@
     <ul>
      <li>m1 bit 7: clear = under construction
       <ul>
-       <li>m1 bits 6..5 : Water class (sea, canal, river or land)
        <li>m1 bits 3..2: construction counter, for buildings under construction incremented on every periodic tile processing</li>
        <li>m1 bits 1..0: stage of construction (<tt>3</tt> = completed), incremented when the construction counter wraps around<br>
            the meaning is different for some animated tiles which are never under construction (types <tt>01</tt>, <tt>1E</tt>..<tt>20</tt>, <tt>30</tt>, <tt>58</tt>; see above)</li>
@@ -1408,13 +1364,14 @@
    <td>
     <ul>
      <li>m1: <a href="#OwnershipInfo">owner</a></li>
-     <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of tram</li>
+     <li>m2 bits 7..4: see bridge ramp</li>
      <li>m3 bits 3..0: <a href="#TrackType">track type</a> for railway</li>
-     <li>m5 bit 4: pbs reservation state for railway</li>
+     <li>m3 bits 2..0: present road types for road</li>
+     <li>m4 bit 7 set = on snow or desert</li>
      <li>m5 bits 7 clear: tunnel entrance/exit</li>
      <li>m5 bit 7 set: bridge ramp
       <ul>
-       <li>m6 bits 5..2: <a name="BridgeType">bridge type</a>:
+       <li>m2 bits 7..4: <a name="BridgeType">bridge type</a>:
         <table>
          <tr>
           <th align=left>Type&nbsp;</th>
@@ -1514,11 +1471,6 @@
         <td><tt>1</tt>&nbsp;</td>
         <td>road</td>
        </tr>
-
-       <tr>
-        <td><tt>2</tt>&nbsp;</td>
-        <td>water</td>
-       </tr>
      </li>
      <li>m5 bits 1..0: direction onto the bridge / out of the tunnel
       <table>
@@ -1545,9 +1497,6 @@
      </li>
      <li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
      <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
-     <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road</li>
-     <li>m7 bit 5 set = on snow or desert</li>
-     <li>m7 bits 7..6: present road types for road</li>
     </ul>
    </td>
   </tr>
@@ -1562,8 +1511,6 @@
     <ul>
      <li>m1: <a href="#OwnershipInfo">owner</a> of the object (for lighthouses and transmitters normally <tt>10</tt>)</li>
      <li>m2: see company statue
-     <li>m3 bits 4..2: size of HQ
-     <li>m3 bits 1..0: section identification of the HQ
      <li>m5: tile type:
       <table>
        <tr>
@@ -1591,8 +1538,8 @@
        </tr>
 
        <tr>
-        <td nowrap valign=top><tt>04</tt><tt></tt>&nbsp; </td>
-        <td align=left>company headquarters</td>
+        <td nowrap valign=top><tt>80</tt>..<tt>93</tt>&nbsp; </td>
+        <td align=left>company headquarters (5 sets of 4 tiles each, updated quarterly depending on the company performance)</td>
        </tr>
       </table>
      </li>

docs/landscape_grid.html

@@ -90,7 +90,7 @@ the array so you can quickly see what is used and what is not.
       <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 OOOO 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">XXXX XXXX</td>
@@ -101,7 +101,7 @@ the array so you can quickly see what is used and what is not.
       <td class="caption">rail with signals</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO</span> XXXX XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO O</span>XXX <span class="free">O</span>XXX</td>
       <td class="bits">XXXX <span class="option">~~</span>XX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">-inherit-</td>
@@ -115,7 +115,7 @@ the array so you can quickly see what is used and what is not.
       <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"><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">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
@@ -126,7 +126,7 @@ the array so you can quickly see what is used and what is not.
       <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 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>
@@ -137,10 +137,10 @@ the array so you can quickly see what is used and what is not.
       <td class="bits"><span class="option">~~~</span>X XXXX</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX X<span class="free">O</span>XX</td>
-      <td class="bits">XXX<span class="free">O</span> XXXX</td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
     </tr>
     <tr>
       <td class="caption">level crossing</td>
@@ -148,17 +148,17 @@ the array so you can quickly see what is used and what is not.
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">XXXX <span class="option">~~</span>XX</td>
+      <td class="bits"><span class="free">O</span>XXX XXXX</td>
+      <td class="bits">XX<span class="free">OO</span> XXXX</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">XXXX<span class="free"> OOO</span>X</td>
-      <td class="bits">XXXX X<span class="free">O</span>XX</td>
-      <td class="bits">XXXX XXXX</td>
     </tr>
     <tr>
       <td class="caption">road depot</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
+      <td class="bits">X<span class="free">OOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
@@ -170,10 +170,10 @@ the array so you can quickly see what is used and what is not.
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits">XXX<span class="option">~ ~~</span>XX</td>
+      <td class="bits">XX<span class="free">O</span><span class="option">~ ~~</span>XX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXX<span class="abuse">X XXXX</span></td>
-      <td class="bits"><span class="abuse">XXXX XX</span>XX</td>
+      <td class="bits"><span class="abuse">XXXX X</span>XXX</td>
       <td class="bits">XXXX <span class="abuse">XXXX</span></td>
     </tr>
     <tr>
@@ -197,19 +197,19 @@ the array so you can quickly see what is used and what is not.
       <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"><span class="free">OO</span>XX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
+      <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">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="free">OOOO O</span>XXX</td>
       <td class="bits"><span class="option">~~~~ ~~~~</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"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">dock</td>
@@ -293,7 +293,7 @@ the array so you can quickly see what is used and what is not.
       <td>8</td>
       <td class="caption">industry</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXX<span class="free">O</span> <span class="abuse">
+      <td class="bits">X<span class="free">OOO</span> <span class="abuse">
         XXXX</span></td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
@@ -308,22 +308,22 @@ 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"><span class="free">OOOO OOOO</span></td>
-      <td class="bits">X<span class="free">OO</span>X XXXX</td>
+      <td class="bits"><span class="free">OOOO</span> <span class="option">~</span><span class="abuse">XXX</span></td>
+      <td class="bits">X<span class="free">OOO OOOO</span></td>
+      <td class="bits">X<span class="free">OOO</span> <span class="option">~</span>XXX</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits">XXXX X<span class="free">O</span>XX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td>bridge ramp</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits">-inherit-</td>
+      <td class="bits"><span class="free">OOOO OOOO</span> XXXX <span class="free">OOOO</span></td>
+      <td class="bits"><span class="free">OOOO</span> <span class="option">~</span><span class="abuse">XXX</span></td>
+      <td class="bits">X<span class="free">OOO OOOO</span></td>
+      <td class="bits">X<span class="free">OOO</span> <span class="option">~</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 rowspan=2>A</td>
@@ -331,9 +331,9 @@ 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"><span class="free">OOO</span>X XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits">XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">X<span class="option">~~</span>X XXXX</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>

docs/obg_format.txt

@@ -1,75 +0,0 @@
-;
-; Example file for the OpenTTD Base Graphics replacement sets.
-; This file consists of basically two different parts:
-;  * metadata
-;  * information about the files
-;
-; Metadata contains information about the name, version and palette
-; of the graphics set.
-;
-; == Getting started ==
-; - you can't add comments after values
-; - you have to fill the MD5 checksum for each file
-; - you may not miss any of the metadata or files items
-; - `openttd -h` lists all graphics replacements sets it found to be correct
-; - `openttd -d grf=1` shows warnings/errors when parsing an .obg file
-; - `openttd -I <name>` starts OpenTTD with the given set (case sensitive)
-; - adding `graphicsset = <name>` to the misc section of openttd.cfg makes
-;   OpenTTD start with that graphics set by default
-; - there is a command line tool for all platforms called md5sum that can
-;   create the MD5 checksum you need.
-; - all files specified in this file are search relatively to the path where
-;   this file is found, i.e. if the graphics files are in a subdir you have
-;   to add that subdir to the names in this file to! It will NOT search for
-;   a file named like specified in here.
-
-[metadata]
-; the name of the pack, preferably less than 16 characters
-name         = example
-; the short name (4 characters), used to identify this set
-shortname    = XMPL
-; the version of this graphics set (read as single integer)
-version      = 0
-; a fairly short description of the set
-description  = foo
-; palette used by the set; either DOS or Windows
-palette      = DOS
-
-; The files section lists the files that replace sprites.
-; The file names are case sensitive.
-[files]
-; GRF file with the base sprites
-base         = TRG1.GRF
-; GRF file with logos, original terrain generator sprites
-logos        = TRGI.GRF
-; GRF file with extra arctic sprites
-arctic       = TRGC.GRF
-; GRF file with extra tropical sprites
-tropical     = TRGH.GRF
-; GRF file with extra toyland sprites
-toyland      = TRGT.GRF
-; NewGRF file using Actions 5, 7, 9 and A to replace sprites
-; Must use a GRF ID starting with FF so it cannot be selected from
-; the in-game NewGRF list and (thus) be loaded twice.
-extra        = OPENTTDD.GRF
-
-; The md5s section lists the MD5 checksum for the files that replace them.
-; Note that the list of files is case sensitive. Each GRF listed in the
-; files section must be listed here with it's MD5 checksum, otherwise you
-; will get a lot of warnings when starting OpenTTD.
-[md5s]
-TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
-TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGC.GRF     = ed446637e034104c5559b32c18afe78d
-TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTDD.GRF = f829f62c137d6d7c6e272c481b796dd5
-
-; The origin section provides the possibility to put and extra line into
-; the warning that a file is missing/corrupt. This can be used to tell
-; them where to find it. It works on the filename specified in the
-; files section and if that is not found it will fall back to the default
-; as shown below here.
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-OPENTTDD.GRF = This file was part of your installation.

docs/openttd.6

@@ -1,52 +1,34 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd Feb 05, 2009
+.Dd Sep 15, 2007
 .Dt OPENTTD 6
 .Sh NAME
 .Nm openttd
 .Nd An open source clone of the Microprose game "Transport Tycoon Deluxe"
 .Sh SYNOPSIS
 .Nm
-.Op Fl efhx
-.Op Fl 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 [host][:port]
-.Op Fl g Ar [savegame]
+.Op Fl Defhi
 .Op Fl G Ar seed
-.Op Fl i Ar palette
-.Op Fl I Ar graphicsset
-.Op Fl l Ar host[:port]
-.Op Fl m Ar driver
+.Op Fl d Ar [level | cat=lvl[, ...]]
+.Op Fl g Ar [savegame]
 .Op Fl n Ar host[:port][#player]
 .Op Fl r Ar widthxheight
+.Op Fl t Ar date
+.Op Fl m Ar driver
 .Op Fl s Ar driver
-.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
-.It Fl c Ar config_file
-Use 'config_file' instead of 'openttd.cfg'
+.It Fl D
+Start a dedicated server
+.It Fl G Ar seed
+Seed the pseudo random number generator
 .It Fl d Ar [level]
 Set debug verbosity for all categories to
 .Ar level
 or 1 if omitted
 .It Fl d Ar cat=level[, ...]
 Set debug verbosity for a specific category
-.It Fl D Ar [host][:port]
-Start a dedicated server. Sets network debug level to 6. If you want to change this, use
-.Fl d
-after
-.Fl D
-.It Fl G Ar seed
-Seed the pseudo random number generator
 .It Fl e
 Start in world editor mode
 .It Fl f
@@ -57,16 +39,9 @@ Load
 .Ar savegame
 at start or start a new game if omitted
 .It Fl h
-Display a summary of all options and available AIs, blitters, drivers and graphic sets
-.It Fl i Ar palette
-Set the palette, see
-.Fl h
-.It Fl I Ar graphicsset
-Set the graphics set, see
-.Fl h
-.It Fl l Ar host[:port]
-Redirect DEBUG(), See
-.Fl D
+Display a summary of all options and available drivers
+.It Fl i
+Force to use the DOS palette (use this if you see a lot of magenta)
 .It Fl m Ar driver
 Set the music driver, see
 .Fl h
@@ -77,13 +52,11 @@ Set the resolution
 .It Fl s Ar driver
 Set the sound driver, see
 .Fl h
-.It Fl t Ar year
-Set the starting year
+.It Fl t Ar date
+Set the starting date
 .It Fl v Ar driver
 Set the video driver, see
 .Fl h
-.It Fl x
-Do not automatically save to config file on exit
 .El
 .Sh SEE ALSO
 http://wiki.openttd.org/, http://www.openttd.org

findversion.sh

@@ -1,118 +0,0 @@
-#!/bin/sh
-
-# $Id$
-
-# Arguments given? Show help text.
-if [ "$#" != "0" ]; then
-	cat <<EOF
-Usage: ./findversion.sh
-Finds the current revision and if the code is modified.
-
-Output: <REV>\t<REV_NR>\t<MODIFIED>\t<CLEAN_REV>
-REV
-    a string describing what version of the code the current checkout is
-    based on. The exact format of this string depends on the version
-    control system in use, but it tries to identify the revision used as
-    close as possible (using the svn revision number or hg/git hash).
-    This also includes an indication of whether the checkout was
-    modified and which branch was checked out. This value is not
-    guaranteed to be sortable, but is mainly meant for identifying the
-    revision and user display.
-
-    If no revision identifier could be found, this is left empty.
-REV_NR
-    the revision number of the svn revision this checkout is based on.
-    This can be used to determine which functionality is present in this
-    checkout. For trunk svn checkouts and hg/git branches based upon it,
-    this number should be accurate. For svn branch checkouts, this
-    number is mostly meaningless, at least when comparing with the
-    REV_NR from other branches or trunk.
-
-    This number should be sortable. Within a given branch or trunk, a
-    higher number means a newer version. However, when using git or hg,
-    this number will not increase on new commits.
-
-    If no revision number could be found, this is left empty.
-MODIFIED
-    Whether (the src directory of) this checkout is modified or not. A
-    value of 0 means not modified, a value of 2 means it was modified.
-    Modification is determined in relation to the commit identified by
-    REV, so not in relation to the svn revision identified by REV_NR.
-
-    A value of 1 means that the modified status is unknown, because this
-    is not an svn/git/hg checkout for example.
-
-CLEAN_REV
-    the same as REV but without branch name
-
-By setting the AWK environment variable, a caller can determine which
-version of "awk" is used. If nothing is set, this script defaults to
-"awk".
-EOF
-exit 1;
-fi
-
-# Allow awk to be provided by the caller.
-if [ -z "$AWK" ]; then
-	AWK=awk
-fi
-
-# Find out some dirs
-cd `dirname "$0"`
-ROOT_DIR=`pwd`
-SRC_DIR=src
-
-# Determine if we are using a modified version
-# Assume the dir is not modified
-MODIFIED="0"
-if [ -d "$ROOT_DIR/.svn" ]; then
-	# We are an svn checkout
-	if [ -n "`svnversion \"$SRC_DIR\" | grep 'M'`" ]; then
-		MODIFIED="2"
-	fi
-	# Find the revision like: rXXXXM-branch
-	BRANCH=`LC_ALL=C svn info "$SRC_DIR" | "$AWK" '/^URL:.*branches/ { split($2, a, "/"); for(i in a) if (a[i]=="branches") { print a[i+1]; break } }'`
-	TAG=`LC_ALL=C svn info "$SRC_DIR" | "$AWK" '/^URL:.*tags/ { split($2, a, "/"); for(i in a) if (a[i]=="tags") { print a[i+1]; break } }'`
-	REV_NR=`LC_ALL=C svn info "$SRC_DIR" | "$AWK" '/^Last Changed Rev:/ { print $4 }'`
-	if [ -n "$TAG" ]; then
-		REV=$TAG
-	else
-		REV="r$REV_NR"
-	fi
-elif [ -d "$ROOT_DIR/.git" ]; then
-	# We are a git checkout
-	if [ -n "`git diff-index HEAD \"$SRC_DIR\"`" ]; then
-		MODIFIED="2"
-	fi
-	HASH=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null`
-	REV="g`echo $HASH | cut -c1-8`"
-	BRANCH=`git branch|grep '[*]' | sed 's@\* @@;s@^master$@@'`
-	REV_NR=`LC_ALL=C git log --pretty=format:%s "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
-elif [ -d "$ROOT_DIR/.hg" ]; then
-	# We are a hg checkout
-	if [ -n "`hg status \"$SRC_DIR\" | grep -v '^?'`" ]; then
-		MODIFIED="2"
-	fi
-	HASH=`LC_ALL=C hg parents --template="{node}"`
-	REV="h`echo $HASH | cut -c1-8`"
-	BRANCH=`hg branch | sed 's@^default$@@'`
-	REV_NR=`LC_ALL=C hg log -r $HASH:0 -k "svn" -l 1 --template "{desc}\n" "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
-else
-	# We don't know
-	MODIFIED="1"
-	BRANCH=""
-	REV=""
-	REV_NR=""
-fi
-
-if [ "$MODIFIED" -eq "2" ]; then
-	REV="${REV}M"
-fi
-
-CLEAN_REV=${REV}
-
-if [ -n "$BRANCH" ]; then
-	REV="${REV}-$BRANCH"
-fi
-
-echo "$REV	$REV_NR	$MODIFIED	$CLEAN_REV"

known-bugs.txt

@@ -1,18 +1,5 @@
-OpenTTD's known bugs
-Last updated:    2009-08-18
-Release version: 0.7.2
+README
 ------------------------------------------------------------------------
-
-
-Table of Contents:
-------------------
-1) About
-2) Known bugs in the this stable release
-3) Known bugs that will not be solved
-
-
-1) About:
--- ------
 All bugs listed below are marked as known. Please do not submit any bugs
 that are the same as these. If you do, do not act surprised, because
 we WILL flame you!!
@@ -21,102 +8,22 @@ Of course if you have more knowledge about any of these bugs, have more
 specifics, we welcome you to report them. React to the given bug indicated
 by the number below on http://bugs.openttd.org.
 
+If the bug report is closed, it has been fixed, which then can be verified
+in the latest SVN version of /trunk.
 
-2) Known bugs in 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.
+Bugs for 0.6.0-beta3
+------------------------------------------------------------------------
+URL: http://bugs.openttd.org
 
-The bugs in this section all refer to a ticket in our bug tracking system
-that you can find at: http://bugs.openttd.org
-If the bugs are closed but still listed here it means that the bug is fixed
-and that the nightlies and next major release will not have that bug.
-
-- 3057	Road vehicle sometimes 'forget' the need for servicing
-- 3040	Not all alternatives are always shown in the "Join station" list
-- 2955	With path signals depots are less likely to be visited
-- 2891	Ignore signal does not keep the train running when in path signalled block till the next signal
-- 2769	No offer for buying bankrupt AIs
-- 2737	Self-crossing trains ignore "forbid 90 degree turn" setting
-- 2616	Cloning creates vehicles with invalid subcargos
-- 2585	[OSX] OS' mouse pointer showing
-- 2484	[OSX] Cannot enter CJK characters
-- 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
+- 1711	Gravel and Clay have no worth
+- 1693	Removing road does not reset owner
+- 1549	Timetable + group ID are not backed up with orders
+- 1495	Long vehicles block multistop station
+- 1487	Ending_year is never written to
+- 1473	Train not going to available platform
+- 1404	Spinner widget interprets one click as many
+- 1264	Autoreplace for multiple NewGRF DMU sets fails
 - 1140	[OSX] Not smooth moving map with touchpad
 - 1072	Text overflows in several windows
 -  119	Clipping problems with vehicles on slopes
-
-
-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.
-
-Clipping problems
-	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.
-
-Duplicate (station) names after renaming
-	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.
-
-Forbid 90 degree turns does not work for crossing PBS paths
-	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.
-
-Lost trains ignore (block) exit signals
-	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.

media/openttd.desktop.in

@@ -1,11 +0,0 @@
-# $Id$
-# http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.1.html
-[Desktop Entry]
-Type=Application
-Version=1.1
-Name=!!MENU_NAME!!
-Comment=A clone of Transport Tycoon Deluxe
-Icon=openttd
-Exec=!!TTD!!
-Terminal=false
-Categories=!!MENU_GROUP!!

os/debian/README.Debian

@@ -15,7 +15,7 @@ You should copy the data files from the original TTD into the data directory
 	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).
+	debian and works out of the box).
 
 	Don't forget to use -m extmidi if you want music, and if you have
 	problems, remember that not all audio devices support multiple
@@ -23,9 +23,12 @@ You should copy the data files from the original TTD into the data directory
 	mixing. My VIA AC97 device cannot do hardware mixing, for example.
 
 -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.
+	There are a few scenarios included in this release. When you start
+	openttd it will look for scenarios in ~/.openttd/scenario, while the
+	premade scenarios are in /usr/share/games/openttd/data/scenario. You
+	have two options to use the scenarios.
+	* Navigate to /usr/share/games/openttd/data/scenario within openttd.
+	* Copy scenarios from /usr/share/games/openttd/data/scenario to
+	  ~/.openttd/scenario. We are looking into a better solution for this.
 
- -- Matthijs Kooijman <matthijs@stdin.nl>, Tue, 25 Jan 2004 14:11:01 +0200
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>, Tue, 25 Jan 2004 14:11:01 +0200

os/debian/changelog

@@ -1,221 +1,92 @@
-openttd (0.7.3~RC2) unstable; urgency=low
+openttd (0.6.0~beta4) unstable; urgency=low
 
   * New upstream release.
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 24 Sep 2009 21:30:43 +0200
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Mon, 18 Feb 2008 20:09:29 +0100
 
-openttd (0.7.3~RC1) unstable; urgency=low
+openttd (0.6.0~beta3-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 13 Sep 2009 10:25:56 +0200
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Tue, 16 Jan 2008 21:40:07 +0100
 
-openttd (0.7.2) unstable; urgency=low
+openttd (0.6.0~beta2-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 01 Aug 2009 00:19:43 +0200
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Sun, 09 Dec 2007 22:05:05 +0100
 
-openttd (0.7.2~RC2) unstable; urgency=low
+openttd (0.6.0~beta1-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 21 Jul 2009 20:25:56 +0200
-
-openttd (0.7.2~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 15 Jul 2009 22:25:56 +0200
-
-openttd (0.7.1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 09 Jun 2009 01:34:56 +0200
-
-openttd (0.7.1~RC3) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 03 Jun 2009 15:34:56 +0200
-
-openttd (0.7.1~RC2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 21 Mar 2009 14:34:56 +0200
-
-openttd (0.7.1~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 11 Mar 2009 17:34:56 +0200
-
-openttd (0.7.0) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 01 Apr 2009 13:37:42 +0000
-
-openttd (0.7.0~RC2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 23 Mar 2009 00:42:00 +0200
-
-openttd (0.7.0~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 16 Mar 2009 00:07:00 +0200
-
-openttd (0.7.0~beta2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 10 Mar 2009 00:33:05 +0100
-
-openttd (0.7.0~beta1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 16 Feb 2009 23:07:05 +0100
-
-openttd (0.6.3-1) unstable; urgency=low
-
-  [ Matthijs Kooijman ]
-  * New upstream release.
-
-  [ Jordi Mallach ]
-  * Add Spanish Debconf template translation, after fixing its corrupted
-    encoding.
-
- -- Jordi Mallach <jordi@debian.org>  Thu, 02 Oct 2008 16:59:03 +0200
-
-openttd (0.6.2-1) unstable; urgency=low
-
-  * New upstream release.
-    - Fixes remote crash vulnerability CVE-2008-3547. Closes: #493714
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 08 Aug 2008 11:07:05 +0200
-
-openttd (0.6.2~rc2-1) experimental; urgency=low
-
-  [ Matthijs Kooijman ]
-  * New upstream release.
-
-  [ Jordi Mallach ]
-  * Fix typo in README.Debian (lintian).
-  * Remove dpatch build-dep and the empty debian/patches dir.
-  * Don't ignore possible "make distclean" errors.
-
- -- Jordi Mallach <jordi@debian.org>  Sat, 26 Jul 2008 01:35:30 +0200
-
-openttd (0.6.2~rc1-1) experimental; urgency=low
-
-  [ Matthijs Kooijman ]
-  * New upstream release.
-
- -- Jordi Mallach <jordi@debian.org>  Thu, 24 Jul 2008 16:09:57 +0200
-
-openttd (0.6.1-1) unstable; urgency=low
-
-  [ Matthijs Kooijman ]
-  * New upstream release.
-  * Remove no_install_personal.dpatch, it is included upstream now.
-
- -- Jordi Mallach <jordi@debian.org>  Thu, 05 Jun 2008 00:47:36 +0200
-
-openttd (0.6.0-2) unstable; urgency=low
-
-  [ Jordi Mallach ]
-  * Rename XS-Vcs-* to the official Vcs-* fields.
-
-  [ Matthijs Kooijman ]
-  * Don't install anything into ~ during make install, this prevented
-    successful builds on some architectures. Fix imported from upstream.
-  * Put the homepage in it's own Homepage field instead of in the description.
-  * Bump Standards-Version to 3.7.3
-
- -- Jordi Mallach <jordi@debian.org>  Thu, 03 Apr 2008 00:07:10 +0200
-
-openttd (0.6.0-1) unstable; urgency=low
-
-  [ Matthijs Kooijman ]
-  * New upstream release:
-    - Adds note about font-configuration for non-latin languages.
-      Closes: #462604
-  * Add .desktop file, provided by Andrea Colangelo.
-    Closes: #460073
-  * Add Finnish Debconf translation, provided by Esko Arajärvi.
-    Closes: #456956
-
-  [ Jordi Mallach ]
-  * Fixes and improvements for the .desktop file according to the spec.
-
- -- Jordi Mallach <jordi@debian.org>  Wed, 02 Apr 2008 14:04:40 +0200
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Sun, 18 Nov 2007 16:05:05 +0100
 
 openttd (0.5.3-1) unstable; urgency=low
 
-  [ Matthijs Kooijman ]
-  * New upstream release
+  * New upstream release.
 
- -- Jordi Mallach <jordi@debian.org>  Tue, 18 Sep 2007 12:05:28 +0200
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Sat, 15 Sep 2007 13:30:00 +0100
+
+openttd (0.5.3~rc3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Thu, 30 Aug 2007 23:30:00 +0100
+
+openttd (0.5.3~rc2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Sat,  7 Jul 2007 20:05:00 +0100
+
+openttd (0.5.3~rc1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Thu, 28 Jun 2007 18:00:00 +0100
 
 openttd (0.5.2-1) unstable; urgency=low
 
-  [ Jordi Mallach ]
   * New upstream release.
-  * Debconf translation updates:
-    - Catalan.
 
-  [ Christian Perrier ]
-  * Debconf templates and debian/control reviewed by the debian-l10n-
-    english team as part of the Smith review project.
-    Closes: #422183, #419096.
-  * Debconf translation updates:
-    - Swedish. Closes: #422780
-    - Basque. Closes: #422786
-    - Czech. Closes: #422809
-    - Galician. Closes: #422831
-    - German. Closes: #422908
-    - Tamil. Closes: #423079
-    - Russian. Closes: #423224
-    - Portuguese. Closes: #423413
-    - French. Closes: #424436
-    - Brazilian Portuguese. Closes: #425585
-    - Dutch. Closes: #425707
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Tue, 29 May 2007 20:00:00 +0100
 
- -- Jordi Mallach <jordi@debian.org>  Sat, 02 Jun 2007 06:24:34 +0200
+openttd (0.5.2~rc1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Wed, 16 May 2007 23:35:39 +0100
 
 openttd (0.5.1-1) unstable; urgency=low
 
-  [ Matthijs Kooijman ]
-  * New upstream release
-  * Add German and Swedish translations (Closes: #420258, #419097)
-  * Remove bogus fuzzy mark from the Catalan translation
+  * New upstream release.
 
-  [ Jordi Mallach ]
-  * debian/control: add XS-Vcs-Svn and XS-Vcs-Browser fields.
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Fri, 20 Apr 2007 21:45:32 +0100
 
- -- Jordi Mallach <jordi@debian.org>  Mon, 23 Apr 2007 21:03:06 +0200
+openttd (0.5.1~rc3-1) unstable; urgency=low
 
-openttd (0.5.0-2) unstable; urgency=low
+  * New upstream release.
 
-  * Upload to Debian.
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Tue, 17 Apr 2007 22:00:46 +0100
 
- -- Jordi Mallach <jordi@debian.org>  Sun, 11 Mar 2007 14:12:37 +0100
+openttd (0.5.1~rc2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Fri, 23 Mar 2007 23:45:46 +0100
+
+openttd (0.5.1~rc1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Wed, 20 Mar 2007 22:03:46 +0100
 
 openttd (0.5.0-1) unstable; urgency=low
 
-  [ Matthijs Kooijman ]
   * New upstream release
 
-  [ Jordi Mallach ]
-  * Depend on ${misc:Depends}, not debconf directly.
-
- -- Jordi Mallach <jordi@debian.org>  Thu,  8 Mar 2007 15:34:54 +0100
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Mon, 26 Feb 2007 21:07:05 +0100
 
 openttd (0.5.0~rc5-1) unstable; urgency=low
 
@@ -318,13 +189,13 @@ openttd (0.4.0.1-1) unstable; urgency=low
 
   * New upstream release
 
- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Mon, 23 May 2005 13:04:24 +0200
+ -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl>  Mon, 23 May 2005 13:04:24 +0200
 
 openttd (0.4.0-1) unstable; urgency=low
 
   * New upstream release
 
- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Mon, 16 May 2005 00:16:17 +0200
+ -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl>  Mon, 16 May 2005 00:16:17 +0200
 
 openttd (0.3.6-1) unstable; urgency=low
 
@@ -332,18 +203,18 @@ openttd (0.3.6-1) unstable; urgency=low
   * Modifed Makefile to install xpm icon and scenarios in /usr/share/games/openttd/
   * Added openttd.32.xpm, openttd.64.xpm was too big
 
- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Tue, 25 Jan 2005 19:21:08 +0100
+ -- root <root@katherina.student.utwente.nl>  Tue, 25 Jan 2005 19:21:08 +0100
 
 openttd (0.3.5-2) unstable; urgency=low
 
   * Fixed some lintian warnings.
   * Added openttd.64.xpm (icon for menu).
 
- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Mon, 27 Dec 2004 01:51:36 +0100
+ -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl>  Mon, 27 Dec 2004 01:51:36 +0100
 
 openttd (0.3.5-1) unstable; urgency=low
 
   * Initial Release.
 
- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Fri, 24 Dec 2004 02:58:47 +0100
+ -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl>  Fri, 24 Dec 2004 02:58:47 +0100
 

os/debian/config

@@ -6,16 +6,16 @@
 FILES="trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf sample.cat"
 DATADIR=/usr/share/games/openttd/data
 
-MISSING="No"
+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
+		MISSING="Yes";
+		break;
+  fi;
+done;
 
 if [ $MISSING = "Yes" ]; then
 	db_input high openttd/datafiles || true
 	db_go
-fi
+fi;

os/debian/control

@@ -1,21 +1,20 @@
 Source: openttd
 Section: contrib/games
 Priority: optional
-Maintainer: Matthijs Kooijman <matthijs@stdin.nl>
+Maintainer: Matthijs Kooijman <m.kooijman@student.utwente.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
-Homepage: http://www.openttd.org/
+Build-Depends: debhelper (>= 4.0.0), dpatch, libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev
+Standards-Version: 3.7.2
 
 Package: openttd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, debconf
 Suggests: 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).
+ A reimplementation of the Microprose game "Transport Tycoon Deluxe" with lots
+ of new features and enhancements.
+ You require the data files of the original Transport Tycoon Deluxe
+ for Windows to play the game. You have to MANUALLY copy them to the
+ game data directory! (see README.Debian for details)
+ .
+ Homepage: http://www.openttd.org/

os/debian/po/ca.po

@@ -1,40 +1,35 @@
 # Catalan translation of openttd's Debconf templates.
-# Copyright © 2007 Software in the Public Interest, Inc.
+# Copyright <EFBFBD> 2007 Software in the Public Interest
 # 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"
+"Project-Id-Version: openttd 0.5.0-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"
+"POT-Creation-Date: 2007-02-01 12:25+0100\n"
+"PO-Revision-Date: 2007-02-01 12:16+0100\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
+#. Type: note
 #. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Es necessiten els fitxers de dades"
+#: ../templates:1001
+msgid "You need to install data files"
+msgstr "Heu d'instal<61>lar els fitxers de dades"
 
-#. Type: error
+#. Type: note
 #. Description
-#: ../templates:2001
+#: ../templates:1001
 msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
+"OpenTTD needs the data files from the original TTD 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 ""
-"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ó."
+"OpenTTD necessita els fitxers de dades del joc TTD original per a funcionar. "
+"Haureu d'instal<61>lar aquests fitxers de dades abans de poder jugar al joc. "
+"Llegiu el document README.Debian per a obtindre m<>s detalls sobre quins "
+"fitxers s'han de copiar i a quina ubicaci<63>."

os/debian/po/cs.po

@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 10:52+0200\n"
-"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
-"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Vyžadovány datové soubory"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Pro svůj běh vyžaduje OpenTTD datové soubory z původní hry Transport Tycoon "
-"Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Podrobnosti o vyžadovaných souborech a jejich umístění naleznete v souboru /"
-"usr/share/doc/openttd/README.Debian."

os/debian/po/de.po

@@ -1,55 +0,0 @@
-# Translation of openttd debconf templates to German
-# Copyright (C) Helge Kreutzmann <debian@helgefjell.de>, 2007.
-# This file is distributed under the same license as the openttd package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd 0.5.0-2\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 21:21+0200\n"
-"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
-"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Ben<65>tigte Datendateien"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Zum Betrieb ben<65>tigt OpenTTD Datendateien aus dem Originalspiel Transport "
-"Tycoon Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Lesen Sie die Datei /usr/share/doc/openttd/README.Debian f<>r weitere Details "
-"<22>ber die ben<65>tigten Dateien und ihren Ort."
-
-#~ msgid "You need to install data files"
-#~ msgstr "Sie m<>ssen Daten-Dateien installieren"
-
-#~ msgid ""
-#~ "OpenTTD needs the data files from the original Transport Tycoon Deluxe "
-#~ "game to run. You should install these data files before you can play the "
-#~ "game. See README.Debian for more details on which files need to be copied "
-#~ "where."
-#~ msgstr ""
-#~ "OpenTTD ben<65>tigt zur Ausf<73>hrung Daten-Dateien aus dem Originalspiel "
-#~ "<22>Transport Tycoon Deluxe<78>. Sie sollten diese Daten-Dateien installieren, "
-#~ "bevor Sie das Spiel spielen k<>nnen. Lesen Sie README.Debian f<>r weitere "
-#~ "Details dar<61>ber, welche Dateien wohin kopiert werden m<>ssen."

os/debian/po/eu.po

@@ -1,42 +0,0 @@
-# OpenTTD debconf template basque translation
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Piarres eobide <pi@beobide.net>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenTTD Debconf\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 09:55+0200\n"
-"Last-Translator: Piarres eobide <pi@beobide.net>\n"
-"Language-Team: Euskara <Librezale@librezale.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Datu fitxategiak behar dira"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Funtziona dezan, OpenTTD-ek jatorrizko 'Transport Tycoon Deluxe' jokoaren "
-"datu fitxategiak behar ditu."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"/usr/share/doc/openttd/README.Debian fitxategia begiratu beharrezko "
-"fitategien eta bere kokapenari buruz xehetasun gehiago ikusteko."

os/debian/po/fi.po

@@ -1,32 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd_0.5.3-1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-19 04:33+0200\n"
-"PO-Revision-Date: 2007-12-18 20:01+0200\n"
-"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
-"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Finnish\n"
-"X-Poedit-Country: Finland\n"
-
-#. Type: error
-#. Description
-#: ../templates:1001
-msgid "Data files needed"
-msgstr "Datatiedostoja puuttuu"
-
-#. Type: error
-#. Description
-#: ../templates:1001
-msgid "For its operation, OpenTTD needs the data files from the original Transport Tycoon Deluxe game."
-msgstr "OpenTTD tarvitsee toimiakseen datatiedostoja alkuperäisestä Transport Tycoon Deluxe -pelistä."
-
-#. Type: error
-#. Description
-#: ../templates:1001
-msgid "See the /usr/share/doc/openttd/README.Debian file for more details about the needed files and their location."
-msgstr "Tiedostossa /usr/share/doc/openttd/README.Debian on (englanniksi) lisätietoja tarvittavista tiedostoista ja niiden sijainnista."
-

os/debian/po/fr.po

@@ -1,42 +0,0 @@
-# debian-l10n-french translation of 0.5.1-1.
-# Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Ivan Buresi <err747@free.fr>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: 0.5.1-1\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 11:41+0200\n"
-"Last-Translator: Ivan Buresi <err747@free.fr>\n"
-"Language-Team: debian-l10n-french <debian-l10n-french@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Fichiers de données indispensables"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Pour fonctionner correctement, OpenTTD a besoin des fichiers de données du "
-"jeu « Transport Tycoon Deluxe » original."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Veuillez lire le fichier /usr/share/doc/openttd/README.Debian pour plus "
-"d'informations sur les fichiers requis et leur emplacement."

os/debian/po/gl.po

@@ -1,41 +0,0 @@
-# Galician translation of openttd's debconf templates
-# This file is distributed under the same license as the openttd package.
-# Jacobo Tarrio <jtarrio@debian.org>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 13:12+0200\n"
-"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
-"Language-Team: Galician <proxecto@trasno.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Precísase de ficheiros de datos"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Para o seu funcionamento, OpenTTD precisa dos ficheiros de datos do xogo "
-"Transport Tycoon Deluxe orixinal."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Consulte o ficheiro /usr/share/doc/openttd/README.Debian para máis "
-"información sobre os ficheiros necesarios e as súas ubicacións."

os/debian/po/nl.po

@@ -1,43 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-16 19:25+0100\n"
-"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
-"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Dutch\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Databestanden zijn vereist"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Om te werken heeft OpenTTD de databestanden van het oorspronkelijkee "
-"'Transport Tycoon Deluxe'-spel nodig."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Meer informatie over de vereiste bestanden en hun locatie vindt u in /usr/"
-"share/doc/openttd/README.Debian . "

os/debian/po/pt.po

@@ -1,42 +0,0 @@
-# Portuguese translation of openttd's debconf messages.
-# Copyright (C) 2007
-# This file is distributed under the same license as the openttd package.
-# Ricardo Silva <ardoric@gmail.com>, 2007
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-09 09:37+0100\n"
-"Last-Translator: Ricardo Silva <ardoric@gmail.com>\n"
-"Language-Team: Portuguese <traduz@debianpt.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "São necessários ficheiros de dados"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Para esta operação o OpenTTD precisa dos ficheiros de dados do jogo original "
-"Transport Tycool Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Veja o ficheiro /usr/share/doc/openttd/README.Debian para mais detalhes "
-"sobre os ficheiros que são necessários e a sua localização."

os/debian/po/pt_BR.po

@@ -1,43 +0,0 @@
-# openttd Brazilian Portuguese translation
-# Copyright (C) 2007, Eder L. Marques
-# This file is distributed under the same license as the openttd package.
-# Eder L. Marques <frolic@debian-ce.org>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd 0.5.0-2\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 11:00-0300\n"
-"Last-Translator: Eder L. Marques <frolic@debian-ce.org>\n"
-"Language-Team: l10n Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"pt_BR utf-8\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Arquivos de dados necessários"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Para sua operação, o OpenTTD necessita dos arquivos de dados do jogo "
-"Transport Tycoon Deluxe original."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Veja o arquivo /usr/share/doc/openttd/README.Debian para maiores detalhes "
-"sobre os arquivos necessários e suas localizações."

os/debian/po/ru.po

@@ -1,45 +0,0 @@
-# translation of openttd_debconf_ru.po to Russian
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Yuri Kozlov <kozlov.y@gmail.com>, 2007.
-msgid ""
-msgstr ""
-"Project-Id-Version: 0.5.1-1\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-10 21:45+0400\n"
-"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
-"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Необходимы файлы данных"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Для работы OpenTTD требуются файлы данных от оригинальной игры Transport "
-"Tycoon Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"В файле /usr/share/doc/openttd/README.Debian приведена информация о том, "
-"какие файлы нужны и где они лежат."

os/debian/po/sv.po

@@ -1,56 +0,0 @@
-# Swedish translation for openttd debconf template.
-# Copyright (C) 2007 Free Software Foundation, Inc.
-# This file is distributed under the same license as the openttd package.
-# Daniel Nylander <po@danielnylander.se>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 09:47+0100\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
-"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Datafiler behövs"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"För att fungera behöva OpenTTD datafilerna från det ursprungliga spelet "
-"Transport Tycoon Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Se filen /usr/share/doc/openttd/README.Debian för mer information om de "
-"nödvändiga filera och var de finns någonstans."
-
-#~ msgid "You need to install data files"
-#~ msgstr "Du behöver installera datafilerna"
-
-#~ msgid ""
-#~ "OpenTTD needs the data files from the original Transport Tycoon Deluxe "
-#~ "game to run. You should install these data files before you can play the "
-#~ "game. See README.Debian for more details on which files need to be copied "
-#~ "where."
-#~ msgstr ""
-#~ "OpenTTD behöver datafilerna från det ursprungliga spelet Transport Tycoon "
-#~ "Deluxe för att kunna köras. Du måste installera dessa datafiler innan du "
-#~ "kan spela spelet. Se README.Debian för fler detaljer om vilka filer som "
-#~ "behöver kopieras."

os/debian/po/ta.po

@@ -1,43 +0,0 @@
-# translation of openttd.po to TAMIL
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Dr.T.Vasudevan <agnihot3@gmail.com>, 2007.
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 15:04+0530\n"
-"Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
-"Language-Team: TAMIL <ubuntu-l10n-tam@lists.ubuntu.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "தேவையான தரவு கோப்புகள்"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"இயங்குவதற்கு ஓபன் டிடிடி(OpenTTD) க்கு ட்ரான்ஸ்போர்ட் டைகூன் டீலக்ஸ் விளையாட்டிலிருந்து "
-"தரவு கோப்புகள் தேவை."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"தேவையான கோப்புகள் அவற்றின் இடம்  ஆகியவற்றை அறிய /usr/share/doc/openttd/README "
-"டெபியன் கோப்பை பார்க்கவும்."

os/debian/po/templates.pot

@@ -8,7 +8,7 @@ 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"
+"POT-Creation-Date: 2007-02-01 12:25+0100\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"
@@ -16,24 +16,17 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: error
+#. Type: note
 #. Description
-#: ../templates:2001
-msgid "Data files needed"
+#: ../templates:1001
+msgid "You need to install data files"
 msgstr ""
 
-#. Type: error
+#. Type: note
 #. Description
-#: ../templates:2001
+#: ../templates:1001
 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."
+"OpenTTD needs the data files from the original TTD 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 ""

os/debian/rules

@@ -6,7 +6,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-configure: configure-stamp
+include /usr/share/dpatch/dpatch.make
+
+configure: patch configure-stamp
 configure-stamp:
 	dh_testdir
 	# Add here commands to configure the package.
@@ -27,16 +29,13 @@ build-stamp:
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	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
+	-$(MAKE) clean
 
 	dh_clean
 
@@ -85,4 +84,4 @@ binary-arch: build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install configure patch

os/debian/templates

@@ -1,16 +1,6 @@
-# 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.
+Type: note
+_Description: You need to install data files
+ OpenTTD needs the data files from the original TTD 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.

os/dos/copying

@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    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.
-
-    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.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

os/dos/copying.dj

@@ -1,48 +0,0 @@
-This is the file "copying.dj".  It does NOT apply to any sources or
-binaries copyrighted by UCB Berkeley, the Free Software Foundation, or
-any other agency besides DJ Delorie and others who have agreed to
-allow their sources to be distributed under these terms.
-
-   Copyright Information for sources and executables that are marked
-   Copyright (C) DJ Delorie
-                 7 Kim Lane
-                 Rochester NH  03867-2954
-
-This document is Copyright (C) DJ Delorie and may be distributed
-verbatim, but changing it is not allowed.
-
-Source code copyright DJ Delorie is distributed under the terms of the
-GNU General Public Licence, with the following exceptions:
-
-* Sources used to build crt0.o, gcrt0.o, libc.a, libdbg.a, and
-  libemu.a are distributed under the terms of the GNU Library General
-  Public License, rather than the GNU GPL.
-
-* Any existing copyright or authorship information in any given source
-  file must remain intact.  If you modify a source file, a notice to that
-  effect must be added to the authorship information in the source file.
-
-* Runtime binaries, as provided by DJ in DJGPP, may be distributed
-  without sources ONLY if the recipient is given sufficient information
-  to obtain a copy of djgpp themselves.  This primarily applies to
-  go32-v2.exe, emu387.dxe, and stubedit.exe.
-
-* Runtime objects and libraries, as provided by DJ in DJGPP, when
-  linked into an application, may be distributed without sources ONLY
-  if the recipient is given sufficient information to obtain a copy of
-  djgpp themselves.  This primarily applies to crt0.o and libc.a.
-
------
-
-Changes to source code copyright BSD, FSF, or others, by DJ Delorie
-fall under the terms of the original copyright.  Such files usually
-have multiple copyright notices in them.
-
-A copy of the files "COPYING" and "COPYING.LIB" are included with this
-document.  If you did not receive a copy of these files, you may
-obtain one from whence this document was obtained, or by writing:
-
-      Free Software Foundation
-      59 Temple Place - Suite 330
-      Boston, MA 02111-1307
-      USA

os/dos/copying.lib

@@ -1,481 +0,0 @@
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1991 Free Software Foundation, Inc.
-                    675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the library GPL.  It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
-
-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License").  Each licensee is
-addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    c) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    d) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-     Appendix: How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library 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
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!

os/dos/cwsdpmi.txt

@@ -1,173 +0,0 @@
-CWSDPMI is Copyright (C) 1995-2000  Charles W Sandmann (sandmann@clio.rice.edu)
-                                    1206 Braelinn, Sugar Land, TX 77479
-
-This is release 5.  The files in this binary distribution may be redistributed
-under the GPL (with source) or without the source code provided:
-
-* CWSDPMI.EXE or CWSDPR0.EXE are not modified in any way except via CWSPARAM.
-
-* CWSDSTUB.EXE internal contents are not modified in any way except via
-  CWSPARAM or STUBEDIT.  It may have a COFF image plus data appended to it.
-
-* Notice to users that they have the right to receive the source code and/or
-  binary updates for CWSDPMI.  Distributors should indicate a site for the
-  source in their documentation.
-
--------------------------------------------------------------------------------
-
-CWSDPMI was written to provide DPMI services for V2 of DJGPP.  It currently
-does not support 16-bit DPMI applications, or DPMI applications requiring a
-built in extender.  It does support virtual memory and hardware interrupt
-reflection from real mode to protected mode.  DJGPP V1.1x and RSX applications
-will also run using this server, which can be used to provide enhanced control
-over hardware interrupts.  Some DPMI 1.0 extensions (0x506, 0x507, 0x508) have
-been implemented.
-
-CWSDPR0.EXE is an alternate version which runs at ring 0 with virtual memory
-disabled.  It may be used if access to ring-0 features are desired.  It
-currently does not switch stacks on HW interrupts, so some DJGPP features
-such as SIGINT and SIGFPE are not supported and will generate a double fault
-or stack fault error (to be fixed someday).
-
-CWSDSTUB.EXE is a stub loader image for DJGPP which includes CWSDPMI.  This
-allows single executable image distributions.  You can use the EXE2COFF
-program and COPY /B CWSDSTUB.EXE+yourimage yourimage.exe to create a
-standalone executable image.
-
-Some of the internal tuning and configuration parameters may be modified
-in the image using CWSPARAM.EXE (see CWSPARAM.DOC).
-
-If you want to use CWSDPMI with DJGPP, you expand the distribution into the
-DJGPP directory tree.  CWSDPMI.EXE will be put in the BIN directory with your
-DJGPP images and it will automatically be loaded when they run.
-
-Directions for use (server can be used in either of two different ways):
-
-1) "cwsdpmi" alone with no parameters will terminate and stay resident
-   FOR A SINGLE DPMI PROCESS.  This means it unloads itself when your
-   DPMI application exits.  This mode is useful in software which needs
-   DPMI services, since CWSDPMI can be exec'ed and then will unload on exit.
-
-2) "cwsdpmi -p" will terminate and stay resident until you remove it.
-   It can be loaded into UMBs with LH.  "cwsdpmi -u" will unload the TSR.
-
-3) The file used for virtual memory swapping, if desired, is controlled
-   by the "-sc:\cwsdpmi.swp" syntax on the command line.  You must specify
-   either a file with full disk/directory syntax, or "-s-" which disables
-   virtual memory.
-
-4) The default swap file name is c:\cwsdpmi.swp, but this can be changed
-   with the CWSPARAM image, as can some other parameters.
-
-5) You can disable the DPMI 1.0 extensions by starting the image with the
-   "cwsdpmi -x" syntax.  This feature allows you to run programs developed
-   under other DPMI providers which do not behave properly with these
-   extensions enabled (typically use of NULL pointers).
-
-I would like to give special thanks to DJ Delorie who wrote the original
-GO32 code on which CWSDPMI is based.  Morten Welinder also provided and
-improved much of the code in this program.
-
--------------------------------------------------------------------------------
-
-This section contains a list of the error messages you might see out of
-CWSDPMI and some details on what they mean.
-
-Exceptions are only handled by CWSDPMI if the application does not establish
-an exception handler, exceptions nest 5 deep, or the error is particularly bad:
-
-"Page fault" -
-  1) an illegal page fault happens in a RMCB or HW interrupt, (lock all pages!)
-  2) all available pages have been locked,
-  3) the application is using non-committed pages for null pointer protection.
-"Double Fault" - multiple exceptions occurred
-"Invalid TSS" - typically due to RMCB or HW interrupt being called after the
-   selectors/memory have been deallocated (remember to reset the mouse)
-"General Protection Fault" - bad parameter sent to a DPMI call
-
-"80386 required."
-
-Since 80286 and lesser processors don't have the hardware necessary to
-run CWSDPMI.  No workaround, upgrade.
-
-"DOS 3 required."
-
-A few interrupts are used which need DOS 3.0 or higher.  I don't expect to
-ever see this message, since 80386 machines were introduced after DOS 3.0
-and that check is made first.
-
-"CWSDPMI V0.90+ (r5) Copyright (C) 2000 CW Sandmann  ABSOLUTELY NO WARRANTY"
-
-An informational message displayed if the program is not run in one-pass mode.
-
-"Protected mode not accessible."
-
-This message should only be displayed if running CWSDPMI in a protected
-environment with no access to protected mode.  In this case, DPMI should
-already be available and CWSDPMI would not be needed.  This might happen if
-a 16-bit DPMI client is loaded and a DJGPP image attempts to load CWSDPMI
-to provide 32-bit DPMI services under Windows.
-
-"Warning: cannot open swap file c:\cwsdpmi.swp"
-
-Maybe you are out of file handles, or the swap file name is incorrectly
-specified in the image (change the name with cwsparam).
-
-"No swap space!"
-
-This message means you tried to use more paging file than CWSDPMI was
-configured to handle.  Since this is protected against in the memory
-allocation code, you should never see this message.
-
-"Swap disk full!"
-
-This means the paging file could not be expanded when trying to page
-memory out to disk.  This would normally not be seen, unless you are
-writing output to the same disk which holds the paging file.  Decrease
-the amount of memory your DPMI application is using or free up disk space.
-
-"Interrupt 0x??"
-
-Your application tried to call an interrupt from protected mode which
-normally shouldn't be called (something like a data pointer).  If the
-request was allowed to continue it would likely hang your machine.  If you
-see this message and think the interrupt should be allowed to continue, let
-me know.
-
-"Error: Using XMS switched CPU into V86 mode."
-
-This message might be seen if you have your memory manager in AUTO mode.  The
-only workaround in this case is to stop using AUTO mode.
-
-"Error: could not allocate page table memory"
-
-The page table memory (a minimum of 16Kb) is allocated from conventional
-memory (either in the 640Kb region or UMBs).  If CWSDPMI cannot allocate the
-minimum necessary memory, you would see this message.  Free up some
-conventional memory.  You may also see this message if a page directory needs
-to be faulted in, and there are no available pages.  This means too many pages
-have been locked for the allocated page tables available.  While CWSDPMI
-tries to dynamically allocate these if needed, this effort failed.  You need
-to increase the number of page tables with CWSPARAM, or increase the amount
-of free conventional memory if it is low.  If the application which calls
-CWSDPMI internally manages all the DOS memory, the page tables may need to
-be pre-allocated at DPMI startup time (if this is needed, try using the
-run option flag 2 in cwsparam).
-
-"16-bit DPMI unsupported."
-
-CWSDPMI is a 32-bit only DPMI server.  Ideally, on the request to enter DPMI's
-PM with a 16-bit request, we would just fail the call setting the carry bit
-like the DPMI specification describes.  Some buggy 16-bit compiler tools don't
-check the return status and will hang the machine in this case.  So, I issue
-an error message and exit the image instead.
-
-"Descriptors exhausted."
-
-An attempt to nest a DPMI client failed in the setup phase due to insufficient
-free selectors in the LDT.
-
-"CWSDPMI not removed"
-
-When the -u parameter is specified, if DPMI is not detected this message is
-printed.  Informational.

os/dos/exe2coff.c

@@ -1,94 +0,0 @@
-/* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */
-/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
-/* Updated 2008 to use fread/fopen and friends instead of read/open so it compiles with GCC on Unix (Rubidium) */
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-
-
-static void
-exe2aout(char *fname)
-{
-  unsigned short header[3];
-  FILE *ifile;
-  FILE *ofile;
-  char buf[4096];
-  int rbytes;
-  char *dot = strrchr(fname, '.');
-  if (!dot || strlen(dot) != 4
-      || tolower(dot[1]) != 'e'
-      || tolower(dot[2]) != 'x'
-      || tolower(dot[3]) != 'e')
-  {
-    fprintf(stderr, "%s: Arguments MUST end with a .exe extension\n", fname);
-    return;
-  }
-
-  ifile = fopen(fname, "rb");
-  if (!ifile)
-  {
-    perror(fname);
-    return;
-  }
-  fread(header, sizeof(header), 1, ifile);
-  if (header[0] == 0x5a4d)
-  {
-    long header_offset = (long)header[2]*512L;
-    if (header[1])
-      header_offset += (long)header[1] - 512L;
-    fseek(ifile, header_offset, SEEK_SET);
-    header[0] = 0;
-    fread(header, sizeof(header), 1, ifile);
-    if ((header[0] != 0x010b) && (header[0] != 0x014c))
-    {
-      fprintf(stderr, "`%s' does not have a COFF/AOUT program appended to it\n", fname);
-      return;
-    }
-    fseek(ifile, header_offset, SEEK_SET);
-  }
-  else
-  {
-    fprintf(stderr, "`%s' is not an .EXE file\n", fname);
-    return;
-  }
-
-  *dot = 0;
-  ofile = fopen(fname, "w+b");
-  if (!ofile)
-  {
-    perror(fname);
-    return;
-  }
-
-  while ((rbytes=fread(buf, 1, 4096, ifile)) > 0)
-  {
-    int wb = fwrite(buf, 1, rbytes, ofile);
-    if (wb < 0)
-    {
-      perror(fname);
-      break;
-    }
-    if (wb < rbytes)
-    {
-      fprintf(stderr, "`%s': disk full\n", fname);
-      exit(1);
-    }
-  }
-  fclose(ifile);
-  fclose(ofile);
-}
-
-int
-main(int argc, char **argv)
-{
-  int i;
-  if (argc == 1) printf("Usage: %s <exename>", argv[0]);
-  for (i=1; i<argc; i++)
-    exe2aout(argv[i]);
-  return 0;
-}
-

os/dos/make_dos_binary_selfcontained.sh

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# $Id$
-
-cd `dirname $0`
-cc -o exe2coff exe2coff.c || exit
-cp $1 binary.exe || exit
-./exe2coff binary.exe || exit
-cat cwsdstub.exe binary > binary.exe || exit
-mv binary.exe $1
-rm binary exe2coff

os/macosx/plistgen.sh

@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# $Id$
-
 # sets VERSION to the value if RELEASE if there are any,
 # otherwise it sets VERSION to revision number
 if [ "$3" ]; then
@@ -21,7 +19,7 @@ echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
         <key>CFBundleDevelopmentRegion</key>
         <string>English</string>
         <key>CFBundleDisplayName</key>
-        <string>OpenTTD</string>
+        <string>Open Transport Tycoon</string>
         <key>CFBundleExecutable</key>
         <string>openttd</string>
         <key>CFBundleGetInfoString</key>

os/mandrake/README.urpmi

@@ -0,0 +1,9 @@
+You require the data files of the original Transport Tycoon Deluxe
+for Windows to play the game. You have to manually copy the following
+files to %{_gamesdatadir}/openttd/data/
+sample.cat
+trg1r.grf
+trgcr.grf
+trghr.grf
+trgir.grf
+trgtr.grf

os/mandrake/openttd.spec

@@ -0,0 +1,146 @@
+#------------------------------------------------------------------------------
+#   openttd.spec
+#       This SPEC file controls the building of custom OpenTTD RPM
+#       packages.
+#------------------------------------------------------------------------------
+
+%define name openttd
+%define version 0.5.0
+%define release 1mdk
+
+#------------------------------------------------------------------------------
+#   Prologue information
+#------------------------------------------------------------------------------
+Name: %{name}
+Version: %{version}
+Release: %{release}
+Summary: An open source clone of the Microprose game "Transport Tycoon Deluxe"
+Group: Games/Strategy
+License: GPL
+
+URL: http://www.openttd.org
+
+Source: %{name}-%{version}.tar.gz
+Packager: Dominik Scherer <dominik@openttd.com>
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires: libSDL1.2-devel >= 1.2.7
+BuildRequires: libpng3-devel >= 1.2.5
+BuildRequires: zlib1-devel >= 1.2.1
+
+#------------------------------------------------------------------------------
+#   Description
+#------------------------------------------------------------------------------
+%description
+An enhanced open source clone of the Microprose game "Transport Tycoon Deluxe".
+You require the data files of the original Transport Tycoon Deluxe
+for Windows to play the game. You have to MANUALLY copy them to the
+game data directory!
+
+#------------------------------------------------------------------------------
+#   install scripts
+#------------------------------------------------------------------------------
+%prep
+rm -rf $RPM_BUILD_ROOT
+%setup
+
+%build
+make BINARY_DIR=%{_gamesbindir} PREFIX=%{_gamesdatadir} DATA_DIR=openttd INSTALL_DIR=%{_gamesdatadir}/openttd/ USE_HOMEDIR=1 PERSONAL_DIR=.openttd INSTALL=1 RELEASE=%{version}
+
+%install
+mkdir -p $RPM_BUILD_ROOT%{_gamesbindir}
+mkdir -p $RPM_BUILD_ROOT%{_gamesdatadir}/openttd/lang
+mkdir -p $RPM_BUILD_ROOT%{_gamesdatadir}/openttd/data
+mkdir -p $RPM_BUILD_ROOT%{_gamesdatadir}/openttd/scenario
+
+cp ./openttd $RPM_BUILD_ROOT%{_gamesbindir}/
+cp -r ./lang/*.lng $RPM_BUILD_ROOT%{_gamesdatadir}/openttd/lang/
+cp -r ./data/*.grf $RPM_BUILD_ROOT%{_gamesdatadir}/openttd/data/
+cp -r ./scenario/*.scn $RPM_BUILD_ROOT%{_gamesdatadir}/openttd/scenario/
+cp -r ./data/opntitle.dat $RPM_BUILD_ROOT%{_gamesdatadir}/openttd/data/
+
+# icon
+install -m644 media/openttd.32.png -D $RPM_BUILD_ROOT%{_miconsdir}/%{name}.png
+install -m644 media/openttd.64.png -D $RPM_BUILD_ROOT%{_iconsdir}/%{name}.png
+install -m644 media/openttd.128.png -D $RPM_BUILD_ROOT%{_liconsdir}/%{name}.png
+
+# menu entry
+mkdir -p $RPM_BUILD_ROOT/%{_menudir}
+cat << EOF > $RPM_BUILD_ROOT/%{_menudir}/%{name}
+?package(%{name}):command="%{_gamesbindir}/openttd" icon="%{name}.png" \
+  needs="X11" section="Amusement/Strategy" title="OpenTTD" \
+  longtitle="%{Summary}"
+EOF
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%{update_menus}
+
+%postun
+%{clean_menus}
+
+#------------------------------------------------------------------------------
+#   Files listing.
+#------------------------------------------------------------------------------
+%files
+%defattr(-,root,root,0755)
+%{_gamesbindir}/openttd
+
+%{_gamesdatadir}/openttd/lang/american.lng
+%{_gamesdatadir}/openttd/lang/catalan.lng
+%{_gamesdatadir}/openttd/lang/czech.lng
+%{_gamesdatadir}/openttd/lang/danish.lng
+%{_gamesdatadir}/openttd/lang/dutch.lng
+%{_gamesdatadir}/openttd/lang/english.lng
+%{_gamesdatadir}/openttd/lang/finnish.lng
+%{_gamesdatadir}/openttd/lang/french.lng
+%{_gamesdatadir}/openttd/lang/galician.lng
+%{_gamesdatadir}/openttd/lang/german.lng
+%{_gamesdatadir}/openttd/lang/hungarian.lng
+%{_gamesdatadir}/openttd/lang/icelandic.lng
+%{_gamesdatadir}/openttd/lang/italian.lng
+%{_gamesdatadir}/openttd/lang/norwegian.lng
+%{_gamesdatadir}/openttd/lang/origveh.lng
+%{_gamesdatadir}/openttd/lang/polish.lng
+%{_gamesdatadir}/openttd/lang/portuguese.lng
+%{_gamesdatadir}/openttd/lang/romanian.lng
+%{_gamesdatadir}/openttd/lang/slovak.lng
+%{_gamesdatadir}/openttd/lang/spanish.lng
+%{_gamesdatadir}/openttd/lang/swedish.lng
+
+%{_gamesdatadir}/openttd/data/autorail.grf
+%{_gamesdatadir}/openttd/data/canalsw.grf
+%{_gamesdatadir}/openttd/data/openttd.grf
+%{_gamesdatadir}/openttd/data/opntitle.dat
+%{_gamesdatadir}/openttd/data/signalsw.grf
+%{_gamesdatadir}/openttd/data/trkfoundw.grf
+
+"%{_gamesdatadir}/openttd/scenario/Linkgame Islands 2004.scn"
+"%{_gamesdatadir}/openttd/scenario/Mountain Pass.scn"
+"%{_gamesdatadir}/openttd/scenario/Volcano City.scn"
+
+%{_menudir}/%{name}
+%{_iconsdir}/*.png
+%{_miconsdir}/*.png
+%{_liconsdir}/*.png
+
+%doc changelog.txt readme.txt COPYING os/linux/README.urpmi
+
+#------------------------------------------------------------------------------
+#   Change Log
+#------------------------------------------------------------------------------
+%changelog
+* Sun Jan 23 2005 Dominik Scherer <dominik@openttd.com> 0.3.6-1mdk
+- Upgraded to 0.3.6
+- Structured and commented the spec file a bit (inspired by ScummVM)
+
+* Fri Dec 24 2004 Dominik Scherer <dominik@openttd.com> 0.3.5-1mdk
+- Upgraded to 0.3.5
+- Added a warning message about the additional required files (only displayed when installing via urpmi)
+
+* Wed Sep 15 2004 Dominik Scherer <> 0.3.4-1mdk
+- Upgraded to 0.3.4
+
+* Wed Jul 31 2004 Dominik Scherer <> 0.3.3-1mdk
+- Initial release

os/rpm/openttd.spec

@@ -1,181 +0,0 @@
-# $Id$
-#-------------------------------------------------------------------------------
-# spec file for the openttd rpm package
-#
-# Copyright (c) 2007-2009 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.3
-Release:       1%{?dist}
-
-Group:         Amusements/Games
-License:       GPLv2
-URL:           http://www.openttd.org
-Summary:       OpenTTD is an Open Source clone of Chris Sawyer's Transport Tycoon Deluxe
-
-Source:        %{name}-%{version}-source.tar.bz2
-
-Requires:      fontconfig
-Requires:      libicu
-Requires:      libpng
-Requires:      SDL
-Requires:      zlib
-BuildRequires: fontconfig-devel
-BuildRequires: libpng-devel
-BuildRequires: libicu-devel
-BuildRequires: SDL-devel
-BuildRequires: zlib-devel
-# vendor specific dependencies
-%if %{_vendor}=="alt"
-Requires:      freetype
-BuildRequires: freetype-devel
-%endif
-%if %{_vendor}=="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"
-Requires:      freetype2
-BuildRequires: freetype2-devel
-%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
-
-OpenTTD is licensed under the GNU General Public License version 2.0. For more
-information, see the file 'COPYING' included with every release and source
-download of the game.
-
-%prep
-%setup -q
-
-%build
-./configure \
-	--revision=%{version} \
-	--prefix-dir="%{_prefix}" \
-	--binary-dir="bin" \
-	--binary-name="%{name}" \
-	--enable-debug=0 \
-	--with-sdl \
-	--with-zlib \
-	--with-png \
-	--with-freetype \
-	--with-fontconfig \
-	--with-icu \
-	--enable-strip \
-#	--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"
-
-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 \
-	--vendor="%{_vendor}" \
-	--remove-key Version \
-	--dir="%{buildroot}/%{_datadir}/applications/" \
-	"%{buildroot}/%{_datadir}/applications/%{name}.desktop" \
-#	--delete-original
-%endif
-
-%clean
-rm -rf "%{buildroot}"
-
-%post
-# Update the icon cache (vendor specific)
-%if %{_vendor}=="MandrakeSoft" || %{_vendor}=="mandriva"
-%update_icon_cache hicolor
-%endif
-
-%if %{_vendor} == "redhat" || %{_vendor}=="fedora"
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-%endif
-
-%postun
-# Update the icon cache (vendor specific)
-%if %{_vendor}=="MandrakeSoft" || %{_vendor}=="mandriva"
-%update_icon_cache hicolor
-%endif
-
-%if %{_vendor} == "redhat" || %{_vendor}=="fedora"
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-%endif
-
-%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
-%attr(755, root, games) %{_bindir}/%{name}
-%{_datadir}/doc/%{name}/*
-%{_datadir}/games/%{name}/lang/*
-%{_datadir}/games/%{name}/data/*
-%{_datadir}/games/%{name}/scripts/*
-%{_datadir}/applications/*%{name}.desktop
-%{_datadir}/pixmaps/*
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
-%doc %{_mandir}/man6/%{name}.6.gz
-
-%changelog
-* 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
-

os/win32/installer/build_installers.bat

@@ -1,4 +0,0 @@
-@echo off
-"c:\Program Files\NSIS\makensis.exe" /DVERSION_INCLUDE=version_win9x.txt install.nsi > win9x.log
-"c:\Program Files\NSIS\makensis.exe" /DVERSION_INCLUDE=version_win32.txt install.nsi > win32.log
-"c:\Program Files\NSIS\makensis.exe" /DVERSION_INCLUDE=version_win64.txt install.nsi > win64.log

os/win32/installer/install.nsi

@@ -1,11 +1,10 @@
 !define APPNAME "OpenTTD"   ; Define application name
-!define APPVERSION "0.7.3-RC2"  ; Define application version
-!define APPVERSIONINTERNAL "0.7.3.0" ; Define application version in X.X.X.X
-!define INSTALLERVERSION 67 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
-!include ${VERSION_INCLUDE}
+!define APPVERSION "0.6.0"  ; Define application version
+!define INSTALLERVERSION 42 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
 
 !define APPURLLINK "http://www.openttd.org"
-!define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}"
+!define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}-beta4"
+!define APPVERSIONINTERNAL "${APPVERSION}.0" ; Needs to be of the format X.X.X.X
 
 !define MUI_ICON "..\..\..\media\openttd.ico"
 !define MUI_UNICON "..\..\..\media\openttd.ico"
@@ -19,20 +18,21 @@ SetCompressor LZMA
 ; Version Info
 Var AddWinPrePopulate
 VIProductVersion "${APPVERSIONINTERNAL}"
-VIAddVersionKey "ProductName" "OpenTTD Installer ${APPBITS} bits version ${EXTRA_VERSION}"
+VIAddVersionKey "ProductName" "OpenTTD Installer"
 VIAddVersionKey "Comments" "Installs ${APPNAMEANDVERSION}"
 VIAddVersionKey "CompanyName" "OpenTTD Developers"
 VIAddVersionKey "FileDescription" "Installs ${APPNAMEANDVERSION}"
 VIAddVersionKey "ProductVersion" "${APPVERSION}"
-VIAddVersionKey "InternalName" "InstOpenTTD-${APPARCH}"
-VIAddVersionKey "FileVersion" "${APPVERSION}-${APPARCH}"
+VIAddVersionKey "InternalName" "InstOpenTTD"
+VIAddVersionKey "FileVersion" "${APPVERSION}"
 VIAddVersionKey "LegalCopyright" " "
 ; Main Install settings
-Name "${APPNAMEANDVERSION} ${APPBITS} bits version ${EXTRA_VERSION}"
+Name "${APPNAMEANDVERSION}"
 
 ; NOTE: Keep trailing backslash!
+InstallDir "$PROGRAMFILES\OpenTTD\"
 InstallDirRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Install Folder"
-OutFile "openttd-${APPVERSION}-${APPARCH}.exe"
+OutFile "openttd-${APPVERSION}-win32.exe"
 CRCCheck force
 
 ShowInstDetails show
@@ -45,7 +45,7 @@ Var CDDRIVE
 !include "MUI.nsh"
 
 !define MUI_ABORTWARNING
-!define MUI_WELCOMEPAGE_TITLE_3LINES
+
 !insertmacro MUI_PAGE_WELCOME
 
 !define MUI_LICENSEPAGE_RADIOBUTTONS
@@ -71,8 +71,10 @@ Page custom SelectCDEnter SelectCDExit ": TTD folder"
 
 !insertmacro MUI_PAGE_INSTFILES
 
-!define MUI_FINISHPAGE_TITLE_3LINES
-!define MUI_FINISHPAGE_RUN_TEXT "Run ${APPNAMEANDVERSION} now!"
+;-----------------------------------------------------
+; New custom page to show UNICODE and MSLU information
+Page custom ShowWarningsPage
+
 !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_LOCATION "${APPURLLINK}"
@@ -82,7 +84,6 @@ Page custom SelectCDEnter SelectCDExit ": TTD folder"
 !define MUI_WELCOMEFINISHPAGE_CUSTOMFUNCTION_INIT DisableBack
 
 !insertmacro MUI_PAGE_FINISH
-!define MUI_PAGE_HEADER_TEXT "Uninstall ${APPNAMEANDVERSION}"
 !insertmacro MUI_UNPAGE_CONFIRM
 !insertmacro MUI_UNPAGE_INSTFILES
 
@@ -96,22 +97,27 @@ Section "!OpenTTD" Section1
 	; Overwrite files by default, but don't complain on failure
 	SetOverwrite try
 
+	; Make savegame folder
+	SetOutPath "$INSTDIR\save"
 	; Define root variable relative to installer
 	!define PATH_ROOT "..\..\..\"
 
 	; Copy language files
 	SetOutPath "$INSTDIR\lang\"
 	File ${PATH_ROOT}bin\lang\*.lng
+	File ${PATH_ROOT}src\lang\english.txt
 
 	; Copy data files
 	SetOutPath "$INSTDIR\data\"
 	File ${PATH_ROOT}bin\data\*.grf
-	File ${PATH_ROOT}bin\data\*.obg
 	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 the scripts
-	SetOutPath "$INSTDIR\scripts\"
-	File ${PATH_ROOT}bin\scripts\*.*
+	; Copy heightmap files (don't choke if they don't exist)
+	SetOutPath "$INSTDIR\scenario\heightmap\"
+	File /nonfatal ${PATH_ROOT}bin\scenario\heightmap\*.*
 
 	; Copy the rest of the stuff
 	SetOutPath "$INSTDIR\"
@@ -123,7 +129,8 @@ Section "!OpenTTD" Section1
 	File ${PATH_ROOT}known-bugs.txt
 
 	; Copy executable
-	File /oname=openttd.exe ${BINARY_DIR}\openttd.exe
+	File /oname=openttd.exe ${PATH_ROOT}objs\Win32\Release\openttd.exe
+	File ${PATH_ROOT}objs\strgen\strgen.exe
 
 
 	; Delete old files from the main dir. they are now placed in data/ and lang/
@@ -240,10 +247,10 @@ Section "Uninstall"
 	Delete "$INSTDIR\readme.txt"
 	Delete "$INSTDIR\known-bugs.txt"
 	Delete "$INSTDIR\openttd.exe"
+	Delete "$INSTDIR\strgen.exe"
 	Delete "$INSTDIR\COPYING"
 	Delete "$INSTDIR\INSTALL.LOG"
 	Delete "$INSTDIR\crash.log"
-	Delete "$INSTDIR\crash.dmp"
 	Delete "$INSTDIR\openttd.cfg"
 	Delete "$INSTDIR\hs.dat"
 	Delete "$INSTDIR\cached_sprites.*"
@@ -262,11 +269,6 @@ Section "Uninstall"
 	Delete "$INSTDIR\data\openttd.grf"
 	Delete "$INSTDIR\data\roadstops.grf"
 	Delete "$INSTDIR\data\trkfoundw.grf"
-	Delete "$INSTDIR\data\openttdd.grf"
-	Delete "$INSTDIR\data\openttdw.grf"
-	Delete "$INSTDIR\data\orig_win.obg"
-	Delete "$INSTDIR\data\orig_dos.obg"
-	Delete "$INSTDIR\data\orig_dos_de.obg"
 
 	Delete "$INSTDIR\data\sample.cat"
 	; Windows Data files
@@ -287,9 +289,7 @@ Section "Uninstall"
 
 	; Language files
 	Delete "$INSTDIR\lang\*.lng"
-
-	; Scripts
-	Delete "$INSTDIR\scripts\*.*"
+	Delete "$INSTDIR\lang\english.txt"
 
 	; Remove remaining directories
 	RMDir "$SMPROGRAMS\$SHORTCUTS\Extras\"
@@ -367,61 +367,37 @@ 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
 	ClearErrors
 	StrCpy $R0 "winnt"
 
-	GetVersion::WindowsPlatformId
-	Pop $R0
-	IntCmp $R0 2 WinNT 0
+	ReadRegStr $R1 HKLM "SOFTWARE\MICROSOFT\WINDOWS NT\CurrentVersion" CurrentVersion
+	IfErrors 0 WinNT
 	StrCpy $R0 "win9x"
 WinNT:
 	ClearErrors
 	Push $R0
 FunctionEnd
 
-;-------------------------------------------------------------------------------
-; Check whether we're not running an installer for 64 bits on 32 bits and vice versa
-Function CheckProcessorArchitecture
-	GetVersion::WindowsPlatformArchitecture
-	Pop $R0
-	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
-	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
-	GoTo Done
-Abort:
-	Quit
-Done:
-FunctionEnd
-
-
-;-------------------------------------------------------------------------------
-; Check whether we're not running an installer for NT on 9x and vice versa
-Function CheckWindowsVersion
-	Call GetWindowsVersion
-	Pop $R0
-	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
-	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
-Abort:
-	Quit
-Done:
-FunctionEnd
-
 Var OLDVERSION
 Var UninstallString
 
@@ -472,8 +448,6 @@ InstallerIsOlder:
 
 FinishCallback:
 	ClearErrors
-	Call CheckProcessorArchitecture
-	Call CheckWindowsVersion
 FunctionEnd
 ; eof
 

os/win32/installer/notice.ini

@@ -0,0 +1,30 @@
+; 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
+

os/win32/installer/version_win32.txt

@@ -1,5 +0,0 @@
-!define APPBITS 32          ; Define number of bits for the architecture
-!define EXTRA_VERSION "for Windows 2000, XP and Vista"
-!define APPARCH "win32"     ; Define the application architecture
-!define BINARY_DIR "${PATH_ROOT}objs\win32\Release"
-InstallDir "$PROGRAMFILES32\OpenTTD\"

os/win32/installer/version_win64.txt

@@ -1,5 +0,0 @@
-!define APPBITS 64          ; Define number of bits for the architecture
-!define EXTRA_VERSION "for Windows XP and Vista"
-!define APPARCH "win64"     ; Define the application architecture
-!define BINARY_DIR "${PATH_ROOT}objs\x64\Release"
-InstallDir "$PROGRAMFILES64\OpenTTD\"

os/win32/installer/version_win9x.txt

@@ -1,5 +0,0 @@
-!define APPBITS 32          ; Define number of bits for the architecture
-!define EXTRA_VERSION "for Windows 95, 98 and ME"
-!define APPARCH "win9x"     ; Define the application architecture
-!define BINARY_DIR "${PATH_ROOT}bin"
-InstallDir "$PROGRAMFILES32\OpenTTD\"

projects/determineversion.vbs

@@ -9,248 +9,172 @@ Sub FindReplaceInFile(filename, to_find, replacement)
 	data = file.ReadAll
 	file.Close
 	data = Replace(data, to_find, replacement)
-	Set file = FSO.CreateTextFile(filename, -1, 0)
+	Set file = FSO.CreateTextFile(FileName, -1, 0)
 	file.Write data
 	file.Close
 End Sub
 
-Sub UpdateFile(modified, revision, version, cur_date, filename)
+Sub UpdateFile(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, "@@REVISION@@", revision
+	FindReplaceInFile filename, "@@VERSION@@", version
+	FindReplaceInFile filename, "@@DATE@@", cur_date
 End Sub
 
 Sub UpdateFiles(version)
-	Dim modified, revision, cur_date
+	Dim WshShell, cur_date, revision, oExec
+	Set WshShell = CreateObject("WScript.Shell")
 	cur_date = DatePart("D", Date) & "." & DatePart("M", Date) & "." & DatePart("YYYY", Date)
-
-	If InStr(version, Chr(9)) Then
-		revision = Mid(version, InStr(version, Chr(9)) + 1)
-		revision = Mid(revision, 1, InStr(revision, Chr(9)) - 1)
-		modified = Mid(version, InStrRev(version, Chr(9)) + 1)
-		version  = Mid(version, 1, InStr(version, Chr(9)) - 1)
-	Else
-		version = "0.7.3-RC2"
-		revision = 0
-		modified = 1
-	End If
-
-	UpdateFile modified, revision, version, cur_date, "../src/rev.cpp"
-	UpdateFile modified, revision, version, cur_date, "../src/ottdres.rc"
-End Sub
-
-Function ReadRegistryKey(shive, subkey, valuename, architecture)
-	Dim hiveKey, objCtx, objLocator, objServices, objReg, Inparams, Outparams
-
-	' First, get the Registry Provider for the requested architecture
-	Set objCtx = CreateObject("WbemScripting.SWbemNamedValueSet")
-	objCtx.Add "__ProviderArchitecture", architecture ' Must be 64 of 32
-	Set objLocator = CreateObject("Wbemscripting.SWbemLocator")
-	Set objServices = objLocator.ConnectServer("","root\default","","",,,,objCtx)
-	Set objReg = objServices.Get("StdRegProv")
-
-	' Check the hive and give it the right value
-	Select Case shive
-		Case "HKCR", "HKEY_CLASSES_ROOT"
-			hiveKey = &h80000000
-		Case "HKCU", "HKEY_CURRENT_USER"
-			hiveKey = &H80000001
-		Case "HKLM", "HKEY_LOCAL_MACHINE"
-			hiveKey = &h80000002
-		Case "HKU", "HKEY_USERS"
-			hiveKey = &h80000003
-		Case "HKCC", "HKEY_CURRENT_CONFIG"
-			hiveKey = &h80000005
-		Case "HKDD", "HKEY_DYN_DATA" ' Only valid for Windows 95/98
-			hiveKey = &h80000006
-		Case Else
-			MsgBox "Hive not valid (ReadRegistryKey)"
+	revision = 0
+	Select Case Mid(version, 1, 1)
+		Case "r" ' svn
+			revision = Mid(version, 2)
+			If InStr(revision, "M") Then
+				revision = Mid(revision, 1, InStr(revision, "M") - 1)
+			End If
+			If InStr(revision, "-") Then
+				revision = Mid(revision, 1, InStr(revision, "-") - 1)
+			End If
+		Case "h" ' mercurial (hg)
+			Set oExec = WshShell.Exec("hg log -k " & Chr(34) & "svn" & Chr(34) & " -l 1 --template " & Chr(34) & "{desc}\n" & Chr(34) & " ../src")
+			If Err.Number = 0 Then
+				revision = Mid(OExec.StdOut.ReadLine(), 7)
+				revision = Mid(revision, 1, InStr(revision, ")") - 1)
+			End If
+		Case "g" ' git
+			Set oExec = WshShell.Exec("git log --pretty=format:%s --grep=" & Chr(34) & "^(svn r[0-9]*)" & Chr(34) & " -1 ../src")
+			if Err.Number = 0 Then
+				revision = Mid(oExec.StdOut.ReadLine(), 7)
+				revision = Mid(revision, 1, InStr(revision, ")") - 1)
+			End If
 	End Select
 
-	Set Inparams = objReg.Methods_("GetStringValue").Inparameters
-	Inparams.Hdefkey = hiveKey
-	Inparams.Ssubkeyname = subkey
-	Inparams.Svaluename = valuename
-	Set Outparams = objReg.ExecMethod_("GetStringValue", Inparams,,objCtx)
-
-	ReadRegistryKey = Outparams.SValue
-End Function
+	UpdateFile revision, version, cur_date, "../src/rev.cpp"
+	UpdateFile revision, version, cur_date, "../src/ottdres.rc"
+End Sub
 
 Function DetermineSVNVersion()
-	Dim WshShell, version, branch, modified, revision, url, oExec, line, hash
+	Dim WshShell, version, url, oExec, line
 	Set WshShell = CreateObject("WScript.Shell")
 	On Error Resume Next
 
-	revision = 0
-
 	' Try TortoiseSVN
 	' Get the directory where TortoiseSVN (should) reside(s)
 	Dim sTortoise
-	' First, try with 32-bit architecture
-	sTortoise = ReadRegistryKey("HKLM", "SOFTWARE\TortoiseSVN", "Directory", 32)
-	If 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
+	sTortoise = WshShell.RegRead("HKLM\SOFTWARE\TortoiseSVN\Directory")
 
-	' If TortoiseSVN is installed, try to get the revision number
-	If sTortoise <> "" Then
-		Dim SubWCRev
-		Set SubWCRev = WScript.CreateObject("SubWCRev.object")
-		SubWCRev.GetWCInfo FSO.GetAbsolutePathName("../src"), 0, 0
-		revision = SubWCRev.Revision
-		version = "r" & revision
-		modified = 0
-		if SubWCRev.HasModifications then modified = 2
-		url = SubWCRev.Url
-	End If
+	Dim file
+	' Write some "magic" to a temporary file so we can acquire the svn revision/state
+	Set file = FSO.CreateTextFile("tsvn_tmp", -1, 0)
+	file.WriteLine "r$WCREV$$WCMODS?M:$"
+	file.WriteLine "$WCURL$"
+	file.Close
+	Set oExec = WshShell.Exec(sTortoise & "\bin\SubWCRev.exe ../src tsvn_tmp tsvn_tmp")
+	' Wait till the application is finished ...
+	Do
+		OExec.StdOut.ReadLine()
+	Loop While Not OExec.StdOut.atEndOfStream
+
+	Set file = FSO.OpenTextFile("tsvn_tmp", 1, 0, 0)
+	version = file.ReadLine
+	url = file.ReadLine
+	file.Close
+
+	Set file = FSO.GetFile("tsvn_tmp")
+	file.Delete
 
 	' Looks like there is no TortoiseSVN installed either. Then we don't know it.
-	If revision = 0 Then
+	If InStr(version, "$") Then
 		' Reset error and version
 		Err.Clear
 		version = "norev000"
-		modified = 0
-
-		' Set the environment to english
-		WshShell.Environment("PROCESS")("LANG") = "en"
-
 		' Do we have subversion installed? Check immediatelly whether we've got a modified WC.
 		Set oExec = WshShell.Exec("svnversion ../src")
 		If Err.Number = 0 Then
-			' Wait till the application is finished ...
-			Do While oExec.Status = 0
-			Loop
+			Dim modified
+			If InStr(OExec.StdOut.ReadLine(), "M") Then
+				modified = "M"
+			Else
+				modified = ""
+			End If
 
-			line = OExec.StdOut.ReadLine()
-			If line <> "exported" Then
-				If InStr(line, "M") Then
-					modified = 2
-				End If
+			' Set the environment to english
+			WshShell.Environment("PROCESS")("LANG") = "en"
 
-				' And use svn info to get the correct revision and branch information.
-				Set oExec = WshShell.Exec("svn info ../src")
-				If Err.Number = 0 Then
-					Do
-						line = OExec.StdOut.ReadLine()
-						If InStr(line, "URL") Then
-							url = line
-						End If
-						If InStr(line, "Last Changed Rev") Then
-							revision = Mid(line, 19)
-							version = "r" & revision
-						End If
-					Loop While Not OExec.StdOut.atEndOfStream
-				End If ' Err.Number = 0
-			End If ' line <> "exported"
-		End If ' Err.Number = 0
-	End If ' InStr(version, "$")
+			' And use svn info to get the correct revision and branch information.
+			Set oExec = WshShell.Exec("svn info ../src")
+			If Err.Number = 0 Then
+				Do
+					line = OExec.StdOut.ReadLine()
+					If InStr(line, "URL") Then
+						url = line
+					End If
+					If InStr(line, "Last Changed Rev") Then
+						version = "r" & Mid(line, 19) & modified
+					End If
+				Loop While Not OExec.StdOut.atEndOfStream
+			End If
+		End If
+	End If
 
 	If version <> "norev000" Then
 		If InStr(url, "branches") Then
-			url = Mid(url, InStr(url, "branches/") + 9)
-			branch = Mid(url, 1, InStr(2, url, "/") - 1)
+			url = Mid(url, InStr(url, "branches") + 8)
+			url = Mid(url, 1, InStr(2, url, "/") - 1)
+			version = version & Replace(url, "/", "-")
 		End If
-	Else ' version <> "norev000"
+	Else
 		' svn detection failed, reset error and try git
 		Err.Clear
-		Set oExec = WshShell.Exec("git rev-parse --verify HEAD")
+		Set oExec = WshShell.Exec("git rev-parse --verify --short=8 HEAD")
 		If Err.Number = 0 Then
-			' Wait till the application is finished ...
-			Do While oExec.Status = 0
+			version = "g" & oExec.StdOut.ReadLine()
+			Set oExec = WshShell.Exec("git diff-index --exit-code --quiet HEAD ../src")
+			Do While oExec.Status = 0 And Err.Number = 0
 			Loop
+			If Err.Number = 0 And oExec.ExitCode = 1 Then
+				version = version & "M"
+			End If
 
-			If oExec.ExitCode = 0 Then
-				hash = oExec.StdOut.ReadLine()
-				version = "g" & Mid(hash, 1, 8)
-				Set oExec = WshShell.Exec("git diff-index --exit-code --quiet HEAD ../src")
-				If Err.Number = 0 Then
-					' Wait till the application is finished ...
-					Do While oExec.Status = 0
-					Loop
-
-					If oExec.ExitCode = 1 Then
-						modified = 2
-					End If ' oExec.ExitCode = 1
-
-					Set oExec = WshShell.Exec("git symbolic-ref HEAD")
-					If Err.Number = 0 Then
-						line = oExec.StdOut.ReadLine()
-						line = Mid(line, InStrRev(line, "/") + 1)
-						If line <> "master" Then
-							branch = line
-						End If ' line <> "master"
-					End If ' Err.Number = 0
-
-					Set oExec = WshShell.Exec("git log --pretty=format:%s --grep=" & Chr(34) & "^(svn r[0-9]*)" & Chr(34) & " -1 ../src")
-					if Err.Number = 0 Then
-						revision = Mid(oExec.StdOut.ReadLine(), 7)
-						revision = Mid(revision, 1, InStr(revision, ")") - 1)
-					End If ' Err.Number = 0
-				End If ' Err.Number = 0
-			End If ' oExec.ExitCode = 0
-		End If ' Err.Number = 0
-
-		If version = "norev000" Then
-			' git detection failed, reset error and try mercurial (hg)
-			Err.Clear
-			Set oExec = WshShell.Exec("hg parents")
+			Set oExec = WshShell.Exec("git symbolic-ref HEAD")
 			If Err.Number = 0 Then
-				' Wait till the application is finished ...
-				Do While oExec.Status = 0
-				Loop
-
-				If oExec.ExitCode = 0 Then
-					line = OExec.StdOut.ReadLine()
-					hash = Mid(line, InStrRev(line, ":") + 1)
-					version = "h" & Mid(hash, 1, 8)
-					Set oExec = WshShell.Exec("hg status ../src")
-					If Err.Number = 0 Then
-						Do
-							line = OExec.StdOut.ReadLine()
-							If Len(line) > 0 And Mid(line, 1, 1) <> "?" Then
-								modified = 2
-								Exit Do
-							End If ' Len(line) > 0 And Mid(line, 1, 1) <> "?"
-						Loop While Not OExec.StdOut.atEndOfStream
-
-						Set oExec = WshShell.Exec("hg branch")
-						If Err.Number = 0 Then
-							line = OExec.StdOut.ReadLine()
-							If line <> "default" Then
-								branch = line
-							End If ' line <> "default"
-						End If ' Err.Number = 0
-
-						Set oExec = WshShell.Exec("hg log -r " & hash & ":0 -k " & Chr(34) & "svn" & Chr(34) & " -l 1 --template " & Chr(34) & "{desc}\n" & Chr(34) & " ../src")
-						If Err.Number = 0 Then
-							revision = Mid(OExec.StdOut.ReadLine(), 7)
-							revision = Mid(revision, 1, InStr(revision, ")") - 1)
-						End If ' Err.Number = 0
-					End If ' Err.Number = 0
-				End If ' oExec.ExitCode = 0
-			End If ' Err.Number = 0
-		End If ' version = "norev000"
-	End If ' version <> "norev000"
-
-	If modified = 2 Then
-		version = version & "M"
+				line = oExec.StdOut.ReadLine()
+				line = Mid(line, InStrRev(line, "/")+1)
+				If line <> "master" Then
+					version = version & "-" & line
+				End If
+			End If
+		Else
+			' try mercurial (hg)
+			Err.Clear
+			Set oExec = WshShell.Exec("hg tip")
+			If Err.Number = 0 Then
+				version = "h" & Mid(OExec.StdOut.ReadLine(), 19, 8)
+				Set oExec = WshShell.Exec("hg status ../src")
+				If Err.Number = 0 Then
+					Do
+						line = OExec.StdOut.ReadLine()
+						If Mid(line, 1, 1) <> "?" Then
+							version = version & "M"
+							Exit Do
+						End If
+					Loop While Not OExec.StdOut.atEndOfStream
+				End If
+				Set oExec = WshShell.Exec("hg branch")
+				If Err.Number = 0 Then
+						line = OExec.StdOut.ReadLine()
+						If line <> "default" Then
+							version = version & "-" & line
+						End If
+				End If
+			End If
+		End If
 	End If
 
-	If branch <> "" Then
-		version = version & "-" & branch
-	End If
-
-	If version <> "norev000" Then
-		DetermineSVNVersion = version & Chr(9) & revision & Chr(9) & modified
-	Else
-		DetermineSVNVersion = version
-	End If
+	DetermineSVNVersion = version
 End Function
 
-Function IsCachedVersion(ByVal version)
+Function IsCachedVersion(version)
 	Dim cache_file, cached_version
 	cached_version = ""
 	Set cache_file = FSO.OpenTextFile("../config.cache.version", 1, True, 0)
@@ -259,10 +183,6 @@ Function IsCachedVersion(ByVal version)
 	End If
 	cache_file.Close
 
-	If InStr(version, Chr(9)) Then
-		version = Mid(version, 1, Instr(version, Chr(9)) - 1)
-	End If
-
 	If version <> cached_version Then
 		Set cache_file = fso.CreateTextFile("../config.cache.version", True)
 		cache_file.WriteLine(version)
@@ -273,13 +193,8 @@ Function IsCachedVersion(ByVal version)
 	End If
 End Function
 
-Function CheckFile(filename)
-	CheckFile = FSO.FileExists(filename)
-	If CheckFile Then CheckFile = (FSO.GetFile(filename).DateLastModified >= FSO.GetFile(filename & ".in").DateLastModified)
-End Function
-
 Dim version
-version = DetermineSVNVersion
-If Not (IsCachedVersion(version) And CheckFile("../src/rev.cpp") And CheckFile("../src/ottdres.rc")) Then
+version = "0.6.0-beta4"
+If Not (IsCachedVersion(version) And FSO.FileExists("../src/rev.cpp") And FSO.FileExists("../src/ottdres.rc")) Then
 	UpdateFiles version
 End If

projects/generate

@@ -28,7 +28,6 @@ fi
 
 
 # First, collect the list of Windows files
-allegro_config=""
 sdl_config="1"
 png_config="1"
 os="MSVC"
@@ -56,15 +55,6 @@ safety_check() {
 	done
 }
 
-grep '\.h' "$ROOT_DIR/source.list" | grep -v '../objs/langs/table/strings.h' | sed 's/	//' | sort > tmp.headers.source.list
-find "$ROOT_DIR/src" \( -iname "*.h" -or -iname "*.hpp" \) -and -not -ipath "*/.svn/*" | sed "s~$ROOT_DIR/src/~~" | sort > tmp.headers.src
-if [ -n "`diff tmp.headers.source.list tmp.headers.src`" ]; then
-	echo "The following headers are missing in source.list and not in /src/ or vice versa."
-	diff tmp.headers.source.list tmp.headers.src | grep '[<>]' | sort
-	echo ""
-fi
-rm tmp.headers.*
-
 load_main_data() {
 	# Read the source.list and process it
 	RES="`cat $1 | tr '\r' '\n' | awk '
@@ -79,13 +69,11 @@ load_main_data() {
 
 			deep += 1;
 
-			if ($0 == "ALLEGRO"     && "'$allegro_config'" == "")      { next; }
 			if ($0 == "SDL"         && "'$sdl_config'" == "")          { next; }
 			if ($0 == "PNG"         && "'$png_config'" == "")          { next; }
 			if ($0 == "OSX"         && "'$os'" != "OSX")               { next; }
 			if ($0 == "OS2"         && "'$os'" != "OS2")               { next; }
 			if ($0 == "PSP"         && "'$os'" != "PSP")               { next; }
-			if ($0 == "DOS"         && "'$os'" != "DOS")               { next; }
 			if ($0 == "DEDICATED"   && "'$enable_dedicated'" != "1")   { next; }
 			if ($0 == "COCOA"       && "'$with_cocoa'" == "0")         { next; }
 			if ($0 == "BEOS"        && "'$os'" != "BEOS")              { next; }
@@ -95,7 +83,7 @@ load_main_data() {
 			if ($0 == "MSVC"        && "'$os'" != "MSVC")              { next; }
 			if ($0 == "DIRECTMUSIC" && "'$enable_directmusic'" != "1") { next; }
 			if ($0 == "LIBTIMIDITY" && "'$libtimidity'" == "" )        { next; }
-			if ($0 == "HAVE_THREAD" && "'$with_threads'" == "0")       { next; }
+			if ($0 == "NO_THREADS"  && "'$with_threads'" == "0")       { next; }
 
 			skip += 1;
 
@@ -141,7 +129,7 @@ load_lang_data() {
 	RES=""
 	for i in `ls $1`
 	do
-		i=`basename $i | sed s~.txt$~~g`
+		i=`basename $i | sed s/.txt$//g`
 		RES="$RES
 		<File
 			RelativePath=\"..\\src\\lang\\"$i".txt\"
@@ -153,7 +141,7 @@ load_lang_data() {
 					Name=\"VCCustomBuildTool\"
 					Description=\"Generating "$i" language file\"
 					CommandLine=\"..\\objs\\strgen\\strgen.exe -s ..\\src\\lang -d ..\\bin\\lang &quot;\$(InputPath)&quot;&#x0D;&#x0A;\"
-					AdditionalDependencies=\"..\\src\\lang\\english.txt\"
+					AdditionalDependencies=\"\"
 					Outputs=\"..\\bin\\lang\\"$i".lng\"
 				/>
 			</FileConfiguration>

projects/generate.vbs

@@ -46,85 +46,6 @@ Sub safety_check(filename)
 	file.Close
 End Sub
 
-Sub get_files(srcdir, dir, list)
-	Dim file, filename
-	Dim rekeep, reskip
-
-	' pattern for files to keep
-	Set rekeep = New RegExp
-	rekeep.Pattern = "\.h(pp)?$"
-	rekeep.Global = True
-
-	' pattern for files to exclude
-	Set reskip = New RegExp
-	reskip.Pattern = "\.svn"
-	reskip.Global = True
-
-	For Each file in dir.Files
-		filename = Replace(file.path, srcdir, "") ' Remove */src/
-		filename = Replace(filename, "\", "/") ' Replace separators
-		If rekeep.Test(filename) And Not reskip.Test(filename) Then
-			list.Add filename, filename
-		End If
-	Next
-End Sub
-
-Sub get_dir_files(srcdir, dir, list)
-	Dim folder
-	' Get files
-	get_files srcdir, dir, list
-
-	' Recurse in subfolders
-	For Each folder in dir.SubFolders
-		get_dir_files srcdir, folder, list
-	Next
-End Sub
-
-Sub headers_check(filename, dir)
-	Dim source_list_headers, src_dir_headers, regexp, line, file, str
-
-	' Define regexp for source.list parsing
-	Set regexp = New RegExp
-	regexp.Pattern = "\.h"
-	regexp.Global = True
-
-	' Parse source.list and store headers in a dictionary
-	Set source_list_headers = CreateObject("Scripting.Dictionary")
-	Set file = FSO.OpenTextFile(filename, 1, 0, 0)
-	While Not file.AtEndOfStream
-		line = Replace(file.ReadLine, Chr(9), "") ' Remove tabs
-		If Len(line) > 0 And regexp.Test(line) And line <> "../objs/langs/table/strings.h" Then
-			source_list_headers.Add line, line
-		End If
-	Wend
-	file.Close()
-
-	' Get header files in /src/
-	Set src_dir_headers = CreateObject("Scripting.Dictionary")
-	get_dir_files dir, FSO.GetFolder(dir), src_dir_headers
-
-	' Finding files in source.list but not in /src/
-	For Each line In source_list_headers
-		If Not src_dir_headers.Exists(line) Then
-			str = str & "< " & line & vbCrLf
-		End If
-	Next
-
-	' Finding files in /src/ but not in source.list
-	For Each line In src_dir_headers
-		If Not source_list_headers.Exists(line) Then
-			str = str & "> " & line & vbCrLf
-		End If
-	Next
-
-	' Display the missing files if any
-	If str <> "" Then
-		str = "The following headers are missing in source.list and not in /src/ or vice versa." _
-		& vbCrLf & str
-		WScript.Echo str
-	End If
-End Sub
-
 Function load_main_data(filename)
 	Dim res, file, line, deep, skip, first_time
 	res = ""
@@ -150,8 +71,7 @@ Function load_main_data(filename)
 						line = "PNG" Or _
 						line = "WIN32" Or _
 						line = "MSVC" Or _
-						line = "DIRECTMUSIC" Or _
-						line = "HAVE_THREAD" _
+						line = "DIRECTMUSIC" _
 					) Then skip = skip + 1
 					deep = deep + 1
 				Case "#"
@@ -203,7 +123,7 @@ Function load_lang_data(dir)
 			& 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) & "..\src\lang\english.txt" & Chr(34) _
+			& vbCrLf & "					AdditionalDependencies=" & Chr(34) & Chr(34) _
 			& vbCrLf & "					Outputs=" & Chr(34) & "..\bin\lang\" & file & ".lng" & Chr(34) _
 			& vbCrLf & "				/>" _
 			& vbCrLf & "			</FileConfiguration>" _
@@ -250,7 +170,6 @@ If Not FSO.FileExists(ROOT_DIR & "/source.list") Then
 End If
 
 safety_check ROOT_DIR & "/source.list"
-headers_check ROOT_DIR & "/source.list", ROOT_DIR & "\src\" ' Backslashes needed for DoFiles
 
 Dim openttd
 openttd = load_main_data(ROOT_DIR &"/source.list")

projects/langs_vs80.vcproj

@@ -56,26 +56,11 @@
 					Name="VCCustomBuildTool"
 					Description="Generating afrikaans language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\afrikaans.lng"
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\arabic_egypt.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating arabic_egypt language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
-					Outputs="..\bin\lang\arabic_egypt.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\brazilian_portuguese.txt"
 			>
@@ -86,7 +71,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating brazilian_portuguese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\brazilian_portuguese.lng"
 				/>
 			</FileConfiguration>
@@ -101,7 +86,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating bulgarian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\bulgarian.lng"
 				/>
 			</FileConfiguration>
@@ -116,7 +101,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating catalan language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\catalan.lng"
 				/>
 			</FileConfiguration>
@@ -131,7 +116,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating croatian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\croatian.lng"
 				/>
 			</FileConfiguration>
@@ -146,7 +131,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating czech language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\czech.lng"
 				/>
 			</FileConfiguration>
@@ -161,7 +146,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating danish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\danish.lng"
 				/>
 			</FileConfiguration>
@@ -176,7 +161,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating dutch language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\dutch.lng"
 				/>
 			</FileConfiguration>
@@ -191,7 +176,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating english language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\english.lng"
 				/>
 			</FileConfiguration>
@@ -206,7 +191,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating english_US language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\english_US.lng"
 				/>
 			</FileConfiguration>
@@ -221,7 +206,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating esperanto language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\esperanto.lng"
 				/>
 			</FileConfiguration>
@@ -236,7 +221,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating estonian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\estonian.lng"
 				/>
 			</FileConfiguration>
@@ -251,7 +236,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating finnish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\finnish.lng"
 				/>
 			</FileConfiguration>
@@ -266,7 +251,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating french language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\french.lng"
 				/>
 			</FileConfiguration>
@@ -281,7 +266,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating galician language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\galician.lng"
 				/>
 			</FileConfiguration>
@@ -296,26 +281,11 @@
 					Name="VCCustomBuildTool"
 					Description="Generating german language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\german.lng"
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\hebrew.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating hebrew language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
-					Outputs="..\bin\lang\hebrew.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\hungarian.txt"
 			>
@@ -326,7 +296,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating hungarian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\hungarian.lng"
 				/>
 			</FileConfiguration>
@@ -341,26 +311,11 @@
 					Name="VCCustomBuildTool"
 					Description="Generating icelandic language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\icelandic.lng"
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\indonesian.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating indonesian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
-					Outputs="..\bin\lang\indonesian.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\italian.txt"
 			>
@@ -371,7 +326,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating italian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\italian.lng"
 				/>
 			</FileConfiguration>
@@ -386,7 +341,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating japanese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\japanese.lng"
 				/>
 			</FileConfiguration>
@@ -401,26 +356,11 @@
 					Name="VCCustomBuildTool"
 					Description="Generating korean language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\korean.lng"
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\latvian.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating latvian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
-					Outputs="..\bin\lang\latvian.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\lithuanian.txt"
 			>
@@ -431,26 +371,11 @@
 					Name="VCCustomBuildTool"
 					Description="Generating lithuanian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\lithuanian.lng"
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\luxembourgish.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating luxembourgish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
-					Outputs="..\bin\lang\luxembourgish.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\norwegian_bokmal.txt"
 			>
@@ -461,7 +386,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating norwegian_bokmal language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\norwegian_bokmal.lng"
 				/>
 			</FileConfiguration>
@@ -476,11 +401,26 @@
 					Name="VCCustomBuildTool"
 					Description="Generating norwegian_nynorsk language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\norwegian_nynorsk.lng"
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\src\lang\origveh.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating origveh language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\origveh.lng"
+				/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="..\src\lang\piglatin.txt"
 			>
@@ -491,7 +431,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating piglatin language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\piglatin.lng"
 				/>
 			</FileConfiguration>
@@ -506,7 +446,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating polish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\polish.lng"
 				/>
 			</FileConfiguration>
@@ -521,7 +461,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating portuguese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\portuguese.lng"
 				/>
 			</FileConfiguration>
@@ -536,7 +476,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating romanian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\romanian.lng"
 				/>
 			</FileConfiguration>
@@ -551,26 +491,11 @@
 					Name="VCCustomBuildTool"
 					Description="Generating russian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\russian.lng"
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\serbian.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating serbian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
-					Outputs="..\bin\lang\serbian.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\simplified_chinese.txt"
 			>
@@ -581,7 +506,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating simplified_chinese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\simplified_chinese.lng"
 				/>
 			</FileConfiguration>
@@ -596,7 +521,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating slovak language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\slovak.lng"
 				/>
 			</FileConfiguration>
@@ -611,7 +536,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating slovenian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\slovenian.lng"
 				/>
 			</FileConfiguration>
@@ -626,7 +551,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating spanish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\spanish.lng"
 				/>
 			</FileConfiguration>
@@ -641,7 +566,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating swedish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\swedish.lng"
 				/>
 			</FileConfiguration>
@@ -656,7 +581,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating traditional_chinese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\traditional_chinese.lng"
 				/>
 			</FileConfiguration>
@@ -671,7 +596,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating turkish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\turkish.lng"
 				/>
 			</FileConfiguration>
@@ -686,26 +611,11 @@
 					Name="VCCustomBuildTool"
 					Description="Generating ukrainian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\ukrainian.lng"
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\welsh.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating welsh language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
-					Outputs="..\bin\lang\welsh.lng"
-				/>
-			</FileConfiguration>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>

projects/langs_vs90.vcproj

@@ -57,26 +57,11 @@
 					Name="VCCustomBuildTool"
 					Description="Generating afrikaans language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\afrikaans.lng"
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\arabic_egypt.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating arabic_egypt language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
-					Outputs="..\bin\lang\arabic_egypt.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\brazilian_portuguese.txt"
 			>
@@ -87,7 +72,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating brazilian_portuguese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\brazilian_portuguese.lng"
 				/>
 			</FileConfiguration>
@@ -102,7 +87,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating bulgarian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\bulgarian.lng"
 				/>
 			</FileConfiguration>
@@ -117,7 +102,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating catalan language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\catalan.lng"
 				/>
 			</FileConfiguration>
@@ -132,7 +117,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating croatian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\croatian.lng"
 				/>
 			</FileConfiguration>
@@ -147,7 +132,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating czech language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\czech.lng"
 				/>
 			</FileConfiguration>
@@ -162,7 +147,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating danish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\danish.lng"
 				/>
 			</FileConfiguration>
@@ -177,7 +162,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating dutch language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\dutch.lng"
 				/>
 			</FileConfiguration>
@@ -192,7 +177,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating english language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\english.lng"
 				/>
 			</FileConfiguration>
@@ -207,7 +192,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating english_US language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\english_US.lng"
 				/>
 			</FileConfiguration>
@@ -222,7 +207,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating esperanto language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\esperanto.lng"
 				/>
 			</FileConfiguration>
@@ -237,7 +222,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating estonian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\estonian.lng"
 				/>
 			</FileConfiguration>
@@ -252,7 +237,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating finnish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\finnish.lng"
 				/>
 			</FileConfiguration>
@@ -267,7 +252,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating french language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\french.lng"
 				/>
 			</FileConfiguration>
@@ -282,7 +267,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating galician language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\galician.lng"
 				/>
 			</FileConfiguration>
@@ -297,26 +282,11 @@
 					Name="VCCustomBuildTool"
 					Description="Generating german language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\german.lng"
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\hebrew.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating hebrew language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
-					Outputs="..\bin\lang\hebrew.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\hungarian.txt"
 			>
@@ -327,7 +297,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating hungarian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\hungarian.lng"
 				/>
 			</FileConfiguration>
@@ -342,26 +312,11 @@
 					Name="VCCustomBuildTool"
 					Description="Generating icelandic language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\icelandic.lng"
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\indonesian.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating indonesian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
-					Outputs="..\bin\lang\indonesian.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\italian.txt"
 			>
@@ -372,7 +327,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating italian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\italian.lng"
 				/>
 			</FileConfiguration>
@@ -387,7 +342,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating japanese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\japanese.lng"
 				/>
 			</FileConfiguration>
@@ -402,26 +357,11 @@
 					Name="VCCustomBuildTool"
 					Description="Generating korean language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\korean.lng"
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\latvian.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating latvian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
-					Outputs="..\bin\lang\latvian.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\lithuanian.txt"
 			>
@@ -432,26 +372,11 @@
 					Name="VCCustomBuildTool"
 					Description="Generating lithuanian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\lithuanian.lng"
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\luxembourgish.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating luxembourgish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
-					Outputs="..\bin\lang\luxembourgish.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\norwegian_bokmal.txt"
 			>
@@ -462,7 +387,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating norwegian_bokmal language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\norwegian_bokmal.lng"
 				/>
 			</FileConfiguration>
@@ -477,11 +402,26 @@
 					Name="VCCustomBuildTool"
 					Description="Generating norwegian_nynorsk language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\norwegian_nynorsk.lng"
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\src\lang\origveh.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating origveh language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\origveh.lng"
+				/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="..\src\lang\piglatin.txt"
 			>
@@ -492,7 +432,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating piglatin language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\piglatin.lng"
 				/>
 			</FileConfiguration>
@@ -507,7 +447,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating polish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\polish.lng"
 				/>
 			</FileConfiguration>
@@ -522,7 +462,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating portuguese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\portuguese.lng"
 				/>
 			</FileConfiguration>
@@ -537,7 +477,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating romanian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\romanian.lng"
 				/>
 			</FileConfiguration>
@@ -552,26 +492,11 @@
 					Name="VCCustomBuildTool"
 					Description="Generating russian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\russian.lng"
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\serbian.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating serbian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
-					Outputs="..\bin\lang\serbian.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\simplified_chinese.txt"
 			>
@@ -582,7 +507,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating simplified_chinese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\simplified_chinese.lng"
 				/>
 			</FileConfiguration>
@@ -597,7 +522,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating slovak language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\slovak.lng"
 				/>
 			</FileConfiguration>
@@ -612,7 +537,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating slovenian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\slovenian.lng"
 				/>
 			</FileConfiguration>
@@ -627,7 +552,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating spanish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\spanish.lng"
 				/>
 			</FileConfiguration>
@@ -642,7 +567,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating swedish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\swedish.lng"
 				/>
 			</FileConfiguration>
@@ -657,7 +582,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating traditional_chinese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\traditional_chinese.lng"
 				/>
 			</FileConfiguration>
@@ -672,7 +597,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating turkish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\turkish.lng"
 				/>
 			</FileConfiguration>
@@ -687,26 +612,11 @@
 					Name="VCCustomBuildTool"
 					Description="Generating ukrainian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\ukrainian.lng"
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\welsh.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating welsh language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
-					Outputs="..\bin\lang\welsh.lng"
-				/>
-			</FileConfiguration>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>

projects/openttd_vs80.sln

@@ -4,7 +4,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openttd", "openttd_vs80.vcp
 	ProjectSection(ProjectDependencies) = postProject
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966} = {0F066B23-18DF-4284-8265-F4A5E7E3B966}
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC} = {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen_vs80.vcproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
@@ -14,8 +13,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "langs", "langs_vs80.vcproj"
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "version", "version_vs80.vcproj", "{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -48,14 +45,6 @@ Global
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.Build.0 = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.Build.0 = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.ActiveCfg = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.Build.0 = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.ActiveCfg = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.Build.0 = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.ActiveCfg = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.Build.0 = Debug|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

projects/openttd_vs80.vcproj.in

@@ -33,6 +33,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -53,14 +55,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
 				Optimization="3"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				AdditionalIncludeDirectories="..\objs\langs"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -90,21 +91,19 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
+				Culture="1053"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				OptimizeReferences="2"
 				OptimizeForWindows98="1"
 				TargetMachine="1"
@@ -146,6 +145,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -166,10 +167,9 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				AdditionalIncludeDirectories="..\objs\langs"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -190,21 +190,19 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"
+				Culture="1053"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -245,6 +243,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -266,14 +266,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
 				Optimization="3"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				AdditionalIncludeDirectories="..\objs\langs"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -303,21 +302,19 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
+				Culture="1053"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				OptimizeReferences="2"
 				OptimizeForWindows98="1"
 				TargetMachine="17"
@@ -359,6 +356,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -380,10 +379,9 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				AdditionalIncludeDirectories="..\objs\langs"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -406,21 +404,19 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"
+				Culture="1053"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -496,6 +492,10 @@
 				</FileConfiguration>
 			</File>
 		</Filter>
+		<File
+			RelativePath=".\..\media\mainicon.ico"
+			>
+		</File>
 		<File
 			RelativePath=".\..\media\openttd.ico"
 			>

projects/openttd_vs90.sln

@@ -4,7 +4,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openttd", "openttd_vs90.vcp
 	ProjectSection(ProjectDependencies) = postProject
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966} = {0F066B23-18DF-4284-8265-F4A5E7E3B966}
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC} = {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen_vs90.vcproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
@@ -14,8 +13,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "langs", "langs_vs90.vcproj"
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "version", "version_vs90.vcproj", "{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -48,14 +45,6 @@ Global
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.Build.0 = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.Build.0 = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.ActiveCfg = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.Build.0 = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.ActiveCfg = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.Build.0 = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.ActiveCfg = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.Build.0 = Debug|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

projects/openttd_vs90.vcproj.in

@@ -34,6 +34,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -54,14 +56,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
 				Optimization="3"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				AdditionalIncludeDirectories="..\objs\langs"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -91,21 +92,19 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
+				Culture="1053"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				OptimizeReferences="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -145,6 +144,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -165,10 +166,9 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				AdditionalIncludeDirectories="..\objs\langs"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -189,21 +189,19 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"
+				Culture="1053"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
@@ -243,6 +241,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -264,14 +264,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
 				Optimization="3"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				AdditionalIncludeDirectories="..\objs\langs"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -301,21 +300,19 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
+				Culture="1053"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				OptimizeReferences="2"
 				TargetMachine="17"
 			/>
@@ -356,6 +353,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -377,10 +376,9 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				AdditionalIncludeDirectories="..\objs\langs"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -403,21 +401,19 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"
+				Culture="1053"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -493,6 +489,10 @@
 				</FileConfiguration>
 			</File>
 		</Filter>
+		<File
+			RelativePath=".\..\media\mainicon.ico"
+			>
+		</File>
 		<File
 			RelativePath=".\..\media\openttd.ico"
 			>

projects/openttd_vs90.vcproj.user

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="9.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				WorkingDirectory="..\bin"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				WorkingDirectory="..\bin"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			>
-			<DebugSettings
-				WorkingDirectory="..\bin"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			>
-			<DebugSettings
-				WorkingDirectory="..\bin"
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>

projects/strgen_vs80.vcproj

@@ -43,7 +43,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
 				Optimization="1"
 				FavorSizeOrSpeed="2"
 				PreprocessorDefinitions="STRGEN;WIN32;_DEBUG;_CONSOLE"

projects/strgen_vs90.vcproj

@@ -44,7 +44,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
 				Optimization="1"
 				FavorSizeOrSpeed="2"
 				PreprocessorDefinitions="STRGEN;WIN32;_DEBUG;_CONSOLE"

projects/version_vs80.vcproj

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="version"
-	ProjectGUID="{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}"
-	RootNamespace="version"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Determining version number"
-				CommandLine="cscript &quot;$(InputDir)/determineversion.vbs&quot;"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\src\ottdres.rc.in"
-			>
-		</File>
-		<File
-			RelativePath="..\src\rev.cpp.in"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

projects/version_vs90.vcproj

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="version"
-	ProjectGUID="{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}"
-	RootNamespace="version"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Determining version number"
-				CommandLine="cscript &quot;$(InputDir)/determineversion.vbs&quot;"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\src\ottdres.rc.in"
-			>
-		</File>
-		<File
-			RelativePath="..\src\rev.cpp.in"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

readme.txt

@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2009-08-18
-Release version: 0.7.2
+Last updated:    2008-02-18
+Release version: 0.6.0-beta4
 ------------------------------------------------------------------------
 
 
@@ -11,13 +11,9 @@ Table of Contents:
  * 2.1 Reporting Bugs
 3.0) Supported Platforms
 4.0) Installing and running OpenTTD
- * 4.1 (Required) 3rd party files
- * 4.2 OpenTTD directories
- * 4.3 Portable Installations (External Media)
 5.0) OpenTTD features
 6.0) Configuration File
 7.0) Compiling
- * 7.1) Required/optional libraries
 8.0) Translating
  * 8.1 Guidelines
  * 8.2 Translation
@@ -49,94 +45,24 @@ http://forum.openttd.org/
 
 2.1) Reporting Bugs:
 ---- ---------------
-First of all, check whether the bug is not already known. Do this by looking
-through the file called 'known-bugs.txt' which is distributed with OpenTTD
-like this readme.
+To report a bug, please create a Flyspray account and follow the bugs
+link from our homepage. Please make sure the bug is reproducible and
+still occurs in the latest daily build or the current SVN version. Also
+please look through the existing bug reports briefly to see whether the bug
+is not already known.
 
-For tracking our bugs we are using a bug tracker called Flyspray. You can find
-the tracker at http://bugs.openttd.org/. Before actually reporting take a look
-through the already reported bugs there to see if the bug is already known.
-The 'known-bugs.txt' file might be a bit outdated at the moment you are
-reading it as only bugs known before the release are documented there. Also
-look through the recently closed bugs.
+The Flyspray project page URL is: http://bugs.openttd.org/
 
-When you are sure it is not already reported you should:
- * Make sure you are running a recent version, i.e. run the latest stable or
-   nightly based on where you found the bug.
- * Make sure you are not running a non-official binary, like a patch pack.
-   When you are playing with a patch pack you should report any bugs to the
-   forum thread related to that patch pack.
- * Make it reproducable for the developers. In other words, create a savegame
-   in which you can reproduce the issue once loaded. It is very useful to give
-   us the crash.dmp, crash.sav and crash.log which are created on crashes.
- * Check whether the bug is already reported on our bug tracker. This includes
-   searching for recently closed bug reports as the bug might already be fixed.
+Please include the following information in your bug report:
+        - OpenTTD version (PLEASE test the latest SVN/nightly build)
+        - Bug details, including instructions how to reproduce it
+        - Platform and compiler (Win32, Linux, FreeBSD, ...)
+        - Attach a saved game *and* a screenshot if possible
+        - If this bug only occurred recently please note the last
+          version without the bug and the first version including
+          the bug. That way we can fix it quicker by looking at the
+          changes made.
 
-After you have done all that you can report the bug. Please include the
-following information in your bug report:
- * OpenTTD version (PLEASE test the latest SVN/nightly build)
- * Bug details, including instructions how to reproduce it
- * Platform (Win32, Linux, FreeBSD, ...) and compiler (including version) if
-   you compiled OpenTTD yourself.
- * Attach a saved game *and* a screenshot if possible
- * If this bug only occurred recently please note the last version without
-   the bug and the first version including the bug. That way we can fix it
-   quicker by looking at the changes made.
- * Attach crash.dmp, crash.log and crash.sav. These files are usually created
-   next to your openttd.cfg. The crash handler will tell you the location.
-
-2.2) Reporting Desyncs:
----- ------------------
-As desyncs are hard to make reproducable OpenTTD has the ability to log all
-actions done by clients so we can replay the whole game in an effort to make
-desyncs better reproducable. You need to turn this ability on. When turned
-on an automatic savegame will be made once the map has been constructed in
-the 'save/autosave' directory, see OpenTTD directories to know where to find
-this directory. Furthermore the log file 'commands-out.log' will be created
-and all actions will be written to there.
-
-To enable the desync debugging you need to set the debug level for 'desync'
-to at least 1. You do this by starting OpenTTD with '-d desync=<level>' as
-parameter or by typing 'debug_level desync=<level>' in OpenTTD's internal
-console.
-The desync debug levels are:
- 0: nothing.
- 1: dumping of commands to 'commands-out.log'.
- 2: same as 1 plus checking vehicle caches and dumping that too.
- 3: same as 2 plus monthly saves in autosave.
- 4 and higher: same as 3
-
-Restarting OpenTTD will overwrite 'commands-out.log'. OpenTTD will not remove
-the savegames (dmp_cmds_*.sav) made by the desync debugging system, so you
-have to occasionally remove them yourself!
-
-The naming format of the desync savegames is as follows:
-dmp_cmds_XXXXXXXX_YYYYYYYY.sav. The XXXXXXXX is the hexadecimal representation
-of the generation seed of the game and YYYYYYYY is the hexadecimal
-representation of the date of the game. This sorts the savegames by game and
-then by date making it easier to find the right savegames.
-
-When a desync has occurred with the desync debugging turned on you should file
-a bug report with the following files attached:
- - commands-out.log as it contains all the commands that were done
- - the last saved savegame (search for the last line beginning with
-   'save: dmp_cmds_' in commands-out.log). We use this savegame to check
-   whether we can quickly reproduce the desync. Otherwise we will need...
- - the first saved savegame (search for the first line beginning with 'save'
-   where the first part, up to the last underscore '_', is the same). We need
-   this savegame to be able to reproduce the bug when the last savegame is not
-   old enough. If you loaded a scenario or savegame you need to attach that.
- - optionally you can attach the savegames from around 50%, 75%, 85%, 90% and
-   95% of the game's progression. We can use these savegames to speed up the
-   reproduction of the desync, but we should be able to reproduce these
-   savegames based on the first savegame and commands-out.log.
- - in case you use any NewGRFs you should attach the ones you used unless
-   we can easily find them ourselves via e.g. grfcrawler or when they are
-   in the OpenTTDCoop pack.
-
-Do NOT remove the dmp_cmds savegames of a desync you have reported until the
-desync has been fixed; if you, by accident, send us the wrong savegames we
-will not be able to reproduce the desync and thus will be unable to fix it.
 
 3.0) Supported Platforms:
 ---- --------------------
@@ -144,15 +70,14 @@ OpenTTD has been ported to several platforms and operating systems. It shouldn't
 be very difficult to port it to a new platform. The currently working platforms
 are:
 
-  BeOS                 - SDL or Allegro
-  DOS                  - Allegro
+  BeOS                 - SDL
   FreeBSD              - SDL
-  Linux                - SDL or Allegro
+  Linux                - SDL
   MacOS X (universal)  - Cocoa video and sound drivers (SDL works too, but not 100% and not as a universal binary)
   MorphOS              - SDL
   OpenBSD              - SDL
   OS/2                 - SDL
-  Windows              - Win32 GDI (faster) or SDL or Allegro
+  Windows              - Win32 GDI (faster) or SDL
 
 
 4.0) Installing and running OpenTTD:
@@ -163,113 +88,25 @@ archive which you have to extract to a directory where you want OpenTTD to
 be installed, or you have downloaded an installer, which will automatically
 extract OpenTTD in the given directory.
 
-OpenTTD looks in multiple locations to find the required data files (described
-in section 4.2). Installing any 3rd party files into a "shared" location has
-the advantage that you only need to do this step once, rather than copying the
-data files into all OpenTTD versions you have.
-Savegames, screenshots, etc are saved relative to the config file (openttd.cfg)
-currently being used. This means that if you use a config file in one of the
-shared directories, savegames will reside in the save/ directory next to the
-openttd.cfg file there.
-If you want savegames and screenshots in the directory where the OpenTTD binary
-resides, simply have your config file in that location. But if you remove this
-config file, savegames will still be in this directory (see notes in section 4.2)
-
-4.1) (Required) 3rd party files:
----- ---------------------------
-
-Before you run OpenTTD, you need to put the game's datafiles into a data/
-directory which can be located in various places addressed in the following
-section.
-As OpenTTD makes use of the original TTD artwork you will need the files listed
-below, which you can find on a Transport Tycoon Deluxe CD-ROM.
-The Windows installer optionally can copy these files from that CD-ROM.
+Before you run OpenTTD, you need to put the game's datafiles into the data/
+subdirectory. You need the following files from the original version
+of TTD as OpenTTD makes use of the original TTD artwork. The Windows
+installer optionally can copy these files from your Transport Tycoon Deluxe
+CD-ROM.
 
 List of the required files:
-	- sample.cat
-	- trg1r.grf
-	- trgcr.grf
-	- trghr.grf
-	- trgir.grf
-	- trgtr.grf
+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
+(Alternatively you can use the TTD GRF files from the DOS version: TRG1.GRF,
+TRGC.GRF, TRGH.GRF, TRGI.GRF, TRGT.GRF.
 
-If you want the TTD music, copy the gm/ folder from the Windows version
-of TTD to your OpenTTD folder (not your data folder - also explained in
-the following sections).
-
-Do NOT copy files included with OpenTTD into "shared" directories (explained in
-the following sections) as sooner or later you will run into graphical glitches
-when using other versions of the game.
-
-If you want AIs use the in-game content downloader. If for some reason that is
-not possible or you want to use an AI that has not been uploaded to the content
-download system download the tar file and place it in the ai/ directory. If the
-AI needs libraries you'll have to download those too and put them in the
-ai/library/ directory. All AIs and AI Libraries that have been uploaded to
-the content download system can be found at http://noai.openttd.org/downloads/
-The AIs and libraries can be found their in the form of .tar.gz packages.
-OpenTTD can read inside tar files but it does not extract .tar.gz files by
-itself.
-To figure out which libraries you need for an AI you have to start the AI and
-wait for an error message to pop up. The error message will tell you
-"couldn't find library 'lib-name'". Download that library and try again.
-
-4.2) OpenTTD directories
----- -------------------------------
-
-The TTD artwork files listed in the section 4.1 "(Required) 3rd party files"
-can be placed in a few different locations:
-	1. The current working directory (from where you started OpenTTD)
-	2. Your personal directory
-		Windows: C:\Documents and Settings\<username>\My Documents\OpenTTD
-		Mac OSX: ~/Documents/OpenTTD
-		Linux:   ~/.openttd
-	3. The shared directory
-		Windows: C:\Documents and Settings\All Users\Documents\OpenTTD
-		Mac OSX: /Library/Application Support/OpenTTD
-		Linux:   not available
-	4. The binary directory (where the OpenTTD executable is)
-		Windows: C:\Program Files\OpenTTD
-		Linux:   /usr/games
-	5. The installation directory (Linux only)
-		Linux:   /usr/share/games/openttd
-	6. The application bundle (Mac OSX only)
-		It includes the OTTD files (grf+lng) and it will work as long as they aren't touched
-
-Notes:
-	- Linux in the previous list means .deb, but most paths should be similar for others.
-	- The previous search order is also used for newgrfs and openttd.cfg.
-	- If openttd.cfg is not found, then it will be created using the 2, 4, 1, 3, 5 order.
-	- Savegames will be relative to the config file only if there is no save/
-	  directory in paths with higher priority than the config file path, but
-	  autosaves and screenshots will always be relative to the config file.
-
-The prefered setup:
-Place 3rd party files in shared directory (or in personal directory if you don't
-have write access on shared directory) and have your openttd.cfg config file in
-personal directory (where the game will then also place savegames and screenshots).
-
-
-4.3) Portable Installations (External Media):
----- ----------------------------------------
-
-You can install OpenTTD on external media so you can take it with you, i.e.
-using a USB key, or a USB HDD, etc.
-Create a directory where you shall store the game in (i.e. OpenTTD/).
-Copy the binary (OpenTTD.exe, OpenTTD.app, openttd, etc), data/ and your
-openttd.cfg to this directory.
-You can copy binaries for any operating system into this directory, which will
-allow you to play the game on nearly any computer you can attach the external
-media to.
-As always - additional grf files are stored in the data/ dir (for details,
-again, see section 4.1).
+If you want music you need to copy the gm/ folder from Windows TTD into your
+OpenTTD folder, not your data folder.
 
 
 5.0) OpenTTD features:
@@ -278,56 +115,21 @@ again, see section 4.1).
 OpenTTD has a lot of features going beyond the original TTD emulation.
 Unfortunately, there is currently no comprehensive list of features, but there
 is a basic features list on the web, and some optional features can be
-controlled through the Advanced Settings dialog. We also implement some
+controlled through the Configure Patches dialog. We also implement some
 features known from TTDPatch (http://www.ttdpatch.net/).
 
 Several important non-standard controls:
 
-* Ctrl makes many commands more powerful. For example Ctrl clicking on signals
-  with the build signal tool changes their behaviour.
+* Use Ctrl to place semaphore signals
 * Ingame console. More information at
   http://wiki.openttd.org/index.php/Console
-* Right clicking shows tooltips
-
-
-5.1) Logging of potentially dangerous actions:
----- ----------------------------------------
-
-OpenTTD is a complex program, and together with NewGRF, it may show a buggy
-behaviour. But not only bugs in code can cause problems. There are several
-ways to affect game state possibly resulting in program crash or multiplayer
-desyncs.
-Easier way would be to forbid all these unsafe actions, but that would affect
-game usability for many players. We certainly do not want that.
-However, we receive bugreports because of this. To reduce time spent with
-solving these problems, these potentially unsafe actions are logged in
-the savegame (including crash.sav). Log is stored in crash logs, too.
-
-Information logged:
-
-* Adding / removing / changing order of NewGRFs
-* Changing NewGRF parameters, loading compatible NewGRF
-* Changing game mode (scenario editor <-> normal game)
-* Loading game saved in a different OTTD / TTDPatch / TTD version
-* Running a modified OTTD build
-* Changing settings affecting NewGRF behaviour (non-networksafe settings)
-* Changing landscape (by cheat)
-* Triggering NewGRF bugs
-
-No personal information is stored.
-
-You can show the gamelog by typing 'gamelog' in the console or by running
-OpenTTD in debug mode.
 
 
 6.0) Configuration File:
 ---- -------------------
 The configuration file for OpenTTD (openttd.cfg) is in a simple Windows-like
 .INI format. It's mostly undocumented. Almost all settings can be changed
-ingame by using the 'Advanced Settings' window.
-When you can not find openttd.cfg you should look in the directories as
-described in section 4.2. If you do not have an openttd.cfg OpenTTD will
-create one after closing.
+ingame by using the 'Configure Patches' window.
 
 
 7.0) Compiling:
@@ -346,12 +148,18 @@ Windows:
   You can also build it using the Makefile with MSYS/MinGW or Cygwin/MinGW.
   Please read the Makefile for more information.
 
-Solaris, FreeBSD, OpenBSD:
-  Use "gmake", but do a "./configure" before the first build.
+Solaris 10:
+  You need g++ (version 3 or higher), together with SDL. Installation of
+  libpng and zlib is recommended. For the first build it is required
+  to execute "bash configure" first. Note that ./configure does not work
+  yet. It is likely that you don't have a strip binary, so use the
+  --disable-strip option in that case. Fontconfig (>2.3.0) and freetype
+  are optional. "make run" will then run the program.
 
-Linux/Unix:
+Unix:
   OpenTTD can be built with GNU "make". On non-GNU systems it's called "gmake".
   However, for the first build one has to do a "./configure" first.
+  Note that you need SDL-devel 1.2.5 (or higher) to compile OpenTTD.
 
 MacOS X:
   Use "make" or Xcode (which will then call make for you)
@@ -363,6 +171,15 @@ MacOS X:
 BeOS:
   Use "make", but do a "./configure" before the first build.
 
+FreeBSD:
+  You need the port devel/sdl12 for a non-dedicated build.
+  graphics/png is optional for screenshots in the PNG format.
+  Use "gmake", but do a "./configure" before the first build.
+
+OpenBSD:
+  Use "gmake", but do a "./configure" before the first build.
+  Note that you need the port devel/sdl to compile OpenTTD.
+
 MorphOS:
   Use "make". However, for the first build one has to do a "./configure" first.
   Note that you need the MorphOS SDK, latest libnix updates (else C++ parts of
@@ -373,38 +190,16 @@ OS/2:
   A comprehensive GNU build environment is required to build the OS/2 version.
   See the docs/Readme_OS2.txt file for more information.
 
-DOS:
-  A build environment with DJGPP is needed as well as libraries such as
-  Allegro, zlib and libpng, which all can be downloaded from the DJGPP
-  website. Compilation is straight forward: use make, but do a "./configure"
-  before the first build. The build binary will need cwsdpmi.exe to be in
-  the same directory as the openttd executable. cwsdpmi.exe can be found in
-  the os/dos subdirectory. If you compile with stripping turned on a binary
-  will be generated that does not need cwsdpmi.exe by adding the cswdstub.exe
-  to the created OpenTTD binary.
-
-7.1) Required/optional libraries:
----- -------------------
-The following libraries are used by OpenTTD for:
-  - libSDL/liballegro: hardware access (video, sound, mouse)
-  - zlib: (de)compressing of savegames
-  - libpng: making screenshots and loading heightmaps
-  - libfreetype: loading generic fonts and rendering them
-  - libfontconfig: searching for fonts, resolving font names to actual fonts
-  - libicu: handling of right-to-left scripts (e.g. Arabic and Persian)
-
-OpenTTD does not require any of the libraries to be present, but without
-zlib you cannot open most savegames or use the content downloading system.
-Without libSDL/liballegro on non-Windows and non-MacOS X machines you have
-no graphical user interface; you would be building a dedicated server.
 
 8.0) Translating:
 ---- -------------------
-See http://www.openttd.org/development for up-to-date information.
+See http://www.openttd.org/translating.php for up-to-date information.
 
 The use of the online Translator service, located at
-http://translator.openttd.org/, is highly encouraged. For getting an account
-simply follow the guidelines in the FAQ of the translator website.
+http://translator2.openttd.org/, is highly encouraged. For a username/password
+combo you should contact the development team, either by mail, IRC or the
+forums. The system is straightforward to use, and if you have any problems,
+read the online help located there.
 
 If for some reason the website is down for a longer period of time, the
 information below might be of help.
@@ -421,7 +216,7 @@ Here are some translation guidelines which you should follow closely.
 ---- -------------------
 So, now that you've notified the development team about your intention to
 translate (You did, right? Of course you did.) you can pick up english.txt
-(found in the SVN repository under /src/lang) and translate.
+(found in the SVN repository under /lang) and translate.
 
 You must change the first two lines of the file appropriately:
 
@@ -438,10 +233,7 @@ Note: Do not alter the following parts of the file:
 8.3) Previewing:
 ---- -------------------
 In order to view the translation in the game, you need to compile your language
-file with the strgen utility. You can download the precompiled strgen from:
-http://www.openttd.org/download-strgen
-To compile it yourself just take the normal OpenTTD sources and build that.
-During the build process the strgen utility will be made.
+file with the strgen utility, which is now bundled with the game.
 
 strgen is a command-line utility. It takes the language filename as parameter.
 Example:
@@ -492,43 +284,37 @@ The OpenTTD team (in alphabetical order):
   Jean-Francois Claeys (Belugas) - GUI, newindustries and more
   Bjarni Corfitzen (Bjarni)      - MacOSX port, coder and vehicles
   Matthijs Kooijman (blathijs)   - Pathfinder-guru, pool rework
-  Victor Fischer (Celestar)      - Programming everywhere you need him to
-  Christoph Elsenhans (frosch)   - General coding
-  Loïc Guilloux (glx)            - Windows Expert
-  Michael Lutz (michi_cc)        - Path based signals
+  Loïc Guilloux (glx)            - General coding
+  Jaroslav Mazanec (KUDr)        - YAPG (Yet Another Pathfinder God) ;)
+  Jonathan Coome (Maedhros)      - High priest of the newGRF Temple
+  Attila Bán (MiHaMiX)           - WebTranslator, Nightlies, Wiki and bugtracker host
   Owen Rudge (orudge)            - Forum host, OS/2 port
   Peter Nelson (peter1138)       - Spiritual descendant from newGRF gods
   Remko Bijker (Rubidium)        - Lead coder and way more
-  Zdeněk Sojka (SmatZ)           - Bug finder and fixer
-  Thijs Marinussen (Yexo)        - AI Framework
+  Benedikt Brüggemeier (skidd13) - Bug fixer and code reworker
+  Zdenek Sojka (SmatZ)           - Bug finder and fixer
 
 Inactive Developers:
+  Victor Fischer (Celestar)      - Programming everywhere you need him to
   Tamás Faragó (Darkvater)       - Ex-Lead coder
-  Jaroslav Mazanec (KUDr)        - YAPG (Yet Another Pathfinder God) ;)
-  Jonathan Coome (Maedhros)      - High priest of the NewGRF Temple
-  Attila Bán (MiHaMiX)           - WebTranslator 1 and 2
   Christoph Mallon (Tron)        - Programmer, code correctness police
 
 Retired Developers:
   Ludvig Strigeus (ludde)        - OpenTTD author, main coder (0.1 - 0.3.3)
   Serge Paquet (vurlix)          - Assistant project manager, coder (0.1 - 0.3.3)
   Dominik Scherer (dominik81)    - Lead programmer, GUI expert (0.3.0 - 0.3.6)
-  Benedikt Brüggemeier (skidd13) - Bug fixer and code reworker
-  Patric Stout (TrueLight)       - Programmer (0.3 - pre0.7), sys op (active)
+  Patric Stout (TrueLight)       - Programmer, webhoster (0.3 - pre0.6)
 
 Thanks to:
   Josef Drexler                  - For his great work on TTDPatch.
   Marcin Grzegorczyk             - For his TTDPatch work and documentation of TTD internals and graphics (signals and track foundations)
-  Petr Baudiš (pasky)            - Many patches, newgrf support, etc.
+  Petr Baudis (pasky)            - Many patches, newgrf support, etc.
   Simon Sasburg (HackyKid)       - For the many bugfixes he has blessed us with
   Stefan Meißner (sign_de)       - For his work on the console
   Mike Ragsdale                  - OpenTTD installer
   Cian Duffy (MYOB)              - BeOS port / manual writing
   Christian Rosentreter (tokai)  - MorphOS / AmigaOS port
   Richard Kempton (RichK67)      - Additional airports, initial TGP implementation
-  Alberto Demichelis             - Squirrel scripting language
-  Markus F.X.J. Oberhumer        - MiniLZO for loading old savegames
-  L. Peter Deutsch               - MD5 implementation
   Michael Blunck                 - For revolutionizing TTD with awesome graphics
   George                         - Canal graphics
   David Dallaston (Pikka)        - Tram tracks

source.list

@@ -1,14 +1,14 @@
 # Source Files
 airport.cpp
-animated_tile.cpp
+core/alloc_func.cpp
 articulated_vehicles.cpp
-autoreplace.cpp
+autoreplace_cmd.cpp
 aystar.cpp
+core/bitmath_func.cpp
 bmp.cpp
 callback_table.cpp
 cargopacket.cpp
 cargotype.cpp
-cheat.cpp
 command.cpp
 console.cpp
 console_cmds.cpp
@@ -18,20 +18,18 @@ debug.cpp
 dedicated.cpp
 depot.cpp
 driver.cpp
+widgets/dropdown.cpp
 economy.cpp
-effectvehicle.cpp
 elrail.cpp
 engine.cpp
 fileio.cpp
 fios.cpp
 fontcache.cpp
-gamelog.cpp
 genworld.cpp
 gfx.cpp
 gfxinit.cpp
 heightmap.cpp
-highscore.cpp
-ini.cpp
+helpers.cpp
 landscape.cpp
 map.cpp
 md5.cpp
@@ -42,12 +40,12 @@ music.cpp
 namegen.cpp
 network/network.cpp
 network/network_client.cpp
-network/network_command.cpp
-network/network_content.cpp
+network/network_data.cpp
 network/network_gamelist.cpp
 network/network_server.cpp
 network/network_udp.cpp
 npf.cpp
+oldloader.cpp
 oldpool.cpp
 openttd.cpp
 os_timer.cpp
@@ -58,11 +56,13 @@ os_timer.cpp
 	ottdres.rc
 #end
 pathfind.cpp
-pbs.cpp
+players.cpp
 queue.cpp
 rail.cpp
+core/random_func.cpp
 rev.cpp
 road.cpp
+saveload.cpp
 screenshot.cpp
 #if SDL
 	sdl.cpp
@@ -77,23 +77,7 @@ string.cpp
 strings.cpp
 texteff.cpp
 tgp.cpp
-#if HAVE_THREAD
-	#if WIN32
-		thread_win32.cpp
-	#else
-		#if OS2
-			thread_os2.cpp
-		#else
-			#if MORPHOS
-				thread_morphos.cpp
-			#else
-				thread_pthread.cpp
-			#end
-		#end
-	#end
-#else
-	thread_none.cpp
-#end
+thread.cpp
 tile_map.cpp
 #if WIN32
 #else
@@ -108,7 +92,6 @@ tile_map.cpp
 	#end
 #end
 vehicle.cpp
-vehiclelist.cpp
 viewport.cpp
 waypoint.cpp
 widget.cpp
@@ -118,15 +101,10 @@ widget.cpp
 window.cpp
 
 # Header Files
-#if ALLEGRO
-	music/allegro_m.h
-	sound/allegro_s.h
-	video/allegro_v.h
-#end
 aircraft.h
 airport.h
 airport_movement.h
-animated_tile_func.h
+core/alloc_func.hpp
 articulated_vehicles.h
 autoreplace_base.h
 autoreplace_func.h
@@ -134,90 +112,62 @@ autoreplace_gui.h
 autoreplace_type.h
 autoslope.h
 aystar.h
+core/bitmath_func.hpp
 bmp.h
 bridge.h
 callback_table.h
 cargo_type.h
 cargopacket.h
 cargotype.h
-cheat_func.h
-cheat_type.h
 cmd_helper.h
 command_func.h
 command_type.h
-company_base.h
-company_func.h
-company_gui.h
-company_manager_face.h
-company_type.h
-console_func.h
-console_gui.h
-console_internal.h
-console_type.h
+console.h
 currency.h
 date_func.h
 date_type.h
 debug.h
 video/dedicated_v.h
-depot_base.h
-depot_func.h
-depot_map.h
-depot_type.h
+depot.h
 direction_func.h
 direction_type.h
 music/dmusic.h
 driver.h
-economy_base.h
+widgets/dropdown_func.h
+widgets/dropdown_type.h
 economy_func.h
 economy_type.h
-effectvehicle_base.h
-effectvehicle_func.h
-elrail_func.h
-engine_base.h
-engine_func.h
-engine_gui.h
-engine_type.h
-fileio_func.h
-fileio_type.h
+core/endian_func.hpp
+engine.h
+core/enum_type.hpp
+fileio.h
 fios.h
 fontcache.h
 functions.h
-gamelog.h
-gamelog_internal.h
 genworld.h
+core/geometry_type.hpp
 gfx_func.h
 gfx_type.h
 gfxinit.h
 group.h
 group_gui.h
-group_type.h
 gui.h
 heightmap.h
-highscore.h
 industry.h
 industry_type.h
-ini_type.h
 landscape.h
-landscape_type.h
 livery.h
-lzoconf.h
-map_func.h
-map_type.h
+core/math_func.hpp
 md5.h
-minilzo.h
 mixer.h
 music.h
-namegen_func.h
 network/network.h
-network/network_base.h
 network/network_client.h
-network/network_content.h
-network/network_func.h
+network/network_data.h
 network/network_gamelist.h
 network/network_gui.h
 network/network_internal.h
 network/network_server.h
-network/network_type.h
 network/network_udp.h
 newgrf.h
 newgrf_callbacks.h
@@ -237,35 +187,34 @@ newgrf_storage.h
 newgrf_text.h
 newgrf_town.h
 newgrf_townname.h
-news_func.h
-news_gui.h
-news_type.h
+news.h
 npf.h
 music/null_m.h
 sound/null_s.h
 video/null_v.h
 oldpool.h
-oldpool_func.h
 openttd.h
-order_base.h
-order_func.h
-order_type.h
+order.h
+core/overflowsafe_type.hpp
 pathfind.h
-pbs.h
-querystring_gui.h
+player_base.h
+player_face.h
+player_func.h
+player_gui.h
+player_type.h
 queue.h
 rail.h
 rail_gui.h
 rail_type.h
-rev.h
+core/random_func.hpp
 road_cmd.h
 road_func.h
 road_gui.h
 road_internal.h
 road_type.h
 roadveh.h
+saveload.h
 screenshot.h
-sdl.h
 sound/sdl_s.h
 video/sdl_v.h
 settings_func.h
@@ -273,29 +222,20 @@ settings_internal.h
 settings_type.h
 ship.h
 signal_func.h
-signal_type.h
-signs_base.h
-signs_func.h
-signs_type.h
+signs.h
 slope_func.h
 slope_type.h
-sortlist_type.h
 sound_func.h
 sound_type.h
 sprite.h
 spritecache.h
-station_base.h
-station_func.h
+station.h
 station_gui.h
-station_type.h
-statusbar_gui.h
 stdafx.h
-strgen/strgen.h
 string_func.h
 string_type.h
 strings_func.h
 strings_type.h
-tar_type.h
 terraform_gui.h
 textbuf_gui.h
 texteff.hpp
@@ -303,10 +243,7 @@ tgp.h
 thread.h
 tile_cmd.h
 tile_type.h
-tilehighlight_func.h
-tilehighlight_type.h
 timetable.h
-toolbar_gui.h
 town.h
 town_type.h
 track_func.h
@@ -314,23 +251,14 @@ track_type.h
 train.h
 transparency.h
 transparency_gui.h
-transport_type.h
 tunnelbridge.h
 unmovable.h
 variables.h
 vehicle_base.h
 vehicle_func.h
 vehicle_gui.h
-vehicle_gui_base.h
 vehicle_type.h
-vehiclelist.h
-viewport_func.h
-viewport_type.h
-water.h
 waypoint.h
-waypoint_type.h
-widget_type.h
-win32.h
 music/win32_m.h
 sound/win32_s.h
 video/win32_v.h
@@ -339,40 +267,6 @@ window_gui.h
 window_type.h
 zoom_func.h
 zoom_type.h
-#if WIN32
-#else
-music/bemidi.h
-music/extmidi.h
-music/libtimidity.h
-music/os2_m.h
-music/qtmidi.h
-os/macosx/macos.h
-os/macosx/osx_stdafx.h
-os/macosx/splash.h
-sound/cocoa_s.h
-video/cocoa/cocoa_keys.h
-video/cocoa/cocoa_v.h
-#end
-
-# Core Source Code
-core/alloc_func.cpp
-core/alloc_func.hpp
-core/alloc_type.hpp
-core/bitmath_func.cpp
-core/bitmath_func.hpp
-core/endian_func.hpp
-core/endian_type.hpp
-core/enum_type.hpp
-core/geometry_type.hpp
-core/math_func.hpp
-core/mem_func.hpp
-core/overflowsafe_type.hpp
-core/random_func.cpp
-core/random_func.hpp
-core/smallmap_type.hpp
-core/smallvec_type.hpp
-core/sort_func.hpp
-core/string_compare_type.hpp
 
 # GUI Source Code
 aircraft_gui.cpp
@@ -380,28 +274,22 @@ airport_gui.cpp
 autoreplace_gui.cpp
 bridge_gui.cpp
 build_vehicle_gui.cpp
-cheat_gui.cpp
-company_gui.cpp
-console_gui.cpp
 depot_gui.cpp
 dock_gui.cpp
 engine_gui.cpp
 genworld_gui.cpp
 graph_gui.cpp
 group_gui.cpp
-highscore_gui.cpp
 industry_gui.cpp
 intro_gui.cpp
 main_gui.cpp
 misc_gui.cpp
 music_gui.cpp
-network/network_chat_gui.cpp
-network/network_content_gui.cpp
 network/network_gui.cpp
 newgrf_gui.cpp
 news_gui.cpp
 order_gui.cpp
-osk_gui.cpp
+player_gui.cpp
 rail_gui.cpp
 road_gui.cpp
 roadveh_gui.cpp
@@ -410,28 +298,17 @@ ship_gui.cpp
 signs_gui.cpp
 smallmap_gui.cpp
 station_gui.cpp
-statusbar_gui.cpp
 subsidy_gui.cpp
 terraform_gui.cpp
 timetable_gui.cpp
-toolbar_gui.cpp
 town_gui.cpp
 train_gui.cpp
 transparency_gui.cpp
-tree_gui.cpp
 vehicle_gui.cpp
-waypoint_gui.cpp
 
-# Widgets
-widgets/dropdown.cpp
-widgets/dropdown_func.h
-widgets/dropdown_type.h
-
-# Command handlers
+# Landscape
 aircraft_cmd.cpp
-autoreplace_cmd.cpp
 clear_cmd.cpp
-company_cmd.cpp
 disaster_cmd.cpp
 dummy_land.cpp
 group_cmd.cpp
@@ -442,7 +319,6 @@ rail_cmd.cpp
 road_cmd.cpp
 roadveh_cmd.cpp
 ship_cmd.cpp
-signs_cmd.cpp
 station_cmd.cpp
 terraform_cmd.cpp
 timetable_cmd.cpp
@@ -451,60 +327,22 @@ train_cmd.cpp
 tree_cmd.cpp
 tunnelbridge_cmd.cpp
 unmovable_cmd.cpp
-vehicle_cmd.cpp
 water_cmd.cpp
-waypoint_cmd.cpp
-
-# Save/Load handlers
-saveload/afterload.cpp
-saveload/ai_sl.cpp
-saveload/animated_tile_sl.cpp
-saveload/autoreplace_sl.cpp
-saveload/cargopacket_sl.cpp
-saveload/cheat_sl.cpp
-saveload/company_sl.cpp
-saveload/depot_sl.cpp
-saveload/economy_sl.cpp
-saveload/engine_sl.cpp
-saveload/gamelog_sl.cpp
-saveload/group_sl.cpp
-saveload/industry_sl.cpp
-saveload/map_sl.cpp
-saveload/misc_sl.cpp
-saveload/newgrf_sl.cpp
-saveload/oldloader.cpp
-saveload/oldloader.h
-saveload/oldloader_sl.cpp
-saveload/order_sl.cpp
-saveload/saveload.cpp
-saveload/saveload.h
-saveload/saveload_internal.h
-saveload/signs_sl.cpp
-saveload/station_sl.cpp
-saveload/strings_sl.cpp
-saveload/subsidy_sl.cpp
-saveload/town_sl.cpp
-saveload/vehicle_sl.cpp
-saveload/waypoint_sl.cpp
 
 # Tables
+table/ai_rail.h
 table/animcursors.h
 table/autorail.h
-table/bridge_land.h
 table/build_industry.h
 table/cargo_const.h
 table/clear_land.h
-table/control_codes.h
 table/elrail_data.h
 table/engines.h
-table/files.h
 table/genland.h
 table/industry_land.h
 table/landscape_sprite.h
 table/namegen.h
-table/palette_convert.h
 table/palettes.h
-table/railtypes.h
 table/road_land.h
 table/roadveh_movement.h
 table/sprites.h
@@ -514,187 +352,18 @@ table/town_land.h
 table/track_land.h
 table/train_cmd.h
 table/tree_land.h
-table/unicode.h
 table/unmovable_land.h
 table/water_land.h
 
-# Script
-script/squirrel.cpp
-script/squirrel.hpp
-script/squirrel_class.hpp
-script/squirrel_helper.hpp
-script/squirrel_helper_type.hpp
-script/squirrel_std.cpp
-script/squirrel_std.hpp
-
-# Squirrel
-3rdparty/squirrel/squirrel/sqapi.cpp
-3rdparty/squirrel/squirrel/sqbaselib.cpp
-3rdparty/squirrel/squirrel/sqclass.cpp
-3rdparty/squirrel/squirrel/sqcompiler.cpp
-3rdparty/squirrel/squirrel/sqdebug.cpp
-3rdparty/squirrel/squirrel/sqfuncstate.cpp
-3rdparty/squirrel/squirrel/sqlexer.cpp
-3rdparty/squirrel/squirrel/sqmem.cpp
-3rdparty/squirrel/squirrel/sqobject.cpp
-3rdparty/squirrel/squirrel/sqstate.cpp
-3rdparty/squirrel/sqstdlib/sqstdaux.cpp
-3rdparty/squirrel/squirrel/sqtable.cpp
-3rdparty/squirrel/squirrel/sqvm.cpp
-
-# Squirrel headers
-3rdparty/squirrel/squirrel/sqarray.h
-3rdparty/squirrel/squirrel/sqclass.h
-3rdparty/squirrel/squirrel/sqclosure.h
-3rdparty/squirrel/squirrel/sqcompiler.h
-3rdparty/squirrel/squirrel/sqfuncproto.h
-3rdparty/squirrel/squirrel/sqfuncstate.h
-3rdparty/squirrel/squirrel/sqlexer.h
-3rdparty/squirrel/squirrel/sqobject.h
-3rdparty/squirrel/squirrel/sqopcodes.h
-3rdparty/squirrel/squirrel/sqpcheader.h
-3rdparty/squirrel/squirrel/sqstate.h
-3rdparty/squirrel/include/sqstdaux.h
-3rdparty/squirrel/include/sqstdblob.h
-3rdparty/squirrel/sqstdlib/sqstdblobimpl.h
-3rdparty/squirrel/include/sqstdio.h
-3rdparty/squirrel/include/sqstdmath.h
-3rdparty/squirrel/sqstdlib/sqstdstream.h
-3rdparty/squirrel/include/sqstdstring.h
-3rdparty/squirrel/include/sqstdsystem.h
-3rdparty/squirrel/squirrel/sqstring.h
-3rdparty/squirrel/squirrel/sqtable.h
-3rdparty/squirrel/include/squirrel.h
-3rdparty/squirrel/squirrel/squserdata.h
-3rdparty/squirrel/squirrel/squtils.h
-3rdparty/squirrel/squirrel/sqvm.h
-
-# AI Core
-ai/ai.hpp
-ai/ai_config.cpp
-ai/ai_config.hpp
-ai/ai_core.cpp
-ai/ai_gui.cpp
-ai/ai_gui.hpp
-ai/ai_info.cpp
-ai/ai_info.hpp
-ai/ai_info_dummy.cpp
-ai/ai_instance.cpp
-ai/ai_instance.hpp
-ai/ai_scanner.cpp
-ai/ai_scanner.hpp
-ai/ai_storage.hpp
-
-# AI API
-ai/api/ai_abstractlist.hpp
-ai/api/ai_accounting.hpp
-ai/api/ai_airport.hpp
-ai/api/ai_base.hpp
-ai/api/ai_bridge.hpp
-ai/api/ai_bridgelist.hpp
-ai/api/ai_cargo.hpp
-ai/api/ai_cargolist.hpp
-ai/api/ai_changelog.hpp
-ai/api/ai_company.hpp
-ai/api/ai_controller.hpp
-ai/api/ai_date.hpp
-ai/api/ai_depotlist.hpp
-ai/api/ai_engine.hpp
-ai/api/ai_enginelist.hpp
-ai/api/ai_error.hpp
-ai/api/ai_event.hpp
-ai/api/ai_event_types.hpp
-ai/api/ai_execmode.hpp
-ai/api/ai_gamesettings.hpp
-ai/api/ai_group.hpp
-ai/api/ai_grouplist.hpp
-ai/api/ai_industry.hpp
-ai/api/ai_industrylist.hpp
-ai/api/ai_industrytype.hpp
-ai/api/ai_industrytypelist.hpp
-ai/api/ai_info_docs.hpp
-ai/api/ai_list.hpp
-ai/api/ai_log.hpp
-ai/api/ai_map.hpp
-ai/api/ai_marine.hpp
-ai/api/ai_object.hpp
-ai/api/ai_order.hpp
-ai/api/ai_rail.hpp
-ai/api/ai_railtypelist.hpp
-ai/api/ai_road.hpp
-ai/api/ai_sign.hpp
-ai/api/ai_signlist.hpp
-ai/api/ai_station.hpp
-ai/api/ai_stationlist.hpp
-ai/api/ai_subsidy.hpp
-ai/api/ai_subsidylist.hpp
-ai/api/ai_testmode.hpp
-ai/api/ai_tile.hpp
-ai/api/ai_tilelist.hpp
-ai/api/ai_town.hpp
-ai/api/ai_townlist.hpp
-ai/api/ai_tunnel.hpp
-ai/api/ai_types.hpp
-ai/api/ai_vehicle.hpp
-ai/api/ai_vehiclelist.hpp
-ai/api/ai_waypoint.hpp
-ai/api/ai_waypointlist.hpp
-
-# AI API Implementation
-ai/api/ai_abstractlist.cpp
-ai/api/ai_accounting.cpp
-ai/api/ai_airport.cpp
-ai/api/ai_base.cpp
-ai/api/ai_bridge.cpp
-ai/api/ai_bridgelist.cpp
-ai/api/ai_cargo.cpp
-ai/api/ai_cargolist.cpp
-ai/api/ai_company.cpp
-ai/api/ai_controller.cpp
-ai/api/ai_date.cpp
-ai/api/ai_depotlist.cpp
-ai/api/ai_engine.cpp
-ai/api/ai_enginelist.cpp
-ai/api/ai_error.cpp
-ai/api/ai_event.cpp
-ai/api/ai_event_types.cpp
-ai/api/ai_execmode.cpp
-ai/api/ai_gamesettings.cpp
-ai/api/ai_group.cpp
-ai/api/ai_grouplist.cpp
-ai/api/ai_industry.cpp
-ai/api/ai_industrylist.cpp
-ai/api/ai_industrytype.cpp
-ai/api/ai_industrytypelist.cpp
-ai/api/ai_list.cpp
-ai/api/ai_log.cpp
-ai/api/ai_map.cpp
-ai/api/ai_marine.cpp
-ai/api/ai_object.cpp
-ai/api/ai_order.cpp
-ai/api/ai_rail.cpp
-ai/api/ai_railtypelist.cpp
-ai/api/ai_road.cpp
-ai/api/ai_sign.cpp
-ai/api/ai_signlist.cpp
-ai/api/ai_station.cpp
-ai/api/ai_stationlist.cpp
-ai/api/ai_subsidy.cpp
-ai/api/ai_subsidylist.cpp
-ai/api/ai_testmode.cpp
-ai/api/ai_tile.cpp
-ai/api/ai_tilelist.cpp
-ai/api/ai_town.cpp
-ai/api/ai_townlist.cpp
-ai/api/ai_tunnel.cpp
-ai/api/ai_vehicle.cpp
-ai/api/ai_vehiclelist.cpp
-ai/api/ai_waypoint.cpp
-ai/api/ai_waypointlist.cpp
+# AI Files
+ai/ai.cpp
+ai/trolly/build.cpp
+ai/default/default.cpp
+ai/trolly/pathfinder.cpp
+ai/trolly/shared.cpp
+ai/trolly/trolly.cpp
 
 # Blitters
-#if DEDICATED
-#else
 blitter/32bpp_anim.cpp
 blitter/32bpp_anim.hpp
 blitter/32bpp_base.cpp
@@ -711,7 +380,6 @@ blitter/8bpp_optimized.cpp
 blitter/8bpp_optimized.hpp
 blitter/8bpp_simple.cpp
 blitter/8bpp_simple.hpp
-#end
 blitter/base.hpp
 blitter/factory.hpp
 blitter/null.cpp
@@ -771,9 +439,10 @@ water_map.h
 
 # Misc
 misc/array.hpp
+misc/autocopyptr.hpp
+misc/autoptr.hpp
 misc/binaryheap.hpp
 misc/blob.hpp
-misc/countedobj.cpp
 misc/countedptr.hpp
 misc/crc32.hpp
 misc/dbg_helpers.cpp
@@ -784,33 +453,27 @@ misc/str.hpp
 misc/strapi.hpp
 
 # Network Core
-network/core/address.cpp
-network/core/address.h
 network/core/config.h
 network/core/core.cpp
 network/core/core.h
 network/core/game.h
-network/core/host.cpp
-network/core/host.h
 network/core/os_abstraction.h
 network/core/packet.cpp
 network/core/packet.h
 network/core/tcp.cpp
 network/core/tcp.h
-network/core/tcp_connect.cpp
-network/core/tcp_content.cpp
-network/core/tcp_content.h
-network/core/tcp_game.cpp
-network/core/tcp_game.h
 network/core/udp.cpp
 network/core/udp.h
 
 # YAPF
+yapf/follow_track.cpp
 yapf/follow_track.hpp
 yapf/nodelist.hpp
+yapf/track_dir.hpp
 yapf/yapf.h
 yapf/yapf.hpp
 yapf/yapf_base.hpp
+yapf/yapf_common.cpp
 yapf/yapf_common.hpp
 yapf/yapf_costbase.hpp
 yapf/yapf_costcache.hpp
@@ -821,16 +484,12 @@ yapf/yapf_node_rail.hpp
 yapf/yapf_node_road.hpp
 yapf/yapf_rail.cpp
 yapf/yapf_road.cpp
+yapf/yapf_settings.h
 yapf/yapf_ship.cpp
 
 # Video
 video/dedicated_v.cpp
 video/null_v.cpp
-#if DEDICATED
-#else
-#if ALLEGRO
-	video/allegro_v.cpp
-#end
 #if SDL
 	video/sdl_v.cpp
 #end
@@ -840,18 +499,12 @@ video/null_v.cpp
 #if WINCE
 	video/win32_v.cpp
 #end
-#end
 
 # Music
-music/null_m.cpp
-#if DEDICATED
-#else
-#if ALLEGRO
-	music/allegro_m.cpp
-#end
 #if DIRECTMUSIC
 	music/dmusic.cpp
 #end
+music/null_m.cpp
 #if WIN32
 	music/win32_m.cpp
 #else
@@ -859,10 +512,7 @@ music/null_m.cpp
 	#else
 		#if PSP
 		#else
-			#if DOS
-			#else
-				music/extmidi.cpp
-			#end
+			music/extmidi.cpp
 		#end
 	#end
 #end
@@ -872,22 +522,15 @@ music/null_m.cpp
 #if LIBTIMIDITY
 	music/libtimidity.cpp
 #end
-#end
 
 # Sound
 sound/null_s.cpp
-#if DEDICATED
-#else
-#if ALLEGRO
-	sound/allegro_s.cpp
-#end
 #if SDL
 	sound/sdl_s.cpp
 #end
 #if WIN32
 	sound/win32_s.cpp
 #end
-#end
 
 #if OSX
 # OSX Files

src/3rdparty/squirrel/COMPILE

@@ -1,41 +0,0 @@
-Squirrel 2.2.1 stable
---------------------------------------------------------
-What is in this distribution?
-
-squirrel
-	static library implementing the compiler and interpreter of the language
-
-sqstdlib
-	the standard utility libraries
-
-sq
-	stand alone interpreter
-
-doc
-	The manual
-
-etc
-	a minimalistic embedding sample
-
-samples
-	samples programs
-
-
-HOW TO COMPILE
----------------------------------------------------------
-GCC USERS
-.........................................................
-There is a very simple makefile that compiles all libraries and exes
-from the root of the project run 'make'
-
-for 32 bits systems
-
- $ make
-
-for 64 bits systems
-
- $ make sq64
-
-VISUAL C++ USERS
-.........................................................
-Open squirrel.dsw from the root project directory and build(dho!)

src/3rdparty/squirrel/COPYRIGHT

@@ -1,29 +0,0 @@
-Copyright (c) 2003-2008 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.
------------------------------------------------------
-END OF COPYRIGHT