(svn r17631) -Release: 0.7.3-RC2

- Document: AIInfo's functions [FS#3216] (r17627, r17621)
- Fix: Prevent false positives when verifying company and president name lengths (r17611).
- Fix: When a command did not fail in test run and failed in exec run, error message was not set. Affects only few commands (r17607)
- Fix: [NewGRF] Crash when defining the same tile in a tile layout twice [FS#3218] (r17605)

Doxyfile

@@ -1,10 +1,3 @@
-# $Id$
-
-# This file is part of OpenTTD.
-# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
@@ -33,6 +26,7 @@ STRIP_FROM_INC_PATH    =
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
 MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
 INHERIT_DOCS           = YES
 DISTRIBUTE_GROUP_DOC   = NO
 TAB_SIZE               = 2
@@ -94,7 +88,7 @@ FILE_PATTERNS          = *.c \
 RECURSIVE              = YES
 EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = */3rdparty */.svn
+EXCLUDE_PATTERNS       =
 EXAMPLE_PATH           =
 EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = NO

Makefile.bundle.in

@@ -1,10 +1,3 @@
-# $Id$
-
-# This file is part of OpenTTD.
-# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-
 #
 # Creation of bundles
 #
@@ -29,16 +22,12 @@ endif
 
 # An OSX application bundle needs the data files, lang files and openttd executable in a different location.
 ifdef OSXAPP
-AI_DIR   = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/ai
 DATA_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/data
 LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
-GM_DIR   = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/gm
 TTD_DIR  = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
 else
-AI_DIR   = $(BUNDLE_DIR)/ai
 DATA_DIR = $(BUNDLE_DIR)/data
 LANG_DIR = $(BUNDLE_DIR)/lang
-GM_DIR   = $(BUNDLE_DIR)/gm
 TTD_DIR  = $(BUNDLE_DIR)
 endif
 
@@ -50,31 +39,25 @@ bundle: all
 	$(Q)mkdir -p "$(BUNDLE_DIR)/media"
 	$(Q)mkdir -p "$(BUNDLE_DIR)/scripts"
 	$(Q)mkdir -p "$(TTD_DIR)"
-	$(Q)mkdir -p "$(AI_DIR)"
 	$(Q)mkdir -p "$(DATA_DIR)"
 	$(Q)mkdir -p "$(LANG_DIR)"
-	$(Q)mkdir -p "$(GM_DIR)"
 ifdef OSXAPP
 	$(Q)mkdir -p "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources"
 	$(Q)echo "APPL????" >                                          "$(BUNDLE_DIR)/$(OSXAPP)/Contents/PkgInfo"
 	$(Q)cp    "$(ROOT_DIR)/os/macosx/openttd.icns"                 "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/openttd.icns"
 	$(Q)$(ROOT_DIR)/os/macosx/plistgen.sh                          "$(BUNDLE_DIR)/$(OSXAPP)" "$(REV)"
+	$(Q)cp    "$(ROOT_DIR)/docs/OSX_install_instructions.txt"      "$(BUNDLE_DIR)/docs/"
 	$(Q)cp    "$(ROOT_DIR)/os/macosx/splash.png"                   "$(DATA_DIR)"
 endif
 	$(Q)cp "$(BIN_DIR)/$(TTD)"                "$(TTD_DIR)/"
-	$(Q)cp "$(BIN_DIR)/ai/"compat_*.nut       "$(AI_DIR)/"
 	$(Q)cp "$(BIN_DIR)/data/"*.grf            "$(DATA_DIR)/"
 	$(Q)cp "$(BIN_DIR)/data/"*.obg            "$(DATA_DIR)/"
-	$(Q)cp "$(BIN_DIR)/data/"*.obs            "$(DATA_DIR)/"
 	$(Q)cp "$(BIN_DIR)/data/opntitle.dat"     "$(DATA_DIR)/"
 	$(Q)cp "$(BIN_DIR)/lang/"*.lng            "$(LANG_DIR)/"
-	$(Q)cp "$(BIN_DIR)/gm/"*.obm              "$(GM_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/readme.txt"           "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/COPYING"              "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/known-bugs.txt"       "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/docs/obg_format.txt"  "$(BUNDLE_DIR)/docs/"
-	$(Q)cp "$(ROOT_DIR)/docs/obm_format.txt"  "$(BUNDLE_DIR)/docs/"
-	$(Q)cp "$(ROOT_DIR)/docs/obs_format.txt"  "$(BUNDLE_DIR)/docs/"
 	$(Q)cp "$(ROOT_DIR)/docs/multiplayer.txt" "$(BUNDLE_DIR)/docs/"
 	$(Q)cp "$(ROOT_DIR)/docs/32bpp.txt"       "$(BUNDLE_DIR)/docs/"
 	$(Q)cp "$(ROOT_DIR)/changelog.txt"        "$(BUNDLE_DIR)/"
@@ -112,11 +95,6 @@ bundle_zip: bundle
 	$(Q)mkdir -p "$(BUNDLES_DIR)"
 	$(Q)cd "$(BUNDLE_DIR)" && zip -r $(shell if test -z "$(VERBOSE)"; then echo '-q'; fi) "$(BUNDLES_DIR)/$(BUNDLE_NAME).zip" .
 
-bundle_7z: bundle
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).7z'
-	$(Q)mkdir -p "$(BUNDLES_DIR)"
-	$(Q)cd "$(BUNDLE_DIR)" && 7z a "$(BUNDLES_DIR)/$(BUNDLE_NAME).7z" .
-
 bundle_gzip: bundle
 	@echo '[BUNDLE] Creating $(BUNDLE_NAME).tar.gz'
 	$(Q)mkdir -p "$(BUNDLES_DIR)/.gzip/$(BUNDLE_NAME)"
@@ -131,13 +109,6 @@ bundle_bzip2: bundle
 	$(Q)cd "$(BUNDLES_DIR)/.bzip2" && tar -jc$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.bz2" "$(BUNDLE_NAME)"
 	$(Q)rm -rf   "$(BUNDLES_DIR)/.bzip2"
 
-bundle_lzma: bundle
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).tar.lzma'
-	$(Q)mkdir -p "$(BUNDLES_DIR)/.lzma/$(BUNDLE_NAME)"
-	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.lzma/$(BUNDLE_NAME)/"
-	$(Q)cd "$(BUNDLES_DIR)/.lzma" && tar --lzma -c$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.lzma" "$(BUNDLE_NAME)"
-	$(Q)rm -rf   "$(BUNDLES_DIR)/.lzma"
-
 bundle_lha: bundle
 	@echo '[BUNDLE] Creating $(BUNDLE_NAME).lha'
 	$(Q)mkdir -p "$(BUNDLES_DIR)/.lha/$(BUNDLE_NAME)"
@@ -156,8 +127,8 @@ bundle_exe: all
 	@echo '[BUNDLE] Creating $(BUNDLE_NAME).exe'
 	$(Q)mkdir -p "$(BUNDLES_DIR)"
 	$(Q)unix2dos "$(ROOT_DIR)/docs/"* "$(ROOT_DIR)/readme.txt" "$(ROOT_DIR)/COPYING" "$(ROOT_DIR)/changelog.txt" "$(ROOT_DIR)/known-bugs.txt"
-	$(Q)cd $(ROOT_DIR)/os/windows/installer && makensis.exe //DVERSION_INCLUDE=version_$(PLATFORM).txt install.nsi
-	$(Q)mv $(ROOT_DIR)/os/windows/installer/*$(PLATFORM).exe "$(BUNDLES_DIR)/$(BUNDLE_NAME).exe"
+	$(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:
@@ -168,10 +139,8 @@ install: bundle
 	$(Q)install -d "$(INSTALL_BINARY_DIR)"
 	$(Q)install -d "$(INSTALL_ICON_DIR)"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/gm"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/ai"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/data"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/lang"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/gm"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/scripts"
 	$(Q)install -d "$(INSTALL_DOC_DIR)"
 ifeq ($(TTD), openttd.exe)
@@ -180,9 +149,7 @@ else
 	$(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)/${BINARY_NAME}"
 endif
 	$(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/ai/"* "$(INSTALL_DATA_DIR)/ai"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/data/"* "$(INSTALL_DATA_DIR)/data"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/gm/"* "$(INSTALL_DATA_DIR)/gm"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/scripts/"* "$(INSTALL_DATA_DIR)/scripts"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(INSTALL_DOC_DIR)"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/"*.txt "$(INSTALL_DOC_DIR)"

Makefile.in

@@ -1,10 +1,3 @@
-# $Id$
-
-# This file is part of OpenTTD.
-# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-
 # Check if we want to show what we are doing
 ifdef VERBOSE
 	Q =
@@ -14,36 +7,36 @@ endif
 
 include Makefile.am
 
-CONFIG_CACHE_PWD         = !!CONFIG_CACHE_PWD!!
+SOURCE_LIST = !!SOURCE_LIST!!
 CONFIG_CACHE_SOURCE_LIST = !!CONFIG_CACHE_SOURCE_LIST!!
-BIN_DIR        = !!BIN_DIR!!
-ICON_THEME_DIR = !!ICON_THEME_DIR!!
-MAN_DIR        = !!MAN_DIR!!
-MENU_DIR       = !!MENU_DIR!!
-SRC_DIR        = !!SRC_DIR!!
-ROOT_DIR       = !!ROOT_DIR!!
-BUNDLE_DIR     = "$(ROOT_DIR)/bundle"
-BUNDLES_DIR    = "$(ROOT_DIR)/bundles"
-INSTALL_DIR    = !!INSTALL_DIR!!
-INSTALL_BINARY_DIR     = "$(INSTALL_DIR)/"!!BINARY_DIR!!
-INSTALL_MAN_DIR        = "$(INSTALL_DIR)/$(MAN_DIR)"
-INSTALL_MENU_DIR       = "$(INSTALL_DIR)/$(MENU_DIR)"
-INSTALL_ICON_DIR       = "$(INSTALL_DIR)/"!!ICON_DIR!!
-INSTALL_ICON_THEME_DIR = "$(INSTALL_DIR)/$(ICON_THEME_DIR)"
-INSTALL_DATA_DIR       = "$(INSTALL_DIR)/"!!DATA_DIR!!
-INSTALL_DOC_DIR        = "$(INSTALL_DIR)/"!!DOC_DIR!!
-SOURCE_LIST     = !!SOURCE_LIST!!
+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!!
-TTD         = !!TTD!!
-TTDS        = $(SRC_DIRS:%=%/$(TTD))
-OS          = !!OS!!
-OSXAPP      = !!OSXAPP!!
-LIPO        = !!LIPO!!
-REVISION    = !!REVISION!!
-AWK         = !!AWK!!
-DISTCC      = !!DISTCC!!
+STRIP = !!STRIP!!
+TTD = !!TTD!!
+TTDS = $(SRC_DIRS:%=%/$(TTD))
+OS = !!OS!!
+OSXAPP = !!OSXAPP!!
+REVISION = !!REVISION!!
+AWK = !!AWK!!
+DISTCC = !!DISTCC!!
 
 RES := $(shell if [ ! -f $(CONFIG_CACHE_PWD) ] || [ "`pwd`" != "`cat $(CONFIG_CACHE_PWD)`" ]; then echo "`pwd`" > $(CONFIG_CACHE_PWD); fi )
 RES := $(shell if [ ! -f $(CONFIG_CACHE_SOURCE_LIST) ] || [ -n "`cmp $(CONFIG_CACHE_SOURCE_LIST) $(SOURCE_LIST) 2>/dev/null`" ]; then cp $(SOURCE_LIST) $(CONFIG_CACHE_SOURCE_LIST); fi )

Makefile.lang.in

@@ -1,30 +1,22 @@
-# $Id$
-
-# This file is part of OpenTTD.
-# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-
-STRGEN        = !!STRGEN!!
-ENDIAN_CHECK  = !!ENDIAN_CHECK!!
-SRC_DIR       = !!SRC_DIR!!
-LANG_DIR      = !!LANG_DIR!!
-BIN_DIR       = !!BIN_DIR!!
-LANGS_SRC     = $(shell ls $(LANG_DIR)/*.txt)
-LANGS         = $(LANGS_SRC:$(LANG_DIR)/%.txt=%.lng)
-CXX_BUILD     = !!CXX_BUILD!!
-CFLAGS_BUILD  = !!CFLAGS_BUILD!!
-LDFLAGS_BUILD = !!LDFLAGS_BUILD!!
-STRGEN_FLAGS  = !!STRGEN_FLAGS!!
-STAGE         = !!STAGE!!
-LANG_SUPPRESS = !!LANG_SUPPRESS!!
-LANG_OBJS_DIR = !!LANG_OBJS_DIR!!
+STRGEN       = !!STRGEN!!
+ENDIAN_CHECK = !!ENDIAN_CHECK!!
+SRC_DIR      = !!SRC_DIR!!
+LANG_DIR     = !!LANG_DIR!!
+BIN_DIR      = !!BIN_DIR!!
+LANGS_SRC    = $(shell ls $(LANG_DIR)/*.txt)
+LANGS        = $(LANGS_SRC:$(LANG_DIR)/%.txt=%.lng)
+CXX_BUILD    = !!CXX_BUILD!!
+CFLAGS_BUILD = !!CFLAGS_BUILD!!
+STRGEN_FLAGS = !!STRGEN_FLAGS!!
+STAGE        = !!STAGE!!
+LANG_SUPPRESS= !!LANG_SUPPRESS!!
+LANG_OBJS_DIR= !!LANG_OBJS_DIR!!
 
 ifeq ($(LANG_SUPPRESS), yes)
 LANG_ERRORS = >/dev/null 2>&1
 endif
 
-# Make sure endian_host.h is reachable as if it was in the src/ dir
+# Make sure endian_host.h is reasable as if it was in the src/ dir
 CFLAGS_BUILD += -I $(LANG_OBJS_DIR)
 
 ENDIAN_TARGETS := endian_host.h endian_target.h $(ENDIAN_CHECK)
@@ -42,7 +34,7 @@ RES := $(shell mkdir -p $(BIN_DIR)/lang )
 
 all: table/strings.h $(LANGS)
 
-strgen.o: $(SRC_DIR)/strgen/strgen.cpp endian_host.h $(SRC_DIR)/table/control_codes.h $(SRC_DIR)/table/strgen_tables.h
+strgen.o: $(SRC_DIR)/strgen/strgen.cpp endian_host.h $(SRC_DIR)/table/control_codes.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<
 
@@ -60,7 +52,7 @@ lang/english.txt: $(LANG_DIR)/english.txt
 
 $(STRGEN): alloc_func.o string.o strgen.o
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(LDFLAGS_BUILD) $^ -o $@
+	$(Q)$(CXX_BUILD) $^ -o $@
 
 table/strings.h: lang/english.txt $(STRGEN)
 	$(E) '$(STAGE) Generating $@'

Makefile.msvc

@@ -1,10 +1,3 @@
-# $Id$
-
-# This file is part of OpenTTD.
-# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-
 #
 # Makefile for creating bundles of MSVC's binaries in the same way as we make
 # the zip bundles for ALL other OSes.
@@ -20,14 +13,14 @@ else
 	Q = @
 endif
 
-AWK         = "awk"
-ROOT_DIR   := $(shell pwd)
-BIN_DIR     = "$(ROOT_DIR)/bin"
-SRC_DIR     = "$(ROOT_DIR)/src"
-BUNDLE_DIR  = "$(ROOT_DIR)/bundle"
+AWK = "awk"
+ROOT_DIR := $(shell pwd)
+BIN_DIR = "$(ROOT_DIR)/bin"
+SRC_DIR = "$(ROOT_DIR)/src"
+BUNDLE_DIR = "$(ROOT_DIR)/bundle"
 BUNDLES_DIR = "$(ROOT_DIR)/bundles"
-TTD         = openttd.exe
-TARGET     := $(shell echo $(PLATFORM) | sed "s@win64@x64@;s@win32@Win32@")
+TTD = openttd.exe
+TARGET := $(shell echo $(PLATFORM) | sed "s@win64@x64@;s@win32@Win32@")
 
 all:
 	$(Q)cp objs/$(TARGET)/Release/$(TTD) $(BIN_DIR)/$(TTD)

Makefile.src.in

@@ -1,43 +1,32 @@
-# $Id$
-
-# This file is part of OpenTTD.
-# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-
-CC_HOST        = !!CC_HOST!!
-CXX_HOST       = !!CXX_HOST!!
-CC_BUILD       = !!CC_BUILD!!
-CXX_BUILD      = !!CXX_BUILD!!
-WINDRES        = !!WINDRES!!
-STRIP          = !!STRIP!!
-CFLAGS         = !!CFLAGS!!
-CFLAGS_BUILD   = !!CFLAGS_BUILD!!
-CXXFLAGS       = !!CXXFLAGS!!
-CXXFLAGS_BUILD = !!CXXFLAGS_BUILD!!
-LIBS           = !!LIBS!!
-LDFLAGS        = !!LDFLAGS!!
-LDFLAGS_BUILD  = !!LDFLAGS_BUILD!!
-ROOT_DIR       = !!ROOT_DIR!!
-BIN_DIR        = !!BIN_DIR!!
-LANG_DIR       = !!LANG_DIR!!
-SRC_OBJS_DIR   = !!SRC_OBJS_DIR!!
-LANG_OBJS_DIR  = !!LANG_OBJS_DIR!!
-SRC_DIR        = !!SRC_DIR!!
-SCRIPT_SRC_DIR = !!SCRIPT_SRC_DIR!!
-MEDIA_DIR      = !!MEDIA_DIR!!
-TTD            = !!TTD!!
-STRGEN         = !!STRGEN!!
-ENDIAN_CHECK   = !!ENDIAN_CHECK!!
-DEPEND         = !!DEPEND!!
-ENDIAN_FORCE   = !!ENDIAN_FORCE!!
-OS             = !!OS!!
-STAGE          = !!STAGE!!
-MAKEDEPEND     = !!MAKEDEPEND!!
-CFLAGS_MAKEDEP = !!CFLAGS_MAKEDEP!!
-SORT           = !!SORT!!
-REVISION       = !!REVISION!!
-AWK            = !!AWK!!
+CC_HOST      = !!CC_HOST!!
+CXX_HOST     = !!CXX_HOST!!
+CC_BUILD     = !!CC_BUILD!!
+CXX_BUILD    = !!CXX_BUILD!!
+WINDRES      = !!WINDRES!!
+STRIP        = !!STRIP!!
+CFLAGS       = !!CFLAGS!!
+CFLAGS_BUILD = !!CFLAGS_BUILD!!
+LIBS         = !!LIBS!!
+LDFLAGS      = !!LDFLAGS!!
+ROOT_DIR     = !!ROOT_DIR!!
+BIN_DIR      = !!BIN_DIR!!
+LANG_DIR     = !!LANG_DIR!!
+SRC_OBJS_DIR = !!SRC_OBJS_DIR!!
+LANG_OBJS_DIR= !!LANG_OBJS_DIR!!
+SRC_DIR      = !!SRC_DIR!!
+SCRIPT_SRC_DIR=!!SCRIPT_SRC_DIR!!
+MEDIA_DIR    = !!MEDIA_DIR!!
+TTD          = !!TTD!!
+STRGEN       = !!STRGEN!!
+ENDIAN_CHECK = !!ENDIAN_CHECK!!
+ENDIAN_FORCE = !!ENDIAN_FORCE!!
+OS           = !!OS!!
+STAGE        = !!STAGE!!
+MAKEDEPEND   = !!MAKEDEPEND!!
+CFLAGS_MAKEDEP= !!CFLAGS_MAKEDEP!!
+SORT         = !!SORT!!
+REVISION     = !!REVISION!!
+AWK          = !!AWK!!
 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!!
@@ -109,7 +98,7 @@ REV_NR := 0
 endif
 
 # This helps to recompile if flags change
-RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CXXFLAGS) $(CFLAGS)" ]; then echo "$(CXXFLAGS) $(CFLAGS)" > $(CONFIG_CACHE_COMPILER); fi )
+RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CFLAGS)" ]; then echo "$(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 )
 
@@ -138,18 +127,18 @@ endif
 
 $(OBJS_C:%.o=%.d): %.d: $(SRC_DIR)/%.c $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.c=%.c)'
-	$(Q)$(CC_HOST) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
+	$(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
 
 $(OBJS_CPP:%.o=%.d): %.d: $(SRC_DIR)/%.cpp $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CXXFLAGS) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
+	$(Q)$(CXX_HOST) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
 
 $(OBJS_MM:%.o=%.d): %.d: $(SRC_DIR)/%.mm $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.mm=%.mm)'
 	$(Q)$(CC_HOST) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
 
 $(OBJS_RC:%.o=%.d): %.d: $(SRC_DIR)/%.rc $(FILE_DEP)
-	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.rc=%.rc)'
+	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.mm=%.mm)'
 	$(Q)touch $@
 
 else
@@ -162,18 +151,11 @@ ifeq ($(filter $(ENDIAN_TARGETS) depend clean mrproper, $(MAKECMDGOALS)),)
 -include Makefile.dep
 endif
 
-ifeq ("$(SRC_OBJS_DIR)/$(DEPEND)","$(MAKEDEPEND)")
-DEP := $(MAKEDEPEND)
-$(SRC_OBJS_DIR)/$(DEPEND): $(SRC_DIR)/depend/depend.cpp
-	$(E) '$(STAGE) Compiling and linking $(DEPEND)'
-	$(Q)$(CXX_BUILD) $(CXXFLAGS_BUILD) $(CFLAGS_BUILD) $(LDFLAGS_BUILD) -o $@ $<
-endif
-
 # Make sure that only 'make depend' ALWAYS triggers a recheck
 ifeq ($(filter depend, $(MAKECMDGOALS)),)
-Makefile.dep: $(FILE_DEP) $(SRCS:%=$(SRC_DIR)/%) $(CONFIG_CACHE_SOURCE) $(DEP)
+Makefile.dep: $(FILE_DEP) $(SRCS:%=$(SRC_DIR)/%) $(CONFIG_CACHE_SOURCE)
 else
-Makefile.dep: $(FILE_DEP) $(SRCS:%=$(SRC_DIR)/%) $(DEP) FORCE
+Makefile.dep: FORCE
 endif
 	$(E) '$(STAGE) DEP CHECK (all files)'
 	$(Q)rm -f Makefile.dep.tmp
@@ -228,13 +210,9 @@ endif
 
 # 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) $(CFLAGS) -c -o $@ $<
-
 $(OBJS_CPP): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CXXFLAGS) $(CFLAGS) -c -o $@ $<
+	$(Q)$(CXX_HOST) $(CFLAGS) -c -o $@ $<
 
 $(OBJS_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.mm=%.mm)'
@@ -242,7 +220,7 @@ $(OBJS_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP)
 
 $(OBJS_RC): %.o: $(SRC_DIR)/%.rc $(FILE_DEP)
 	$(E) '$(STAGE) Compiling resource $(<:$(SRC_DIR)/%.rc=%.rc)'
-	$(Q)$(WINDRES) -o $@ -I `basename $<` $<
+	$(Q)$(WINDRES) -o $@ -I $(MEDIA_DIR) $<
 
 $(BIN_DIR)/$(TTD): $(TTD)
 	$(Q)cp $< $@
@@ -273,15 +251,15 @@ endian_target.h: $(ENDIAN_CHECK) $(CONFIG_CACHE_ENDIAN)
 
 $(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CXXFLAGS_BUILD) $(CFLAGS_BUILD) $< -o $@
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $< -o $@
 
 # Revision files
 
 $(SRC_DIR)/rev.cpp: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/rev.cpp.in
 	$(Q)cat $(SRC_DIR)/rev.cpp.in      | sed "s@\!\!REVISION\!\!@$(REV_NR)@g;s@!!VERSION!!@$(REV)@g;s@!!MODIFIED!!@$(MODIFIED)@g;s@!!DATE!!@`date +%d.%m.%y`@g" > $(SRC_DIR)/rev.cpp
 
-$(SRC_DIR)/os/windows/ottdres.rc: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/os/windows/ottdres.rc.in
-	$(Q)cat $(SRC_DIR)/os/windows/ottdres.rc.in | sed "s@\!\!REVISION\!\!@$(REV_NR)@g;s@!!VERSION!!@$(REV)@g;s@!!DATE!!@`date +%d.%m.%y`@g" > $(SRC_DIR)/os/windows/ottdres.rc
+$(SRC_DIR)/ottdres.rc: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/ottdres.rc.in
+	$(Q)cat $(SRC_DIR)/ottdres.rc.in | sed "s@\!\!REVISION\!\!@$(REV_NR)@g;s@!!VERSION!!@$(REV)@g;s@!!DATE!!@`date +%d.%m.%y`@g" > $(SRC_DIR)/ottdres.rc
 
 FORCE:
 
@@ -289,10 +267,10 @@ depend: $(DEPS)
 
 clean:
 	$(E) '$(STAGE) Cleaning up object files'
-	$(Q)rm -f $(DEPS) $(OBJS) $(TTD) $(DEPEND) $(TTD:%=$(BIN_DIR)/%) $(CONFIG_CACHE_COMPILER) $(CONFIG_CACHE_LINKER) $(CONFIG_CACHE_ENDIAN) $(CONFIG_CACHE_SOURCE) $(ENDIAN_TARGETS)
+	$(Q)rm -f $(DEPS) $(OBJS) $(TTD) $(TTD:%=$(BIN_DIR)/%) $(CONFIG_CACHE_COMPILER) $(CONFIG_CACHE_LINKER) $(CONFIG_CACHE_ENDIAN) $(CONFIG_CACHE_SOURCE) $(ENDIAN_TARGETS)
 
 mrproper: clean
-	$(Q)rm -f $(SRC_DIR)/rev.cpp $(SRC_DIR)/os/windows/ottdres.rc
+	$(Q)rm -f $(SRC_DIR)/rev.cpp $(SRC_DIR)/ottdres.rc
 
 %.o:
 	@echo '$(STAGE) No such source-file: $(@:%.o=%).[c|cpp|mm|rc]'

bin/ai/compat_0.7.nut

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

bin/ai/compat_1.0.nut

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

bin/ai/regression/regression.nut

@@ -805,20 +805,6 @@ function Regression::Marine()
 	print("  IsCanalTile():        " + AIMarine.IsCanalTile(32127));
 	print("  GetBankBalance():     " + AICompany.GetBankBalance(AICompany.COMPANY_SELF));
 
-	local list = AIWaypointList(AIWaypoint.WAYPOINT_BUOY);
-	print("");
-	print("--AIWaypointList(BUOY)--");
-	print("  Count():             " + list.Count());
-	print("  Location ListDump:");
-	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
-		print("    " + AIWaypoint.GetLocation(i));
-	}
-	print("  HasWaypointType:");
-	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
-		print("    " + AIWaypoint.HasWaypointType(i, AIWaypoint.WAYPOINT_RAIL) + "  " + AIWaypoint.HasWaypointType(i, AIWaypoint.WAYPOINT_BUOY) + "  " + AIWaypoint.HasWaypointType(i, AIWaypoint.WAYPOINT_ANY));
-	}
-	print("");
-
 	print("  RemoveWaterDepot():   " + AIMarine.RemoveWaterDepot(28479));
 	print("  RemoveDock():         " + AIMarine.RemoveDock(29253));
 	print("  RemoveBuoy():         " + AIMarine.RemoveBuoy(28481));
@@ -842,37 +828,14 @@ function Regression::Order()
 	print("  GetOrderCount():       " + AIOrder.GetOrderCount(12));
 	print("  GetOrderDestination(): " + AIOrder.GetOrderDestination(12, 1));
 	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.AIOF_TRANSFER));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.AIOF_TRANSFER | AIOrder.AIOF_UNLOAD));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.AIOF_TRANSFER | AIOrder.AIOF_FULL_LOAD));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33417, AIOrder.AIOF_SERVICE_IF_NEEDED));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33417, AIOrder.AIOF_STOP_IN_DEPOT));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(0, AIOrder.AIOF_SERVICE_IF_NEEDED | AIOrder.AIOF_GOTO_NEAREST_DEPOT));
-	print("  IsValidConditionalOrder(): " + AIOrder.IsValidConditionalOrder(AIOrder.OC_LOAD_PERCENTAGE, AIOrder.CF_EQUALS));
-	print("  IsValidConditionalOrder(): " + AIOrder.IsValidConditionalOrder(AIOrder.OC_RELIABILITY, AIOrder.CF_IS_TRUE));
-	print("  IsValidConditionalOrder(): " + AIOrder.IsValidConditionalOrder(AIOrder.OC_REQUIRES_SERVICE, AIOrder.CF_IS_FALSE));
-	print("  IsValidConditionalOrder(): " + AIOrder.IsValidConditionalOrder(AIOrder.OC_AGE, AIOrder.CF_INVALID));
 	print("  IsValidVehicleOrder(): " + AIOrder.IsValidVehicleOrder(12, 1));
-	print("  IsGotoStationOrder():  " + AIOrder.IsGotoStationOrder(12, 1));
-	print("  IsGotoDepotOrder():    " + AIOrder.IsGotoDepotOrder(12, 1));
-	print("  IsGotoWaypointOrder(): " + AIOrder.IsGotoWaypointOrder(12, 1));
-	print("  IsConditionalOrder():  " + AIOrder.IsConditionalOrder(12, 1));
-	print("  IsCurrentOrderPartOfOrderList(): " + AIOrder.IsCurrentOrderPartOfOrderList(12));
 	print("  GetOrderFlags():       " + AIOrder.GetOrderFlags(12, 1));
 	print("  AppendOrder():         " + AIOrder.AppendOrder(12, 33416, AIOrder.AIOF_TRANSFER));
 	print("  InsertOrder():         " + AIOrder.InsertOrder(12, 0, 33416, AIOrder.AIOF_TRANSFER));
 	print("  GetOrderCount():       " + AIOrder.GetOrderCount(12));
 	print("  IsValidVehicleOrder(): " + AIOrder.IsValidVehicleOrder(12, 1));
-	print("  IsGotoStationOrder():  " + AIOrder.IsGotoStationOrder(12, 1));
-	print("  IsGotoDepotOrder():    " + AIOrder.IsGotoDepotOrder(12, 1));
-	print("  IsGotoWaypointOrder(): " + AIOrder.IsGotoWaypointOrder(12, 1));
-	print("  IsConditionalOrder():  " + AIOrder.IsConditionalOrder(12, 1));
-	print("  IsCurrentOrderPartOfOrderList(): " + AIOrder.IsCurrentOrderPartOfOrderList(12));
-	print("  GetOrderFlags():       " + AIOrder.GetOrderFlags(12, 0));
-	print("  GetOrderFlags():       " + AIOrder.GetOrderFlags(12, 1));
-	print("  GetOrderJumpTo():      " + AIOrder.GetOrderJumpTo(12, 1));
 	print("  RemoveOrder():         " + AIOrder.RemoveOrder(12, 0));
 	print("  SetOrderFlags():       " + AIOrder.SetOrderFlags(12, 0, AIOrder.AIOF_FULL_LOAD));
-	print("  GetOrderFlags():       " + AIOrder.GetOrderFlags(12, 0));
 	print("  GetOrderDestination(): " + AIOrder.GetOrderDestination(12, 0));
 	print("  CopyOrders():          " + AIOrder.CopyOrders(12, 1));
 	print("  CopyOrders():          " + AIOrder.CopyOrders(13, 12));
@@ -992,7 +955,7 @@ function Regression::Rail()
 	print("    IsRailStationTile():           " + AIRail.IsRailStationTile(7957));
 	print("    IsRailStationTile():           " + AIRail.IsRailStationTile(7958));
 	print("    IsRailStationTile():           " + AIRail.IsRailStationTile(7959));
-	print("    RemoveRailStationTileRectangle():" + AIRail.RemoveRailStationTileRectangle(7959, 7959, false));
+	print("    RemoveRailStationTileRect():   " + AIRail.RemoveRailStationTileRect(7959, 7959));
 	print("    IsRailStationTile():           " + AIRail.IsRailStationTile(7957));
 	print("    IsRailStationTile():           " + AIRail.IsRailStationTile(7958));
 	print("    IsRailStationTile():           " + AIRail.IsRailStationTile(7959));
@@ -1232,7 +1195,7 @@ function Regression::TileList()
 	list.AddRectangle(34436, 256 * 2 + 34436 + 8);
 	print("  Count():             " + list.Count());
 
-	list.Valuate(AITile.GetCornerHeight, AITile.CORNER_N);
+	list.Valuate(AITile.GetHeight);
 	print("  Height():            done");
 	print("  Count():             " + list.Count());
 	print("  ListDump:");
@@ -1664,15 +1627,15 @@ function Regression::Vehicle()
 function Regression::PrintSubsidy(subsidy_id)
 {
 	print("      --Subsidy (" + subsidy_id + ") --");
-	print("        IsValidSubsidy():      " + AISubsidy.IsValidSubsidy(subsidy_id));
-	print("        IsAwarded():           " + AISubsidy.IsAwarded(subsidy_id));
-	print("        GetAwardedTo():        " + AISubsidy.GetAwardedTo(subsidy_id));
-	print("        GetExpireDate():       " + AISubsidy.GetExpireDate(subsidy_id));
-	print("        GetSourceType():       " + AISubsidy.GetSourceType(subsidy_id));
-	print("        GetSourceIndex():      " + AISubsidy.GetSourceIndex(subsidy_id));
-	print("        GetDestinationType():  " + AISubsidy.GetDestinationType(subsidy_id));
-	print("        GetDestinationIndex(): " + AISubsidy.GetDestinationIndex(subsidy_id));
-	print("        GetCargoType():        " + AISubsidy.GetCargoType(subsidy_id));
+	print("        IsValidSubsidy():     " + AISubsidy.IsValidSubsidy(subsidy_id));
+	print("        IsAwarded():          " + AISubsidy.IsAwarded(subsidy_id));
+	print("        GetAwardedTo():       " + AISubsidy.GetAwardedTo(subsidy_id));
+	print("        GetExpireDate():      " + AISubsidy.GetExpireDate(subsidy_id));
+	print("        SourceIsTown():       " + AISubsidy.SourceIsTown(subsidy_id));
+	print("        GetSource():          " + AISubsidy.GetSource(subsidy_id));
+	print("        DestionationIsTown(): " + AISubsidy.DestinationIsTown(subsidy_id));
+	print("        GetDestionation():    " + AISubsidy.GetDestination(subsidy_id));
+	print("        GetCargoType():       " + AISubsidy.GetCargoType(subsidy_id));
 }
 
 
@@ -1682,15 +1645,12 @@ function Regression::Start()
 	this.Std();
 	this.Base();
 	this.List();
-
-	/* Do this first as it gains maximum loan (which is faked to quite a lot). */
-	this.Company();
-
 	this.Airport();
 	this.Bridge();
 	this.BridgeList();
 	this.Cargo();
 	this.CargoList();
+	this.Company();
 	this.Engine();
 	this.EngineList();
 	this.Group();

bin/ai/regression/regression_info.nut

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

bin/data/orig_dos.obg

@@ -24,7 +24,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTDD.GRF = 356cf9663aacb212fdbff609d99090d6
+OPENTTDD.GRF = c886c7d5b38a93f2cb1cdc0d33472eb8
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.

bin/data/orig_dos.obs

@@ -1,19 +0,0 @@
-; $Id$
-;
-; This represents the original sounds as on the Transport
-; Tycoon Deluxe DOS CD.
-;
-[metadata]
-name         = original_dos
-shortname    = TTDO
-version      = 0
-description  = Original Transport Tycoon Deluxe DOS edition sounds
-
-[files]
-samples      = SAMPLE.CAT
-
-[md5s]
-SAMPLE.CAT   = 422ea3dd074d2859bb51639a6e0e85da
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.

bin/data/orig_dos_de.obg

@@ -24,7 +24,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTDD.GRF = 356cf9663aacb212fdbff609d99090d6
+OPENTTDD.GRF = c886c7d5b38a93f2cb1cdc0d33472eb8
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.

bin/data/orig_win.obg

@@ -24,7 +24,7 @@ TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
 TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
 TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
 TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTDW.GRF = 80346ea80de167068cfb975f93963941
+OPENTTDW.GRF = b6689105405fa3ea34cb8a5543633d29
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.

bin/data/orig_win.obs

@@ -1,19 +0,0 @@
-; $Id$
-;
-; This represents the original sounds as on the Transport
-; Tycoon Deluxe for Windows CD.
-;
-[metadata]
-name         = original_windows
-shortname    = TTDO
-version      = 0
-description  = Original Transport Tycoon Deluxe Windows edition sounds
-
-[files]
-samples      = SAMPLE.CAT
-
-[md5s]
-SAMPLE.CAT   = 9212e81e72badd4bbe1eaeae66458e10
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.

bin/gm/no_music.obm

@@ -1,48 +0,0 @@
-; $Id$
-;
-; This represents more or less nothingness
-;
-[metadata]
-name         = NoMusic
-shortname    = NOMU
-version      = 0
-description  = A music pack without actual music
-
-[files]
-theme =
-old_0 =
-old_1 =
-old_2 =
-old_3 =
-old_4 =
-old_5 =
-old_6 =
-old_7 =
-old_8 =
-old_9 =
-new_0 =
-new_1 =
-new_2 =
-new_3 =
-new_4 =
-new_5 =
-new_6 =
-new_7 =
-new_8 =
-new_9 =
-ezy_0 =
-ezy_1 =
-ezy_2 =
-ezy_3 =
-ezy_4 =
-ezy_5 =
-ezy_6 =
-ezy_7 =
-ezy_8 =
-ezy_9 =
-
-[md5s]
-
-[names]
-
-[origin]

bin/gm/orig_win.obm

@@ -1,94 +0,0 @@
-; $Id$
-;
-; This represents the original music as on the Transport
-; Tycoon Deluxe for Windows CD.
-;
-[metadata]
-name         = original_windows
-shortname    = TTDW
-version      = 1
-description  = Original Transport Tycoon Deluxe Windows edition music
-
-[files]
-theme = GM_TT00.GM
-old_0 = GM_TT02.GM
-old_1 = GM_TT06.GM
-old_2 = GM_TT03.GM
-old_3 = GM_TT12.GM
-old_4 = GM_TT08.GM
-old_5 = GM_TT13.GM
-old_6 = GM_TT14.GM
-old_7 = GM_TT19.GM
-old_8 =
-old_9 =
-new_0 = GM_TT04.GM
-new_1 = GM_TT01.GM
-new_2 = GM_TT05.GM
-new_3 = GM_TT15.GM
-new_4 = GM_TT11.GM
-new_5 = GM_TT16.GM
-new_6 = GM_TT09.GM
-new_7 =
-new_8 =
-new_9 =
-ezy_0 = GM_TT18.GM
-ezy_1 = GM_TT19.GM
-ezy_2 = GM_TT21.GM
-ezy_3 = GM_TT17.GM
-ezy_4 = GM_TT20.GM
-ezy_5 = GM_TT07.GM
-ezy_6 =
-ezy_7 =
-ezy_8 =
-ezy_9 =
-
-[md5s]
-GM_TT00.GM = 45cfec1b9d8c7a0ad45e755833cbf221
-GM_TT01.GM = ab14ed3392d848abd2a2e90a9d75d121
-GM_TT02.GM = dd4f696e4be5987ce738257b08b50171
-GM_TT03.GM = a1bfde23343df9e4063419bf29c166b8
-GM_TT04.GM = 4e6943aa0c455203d76c79389054747d
-GM_TT05.GM = cee281cb85a2e2343552d97640545a47
-GM_TT06.GM = 26d1de5efa8675f94065784e9d539e49
-GM_TT07.GM = 6f2691e17558f552ec4c565e4ab7139c
-GM_TT08.GM = a42bf2cb3340a822f1a69646fc7a487d
-GM_TT09.GM = eb35761a58a8df3c59ed8929cce13916
-GM_TT10.GM = 42fecd686720a785d20a78590c466a82
-GM_TT11.GM = 50ef1ef02e49d2112786dd45e69dc3ee
-GM_TT12.GM = 4ce707a0e0e72419f0681dd9bd95271b
-GM_TT13.GM = e765753be29d889ec818f38009103619
-GM_TT14.GM = 270e2d63bd32b95a4d007ce15a6ce45f
-GM_TT15.GM = 89e116a1c0c69f1845cc903a9bfbe460
-GM_TT16.GM = f824e2371b3bedfe61aad4b9c62dd6be
-GM_TT17.GM = 1b23eebb0796c1ab99cd97fa7082cf7b
-GM_TT18.GM = 15650de3bad645d0e88c4f5c7a2df92a
-GM_TT19.GM = 7aec079e15bd09588660b85545ac4dfc
-GM_TT20.GM = 1509097889dee617aa1e9a1738a5a930
-GM_TT21.GM = a8d0aaad02e1a762d8d54cf81da56bab
-
-[names]
-GM_TT00.GM = Tycoon DELUXE Theme
-GM_TT01.GM = Snarl Up
-GM_TT02.GM = Easy Driver
-GM_TT03.GM = Little Red Diesel
-GM_TT04.GM = City Groove
-GM_TT05.GM = Aliens Ate My Railway
-GM_TT06.GM = Stoke It
-GM_TT07.GM = Don't Walk!
-GM_TT08.GM = Sawyer's Tune
-GM_TT09.GM = Fell Apart On Me
-GM_TT10.GM = Can't Get There From Here
-GM_TT11.GM = Hard Drivin'
-GM_TT12.GM = Road Hog
-GM_TT13.GM = Hold That Train!
-GM_TT14.GM = Broomer's Oil Rag
-GM_TT15.GM = Goss Groove
-GM_TT16.GM = Small Town
-GM_TT17.GM = Cruise Control
-GM_TT18.GM = Stroll On
-GM_TT19.GM = Funk Central
-GM_TT20.GM = Jammit
-GM_TT21.GM = Movin' On
-
-[origin]
-default = You can find it on your Transport Tycoon Deluxe CD-ROM.

config.lib

@@ -1,9 +1,3 @@
-# $Id$
-
-# This file is part of OpenTTD.
-# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 
 log() {
 	if [ $1 = "1" ]; then echo "$2"; fi
@@ -11,7 +5,7 @@ log() {
 }
 
 set_default() {
-	released_version="1.0.0-beta3"
+	released_version="0.7.3-RC2"
 
 	ignore_extra_parameters="0"
 	# We set all kinds of defaults for params. Later on the user can override
@@ -48,7 +42,6 @@ set_default() {
 	enable_debug="0"
 	enable_desync_debug="0"
 	enable_profiling="0"
-	enable_lto="0"
 	enable_dedicated="0"
 	enable_network="1"
 	enable_static="1"
@@ -67,10 +60,8 @@ set_default() {
 	with_sdl="1"
 	with_cocoa="1"
 	with_zlib="1"
-	with_lzo2="1"
 	with_png="1"
-	enable_builtin_depend="1"
-	with_makedepend="0"
+	with_makedepend="1"
 	with_direct_music="1"
 	with_sort="1"
 	with_iconv="1"
@@ -80,7 +71,6 @@ set_default() {
 	with_freetype="1"
 	with_fontconfig="1"
 	with_icu="1"
-	static_icu="0"
 	with_psp_config="1"
 	with_threads="1"
 	with_distcc="1"
@@ -119,7 +109,6 @@ set_default() {
 		enable_debug
 		enable_desync_debug
 		enable_profiling
-		enable_lto
 		enable_dedicated
 		enable_network
 		enable_static
@@ -137,9 +126,7 @@ set_default() {
 		with_sdl
 		with_cocoa
 		with_zlib
-		with_lzo2
 		with_png
-		enable_builtin_depend
 		with_makedepend
 		with_direct_music
 		with_sort
@@ -150,12 +137,11 @@ set_default() {
 		with_freetype
 		with_fontconfig
 		with_icu
-		static_icu
 		with_psp_config
 		with_threads
 		with_distcc
 		with_ccache
-	CC CXX CFLAGS CXXFLAGS LDFLAGS"
+	CC CXX CFLAGS LDFLAGS"
 }
 
 detect_params() {
@@ -268,10 +254,6 @@ detect_params() {
 			--enable-desync-debug=*)      enable_desync_debug="$optarg";;
 			--enable-profiling)           enable_profiling="1";;
 			--enable-profiling=*)         enable_profiling="$optarg";;
-			--enable-lto)                 enable_lto="1";;
-			--enable-lto=*)               enable_lto="$optarg";;
-			--enable-ipo)                 enable_lto="1";;
-			--enable-ipo=*)               enable_lto="$optarg";;
 			--enable-dedicated)           enable_dedicated="1";;
 			--enable-dedicated=*)         enable_dedicated="$optarg";;
 			--enable-network=*)           enable_network="$optarg";;
@@ -321,13 +303,6 @@ detect_params() {
 			--without-zlib)               with_zlib="0";;
 			--with-zlib=*)                with_zlib="$optarg";;
 
-			--with-lzo2)                  with_lzo2="2";;
-			--without-lzo2)               with_lzo2="0";;
-			--with-lzo2=*)                with_lzo2="$optarg";;
-			--with-liblzo2)               with_lzo2="2";;
-			--without-liblzo2)            with_lzo2="0";;
-			--with-liblzo2=*)             with_lzo2="$optarg";;
-
 			--with-png)                   with_png="2";;
 			--without-png)                with_png="0";;
 			--with-png=*)                 with_png="$optarg";;
@@ -359,19 +334,11 @@ detect_params() {
 			--with-libicu)                with_icu="2";;
 			--without-libicu)             with_icu="0";;
 			--with-libicu=*)              with_icu="$optarg";;
-			--static-icu)                 static_icu="1";;
-			--static-icu=*)               static_icu="$optarg";;
-			--static-libicu)              static_icu="1";;
-			--static-libicu=*)            static_icu="$optarg";;
 
 			--with-psp-config)            with_psp_config="2";;
 			--without-psp-config)         with_psp_config="0";;
 			--with-psp-config=*)          with_psp_config="$optarg";;
 
-			--disable-builtin-depend)     enable_builtin_depend="0";;
-			--enable-builtin-depend)      enable_builtin_depend="2";;
-			--enable-builtin-depend=*)    enable_builtin_depend="$optarg";;
-
 			--with-makedepend)            with_makedepend="2";;
 			--without-makedepend)         with_makedepend="0";;
 			--with-makedepend=*)          with_makedepend="$optarg";;
@@ -414,7 +381,6 @@ detect_params() {
 			CC=* | --CC=*)                CC="$optarg";;
 			CXX=* | --CXX=*)              CXX="$optarg";;
 			CFLAGS=* | --CFLAGS=*)        CFLAGS="$optarg";;
-			CXXFLAGS=* | --CXXFLAGS=*)    CXXFLAGS="$optarg";;
 			LDFLAGS=* | --LDFLAGS=*)      LDFLAGS="$optarg";;
 
 			--ignore-extra-parameters)    ignore_extra_parameters="1";;
@@ -480,10 +446,10 @@ check_params() {
 		log 1 " PREPROCESSOR is only available for OSX"
 		exit 1
 	fi
-	# OS only allows DETECT, UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, HAIKU, SUNOS, CYGWIN, MINGW, OS2, DOS, WINCE, and PSP
-	if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS|WINCE|PSP)$'`" ]; then
+	# OS only allows DETECT, UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, DOS, WINCE, and PSP
+	if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|DOS|WINCE|PSP)$'`" ]; then
 		log 1 "configure: error: invalid option --os=$os"
-		log 1 " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS|WINCE|PSP]"
+		log 1 " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|DOS|WINCE|PSP]"
 		exit 1
 	fi
 	# cpu_type can be either 32 or 64
@@ -525,11 +491,7 @@ check_params() {
 	if [ "$enable_universal" = "0" ]; then
 		log 1 "checking universal build... no"
 	else
-		if [ "$enable_universal" = "64" ]; then
-			log 1 "checking universal build... yes (including 64 bits)"
-		else
-			log 1 "checking universal build... yes (without 64 bits)"
-		fi
+		log 1 "checking universal build... yes"
 	fi
 
 	# Already detected by check_build
@@ -545,14 +507,6 @@ check_params() {
 		log 1 "checking strip... disabled"
 	fi
 	check_lipo
-
-	if [ "$enable_builtin_depend" != "0" ]; then
-		log 1 "checking builtin depend... yes"
-		makedepend="\$(SRC_OBJS_DIR)/\$(DEPEND)"
-	else
-		log 1 "checking builtin depend... no"
-	fi
-
 	check_makedepend
 	detect_cputype
 
@@ -611,70 +565,6 @@ check_params() {
 		sleep 5
 	fi
 
-	if [ "$enable_lto" != "0" ]; then
-		has_lto=`($cxx_build -dumpspecs 2>&1 | grep '\%{flto}') || ($cxx_build -help ipo 2>&1 | grep '\-ipo')`
-		if [ -n "$has_lto" ]; then
-			log 1 "using link time optimization... yes"
-		else
-			enable_lto="0"
-			log 1 "using link time optimization... no"
-			log 1 "WARNING: you selected link time optimization but it is not found."
-			sleep 5
-		fi
-	else
-		log 1 "using link time optimization... no"
-	fi
-
-
-	if [ "$os" != "OSX" ] && [ "$with_osx_sysroot" != "0" ]; then
-		if [ "$with_osx_sysroot" = "1" ]; then
-			with_osx_sysroot="0"
-
-			log 1 "checking OSX sysroot... not OSX, skipping"
-		else
-			log 1 "configure: error: --with-osx-sysroot only works if OSX is the target"
-			exit 1
-		fi
-	fi
-
-	if [ "$with_osx_sysroot" != "0" ]; then
-		if [ "$enable_universal" = "0" ] && [ "$with_osx_sysroot" != "1" ] && [ "$with_osx_sysroot" != "2" ]; then
-			# Sysroot manually specified? Check for usability
-			log 1 "checking OSX sysroot... $with_osx_sysroot"
-			if ! check_osx_sdk "$with_osx_sysroot"; then
-				log 1 "Passed sysroot not found/not functional"
-				exit 1
-			fi
-		else
-			# If autodetect and no universal, use system default
-			if [ "$with_osx_sysroot" = "1" ] && [ "$enable_universal" = "0" ]; then
-				log 1 "checking OSX sysroot... no (use system default)"
-			else
-				log 1 "checking OSX sysroot... automatically"
-				detect_osx_sdk
-			fi
-		fi
-
-		if [ -n "$osx_sdk_path" ]; then
-			if [ "$enable_universal" != "0" ]; then
-				if [ -z "$osx_sdk_104_path" ]; then
-					log 1 "WARNING: Could not find a usable 10.4u SDK, the resulting"
-					log 1 "WARNING: binary will only run on OSX 10.5 or later"
-					osx_sdk_104_path="$osx_sdk_path"
-				fi
-				OSX_SYSROOT="-isysroot $osx_sdk_104_path"
-				OSX_LD_SYSROOT="-Wl,-syslibroot,$osx_sdk_104_path"
-			else
-				OSX_SYSROOT="-isysroot $osx_sdk_path"
-				OSX_LD_SYSROOT="-Wl,-syslibroot,$osx_sdk_path"
-			fi
-		fi
-	else
-		if [ "$os" = "OSX" ]; then
-			log 1 "checking OSX sysroot... no (use system default)"
-		fi
-	fi
-
 	detect_allegro
 	detect_sdl
 	detect_cocoa
@@ -753,22 +643,6 @@ check_params() {
 		fi
 	fi
 
-	pre_detect_with_lzo2=$with_lzo2
-	detect_lzo2
-
-	if [ "$with_lzo2" = "0" ] || [ -z "$lzo2" ]; then
-		log 1 "WARNING: liblzo2 was not detected or disabled"
-		log 1 "WARNING: OpenTTD doesn't require liblzo2, but it does mean that"
-		log 1 "WARNING: loading old savegames/scenarios will be disabled."
-		if [ "$pre_detect_with_lzo2" = "0" ]; then
-			log 1 "WARNING: We strongly suggest you to install liblzo2."
-		else
-			log 1 "configure: error: no liblzo2 detected"
-			log 1 " If you want to compile without liblzo2 use --without-liblzo2 as parameter"
-			exit
-		fi
-	fi
-
 	detect_png
 	detect_freetype
 	detect_fontconfig
@@ -893,6 +767,36 @@ check_params() {
 		with_threads="0"
 	fi
 
+	if [ "$os" != "OSX" ] && [ "$with_osx_sysroot" != "0" ]; then
+		if [ "$with_osx_sysroot" = "1" ]; then
+			with_osx_sysroot="0"
+
+			log 1 "checking OSX sysroot... not OSX, skipping"
+		else
+			log 1 "configure: error: --with-osx-sysroot only works if OSX is the target"
+			exit 1
+		fi
+	fi
+
+	if [ "$with_osx_sysroot" != "0" ]; then
+		if [ "$enable_universal" = "0" ] && [ "$with_osx_sysroot" != "1" ] && [ "$with_osx_sysroot" != "2" ]; then
+			log 1 "checking OSX sysroot... $with_osx_sysroot"
+		else
+			# If autodetect and no universal, use system default
+			if [ "$with_osx_sysroot" = "1" ] && [ "$enable_universal" = "0" ]; then
+				log 1 "checking OSX sysroot... no (use system default)"
+				with_osx_sysroot="0"
+			else
+				log 1 "checking OSX sysroot... automatically"
+				with_osx_sysroot="3"
+			fi
+		fi
+	else
+		if [ "$os" = "OSX" ]; then
+			log 1 "checking OSX sysroot... no (use system default)"
+		fi
+	fi
+
 	if [ "$os" != "OSX" ] && [ "$with_application_bundle" != "0" ]; then
 		if [ "$with_application_bundle" = "1" ]; then
 			with_application_bundle="0"
@@ -911,6 +815,7 @@ check_params() {
 	fi
 
 	if [ "$os" = "OSX" ]; then
+		check_osx_sdk
 		# Test on G5
 
 		if [ "$enable_osx_g5" != "0" ]; then
@@ -1057,6 +962,8 @@ check_params() {
 		menu_dir="`echo $menu_dir | sed 's@\([^\]\)\\\\ @\1\\\\\\\\ @g;s@\([^\]\) @\1\\\\\\\\ @g'`"
 	fi
 
+	# "set_universal_binary_flags" needs to be before "detect_iconv"
+	set_universal_binary_flags
 	detect_iconv
 
 	if [ -n "$personal_dir" ]
@@ -1106,40 +1013,23 @@ make_compiler_cflags() {
 	# Params:
 	# $1 - compiler
 	# $2 - the current cflags
-	# $3 - variable to finally write cflags to
-	# $4 - the current cxxflags
-	# $5 - variable to finally write cxxflags to
-	# $6 - the current ldflags
-	# $7 - variable to finally write ldflags to
+	# $3 - variable to finally write to
 
 	flags="$2"
-	cxxflags="$4"
-	ldflags="$6"
 
-	if [ `basename $1 | cut -c 1-3` = "icc" ]; then
+	if [ `echo $1 | cut -c 1-3` = "icc" ]; then
 		# Enable some things only for certain ICC versions
-		cc_version=`$1 -dumpversion | cut -c 1-4 | sed s@\\\.@@g`
+		cc_version=`$1 -dumpversion | cut -c 1-4`
 
-		flags="$flags -rdynamic"
-		ldflags="$ldflags -rdynamic"
 
-		if [ $cc_version -ge 101 ]; then
+		if [ "$cc_version" = "10.1" ]; then
 			flags="$flags -Wno-multichar"
 		fi
 
-		if [ $cc_version -ge 110 ]; then
+		if [ "$cc_version" = "11.0" ]; then
+			# warning 1899: multicharacter character literal (potential portability problem) (e.g. 'FOOD')
 			# vec report defaults to telling where it did loop vectorisation, which is not very important
-			flags="$flags -vec-report=0 -wd873"
-
-			# Use c++0x mode so static_assert() is available
-			cxxflags="$cxxflags -std=c++0x"
-		fi
-
-		has_ipo=`$1 -help ipo | grep '\-ipo'`
-		if [ "$enable_lto" != "0" ] && [ -n "$has_ipo" ]; then
-			# Use IPO (only if we see IPO exists and is requested)
-			flags="$flags -ipo"
-			ldflags="$ldflags -ipo $CFLAGS"
+			flags="$flags -vec-report=0 -wd1899"
 		fi
 	else
 		# Enable some things only for certain GCC versions
@@ -1152,6 +1042,8 @@ make_compiler_cflags() {
 
 		flags="$flags -Wall -Wno-multichar -Wsign-compare -Wundef"
 		flags="$flags -Wwrite-strings -Wpointer-arith"
+		flags="$flags -Wno-uninitialized"
+
 		flags="$flags -W -Wno-unused-parameter -Wformat=2"
 		flags="$flags -Wredundant-decls"
 
@@ -1166,10 +1058,6 @@ make_compiler_cflags() {
 			#  break anything. So disable strict-aliasing to make the
 			#  compiler all happy.
 			flags="$flags -fno-strict-aliasing"
-			ldflags="$ldflags -fno-strict-aliasing"
-			# Warn about casting-out 'const' with regular C-style cast.
-			#  The preferred way is const_cast<>() which doesn't warn.
-			flags="$flags -Wcast-qual"
 		fi
 
 		if [ $cc_version -ge 42 ]; then
@@ -1178,59 +1066,22 @@ make_compiler_cflags() {
 			# sure that they will not happen. It furthermore complains
 			# about it's own optimized code in some places.
 			flags="$flags -fno-strict-overflow"
-			ldflags="$ldflags -fno-strict-overflow"
-		fi
-
-		if [ $cc_version -ge 43 ]; then
-			# Use gnu++0x mode so static_assert() is available.
-			# Don't use c++0x, it breaks mingw (with gcc 4.4.0).
-			cxxflags="$cxxflags -std=gnu++0x"
-		fi
-
-		if [ $cc_version -ge 45 ]; then
-			# Only GCC 4.5+ has (possibly) LTO
-			has_lto=`$1 -dumpspecs | grep '\%{flto}'`
-			if [ "$enable_lto" != "0" ] && [ -n "$has_lto" ]; then
-				# Use LTO only if we see LTO exists and is requested
-				flags="$flags -flto"
-				ldflags="$ldflags -flto $2"
-			fi
-		fi
-
-		has_rdynamic=`$1 -dumpspecs | grep rdynamic`
-		if [ -n "$has_rdynamic" ]; then
-			# rdynamic is used to get useful stack traces from crash reports.
-			flags="$flags -rdynamic"
-			ldflags="$ldflags -rdynamic"
 		fi
 	fi
 
 	eval "$3=\"$flags\""
-	eval "$5=\"$cxxflags\""
-	eval "$7=\"$ldflags\""
 }
 
 make_cflags_and_ldflags() {
 	# General CFlags for BUILD
 	CFLAGS_BUILD=""
-	# Special CXXFlags for BUILD
-	CXXFLAGS_BUILD=""
-	# LDFLAGS for BUILD
-	LDFLAGS_BUILD=""
 	# General CFlags for HOST
-	CFLAGS="$CFLAGS"
-	# Special CXXFlags for HOST
-	CXXFLAGS="$CXXFLAGS"
+	CFLAGS="$CFLAGS -D$os"
 	# Libs to compile. In fact this is just LDFLAGS
 	LIBS="-lstdc++"
 	# LDFLAGS used for HOST
 	LDFLAGS="$LDFLAGS"
 
-	make_compiler_cflags "$cc_build" "$CFLAGS_BUILD" "CFLAGS_BUILD" "$CXXFLAGS_BUILD" "CXXFLAGS_BUILD" "$LDFLAGS_BUILD" "LDFLAGS_BUILD"
-	make_compiler_cflags "$cc_host" "$CFLAGS" "CFLAGS" "$CXXFLAGS" "CXXFLAGS" "$LDFLAGS" "LDFLAGS"
-
-	CFLAGS="$CFLAGS -D$os"
-
 	if [ $enable_debug = 0 ]; then
 		# No debug, add default stuff
 		OBJS_SUBDIR="release"
@@ -1244,7 +1095,6 @@ make_cflags_and_ldflags() {
 			fi
 
 			CFLAGS="-O2 -fomit-frame-pointer $CFLAGS"
-			LDFLAGS="-O2 -fomit-frame-pointer $LDFLAGS"
 		fi
 	else
 		OBJS_SUBDIR="debug"
@@ -1258,7 +1108,6 @@ make_cflags_and_ldflags() {
 		fi
 		if [ $enable_debug -ge 2 ]; then
 			CFLAGS="$CFLAGS -fno-inline"
-			LDFLAGS="$LDFLAGS -fno-inline"
 		fi
 		if [ $enable_debug -ge 3 ]; then
 			CFLAGS="$CFLAGS -O0"
@@ -1276,6 +1125,9 @@ make_cflags_and_ldflags() {
 		CFLAGS="$CFLAGS -DNO_THREADS"
 	fi
 
+	make_compiler_cflags "$cc_build" "$CFLAGS_BUILD" "CFLAGS_BUILD"
+	make_compiler_cflags "$cc_host" "$CFLAGS" "CFLAGS"
+
 	if [ "`echo $1 | cut -c 1-3`" != "icc" ]; then
 		if [ "$os" = "CYGWIN" ]; then
 			flags="$flags -mwin32"
@@ -1283,20 +1135,20 @@ make_cflags_and_ldflags() {
 		fi
 		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
 			flags="$flags -mno-cygwin"
-			LDFLAGS="$LDFLAGS -mno-cygwin -Wl,--subsystem,windows"
-			LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32"
+			LDFLAGS="$LDFLAGS -mno-cygwin"
+		fi
 
-			if [ $cc_version -ge 44 ]; then
-				LDFLAGS_BUILD="$LDFLAGS_BUILD -static-libgcc"
-			fi
+		if [ "$os" = "CYGWIN" ] || [ "$os" = "MINGW" ]; then
+			LDFLAGS="$LDFLAGS -Wl,--subsystem,windows"
+			LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32"
 		fi
 	fi
 
-	if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "FREEBSD" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "DOS" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then
+	if [ "$os" != "CYGWIN" ] && [ "$os" != "FREEBSD" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "DOS" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then
 		LIBS="$LIBS -lpthread"
 	fi
 
-	if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "MINGW" ] && [ "$os" != "DOS" ] && [ "$os" != "WINCE" ]; then
+	if [ "$os" != "CYGWIN" ] && [ "$os" != "MINGW" ] && [ "$os" != "DOS" ] && [ "$os" != "WINCE" ]; then
 		LIBS="$LIBS -lc"
 	fi
 	if [ "$os" = "WINCE" ]; then
@@ -1325,42 +1177,17 @@ make_cflags_and_ldflags() {
 
 	if [ "$os" = "OSX" ]; then
 		LDFLAGS="$LDFLAGS -framework Cocoa"
-		if [ "$enable_dedicated" = "0" ] && ([ "$cpu_type" = "32" ] || [ "$enable_universal" != "0" ]); then
+		if [ "$enable_dedicated" = "0" ]; then
 			LIBS="$LIBS -framework QuickTime"
-		else
-			CFLAGS="$CFLAGS -DNO_QUICKTIME"
-		fi
-
-		if [ "$enable_universal" = "0" ]; then
-			# Universal builds set this elsewhere
-			CFLAGS="$OSX_SYSROOT $CFLAGS"
-			LDFLAGS="$OSX_LD_SYSROOT $LDFLAGS"
-		fi
-
-		if [ "$enable_universal" = "0" ] && [ $cc_version -ge 40 ]; then
-			# Only set the min version when not doing an universal build.
-			# Universal builds set the version elsewhere.
-			if [ "$cpu_type" = "64" ]; then
-				CFLAGS="$CFLAGS -mmacosx-version-min=10.5"
-			else
-				gcc_cpu=`$cc_host -dumpmachine`
-				if [ "`echo $gcc_cpu | cut -c 1-3`" = "ppc" -o "`echo $gcc_cpu | cut -c 1-7`" = "powerpc" ]; then
-					# PowerPC build can run on 10.3
-					CFLAGS="$CFLAGS -mmacosx-version-min=10.3"
-				else
-					# Intel is only available starting from 10.4
-					CFLAGS="$CFLAGS -mmacosx-version-min=10.4"
-				fi
-			fi
 		fi
 	fi
 
-	if [ "$os" = "BEOS" ] || [ "$os" = "HAIKU" ]; then
+	if [ "$os" = "BEOS" ]; then
 		LIBS="$LIBS -lmidi -lbe"
 	fi
 
 	# Most targets act like UNIX, just with some additions
-	if [ "$os" = "BEOS" ] || [ "$os" = "HAIKU" ] || [ "$os" = "OSX" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OS2" ]; then
+	if [ "$os" = "BEOS" ] || [ "$os" = "OSX" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OS2" ]; then
 		CFLAGS="$CFLAGS -DUNIX"
 	fi
 	# And others like Windows
@@ -1395,7 +1222,7 @@ make_cflags_and_ldflags() {
 
 	if [ "$with_cocoa" != "0" ]; then
 		CFLAGS="$CFLAGS -DWITH_COCOA"
-		LIBS="$LIBS -F/System/Library/Frameworks -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox"
+		LIBS="$LIBS -F/System/Library/Frameworks -framework Cocoa -framework Carbon -framework AudioUnit"
 
 		if [ "$enable_cocoa_quartz" != "0" ]; then
 			CFLAGS="$CFLAGS -DENABLE_COCOA_QUARTZ"
@@ -1415,17 +1242,8 @@ make_cflags_and_ldflags() {
 		CFLAGS="$CFLAGS -DWITH_ZLIB"
 	fi
 
-	if [ "$with_lzo2" != "0" ]; then
-		if [ "$enable_static" != "0" ] && [ "$os" != "OSX" ]; then
-			LIBS="$LIBS $lzo2"
-		else
-			LIBS="$LIBS -llzo2"
-		fi
-		CFLAGS="$CFLAGS -DWITH_LZO"
-	fi
-
 	# 64bit machines need -D_SQ64
-	if [ "$cpu_type" = "64" ] && [ "$enable_universal" = "0" ]; then
+	if [ "$cpu_type" = "64" ]; then
 		CFLAGS="$CFLAGS -D_SQ64"
 	fi
 	CFLAGS="$CFLAGS -I$SCRIPT_SRC_DIR"
@@ -1484,11 +1302,7 @@ make_cflags_and_ldflags() {
 		CFLAGS="$CFLAGS `$icu_config --cppflags | tr '\n\r' '  '`"
 
 		# Some icu-configs have the 'feature' of not adding a space where others do add the space
-		if [ "$static_icu" != "0" ]; then
-			LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly | tr '\n\r' '  ' | sed s/licu/lsicu/g`"
-		else
-			LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly | tr '\n\r' '  '`"
-		fi
+		LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly | tr '\n\r' '  '`"
 	fi
 
 
@@ -1548,10 +1362,6 @@ make_cflags_and_ldflags() {
 			LDFLAGS="$LDFLAGS -lbind -lsocket"
 		fi
 
-		if [ "$os" = "HAIKU" ]; then
-			LDFLAGS="$LDFLAGS -lnetwork"
-		fi
-
 		if [ "$os" = "SUNOS" ]; then
 			LDFLAGS="$LDFLAGS -lnsl -lsocket"
 		fi
@@ -1587,7 +1397,6 @@ make_cflags_and_ldflags() {
 	CFLAGS="$CFLAGS -DGLOBAL_DATA_DIR=\\\\\"$prefix_dir/$data_dir\\\\\""
 
 	log 1 "using CFLAGS... $CFLAGS"
-	log 1 "using CXXFLAGS... $CXXFLAGS"
 	log 1 "using LDFLAGS... $LIBS $LDFLAGS"
 
 	# Makedepend doesn't like something like: -isysroot /OSX/blabla
@@ -1597,12 +1406,11 @@ make_cflags_and_ldflags() {
 	# Btw, this almost always comes from outside the configure, so it is
 	#  not something we can control.
 	# Also make makedepend aware of compiler's built-in defines.
-	if [ "$with_makedepend" != "0" ] || [ "$enable_builtin_depend" != "0" ]; then
-		# Append CXXFLAGS possibly containing -std=c++0x
-		cflags_makedep="`echo | $cxx_host $CXXFLAGS -E -x c++ -dM - | sed 's@.define @-D@g;s@ .*@ @g;s@(.*)@@g' | tr -d '\r\n'`"
+	if [ "$with_makedepend" != "0" ]; then
+		cflags_makedep="`echo | $cxx_host -E -x c++ -dM - | sed 's@.define @-D@g;s@ .*@ @g;s@(.*)@@g' | tr -d '\r\n'`"
 
 		# Please escape ALL " within ` because e.g. "" terminates the string in some sh implementations
-		cflags_makedep="$cflags_makedep `echo \"$CFLAGS\" \"$CXXFLAGS\" | sed 's@ /@ -@g;s@-I[ ]*[^ ]*@@g'`"
+		cflags_makedep="$cflags_makedep `echo \"$CFLAGS\" | sed 's@ /@ -@g;s@-I[ ]*[^ ]*@@g'`"
 	else
 		makedepend=""
 	fi
@@ -1798,24 +1606,27 @@ check_lipo() {
 	fi
 }
 
-check_osx_sdk() {
-	local sysroot=""
-	if [ -n "$1" ]; then
-		if echo "$1" | grep -q / ; then
-			# Seems to be a file system path
-			osx_sdk_path="$1"
-		else
-			osx_sdk_path="/Developer/SDKs/MacOSX$1.sdk"
-		fi
-		if [ ! -d "$osx_sdk_path" ]; then
-			# No directory, not present or garbage
-			return 1
-		fi
-
-		# Set minimum version to 10.4 as that's when kCGBitmapByteOrder32Host was introduced
-		sysroot="-isysroot $osx_sdk_path -Wl,-syslibroot,$osx_sdk_path -mmacosx-version-min=10.4"
+set_universal_binary_flags() {
+	if [ -z "$osx_target_version" ]; then
+		# if we don't speficy a target version then we presume 10.4
+		osx_target_version=10.4
 	fi
 
+	if [ "$osx_target_version" = "10.4" ]; then
+		# Apple added u to 10.4 to show that it's universal
+		# There is a version without the u, but it's only in Xcode 2.0 and people should use the free update to 2.5
+		osx_sysroot_version=10.4u
+	else
+		osx_sysroot_version="$osx_target_version"
+	fi
+
+	if [ "$with_osx_sysroot" = "3" ]; then
+		CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX$osx_sysroot_version.sdk -mmacosx-version-min=$osx_target_version"
+		LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$osx_sysroot_version.sdk -mmacosx-version-min=$osx_target_version"
+	fi
+}
+
+check_osx_sdk() {
 cat > tmp.osx.mm << EOF
 #include <Cocoa/Cocoa.h>
 int main() {
@@ -1823,13 +1634,18 @@ int main() {
 	return 0;
 }
 EOF
-	execute="$cxx_host $sysroot $CFLAGS tmp.osx.mm -framework Cocoa -o tmp.osx 2>&1"
+	execute="$cxx_host $CFLAGS tmp.osx.mm -framework Cocoa -o tmp.osx 2>&1"
 	eval $execute > /dev/null
 	ret=$?
 	log 2 "executing $execute"
 	log 2 "  exit code $ret"
 	rm -f tmp.osx.mm tmp.osx
-	return $ret
+	if [ "$ret" != "0" ]; then
+		log 1 "Your system SDK is probably too old"
+		log 1 "Please install/upgrade your Xcode to >= 2.5"
+
+		exit 1
+	fi
 }
 
 check_direct_music() {
@@ -1858,10 +1674,6 @@ check_direct_music() {
 }
 
 check_makedepend() {
-	if [ "$enable_builtin_depend" != "0" ]; then
-		with_makedepend="0"
-	fi
-
 	if [ "$with_makedepend" = "0" ]; then
 		log 1 "checking makedepend... disabled"
 		return
@@ -1963,7 +1775,6 @@ detect_os() {
 					/hp-ux/        { print "HPUX";    exit}
 					/morphos/      { print "MORPHOS"; exit}
 					/beos/         { print "BEOS";    exit}
-					/haiku/        { print "HAIKU";   exit}
 					/sunos/        { print "SUNOS";   exit}
 					/solaris/      { print "SUNOS";   exit}
 					/cygwin/       { print "CYGWIN";  exit}
@@ -1984,19 +1795,17 @@ detect_os() {
 					/hp-ux/        { print "HPUX";    exit}
 					/morphos/      { print "MORPHOS"; exit}
 					/beos/         { print "BEOS";    exit}
-					/haiku/        { print "HAIKU";   exit}
 					/sunos/        { print "SUNOS";   exit}
 					/cygwin/       { print "CYGWIN";  exit}
 					/mingw/        { print "MINGW";   exit}
 					/os\/2/        { print "OS2";     exit}
-					/gnu/          { print "UNIX";    exit}
 			'`
 		fi
 
 		if [ -z "$os" ]; then
 			log 1 "detecting OS... none detected"
 			log 1 "I couldn't detect your OS. Please use --os=OS to force one"
-			log 1 "Allowed values are: UNIX, OSX, FREEBSD, OPENBSD, NETBSD, MORPHOS, HPUX, BEOS, HAIKU, SUNOS, CYGWIN, MINGW, OS2, DOS, WINCE, and PSP"
+			log 1 "Allowed values are: UNIX, OSX, FREEBSD, OPENBSD, NETBSD, MORPHOS, HPUX, BEOS, SUNOS, CYGWIN, MINGW, OS2, DOS, WINCE, and PSP"
 			exit 1
 		fi
 
@@ -2137,39 +1946,6 @@ detect_sdl() {
 	log 1 "checking SDL... found"
 }
 
-detect_osx_sdk() {
-	# Try to find the best SDK available. For a normal build this
-	# is currently the 10.5 SDK as this is needed to compile all
-	# optional code. Because such an executable won't run on 10.4
-	# or lower, also check for the 10.4u SDK when doing an universal
-	# build.
-
-	# Check for the 10.5 SDK, but try 10.6 if that fails
-	check_osx_sdk "10.5" ||	check_osx_sdk "10.6" || osx_sdk_path=""
-
-	if [ -z "$osx_sdk_path" ] || [ "$enable_universal" != "0" ]; then
-		# No better SDK or universal build enabled? Check 10.4u SDK as well
-		local old_sdk="$osx_sdk_path"
-		if check_osx_sdk "10.4u"; then
-			osx_sdk_104_path="$osx_sdk_path"
-		else
-			osx_sdk_104_path=""
-		fi
-		if [ -z "$old_sdk" ]; then
-			osx_sdk_path="$osx_sdk_104_path"
-		else
-			osx_sdk_path="$old_sdk"
-		fi
-	fi
-
-	if [ -z "$osx_sdk_path" ]; then
-		log 1 "Your system SDK is probably too old"
-		log 1 "Please install/upgrade your Xcode to >= 2.5"
-
-		exit 1
-	fi
-}
-
 detect_cocoa() {
 	# 0 means no, 1 is auto-detect, 2 is force
 	if [ "$with_cocoa" = "0" ]; then
@@ -2215,66 +1991,21 @@ detect_cocoa() {
 		log 1 "checking whether to enable the Quartz window subdriver... no"
 	fi
 
-	detect_quickdraw
-}
-
-detect_quickdraw() {
-	# 0 means no, 1 is auto-detect, 2 is force
-	if [ "$enable_cocoa_quickdraw" = "0" ]; then
-		log 1 "checking Quickdraw window subdriver... disabled"
-		return 0
+	if [ "$enable_cocoa_quickdraw" != "0" ]; then
+		log 1 "checking whether to enable the Quickdraw window subdriver... yes"
+	else
+		log 1 "checking whether to enable the Quickdraw window subdriver... no"
 	fi
-
-	# Assume QuickDraw is available when doing an universal build
-	if [ "$enable_universal" != "0" ]; then
-		log 1 "checking Quickdraw window subdriver... found"
-		return 0
-	fi
-
-	# 64 bits doesn't have quickdraw
-	if [ "$cpu_type" = "64" ]; then
-		enable_cocoa_quickdraw="0"
-		log 1 "checking Quickdraw window subdriver... disabled (64 bits)"
-		return 0
-	fi
-
-cat > tmp.osx.mm << EOF
-#include <AvailabilityMacros.h>
-#import <Cocoa/Cocoa.h>
-int main(int argc, char *argv[]) { SetEmptyRgn(NULL); return 0; }
-EOF
-	execute="$cxx_host $OSX_SYSROOT $OSX_LD_SYSROOT $CFLAGS -mmacosx-version-min=10.3 tmp.osx.mm -framework Cocoa -o tmp.osx 2>&1"
-	eval $execute > /dev/null
-	ret=$?
-	log 2 "executing $execute"
-	log 2 "  exit code $ret"
-	rm -f tmp.osx.mm tmp.osx
-	if [ "$ret" != "0" ]; then
-		log 1 "checking Quickdraw window subdriver... not found"
-
-		# It was forced, so it should be found.
-		if [ "$enable_cocoa_quickdraw" != "1" ]; then
-			log 1 "configure: error: Quickdraw window driver could not be found"
-			exit 1
-		fi
-
-		enable_cocoa_quickdraw=0
-		return 0
-	fi
-
-	enable_cocoa_quickdraw=1
-	log 1 "checking Quickdraw window subdriver... found"
 }
 
 detect_library() {
 	# $1 - config-param ($with_zlib value)
 	# $2 - library name ('zlib', sets $zlib)
 	# $3 - static library name (libz.a)
-	# $4 - header directory ()
-	# $5 - header name (zlib.h)
-	# $6 - force static (if non-empty)
+	# $4 - header name (zlib.h)
+	# $5 - force static (if non-empty)
 
-	if [ -n "$6" ]; then force_static="1"; fi
+	if [ -n "$5" ]; then force_static="1"; fi
 
 	# 0 means no, 1 is auto-detect, 2 is force
 	if [ "$1" = "0" ]; then
@@ -2287,15 +2018,15 @@ detect_library() {
 	log 2 "detecting $2"
 
 	if [ "$1" = "1" ] || [ "$1" = "" ] || [ "$1" = "2" ]; then
-		eval "$2=`ls -1 /usr/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
+		eval "$2=`ls -1 /usr/include/*.h 2>/dev/null | egrep \"\/$4\$\"`"
 		eval "res=\$$2"
 		if [ -z "$res" ]; then
-			log 2 "  trying /usr/include/$4$5... no"
-			eval "$2=`ls -1 /usr/local/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
+			log 2 "  trying /usr/include/$4... no"
+			eval "$2=`ls -1 /usr/local/include/*.h 2>/dev/null | egrep \"\/$4\$\"`"
 		fi
 		eval "res=\$$2"
 		if [ -z "$res" ]; then
-			log 2 "  trying /usr/local/include/$4$5... no"
+			log 2 "  trying /usr/local/include/$4... no"
 		fi
 
 		eval "res=\$$2"
@@ -2358,15 +2089,11 @@ detect_library() {
 }
 
 detect_zlib() {
-	detect_library "$with_zlib" "zlib" "libz.a" "" "zlib.h"
-}
-
-detect_lzo2() {
-	detect_library "$with_lzo2" "lzo2" "liblzo2.a" "lzo/" "lzo1x.h"
+	detect_library "$with_zlib" "zlib" "libz.a" "zlib.h"
 }
 
 detect_libtimidity() {
-	detect_library "$with_libtimidity" "libtimidity" "libtimidity.a" "" "timidity.h"
+	detect_library "$with_libtimidity" "libtimidity" "libtimidity.a" "timidity.h"
 }
 
 detect_png() {
@@ -2508,12 +2235,6 @@ detect_fontconfig() {
 		return 0
 	fi
 
-	if [ "$os" = "OSX" ]; then
-		log 1 "checking libfontconfig... OSX, skipping"
-		fontconfig_config=""
-		return 0
-	fi
-
 	if [ "$with_fontconfig" = "1" ] || [ "$with_fontconfig" = "" ] || [ "$with_fontconfig" = "2" ]; then
 		fontconfig_config="pkg-config fontconfig"
 	else
@@ -2714,7 +2435,7 @@ int main() {
 	return iconv(convd, &inbuf, &inlen, &outbuf, &outlen);
 }
 EOF
-	execute="$cxx_host $OSX_SYSROOT $CFLAGS -c tmp.iconv.cpp -o tmp.iconv -DTESTING 2>&1"
+	execute="$cxx_host $CFLAGS -c tmp.iconv.cpp -o tmp.iconv -DTESTING 2>&1"
 	eval $execute > /dev/null
 	ret=$?
 	log 2 "executing $execute"
@@ -2735,7 +2456,7 @@ int main() {
 	return iconv(convd, &inbuf, &inlen, &outbuf, &outlen);
 }
 EOF
-	execute="$cxx_host $OSX_SYSROOT $OSX_LD_SYSROOT $CFLAGS tmp.iconv.cpp -o tmp.iconv -DTESTING 2>&1"
+	execute="$cxx_host $CFLAGS tmp.iconv.cpp -o tmp.iconv -DTESTING 2>&1"
 	eval $execute > /dev/null
 	ret=$?
 	log 2 "executing $execute"
@@ -2828,7 +2549,6 @@ detect_cputype() {
 
 make_sed() {
 	T_CFLAGS="$CFLAGS"
-	T_CXXFLAGS="$CXXFLAGS"
 	T_LDFLAGS="$LDFLAGS"
 
 	SRC_OBJS_DIR="$BASE_SRC_OBJS_DIR/$OBJS_SUBDIR"
@@ -2847,12 +2567,9 @@ make_sed() {
 		s@!!LIPO!!@$lipo@g;
 		s@!!CFLAGS!!@$T_CFLAGS@g;
 		s@!!CFLAGS_BUILD!!@$CFLAGS_BUILD@g;
-		s@!!CXXFLAGS!!@$T_CXXFLAGS@g;
-		s@!!CXXFLAGS_BUILD!!@$CXXFLAGS_BUILD@g;
 		s@!!STRGEN_FLAGS!!@$strgen_flags@g;
 		s@!!LIBS!!@$LIBS@g;
 		s@!!LDFLAGS!!@$T_LDFLAGS@g;
-		s@!!LDFLAGS_BUILD!!@$LDFLAGS_BUILD@g;
 		s@!!BIN_DIR!!@$BIN_DIR@g;
 		s@!!ROOT_DIR!!@$ROOT_DIR@g;
 		s@!!MEDIA_DIR!!@$MEDIA_DIR@g;
@@ -2876,7 +2593,6 @@ make_sed() {
 		s@!!BINARY_NAME!!@$binary_name@g;
 		s@!!STRGEN!!@$STRGEN@g;
 		s@!!ENDIAN_CHECK!!@$ENDIAN_CHECK@g;
-		s@!!DEPEND!!@$DEPEND@g;
 		s@!!ENDIAN_FORCE!!@$endian@g;
 		s@!!STAGE!!@$STAGE@g;
 		s@!!MAKEDEPEND!!@$makedepend@g;
@@ -3002,50 +2718,22 @@ generate_src_normal() {
 generate_src_osx() {
 	cc_host_orig="$cc_host"
 	cxx_host_orig="$cxx_host"
-	CFLAGS_orig="$CFLAGS"
-	LDFLAGS_orig="$LDFLAGS"
-
-	if [ -n "$osx_sdk_104_path" ]; then
-		# Use 10.4 SDK for 32-bit targets
-		CFLAGS="-isysroot $osx_sdk_104_path $CFLAGS_orig"
-		LDFLAGS="-Wl,-syslibroot,$osx_sdk_104_path $LDFLAGS_orig"
-	fi
 
 	BASE_SRC_OBJS_DIR="$OBJS_DIR/ppc"
-	cc_host="$cc_host_orig -arch ppc -mmacosx-version-min=10.3"
-	cxx_host="$cxx_host_orig -arch ppc -mmacosx-version-min=10.3"
+	cc_host="$cc_host_orig -arch ppc"
+	cxx_host="$cxx_host_orig -arch ppc"
 	generate_src_normal "[PowerPC]" "objs/ppc"
 
-	BASE_SRC_OBJS_DIR="$OBJS_DIR/ppc970"
-	cc_host="$cc_host_orig -arch ppc970 -mmacosx-version-min=10.3 -mcpu=G5 -mpowerpc64 -mtune=970 -mcpu=970 -mpowerpc-gpopt"
-	cxx_host="$cxx_host_orig -arch ppc970 -mmacosx-version-min=10.3 -mcpu=G5 -mpowerpc64 -mtune=970 -mcpu=970 -mpowerpc-gpopt"
-	generate_src_normal "[PowerPC G5]" "objs/ppc970"
-
 	BASE_SRC_OBJS_DIR="$OBJS_DIR/intel"
-	cc_host="$cc_host_orig -arch i386 -mmacosx-version-min=10.4"
-	cxx_host="$cxx_host_orig -arch i386 -mmacosx-version-min=10.4"
+	cc_host="$cc_host_orig -arch i386"
+	cxx_host="$cxx_host_orig -arch i386"
 	generate_src_normal "[Intel]" "objs/intel"
 
-	if [ "$enable_universal" = "64" ]; then
-		# 64 bits is always 10.5 or higher. Furthermore it has a broken ICONV
-		# and they also removed support for QuickTime/QuickDraw
-		if [ -n "$osx_sdk_path" ]; then
-			CFLAGS="-isysroot $osx_sdk_path $CFLAGS_orig"
-			LDFLAGS="-Wl,-syslibroot,$osx_sdk_path $LDFLAGS_orig"
-		fi
-		CFLAGS="$CFLAGS -D_SQ64 -DHAVE_BROKEN_ICONV -DNO_QUICKTIME -UENABLE_COCOA_QUICKDRAW"
-		LIBS="`echo $LIBS | sed 's/-framework QuickTime//'`"
-
-		BASE_SRC_OBJS_DIR="$OBJS_DIR/ppc64"
-		cc_host="$cc_host_orig -arch ppc64 -mmacosx-version-min=10.5"
-		cxx_host="$cxx_host_orig -arch ppc64 -mmacosx-version-min=10.5"
-		generate_src_normal "[PowerPC 64 bits]" "objs/ppc64"
-
-		BASE_SRC_OBJS_DIR="$OBJS_DIR/intel64"
-		cc_host="$cc_host_orig -arch x86_64 -mmacosx-version-min=10.5"
-		cxx_host="$cxx_host_orig -arch x86_64 -mmacosx-version-min=10.5"
-		generate_src_normal "[Intel 64 bits]" "objs/intel64"
-	fi
+	BASE_SRC_OBJS_DIR="$OBJS_DIR/ppc970"
+	cc_host="$cc_host_orig -arch ppc970"
+	cxx_host="$cxx_host_orig -arch ppc970"
+	CFLAGS="$CFLAGS -mtune=970 -mcpu=970 -mpowerpc-gpopt"
+	generate_src_normal "[PowerPC G5]" "objs/ppc970"
 }
 
 generate_src() {
@@ -3080,7 +2768,7 @@ showhelp() {
 	echo "  --os=OS                        the OS we are compiling for [DETECT]"
 	echo "                                 DETECT/UNIX/OSX/FREEBSD/OPENBSD/NETBSD/"
 	echo "                                 MORPHOS/HPUX/BEOS/SUNOS/CYGWIN/MINGW/OS2/"
-	echo "                                 DOS/WINCE/PSP/HAIKU"
+	echo "                                 DOS/WINCE/PSP"
 	echo "  --endian=ENDIAN                set the endian of the HOST (AUTO/LE/BE)"
 	echo "  --revision=rXXXX               overwrite the revision detection."
 	echo "                                 Use with care!"
@@ -3120,8 +2808,6 @@ showhelp() {
 	echo "  --enable-debug[=LVL]           enable debug-mode (LVL=[0123], 0 is release)"
 	echo "  --enable-desync-debug=[LVL]    enable desync debug options (LVL=[012], 0 is none"
 	echo "  --enable-profiling             enables profiling"
-	echo "  --enable-lto                   enables GCC's Link Time Optimization (LTO)/ICC's"
-	echo "                                 Interprocedural Optimization if available"
 	echo "  --enable-dedicated             compile a dedicated server (without video)"
 	echo "  --enable-static                enable static compile (doesn't work for"
 	echo "                                 all HOSTs)"
@@ -3152,25 +2838,20 @@ showhelp() {
 	echo "  --with-cocoa                   enables COCOA video driver (OSX ONLY)"
 	echo "  --with-sdl[=sdl-config]        enables SDL video driver support"
 	echo "  --with-zlib[=zlib.a]           enables zlib support"
-	echo "  --with-liblzo2[=liblzo2.a]     enables liblzo2 support"
 	echo "  --with-png[=libpng-config]     enables libpng support"
 	echo "  --with-freetype[=freetype-config]"
 	echo "                                 enables libfreetype support"
 	echo "  --with-fontconfig[=pkg-config fontconfig]"
 	echo "                                 enables fontconfig support"
 	echo "  --with-icu[=icu-config]        enables icu (used for right-to-left support)"
-	echo "  --static-icu                   try to link statically (libsicu instead of"
-	echo "                                 libicu; can fail as the new name is guessed)"
 	echo "  --with-iconv[=iconv-path]      enables iconv support"
 	echo "  --with-psp-config[=psp-config] enables psp-config support (PSP ONLY)"
-	echo "  --disable-builtin-depend       disable use of builtin deps finder"
 	echo "  --with-makedepend[=makedepend] enables makedepend support"
 	echo ""
 	echo "Some influential environment variables:"
 	echo "  CC                             C compiler command"
 	echo "  CXX                            C++ compiler command"
 	echo "  CFLAGS                         C compiler flags"
-	echo "  CXXFLAGS                       C++ compiler flags"
 	echo "  WINDRES                        windres command"
 	echo "  LDFLAGS                        linker flags, e.g. -L<lib dir> if you"
 	echo "                                 have libraries in a nonstandard"

configure

@@ -1,12 +1,5 @@
 #!/bin/sh
 
-# $Id$
-
-# This file is part of OpenTTD.
-# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-
 check_path_characters() {
 	if [ -n "`echo $ROOT_DIR | grep '[^-_A-Za-z0-9\/\\\.:]'`" ]; then
 		echo "WARNING: The path contains a non-alphanumeric character that might cause"
@@ -80,7 +73,6 @@ fi
 TTD="openttd$EXE"
 STRGEN="strgen$EXE"
 ENDIAN_CHECK="endian_check$EXE"
-DEPEND="depend$EXE"
 
 if [ -z "$sort" ]; then
 	PIPE_SORT="sed s@a@a@"
@@ -115,10 +107,9 @@ AWKCOMMAND='
 		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" &&
-		                                       "'$os'" != "HAIKU") { next; }
+		if ($0 == "BEOS"        && "'$os'" != "BEOS")              { next; }
 		if ($0 == "WIN32"       && "'$os'" != "MINGW" &&
-		                 "'$os'" != "CYGWIN" && "'$os'" != "MSVC") { next; }
+		                "'$os'" != "CYGWIN" && "'$os'" != "MSVC" ) { next; }
 		if ($0 == "MORPHOS"     && "'$os'" != "MORPHOS")           { next; }
 		if ($0 == "WINCE"       && "'$os'" != "WINCE")             { next; }
 		if ($0 == "MSVC"        && "'$os'" != "MSVC")              { next; }

docs/32bpp.txt

@@ -27,7 +27,7 @@ OpenTTD palette. Upon load of the PNG, the mask is loaded too, and overrides
 the RGB (not the Alpha) of the original PNG image, and replacing it with a
 8bpp color remapped and converted to 32bpp.
 
-Another thing that OpenTTD needs in your png, is 2 tEXt chunks: x_offs and
+An other thing that OpenTTD needs in your png, is 2 tEXt chunks: x_offs and
 y_offs. This to define the x- and y-offset, of course. Use the tool we supply
 to add this information. Sadly enough most graphical editors trashes those
 chunks upon save, so you have to readd it every time you save your image.

docs/Manual.txt

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

docs/OSX_install_instructions.txt

@@ -0,0 +1,23 @@
+To install OpenTTD, you should drag the game to any location you want and in that folder, you should create a folder called "data". It should contain:
+sample.cat
+trg1r.grf
+trgcr.grf
+trghr.grf
+trgir.grf
+trgtr.grf
+
+(Alternatively you can use the TTD GRF files from the DOS version: TRG1.GRF, TRGC.GRF, TRGH.GRF, TRGI.GRF, TRGT.GRF. A few minor graphical glitches with the DOS graphics remain. E.g. the autorail button in the rail toolbar doesn't look as nice as with the Windows graphics.)
+
+You should also use the data folder to add any custom grf files if you like
+
+if you want music, you can add a GM folder and add all .gm files from TTD inside it
+
+If you want to use the scenarios, you can copy the scenario folder as well. If you already have one, just copy the content so you don't overwrite old ones that have been removed.
+
+In the end, you should have a folder containing:
+OpenTTD (the actual game)
+data (containing the grf files)
+GM   (optional for music)
+scenario (optional pregenerated maps)
+
+The game adds some items by itself when it runs, like a save folder and a setting file

docs/Readme_Windows_MSVC.txt

@@ -1,5 +1,5 @@
 Compiling OpenTTD using Microsoft Visual C++
-Last updated: 2010-01-03
+January 2, 2007
 --------------------------------------------
 PLEASE READ THE ENTIRE DOCUMENT BEFORE DOING ANY ACTUAL CHANGES!!
 
@@ -10,7 +10,7 @@ OpenTTD includes projects for MSVC 2005.NET and MSVC 2008.NET. Both will
 compile out of the box, providing you have the required libraries/headers;
 which ones, see below. There is no support for VS6 or MSVC 2002, or
 MSVC 2003.NET. You are therefore strongly encouraged to either upgrade to
-MSVC 2008 Express (free) or use GCC.
+MSVC 2005 Express (free) or use GCC.
 
 
 1) REQUIRED FILES
@@ -36,16 +36,16 @@ You need an SVN-client to download the source from subversion:
 2) INCLUDES AND LIBRARIES
 -------------------------
 Put the newly downloaded files in the VC lib\ and include\ directories; where
-"C:\Program Files\Microsoft Visual Studio 9.0\VC" is your location of Visual C.
+"C:\Program Files\Microsoft Visual Studio 8\VC" is your location of Visual C.
 If you are compiling for an x64 system, use the include\ and lib\ directories
 from the win64/ folder.
 
 	* openttd-useful.zip\include\*
 	* afxresh.h
-	to >	C:\Program Files\Microsoft Visual Studio 9.0\VC\Include
+	to >	C:\Program Files\Microsoft Visual Studio 8\VC\Include
 
 	* openttd-useful.zip\lib\*
-	to >	C:\Program Files\Microsoft Visual Studio 9.0\VC\Lib
+	to >	C:\Program Files\Microsoft Visual Studio 8\VC\Lib
 
 Custom directories might be recommended, check 2.2)
 
@@ -76,7 +76,14 @@ list, above all others, otherwise compilation will most likely fail!!
 
 3) TTD GRAPHICS FILES
 ---------------------
-See section 4.1 of readme.txt for the required 3rdparty files and how to install them.
+Copy the following files from Transport Tycoon Deluxe to the bin/data folder
+
+	* sample.cat
+	* trg1r.grf
+	* trgcr.grf
+	* trghr.grf
+	* trgir.grf
+	* trgtr.grf
 
 
 4) COMPILING
@@ -105,4 +112,4 @@ to ask about reasons; or just wait. The problem will most likely solve itself
 within a few days as the problem is noticed and fixed.
 
 An up-to-date version of this README can be found on the wiki:
-http://wiki.openttd.org/Microsoft_Visual_C%2B%2B_2008_Express_Editions
+http://wiki.openttd.org/index.php/MicrosoftVisualCExpress

docs/landscape.html

@@ -11,13 +11,12 @@
 <body>
 
  <h3><a name="Landscape">Landscape</a></h3>
- <p>Eight attributes (counting &quot;<span style="font-weight: bold;">type_height</span>&quot;) hold the informations about a tile.<BR>
+ <p>Seven attributes (counting &quot;<span style="font-weight: bold;">type_height</span>&quot;) hold the informations about a tile.<BR>
   These attributes are referred to as
   "<span style="font-weight: bold;">type_height</span>",
   "<span style="font-weight: bold;">m1</span>", "<span style="font-weight: bold;">m2</span>",
   "<span style="font-weight: bold;">m3</span>", "<span style="font-weight: bold;">m4</span>",
-  "<span style="font-weight: bold;">m5</span>", "<span style="font-weight: bold;">m6</span>"
-  and "<span style="font-weight: bold;">m7</span>".<BR>
+  "<span style="font-weight: bold;">m5</span>" and "<span style="font-weight: bold;">m6</span>".<BR>
   The most important value is the class of a tile, stored in the upper 4 bits
   of the <span style="font-weight: bold;">type_height</span> attribute. The lower 4 bits are used to encode the height and
   slope data.
@@ -53,10 +52,11 @@
  </p>
 
   The <a name="OwnershipInfo">owner of a tile</a>, as frequently associated with attribute m1,
-  can be either companies (human or AI) or "Game entities".
+  can be either players (human or AI) or "Game entities".
   They are identified using:
   <table border="1">
-   <tr><td><tt>00..0E</tt>&nbsp; </td><td align=left>Normal companies</td></tr>
+   <tr><td><tt>00</tt>&nbsp; </td><td align=left>current player</td></tr>
+   <tr><td><tt>01..08</tt>&nbsp; </td><td align=left>AI or network players</td></tr>
    <tr><td><tt>0F</tt>&nbsp; </td><td align=left>a town owns the tile</td></tr>
    <tr><td><tt>10</tt>&nbsp; </td><td align=left>nobody owns the tile</td></tr>
    <tr><td><tt>11</tt>&nbsp; </td><td align=left>"water" owns the tile</td></tr>
@@ -81,7 +81,6 @@
      <li>m1: <a href="#OwnershipInfo">owner</a> of the tile (normally <tt>10</tt>)</li>
      <li>m2: see fields</li>
      <li>m3 bits 3..0: see fields</li>
-     <li>m3 bit 4: set if the tile is covered with snow</li>
      <li>m4 bits 7..5: type of hedge on the SW border of the tile (1 through 6, or 0=none)</li>
      <li>m4 bits 4..2: same as 7..5, but for the SE border</li>
      <li>m5 bits 7..5: update counter, incremented on every periodic processing for tile types,
@@ -184,7 +183,7 @@
    <td>
     <ul>
      <li>m1: <a href="#OwnershipInfo">owner</a> of the tile</li>
-     <li>m2: see signals</li>
+     <li>m2: see waypoint and signals</li>
      <li>m3 bits 7..4: see signals</li>
      <li>m3 bits 3..0 = <a name="TrackType">track type</a>:
       <table>
@@ -453,9 +452,27 @@
        <li>m2 bit 11: opposite track is reserved, too</li>
       </ul>
      </li>
+     <li>m5 bit 7 set, bit 6 clear: checkpoint
+      <ul>
+       <li>m2: index into the array of waypoints.</li>
+       <li>m5 bit 0:
+        <table>
+         <tr>
+          <td><tt>0</tt>&nbsp; </td>
+          <td>in X direction</td>
+         </tr>
+
+         <tr>
+          <td><tt>1</tt>&nbsp; </td>
+          <td>in Y direction</td>
+         </tr>
+        </table>
+       </li>
+       <li>m5 bit 4: pbs reservation state</li>
+      </ul>
+     </li>
      <li>m5 bit 7 set, bit 6 set: railway depot
       <ul>
-       <li>m2: Depot index</li>
        <li>m5 bits 1..0: exit towards
         <table>
          <tr>
@@ -602,7 +619,7 @@
           </table>
          </li>
          <li>m5 bit 5: set if crossing lights are on</li>
-         <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</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>
         </ul>
        </li>
@@ -611,7 +628,6 @@
      <li>m5 bit 7 set, bit 6 clear: road depot
       <ul>
        <li>m1: <a href="#OwnershipInfo">owner</a> of the depot</li>
-       <li>m2: Depot index</li>
        <li>m5 bits 3..0: exit towards:
         <table>
          <tr>
@@ -724,7 +740,8 @@
    <td>
     <ul>
      <li>m1: <a href="#OwnershipInfo">owner</a> (normally <tt>10</tt>)</li>
-     <li>m2 bits 8..6: ground
+     <li>m2 bits 7..6: ground density
+     <li>m2 bits 5..4: ground
       <table>
 
        <tr>
@@ -746,14 +763,8 @@
         <td align=left><tt>3</tt>&nbsp; </td>
         <td>on shore (density must be 3)</td>
        </tr>
-
-       <tr>
-        <td align=left><tt>4</tt>&nbsp; </td>
-        <td>on snow with rough land underneed</td>
-       </tr>
       </table>
      </li>
-     <li>m2 bits 5..4: ground density</li>
      <li>m2 bits 3..0: update counter, incremented on every periodic processing.<br>
           on wraparound the growth status is updated (or, if it's <tt>3</tt>, a random action is taken)</li>
      <li>m3 bits 7..0: type of trees:
@@ -824,9 +835,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 (railway stations/waypoints)</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 3..0: <a href="#TrackType">track type</a> for railway stations/waypoints</li>
+     <li>m3 bits 3..0: <a href="#TrackType">track type</a> for railway stations</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):
@@ -854,22 +865,6 @@
         </td>
        </tr>
 
-       <tr>
-        <td nowrap valign=top><tt>00</tt>..<tt>01</tt></td>
-        <td align=left>waypoints
-         <table>
-          <tr>
-           <td><tt>00</tt>&nbsp; </td>
-           <td align=left>in X direction</td>
-          </tr>
-          <tr>
-           <td><tt>01</tt>&nbsp; </td>
-           <td align=left>in Y direction</td>
-          </tr>
-         </table>
-        </td>
-       </tr>
-
        <tr>
         <td nowrap valign=top><tt>00</tt>..<tt>8F</tt></td>
         <td align=left>all airports</td>
@@ -877,7 +872,7 @@
 
        <tr>
         <td nowrap valign=top><tt>00</tt>..<tt>05</tt>&nbsp; </td>
-        <td align=left>road stops
+        <td align=left>road stops:
          <table>
           <tr>
            <td><tt>00</tt>&nbsp; </td>
@@ -940,13 +935,13 @@
        </tr>
       </table>
      </li>
-     <li>m6 bits 5..3: the station type (rail, airport, truck, bus, oilrig, dock, buoy, waypoint)</li>
-     <li>m6 bit 2: pbs reservation state for railway stations/waypoints</li>
+     <li>m6 bits 5..3: the station type (rail, airport, truck, bus, oilrig, dock, buoy)</li>
+     <li>m6 bit 2: pbs reservation state for railway stations</li>
 
      <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
      <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road (road stops)</li>
      <li>m7 bits 7..6: present road types (road stops)</li>
-     <li>m7: animation frame (railway stations/waypoints)</li>
+     <li>m7: animation frame (train station)</li>
     </ul>
    </td>
   </tr>
@@ -960,7 +955,6 @@
    <td>
     <ul>
      <li>m1: <a href="#OwnershipInfo">owner</a> (for sea, rivers, and coasts normally <tt>11</tt>)</li>
-     <li>m2: Depot index (for depots only)</li>
      <li>m3 bits 1..0 : Water class (sea, canal or river)
      <li>m4: Random data for canal or river tiles</li>
      <li>m5: tile type:

docs/landscape_grid.html

@@ -68,7 +68,7 @@ the array so you can quickly see what is used and what is not.
       <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="option">~~~~ ~~~~</span></td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOO</span>X <span class="free">OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XXXX XX<span class="free">OO</span></td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
@@ -79,14 +79,14 @@ the array so you can quickly see what is used and what is not.
       <td class="bits">-inherit-</td>
       <td class="bits"><span class="option">~~~~ ~~~~</span></td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits"><span class="free">OOO</span>X XXXX</td>
+      <td class="bits"><span class="free">OOOO</span> XXXX</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
-      <td rowspan=3>1</td>
+      <td rowspan=4>1</td>
       <td class="caption">rail</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="option">~~~</span>X XXXX</td>
@@ -112,13 +112,24 @@ the array so you can quickly see what is used and what is not.
       <td class="caption">depot</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">XXXX XXXX XXXX XXXX</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">XX<span class="free">O</span>X <span class="free">O</span>XXX</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
+    <tr>
+      <td class="caption">waypoint</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">XXXX XXXX XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO</span> <span class="option">~~</span>XX</td>
+      <td class="bits"><span class="free">OOOO</span> XXXX</td>
+      <td class="bits">XX<span class="free">O</span>X <span class="free">OOO</span>X</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
+    </tr>
     <tr>
       <td rowspan=3>2</td>
       <td class="caption">road</td>
@@ -146,7 +157,7 @@ the array so you can quickly see what is used and what is not.
       <td class="caption">road depot</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">XXXX XXXX XXXX XXXX</td>
+      <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
@@ -170,7 +181,7 @@ the array so you can quickly see what is used and what is not.
       <td class="caption">trees</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="option">~~~~ ~~~~</span></td>
-      <td class="bits"><span class="free">OOOO OOO</span>X XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span> XXXX XXXX</td>
       <td class="bits"><span class="option">~~</span>XX XXXX</td>
       <td class="bits">XXXX XX<span class="free">OO</span></td>
       <td class="bits">XX<span class="free">OO O</span>XXX</td>
@@ -178,7 +189,7 @@ the array so you can quickly see what is used and what is not.
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
-      <td rowspan=7>5</td>
+      <td rowspan=6>5</td>
       <td class="caption">rail station</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="option">~~~</span>X XXXX</td>
@@ -189,27 +200,16 @@ the array so you can quickly see what is used and what is not.
       <td class="bits"><span class="free">OO</span>XX XXXX</td>
       <td class="bits">XXXX XXXX</td>
     </tr>
-    <tr>
-      <td class="caption">rail waypoint</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-    </tr>
     <tr>
       <td class="caption">road stop</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">XXXX <span class="free">OOOO</span></td>
+      <td class="bits">XXXX XXXX</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">XX<span class="free">O</span>X XXXX</td>
+      <td class="bits">XXXX X<span class="free">O</span>XX</td>
     </tr>
     <tr>
       <td class="caption">dock</td>
@@ -282,7 +282,7 @@ the array so you can quickly see what is used and what is not.
       <td class="caption">shipdepot</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">XXXX XXXX XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">-inherit-</td>

docs/obg_format.txt

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

docs/obm_format.txt

@@ -1,106 +0,0 @@
-;
-; Example file for the OpenTTD Base Music replacement sets.
-; This file consists of basically two different parts:
-;  * metadata
-;  * information about the files/songs
-;
-; Metadata contains information about the name and version
-; of the music set.
-;
-; == Getting started ==
-; - you can't add comments after values
-; - you have to fill the MD5 checksum for each file
-; - you may not miss any of the metadata or files items
-; - `openttd -h` lists all music replacement sets it found to be correct
-; - `openttd -d grf=1` shows warnings/errors when parsing an .obm file
-; - `openttd -M <name>` starts OpenTTD with the given set (case sensitive)
-; - adding `musicset = <name>` to the misc section of openttd.cfg makes
-;   OpenTTD start with that sound set by default
-; - there is a command line tool for all platforms called md5sum that can
-;   create the MD5 checksum you need.
-; - all files specified in this file are search relatively to the path where
-;   this file is found, i.e. if the sound files are in a subdir you have
-;   to add that subdir to the names in this file to! It will NOT search for
-;   a file named like specified in here.
-
-[metadata]
-; the name of the pack, preferably less than 16 characters
-name         = example
-; the short name (4 characters), used to identify this set
-shortname    = XMPL
-; the version of this sound set (read as single integer)
-version      = 0
-; a fairly short description of the set
-; By adding '.<iso code>' you can translate the description.
-; Note that OpenTTD first tries the full ISO code, then the first
-; two characters and then uses the fallback (no '.<iso code>').
-; The ISO code matching is case sensitive!
-; So en_US will be used for en_GB if no en_GB translation is added.
-; As a result the below example has 'howdie' for en_US and en_GB but
-; 'foo' for all other languages.
-description  = foo
-description.en_US = howdie
-
-; The files section lists the files that replace songs.
-; The file names are case sensitive.
-; You can have empty file names; in that case no song will be loaded
-; for that 'entry'.
-[files]
-; The theme song for OpenTTD
-theme = THEME_SONG.GM
-; The songs in the 'old style' category
-old_0 =
-old_1 =
-old_2 =
-old_3 =
-old_4 =
-old_5 =
-old_6 =
-old_7 =
-old_8 =
-old_9 =
-; The songs in the 'new style' category
-new_0 =
-new_1 =
-new_2 =
-new_3 =
-new_4 =
-new_5 =
-new_6 =
-new_7 =
-new_8 =
-new_9 =
-; The songs in the 'ezy street' category
-ezy_0 =
-ezy_1 =
-ezy_2 =
-ezy_3 =
-ezy_4 =
-ezy_5 =
-ezy_6 =
-ezy_7 =
-ezy_8 =
-ezy_9 =
-
-; The names section lists the song names for the given file name.
-; Note that the list of files is case sensitive. Each file listed in the
-; files section must be listed here with it's song name, otherwise you
-; will get a lot of warnings when starting OpenTTD.
-[names]
-THEME_SONG.GM = Tycoon DELUXE Theme
-
-; The md5s section lists the MD5 checksum for the files that replace them.
-; Note that the list of files is case sensitive. Each file listed in the
-; files section must be listed here with it's MD5 checksum, otherwise you
-; will get a lot of warnings when starting OpenTTD.
-[md5s]
-THEME_SONG.GM = 45cfec1b9d8c7a0ad45e755833cbf221
-
-; The origin section provides the possibility to put and extra line into
-; the warning that a file is missing/corrupt. This can be used to tell
-; them where to find it. It works on the filename specified in the
-; files section and if that is not found it will fall back to the default
-; as shown below here.
-[origin]
-default       = You can find it on your Transport Tycoon Deluxe CD-ROM.
-THEME_SONG.GM  = You can find it also on your Transport Tycoon Deluxe CD-ROM.

docs/obs_format.txt

@@ -1,64 +0,0 @@
-;
-; Example file for the OpenTTD Base Sound replacement sets.
-; This file consists of basically two different parts:
-;  * metadata
-;  * information about the files
-;
-; Metadata contains information about the name and version
-; of the sound set.
-;
-; == Getting started ==
-; - you can't add comments after values
-; - you have to fill the MD5 checksum for each file
-; - you may not miss any of the metadata or files items
-; - `openttd -h` lists all sound replacements sets it found to be correct
-; - `openttd -d grf=1` shows warnings/errors when parsing an .obs file
-; - `openttd -S <name>` starts OpenTTD with the given set (case sensitive)
-; - adding `soundsset = <name>` to the misc section of openttd.cfg makes
-;   OpenTTD start with that sound set by default
-; - there is a command line tool for all platforms called md5sum that can
-;   create the MD5 checksum you need.
-; - all files specified in this file are search relatively to the path where
-;   this file is found, i.e. if the sound files are in a subdir you have
-;   to add that subdir to the names in this file to! It will NOT search for
-;   a file named like specified in here.
-
-[metadata]
-; the name of the pack, preferably less than 16 characters
-name         = example
-; the short name (4 characters), used to identify this set
-shortname    = XMPL
-; the version of this sound set (read as single integer)
-version      = 0
-; a fairly short description of the set
-; By adding '.<iso code>' you can translate the description.
-; Note that OpenTTD first tries the full ISO code, then the first
-; two characters and then uses the fallback (no '.<iso code>').
-; The ISO code matching is case sensitive!
-; So en_US will be used for en_GB if no en_GB translation is added.
-; As a result the below example has 'howdie' for en_US and en_GB but
-; 'foo' for all other languages.
-description  = foo
-description.en_US = howdie
-
-; The files section lists the files that replace sprites.
-; The file names are case sensitive.
-[files]
-; The file with the samples. Must contain exactly 73 samples.
-samples      = SAMPLES.CAT
-
-; The md5s section lists the MD5 checksum for the files that replace them.
-; Note that the list of files is case sensitive. Each file listed in the
-; files section must be listed here with it's MD5 checksum, otherwise you
-; will get a lot of warnings when starting OpenTTD.
-[md5s]
-SAMPLES.CAT  = 422ea3dd074d2859bb51639a6e0e85da
-
-; The origin section provides the possibility to put and extra line into
-; the warning that a file is missing/corrupt. This can be used to tell
-; them where to find it. It works on the filename specified in the
-; files section and if that is not found it will fall back to the default
-; as shown below here.
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
-SAMPLES.CAT  = You can find it also on your Transport Tycoon Deluxe CD-ROM.

docs/openttd.6

@@ -1,6 +1,6 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd Jan 18, 2010
+.Dd Feb 05, 2009
 .Dt OPENTTD 6
 .Sh NAME
 .Nm openttd
@@ -11,7 +11,7 @@
 .Op Fl a Ar ai
 .Op Fl b Ar blitter
 .Op Fl c Ar config_file
-.Op Fl d Ar [level | cat=lvl[,...]]
+.Op Fl d Ar [level | cat=lvl[, ...]]
 .Op Fl D Ar [host][:port]
 .Op Fl g Ar [savegame]
 .Op Fl G Ar seed
@@ -19,13 +19,9 @@
 .Op Fl I Ar graphicsset
 .Op Fl l Ar host[:port]
 .Op Fl m Ar driver
-.Op Fl M Ar musicset
 .Op Fl n Ar host[:port][#player]
-.Op Fl p Ar password
-.Op Fl P Ar password
 .Op Fl r Ar widthxheight
 .Op Fl s Ar driver
-.Op Fl S Ar soundset
 .Op Fl t Ar year
 .Op Fl v Ar driver
 .Sh OPTIONS
@@ -33,18 +29,16 @@
 .It Fl a Ar ai
 Set the AI, see
 .Fl h
-for a full list
 .It Fl b Ar blitter
 Set the blitter, see
 .Fl h
-for a full list
 .It Fl c Ar config_file
 Use 'config_file' instead of 'openttd.cfg'
 .It Fl d Ar [level]
 Set debug verbosity for all categories to
 .Ar level
 or 1 if omitted
-.It Fl d Ar cat=level[,...]
+.It Fl d Ar cat=level[, ...]
 Set debug verbosity for a specific category
 .It Fl D Ar [host][:port]
 Start a dedicated server. Sets network debug level to 6. If you want to change this, use
@@ -56,59 +50,38 @@ Seed the pseudo random number generator
 .It Fl e
 Start in world editor mode
 .It Fl f
-Fork into background (dedicated server only, see
+Fork into background (dedicated only, see
 .Fl D )
 .It Fl g Ar [savegame]
 Load
 .Ar savegame
-at start or start a new game if omitted. The
-.Ar savegame
-must be either absolute or relative to the current path or one of the search paths.
+at start or start a new game if omitted
 .It Fl h
-Display a summary of all options and lists all the available AIs, blitters, sound, music and video drivers, graphics sets and sound sets.
+Display a summary of all options and available AIs, blitters, drivers and graphic sets
 .It Fl i Ar palette
-Set the palette. '0' for the DOS palette, '1' for the Windows palette and '2' to autodetect (default).
-.sp
-The palette depends where the base graphics set originated from. If it came from the Transport Tycoon Deluxe for DOS it has the DOS palette, if it came from the Windows version of Transport Tycoon Deluxe it has the Windows palette. All others likely have the Windows palette as that is the most used palette.
+Set the palette, see
+.Fl h
 .It Fl I Ar graphicsset
 Set the graphics set, see
 .Fl h
-for a full list
 .It Fl l Ar host[:port]
 Redirect DEBUG(), See
 .Fl D
 .It Fl m Ar driver
 Set the music driver, see
 .Fl h
-for a full list
-.It Fl M Ar musicset
-Set the music set, see
-.Fl h
-for a full list
 .It Fl n Ar host[:port][#player]
-Join a network game, optionally specify a port to connect to and player to play as
-.It Fl p Ar password
-Password used to join server. Only useful with
-.Fl n
-.It Fl P Ar password
-Password used to join company. Only useful with
-.Fl n
+Join a network game, optionally specify player to play as and port to connect to
 .It Fl r Ar widthxheight
 Set the resolution
 .It Fl s Ar driver
 Set the sound driver, see
 .Fl h
-for a full list
-.It Fl S Ar soundset
-Set the sound set, see
-.Fl h
-for a full list
 .It Fl t Ar year
 Set the starting year
 .It Fl v Ar driver
 Set the video driver, see
 .Fl h
-for a full list
 .It Fl x
 Do not automatically save to config file on exit
 .El

findversion.sh

@@ -2,12 +2,6 @@
 
 # $Id$
 
-# This file is part of OpenTTD.
-# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-
-
 # Arguments given? Show help text.
 if [ "$#" != "0" ]; then
 	cat <<EOF

known-bugs.txt

@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2010-01-21
-Release version: 1.0.0-beta3
+Last updated:    2009-08-18
+Release version: 0.7.2
 ------------------------------------------------------------------------
 
 
@@ -34,12 +34,23 @@ 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.
 
-- 3447	[OSX] SDL port is unuseable
-- 3194	[OSX] Full screen strobing/flickering
-- 2782	[OSX] Port hopelessly outdated
+- 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
 - 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:
@@ -49,18 +60,7 @@ reasons why we think that fixing them is infeasible. We might make some
 minor improvements that reduce the scope of these bugs, but we will not
 be able to completely fix them.
 
-No suitable AI can be found
-	If you have no AIs and an AI is started the so-called 'dummy' AI will
-	be loaded. This AI does nothing but writing a message on the AI debug
-	window and showing a red warning. There are basically two solutions
-	for this problem: you must change the settings so no AI is started,
-	this is done in the difficulty settings window. The other solution is
-	acquiring (downloading) some AI. The easiest way to do this is via
-	the "Check Online Content" button in the main (intro) menu or via
-	"AI Settings" -> "Select AI" -> "Check Online Content" which is also
-	accessed via the main menu.
-
-Clipping problems [FS#119]
+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.
@@ -78,45 +78,7 @@ Clipping problems [FS#119]
 	leave the Transport Tycoon graphics, which in effect means OpenTTD
 	will not be a Transport Tycoon clone anymore.
 
-Lost trains ignore (block) exit signals [FS#1473]
-	If trains are lost they ignore block exit signals, blocking junctions
-	with presignals. This is caused because the path finders cannot tell
-	where the train needs to go. As such a random direction is chosen at
-	each junction. This causes the trains to occasionally to make choices
-	that are unwanted from a player's point of view.
-	This will not be fixed because lost trains are in almost all cases a
-	network problem, e.g. a train can never reach a specific place. This
-	makes the impact of fixing the bug enormously small against the
-	amount of work needed to write a system that prevents the lost trains
-	from taking the wrong direction.
-
-Vehicle owner of last transfer leg gets paid for all [FS#2427]
-	When you make a transfer system that switches vehicle owners. This
-	is only possible with 'industry stations', e.g. the oil rig station
-	the owner of the vehicle that does the final delivery gets paid for
-	the whole trip. It is not shared amongst the different vehicle
-	owners that have participated in transporting the cargo.
-	This sharing is not done because it would enormously increase the
-	memory and CPU usage in big games for something that is happening
-	in only one corner case. We think it is not worth the effort until
-	sharing of stations is an official feature.
-
-Forbid 90 degree turns does not work for crossing PBS paths [FS#2737]
-	When you run a train through itself on a X junction with PBS turned on
-	the train will not obey the 'forbid 90 degree turns' setting. This is
-	due to the fact that we can not be sure that the setting was turned
-	off when the track was reserved, which means that we assume it was
-	turned on and that the setting does not hold at the time. We made it
-	this way to allow one to change the setting in-game, but it breaks
-	slightly when you are running your train through itself. Running a
-	train through means that your network is broken and is thus a user
-	error which OpenTTD tries to graciously handle.
-	Fixing this bug means that we need to record whether this particular
-	setting was turned on or off at the time the reservation was made. This
-	means adding quite a bit of data to the savegame for solving an issue
-	that is basically an user error. We think it is not worth the effort.
-
-Duplicate (station) names after renaming [FS#3204]
+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.
@@ -132,41 +94,29 @@ Duplicate (station) names after renaming [FS#3204]
 	compared to the other custom names in the same class and not compared
 	to the automatically generated names.
 
-Extreme CPU usage/hangs when using SDL and PulseAudio [FS#3294]
-	OpenTTD can be extremely slow/use a lot of CPU when the sound is
-	played via SDL and then through PulseAudio's ALSA wrapper. Under the
-	same configuration OpenTTD, or rather SDL, might hang when exiting
-	the game. This problem is seen most in Ubuntu 9.04 and higher.
+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.
 
-	This is because recent versions of the PulseAudio sound server are
-	configured to use timer-based audio scheduling rather than
-	interrupt-based audio scheduling. Configuring PulseAudio to force
-	use of interrupt-based scheduling may resolve sound problems for
-	some users. Under recent versions of Ubuntu Linux (9.04 and higher)
-	this can be accomplished by changing the following line in the
-	/etc/pulsa/default.pa file:
-		load-module module-udev-detect
-	to
-		load-module module-udev-detect tsched=0
-	Note that PulseAudio must be restarted for changes to take effect.
-	Older versions of PulseAudio may use the module-hal-detect module
-	instead. Adding tsched=0 to the end of that line will have a similar
-	effect.
-
-	Another possible solution is selecting the "pulse" backend of SDL
-	by either using "SDL_AUDIODRIVER=pulse openttd" at the command
-	prompt or installing the 'libsdl1.2debian-pulseaudio' package from
-	Ubuntu's Universe repository. For other distributions a similar
-	package needs to be installed.
-
-OpenTTD not properly resizing with SDL on X [FS#3305]
-	Under some X window managers OpenTTD's window does not properly
-	resize. You will either end up with a black bar at the right/bottom
-	side of the window or you cannot see the right/bottom of the window,
-	e.g you cannot see the status bar. The problem is that OpenTTD does
-	not always receive a resize event from SDL making it impossible for
-	OpenTTD to know that the window was resized; sometimes moving the
-	window will solve the problem.
-	Window managers that are known to exhibit this behaviour are KDE's
-	and GNOME's. With the XFCE's and LXDE's window managers the resize
-	event is sent when the user releases the mouse.
+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.svg

@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="256"
-   height="256"
-   id="svg2"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="openttd.svg">
-  <metadata
-     id="metadata42">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1177"
-     id="namedview40"
-     showgrid="false"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="163.74991"
-     inkscape:cy="132.32268"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 124 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="256 : 124 : 1"
-       inkscape:persp3d-origin="128 : 82.666667 : 1"
-       id="perspective44" />
-    <linearGradient
-       id="linearGradient3421">
-      <stop
-         style="stop-color:#fe7600;stop-opacity:1"
-         offset="0"
-         id="stop3423" />
-      <stop
-         style="stop-color:#f2b26d;stop-opacity:1"
-         offset="1"
-         id="stop3425" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3269">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop3271" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1"
-         id="stop3273" />
-    </linearGradient>
-    <linearGradient
-       x1="312.62323"
-       y1="468.58658"
-       x2="315.21729"
-       y2="471.18063"
-       id="linearGradient3275"
-       xlink:href="#linearGradient3269"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="312.62323"
-       y1="468.58658"
-       x2="315.21729"
-       y2="471.18063"
-       id="linearGradient3289"
-       xlink:href="#linearGradient3269"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="312.62323"
-       y1="468.58658"
-       x2="315.21729"
-       y2="471.18063"
-       id="linearGradient3308"
-       xlink:href="#linearGradient3269"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7071068,-0.7071068,0.7071068,0.7071068,-266.24277,420.94154)" />
-    <linearGradient
-       x1="312.62323"
-       y1="468.58658"
-       x2="315.21729"
-       y2="471.18063"
-       id="linearGradient3326"
-       xlink:href="#linearGradient3269"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7071068,-0.7071068,0.7071068,0.7071068,-266.24277,420.94154)" />
-    <linearGradient
-       x1="312.62323"
-       y1="468.58658"
-       x2="315.21729"
-       y2="471.18063"
-       id="linearGradient3336"
-       xlink:href="#linearGradient3269"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.3591922,-0.1487874)" />
-    <linearGradient
-       x1="312.62323"
-       y1="468.58658"
-       x2="315.21729"
-       y2="471.18063"
-       id="linearGradient3406"
-       xlink:href="#linearGradient3269"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.2643187,40.455238)" />
-    <linearGradient
-       x1="133.3282"
-       y1="156.16792"
-       x2="117.66125"
-       y2="78.463249"
-       id="linearGradient3431"
-       xlink:href="#linearGradient3421"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="133.3282"
-       y1="156.16792"
-       x2="117.66125"
-       y2="78.463249"
-       id="linearGradient3488"
-       xlink:href="#linearGradient3421"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(2,2)" />
-    <filter
-       id="filter3566"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur3568"
-         stdDeviation="1.2236964"
-         inkscape:collect="always" />
-    </filter>
-    <linearGradient
-       x1="136.3282"
-       y1="151.16792"
-       x2="117.66125"
-       y2="78.463249"
-       id="linearGradient3571"
-       xlink:href="#linearGradient3421"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <g
-     transform="translate(-246.4375,-405.5443)"
-     id="layer1">
-    <path
-       d="m 127.34375,3.46875 c -0.48316,0.02376 -0.94805,0.22615 -1.3125,0.59375 L 7.65625,122.40625 c -0.78094,0.7811 -0.78094,2.06266 0,2.84375 L 25.25,142.84375 5,163.09375 c -0.78094,0.7811 -0.78094,2.03141 0,2.8125 l 80.40625,80.40625 c 0.7811,0.78094 2.03141,0.78093 2.8125,0 l 20.25,-20.25 17.59375,17.59375 c 0.7811,0.78093 2.03141,0.78093 2.8125,0 l 17.5625,-17.5625 20.21875,20.21875 c 0.78108,0.78094 2.06265,0.78093 2.84375,0 l 80.375,-80.40625 c 0.78094,-0.78109 0.78094,-2.0314 0,-2.8125 L 229.65625,142.875 247.25,125.28125 c 0.78094,-0.7811 0.78094,-2.06265 0,-2.84375 L 128.875,4.0625 c -0.0421,-0.04625 -0.11001,-0.11415 -0.15625,-0.15625 -0.39876,-0.33006 -0.89184,-0.46126 -1.375,-0.4375 z m -6,43.5625 14.15625,0 0,19.75 c 0.01,0.435733 0.30048,0.815 0.71875,0.9375 2.36672,0.715663 4.34765,1.46009 5.9375,2.1875 1.57854,0.722523 3.76284,1.94 6.53125,3.65625 0.23423,0.144983 0.51508,0.19598 0.78125,0.125 0.26615,-0.07098 0.49406,-0.25764 0.625,-0.5 l 2.875,-5.40625 7.75,0 9.34375,36.21875 -13.625,3.90625 c -4.11145,-10.161057 -10.59377,-17.79909 -19.46875,-22.625 -0.31359,-0.166457 -0.69786,-0.15518 -1,0.03125 -0.30216,0.186431 -0.47688,0.52006 -0.46875,0.875 l 0,24.03125 c 0.01,0.43573 0.30048,0.815 0.71875,0.9375 10.93974,3.10986 18.88772,6.27714 23.75,9.4375 4.89952,3.1848 8.58915,7.0982 11.15625,11.71875 2.57543,4.63598 3.84364,9.41467 3.84375,14.375 -1.1e-4,5.33303 -1.49612,10.44021 -4.5625,15.40625 -3.05188,4.94228 -7.57932,9.1061 -13.59375,12.46875 -5.99929,3.35409 -12.74816,5.29505 -20.375,5.84375 -0.52771,0.0331 -0.93848,0.47125 -0.9375,1 l 0,19.25 -14.15625,0 0,-20.65625 c 0.0115,-0.47702 -0.31562,-0.89572 -0.78125,-1 -6.24994,-1.46738 -12.82661,-4.66999 -19.71875,-9.6875 -0.25021,-0.18733 -0.57446,-0.24211 -0.875,-0.15625 -0.300532,0.0859 -0.54278,0.30252 -0.65625,0.59375 l -3.75,9.25 -7.625,0 -7.875,-42.34375 14.3125,-3.4375 c 2.78387,6.00776 5.47545,10.86469 8.09375,14.4375 2.72545,3.71918 5.79951,6.95217 9.21875,9.6875 2.53873,2.0772 5.32819,3.64369 8.34375,4.6875 0.30262,0.0995 0.64703,0.0602 0.90625,-0.125 0.25923,-0.18516 0.40226,-0.49396 0.40625,-0.8125 l 0,-27.875 c 0.008,-0.43878 -0.2706,-0.83165 -0.6875,-0.96875 -11.9575,-4.0043 -20.14727,-7.50583 -24.4375,-10.375 C 91.88074,118.97403 88.49102,115.30727 86,110.8125 83.50306,106.30724 82.24999,101.8073 82.25,97.25 c -1e-5,-5.212767 1.5369,-10.24246 4.65625,-15.125 3.11104,-4.869387 7.41684,-8.74009 12.96875,-11.625 5.52685,-2.871687 12.35433,-4.48215 20.5,-4.8125 0.54002,-0.01694 0.96896,-0.45971 0.96875,-1 l 0,-17.65625 z m -2,37.375 c -3.80484,0.61143 -6.64239,1.484763 -8.125,2.53125 -2.55269,1.82341 -3.68754,3.817503 -3.6875,6.21875 -3e-5,1.99888 0.82821,3.916143 2.6875,5.90625 1.5957,1.70818 4.79074,3.41885 9.125,5.03125 l 0,-19.6875 z m 18.15625,55.125 0,22.40625 c 3.64443,-0.60429 6.6344,-1.65745 8.8125,-3.25 2.37481,-1.73646 3.46868,-3.90374 3.46875,-6.875 -7e-5,-2.6212 -0.83434,-4.7944 -2.625,-6.6875 -2.27356,-2.32082 -5.55946,-4.16441 -9.65625,-5.59375 z"
-       transform="translate(247,408.36218)"
-       style="fill:#000000;fill-opacity:0.69019608;fill-rule:evenodd;stroke:none;filter:url(#filter3566)"
-       id="path3453" />
-    <path
-       d="m 125.4375,3.46875 -118.375,118.375 118.375,118.375 118.40625,-118.375 L 125.4375,3.46875 z m -7.09375,40.5625 16.15625,0 0,20.75 c 2.39847,0.725255 4.41692,1.465836 6.0625,2.21875 1.64544,0.753136 3.86718,1.989686 6.65625,3.71875 l 3.15625,-5.9375 9.125,0 9.78125,37.90625 -15.375,4.4375 C 149.89001,96.694255 143.4247,89.040435 134.5,84.1875 l 0,24.03125 c 10.98855,3.12374 18.97973,6.29945 24,9.5625 5.02009,3.26318 8.85036,7.29338 11.5,12.0625 2.64944,4.76921 3.96864,9.71205 3.96875,14.84375 -1.1e-4,5.52222 -1.56729,10.83367 -4.71875,15.9375 -3.15166,5.10387 -7.80181,9.38205 -13.9375,12.8125 -6.13586,3.43045 -13.05918,5.41095 -20.8125,5.96875 l 0,20.25 -16.15625,0 0,-21.65625 c -6.41472,-1.50606 -13.12131,-4.79903 -20.09375,-9.875 l -4,9.875 -9.125,0 -8.21875,-44.09375 16,-3.84375 c 2.900524,6.35894 5.697538,11.34646 8.375,15 2.6774,3.65361 5.68442,6.8226 9.03125,9.5 2.45427,2.0081 5.13065,3.52723 8.03125,4.53125 l 0,-27.875 c -11.9927,-4.01609 -20.225144,-7.51572 -24.6875,-10.5 C 89.193843,117.73459 85.690854,113.94229 83.125,109.3125 80.559118,104.68285 79.249989,99.991365 79.25,95.25 c -9e-6,-5.410553 1.605147,-10.635971 4.8125,-15.65625 3.207321,-5.02008 7.654184,-9.01231 13.34375,-11.96875 5.68951,-2.956214 12.68204,-4.602705 20.9375,-4.9375 l 0,-18.65625 z m 0,37.15625 c -4.57399,0.613679 -7.82228,1.598881 -9.71875,2.9375 -2.73325,1.952387 -4.09379,4.29813 -4.09375,7.03125 -4e-5,2.287057 0.98853,4.4742 2.96875,6.59375 1.98014,2.119711 5.6004,4.09012 10.84375,5.875 l 0,-22.4375 z m 16.15625,54.875 0,25.125 c 4.35076,-0.55777 7.81241,-1.79097 10.40625,-3.6875 2.59369,-1.8965 3.87492,-4.45224 3.875,-7.6875 -8e-5,-2.84474 -0.95404,-5.31111 -2.90625,-7.375 -2.67751,-2.73317 -6.46645,-4.8689 -11.375,-6.375 z"
-       transform="translate(247,408.36218)"
-       style="fill:url(#linearGradient3571);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect3418" />
-    <rect
-       width="113.67383"
-       height="30.562906"
-       x="581.44257"
-       y="195.29802"
-       transform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,0,0)"
-       style="fill:#6ad636;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect3277" />
-    <path
-       d="m 271.41033,548.04524 -21.3701,21.3701 c -0.51722,0.5028 -0.72366,1.24514 -0.54025,1.94279 0.18341,0.69764 0.72825,1.24248 1.42588,1.42589 0.69765,0.1834 1.44,-0.023 1.9428,-0.54026 l 21.91555,-21.91555 -3.37388,-2.28297 z"
-       style="opacity:0.7;fill:url(#linearGradient3406);fill-opacity:1;fill-rule:evenodd;stroke:none"
-       id="path3404" />
-    <rect
-       width="167.41394"
-       height="167.41394"
-       x="554.57251"
-       y="27.848526"
-       transform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,0,0)"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect2251" />
-    <path
-       d="m 373.71159,410.23833 c -0.81035,-0.62925 -1.9654,-0.54334 -2.67374,0.19888 l -118.37411,118.3741 c -0.51722,0.5028 -0.72366,1.24514 -0.54025,1.94279 0.18341,0.69764 0.72825,1.24248 1.42588,1.42589 0.69765,0.1834 1.44,-0.023 1.9428,-0.54026 l 118.3741,-118.3741 c 0.42126,-0.40199 0.64643,-0.96759 0.61671,-1.54911 -0.0297,-0.58152 -0.31136,-1.12123 -0.77139,-1.47819 l 0,0 z"
-       style="opacity:0.7;fill:url(#linearGradient3336);fill-opacity:1;fill-rule:evenodd;stroke:none"
-       id="path3256" />
-    <rect
-       width="113.67384"
-       height="30.56292"
-       x="54.718613"
-       y="-752.58502"
-       transform="matrix(-0.7071068,0.7071068,-0.7071068,-0.7071068,0,0)"
-       style="fill:#6ad636;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.00000048;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect3279" />
-    <rect
-       width="11.142811"
-       height="14.090264"
-       x="602.29895"
-       y="203.53435"
-       transform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,0,0)"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect3291" />
-    <rect
-       width="11.142811"
-       height="8.5145016"
-       x="622.57172"
-       y="203.53435"
-       transform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,0,0)"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect3293" />
-    <path
-       d="m 308.55497,616.32265 -7.87916,-7.87915 9.96333,-9.96333 7.87916,7.87916"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       id="rect3295" />
-    <path
-       d="m 315.01081,622.77849 9.96332,-9.96333 7.87916,7.87916 -9.96333,9.96332"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       id="rect3297" />
-    <path
-       d="m 445.04627,584.86337 1.41421,1.41422 9.96579,9.96578 1.41421,1.41422 1.41421,-1.41422 6.47445,-6.47444 -2.82843,-2.82843 2.82843,-2.82843 -7.13736,-7.13736 -2.82843,2.82843 -2.82842,-2.82843 -6.47445,6.47445 -1.41421,1.41421 z m 5.65685,0 5.06023,-5.06023 7.13736,7.13736 -5.06023,5.06023 -7.13736,-7.13736 z"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
-       id="rect3347" />
-    <path
-       d="m 427.09359,605.64776 -7.87916,7.87915"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       id="rect3343" />
-    <path
-       d="m 433.11734,619.55066 -9.96333,-9.96333"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       id="path3352" />
-    <path
-       d="m 441.42857,591.31278 -7.87916,7.87916"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       id="path3364" />
-    <path
-       d="m 447.45232,605.21568 -9.96333,-9.96333"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       id="path3366" />
-    <path
-       d="m 296.30415,584.14518 -9.96332,9.96333"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       id="rect3380" />
-    <path
-       d="m 306.75446,602.36485 7.87915,7.87916"
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       id="path3384" />
-  </g>
-</svg>

os/debian/changelog

@@ -1,51 +1,3 @@
-openttd (1.0.0~beta3) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 21 Jan 2010 00:01:02 +0100
-
-openttd (1.0.0~beta2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 05 Jan 2010 21:36:51 +0100
-
-openttd (1.0.0~beta1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 24 Dec 2009 01:01:01 +0100
-
-openttd (0.7.5) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 23 Dec 2009 20:52:34 +0100
-
-openttd (0.7.5~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 14 Dec 2009 19:28:37 +0100
-
-openttd (0.7.4) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 01 Dec 2009 01:23:45 +0100
-
-openttd (0.7.4~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 15 Nov 2009 16:30:07 +0100
-
-openttd (0.7.3) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 01 Oct 2009 12:35:47 +0200
-
 openttd (0.7.3~RC2) unstable; urgency=low
 
   * New upstream release.

os/debian/control

@@ -3,7 +3,7 @@ Section: contrib/games
 Priority: optional
 Maintainer: Matthijs Kooijman <matthijs@stdin.nl>
 Uploaders: Jordi Mallach <jordi@debian.org>
-Build-Depends: debhelper (>= 4.0.0), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev, liblzo2-dev
+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

os/debian/docs

@@ -1,2 +1,3 @@
 readme.txt
+docs/Manual.txt
 docs/multiplayer.txt

os/os2/installer/download_nosound.cmd

@@ -1,21 +0,0 @@
-@echo off
-if "%1" == "" goto err
-if "%2" == "" goto err
-
-echo Downloading NoSound...
-
-%1\wget http://binaries.openttd.org/installer/nosound-NOSOUND_VERSION.7z -O %2/data/nosound.7z
-
-echo Extracting NoSound...
-
-%1\7za x -y -O%2/data %2/data/nosound.7z
-del %1\data\nosound.7z /n
-
-echo NoSound has been installed.
-goto end
-
-:err
-echo This batch file is only intended for use by the OpenTTD installer.
-echo Please visit www.openttd.org for details on downloading NoSound.
-
-:end

os/os2/installer/download_opengfx.cmd

@@ -1,21 +0,0 @@
-@echo off
-if "%1" == "" goto err
-if "%2" == "" goto err
-
-echo Downloading OpenGFX...
-
-%1\wget http://binaries.openttd.org/installer/opengfx-OPENGFX_VERSION.7z -O %2/data/opengfx.7z
-
-echo Extracting OpenGFX...
-
-%1\7za x -y -O%2/data %2/data/opengfx.7z
-del %1\data\opengfx.7z /n
-
-echo OpenGFX has been installed.
-goto end
-
-:err
-echo This batch file is only intended for use by the OpenTTD installer.
-echo Please visit www.openttd.org for details on downloading OpenGFX.
-
-:end

os/os2/installer/download_opensfx.cmd

@@ -1,21 +0,0 @@
-@echo off
-if "%1" == "" goto err
-if "%2" == "" goto err
-
-echo Downloading OpenSFX...
-
-%1\wget http://binaries.openttd.org/installer/opensfx-OPENSFX_VERSION.7z -O %2/data/opensfx.7z
-
-echo Extracting OpenSFX...
-
-%1\7za x -y -O%2/data %2/data/opensfx.7z
-del %1\data\opensfx.7z /n
-
-echo OpenSFX has been installed.
-goto end
-
-:err
-echo This batch file is only intended for use by the OpenTTD installer.
-echo Please visit www.openttd.org for details on downloading OpenSFX.
-
-:end

os/os2/installer/make_installer.cmd

@@ -1,85 +0,0 @@
-@echo off
-
-set OPENTTD_VERSION=1.0.0-beta3
-set OPENSFX_VERSION=0.8.0
-set NOSOUND_VERSION=0.8.0
-set OPENGFX_VERSION=0.7.0
-
-echo To make the installer, you must have the WarpIN compiler (wic) installed and in
-echo your path, as well as wget and unzip. This file will download the various DLLs
-echo to be distributed with the installer. If you do not want to continue, please
-echo press CTRL-C now.
-echo.
-pause
-
-cd ..\..\..\bundle
-
-if not exist SDL12.dll goto getsdl
-if not exist FSLib.dll goto getsdl
-goto libc
-
-:getsdl
-
-wget http://www.os2site.com/sw/dev/sdl/sdl-1.2.10-bin-20080804.zip -O dl.zip
-unzip -j dl.zip SDL/FSLib.dll SDL/SDL12.dll
-del dl.zip
-
-:libc
-
-if exist libc063.dll goto gcc
-
-wget ftp://ftp.netlabs.org/pub/gcc/libc-0.6.3-csd3.zip -O dl.zip
-unzip -j dl.zip libc063.dll
-del dl.zip
-
-:gcc
-
-if exist gcc442.dll goto tools
-
-wget http://www.owenrudge.net/various/gcc442.zip -O dl.zip
-unzip -j dl.zip gcc442.dll
-del dl.zip
-
-:tools
-
-cd ..\os\os2\installer
-if exist tools goto opengfx
-
-mkdir tools
-cd tools
-
-wget http://download.smedley.info/wget-1.11.4-os2-20090315.zip -O dl.zip
-unzip -j dl.zip wget/bin/wget.exe
-del dl.zip
-
-wget ftp://ftp.os4.su/moveton/p7zip-9.04-bin-os2.zip -O dl.zip
-unzip -j dl.zip bin/7za.exe dll/ilibca.dll
-del dl.zip
-
-cd ..
-
-:opengfx
-
-if exist opengfx goto opensfx
-
-mkdir opengfx
-sed s/OPENGFX_VERSION/%OPENGFX_VERSION%/ < download_opengfx.cmd > opengfx\download_opengfx.cmd
-copy remove_opengfx.cmd opengfx
-
-:opensfx
-if exist opensfx goto nosound
-
-mkdir opensfx
-sed s/OPENSFX_VERSION/%OPENSFX_VERSION%/ < download_opensfx.cmd > opensfx\download_opensfx.cmd
-copy remove_opensfx.cmd opensfx
-
-:nosound
-
-mkdir nosound
-sed s/NOSOUND_VERSION/%NOSOUND_VERSION%/ < download_nosound.cmd > nosound\download_nosound.cmd
-copy remove_nosound.cmd nosound
-
-:end
-
-if exist openttd-%OPENTTD_VERSION%-os2.exe del openttd-%OPENTTD_VERSION%-os2.exe
-wic -a openttd-%OPENTTD_VERSION%-os2.exe 1 -c../../../bundle -r * 2 -ctools -r * 3 -copengfx -r * 4 -copensfx -r * 5 -cnosound -r * -U -s openttd.wis

os/os2/installer/openttd.wis

@@ -1,106 +0,0 @@
-<WARPIN>
-<HEAD>
-<TITLE>OpenTTD</TITLE>
-
-<!-- Please remember to increment the build number for each package
-     when releasing a new stable version, particularly if there are
-     also release candidates sharing the major/minor versions:
-
-     e.g., 0\7\1\16279 for 0.7.1-RC1,
-           0\7\1\16365 for 0.7.1-RC2,
-           0\7\1\16540 for 0.7.1 final
--->
-
-<PCK INDEX="1"
-      PACKAGEID="OpenTTD\OpenTTD\OpenTTD\1\0\0\18862"
-      TARGET="$(WARPIN_DEFAULTAPPSPATH)\OpenTTD"
-      SELECT
-      TITLE="OpenTTD"
-      LONGFILENAMES
-      BASE
-      >OpenTTD is an open source transport simulation game</PCK>
-
-<PCK INDEX="2"
-      PACKAGEID="OpenTTD\OpenTTD\Downloader\1\0\0\18862"
-      TARGET="$(WARPIN_DEFAULTAPPSPATH)\OpenTTD"
-      SELECT
-      TITLE="Download tools"
-      REQUIRES=1
-      FIXED
-      >Tools required for downloading the OpenGFX/SFX packs</PCK>
-
-<PCK INDEX="3"
-      PACKAGEID="OpenTTD\OpenTTD\OpenGFX\1\0\0\18862"
-      TARGET="$(WARPIN_DEFAULTAPPSPATH)\OpenTTD"
-      SELECT
-      TITLE="OpenGFX"
-      LONGFILENAMES
-      REQUIRES=2
-      EXECUTE="$(3)\download_opengfx.cmd | $(1) $(/1)"
-      DEEXECUTE="$(3)\remove_opengfx.cmd | $(1) $(/1)"
-      FIXED
-      >Downloads the OpenGFX graphics pack for OpenTTD</PCK>
-
-<PCK INDEX="4"
-      PACKAGEID="OpenTTD\OpenTTD\OpenSFX\1\0\0\18862"
-      TARGET="$(WARPIN_DEFAULTAPPSPATH)\OpenTTD"
-      SELECT
-      TITLE="OpenSFX"
-      LONGFILENAMES
-      REQUIRES=2
-      EXECUTE="$(4)\download_opensfx.cmd | $(1) $(/1)"
-      DEEXECUTE="$(4)\remove_opensfx.cmd | $(1) $(/1)"
-      FIXED
-      >Downloads the OpenSFX sound effects pack for OpenTTD</PCK>
-
-<PCK INDEX="5"
-      PACKAGEID="OpenTTD\OpenTTD\NoSound\1\0\0\18862"
-      TARGET="$(WARPIN_DEFAULTAPPSPATH)\OpenTTD"
-      SELECT
-      TITLE="NoSound"
-      LONGFILENAMES
-      REQUIRES=2
-      EXECUTE="$(5)\download_nosound.cmd | $(1) $(/1)"
-      DEEXECUTE="$(5)\remove_nosound.cmd | $(1) $(/1)"
-      FIXED
-      >Downloads the NoSound pack for OpenTTD, to disable sound effects</PCK>
-
-</HEAD>
-
-<BODY>
-<!-- page 1: introductory page -->
-<PAGE INDEX="1" TYPE="README">
-<NEXTBUTTON TARGET=2>~Next</NEXTBUTTON>
-<README EXTRACTFROMPCK="1">README.TXT</README>
-<TEXT>Welcome to the OpenTTD installer. This program will install OpenTTD 1.0 on your system. Before we begin the installation process, please take a moment to read the following document.
-
-Select "Next" to continue, or "Cancel" to abort installation.</TEXT>
-</PAGE>
-
-<!-- page 2: licence page -->
-<PAGE INDEX="2" TYPE="README">
-<NEXTBUTTON TARGET=3>~Next</NEXTBUTTON>
-<README EXTRACTFROMPCK="1">COPYING</README>
-<TEXT>OpenTTD is licenced under the GNU General Public License. The text of the licence is below.
-
-Select "Next" if you agree to this licence.
-Select "Cancel" to abort installation.</TEXT>
-</PAGE>
-
-<!-- The TYPE=CONTAINER will list the packages which can be installed. -->
-<PAGE INDEX="3" TYPE="CONTAINER">
-<NEXTBUTTON TARGET="4">~Next</NEXTBUTTON>
-<TEXT>On this page, you may choose which components to install. If you don't own Transport Tycoon Deluxe, you will need to download OpenGFX (3MiB) and OpenSFX (10MiB).</TEXT>
-</PAGE>
-
-<!-- Display another TEXT page to inform the user
-         that installation will begin. We use the TARGET=0
-        with the NEXTBUTTON tag which starts installation. -->
-
-<PAGE INDEX="4" TYPE="TEXT">
-<NEXTBUTTON TARGET="0">I~nstall</NEXTBUTTON>
-<TEXT>
-Press "Install" to begin installing OpenTTD.</TEXT>
-</PAGE>
-</BODY>
-</WARPIN>

os/os2/installer/remove_nosound.cmd

@@ -1,15 +0,0 @@
-@echo off
-if "%1" == "" goto err
-
-echo Removing NoSound...
-
-del %1\data\nosound\*.* /n
-rmdir %1\data\nosound
-
-echo NoSound has been removed.
-goto end
-
-:err
-echo This batch file is only intended for use by the OpenTTD installer.
-
-:end

os/os2/installer/remove_opengfx.cmd

@@ -1,15 +0,0 @@
-@echo off
-if "%1" == "" goto err
-
-echo Removing OpenGFX...
-
-del %1\data\opengfx\*.* /n
-rmdir %1\data\opengfx
-
-echo OpenGFX has been removed.
-goto end
-
-:err
-echo This batch file is only intended for use by the OpenTTD installer.
-
-:end

os/os2/installer/remove_opensfx.cmd

@@ -1,15 +0,0 @@
-@echo off
-if "%1" == "" goto err
-
-echo Removing OpenSFX...
-
-del %1\data\opensfx\*.* /n
-rmdir %1\data\opensfx
-
-echo OpenSFX has been removed.
-goto end
-
-:err
-echo This batch file is only intended for use by the OpenTTD installer.
-
-:end

os/rpm/openttd.spec

@@ -2,7 +2,7 @@
 #-------------------------------------------------------------------------------
 # spec file for the openttd rpm package
 #
-# Copyright (c) 2007-2010 The OpenTTD developers
+# 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
@@ -13,7 +13,7 @@
 #-------------------------------------------------------------------------------
 
 Name:          openttd
-Version:       1.0.0
+Version:       0.7.3
 Release:       1%{?dist}
 
 Group:         Amusements/Games
@@ -24,9 +24,10 @@ Summary:       OpenTTD is an Open Source clone of Chris Sawyer's Transport Tycoo
 Source:        %{name}-%{version}-source.tar.bz2
 
 Requires:      fontconfig
+Requires:      libicu
+Requires:      libpng
 Requires:      SDL
 Requires:      zlib
-BuildRequires: gcc-c++
 BuildRequires: fontconfig-devel
 BuildRequires: libpng-devel
 BuildRequires: libicu-devel
@@ -37,32 +38,33 @@ BuildRequires: zlib-devel
 Requires:      freetype
 BuildRequires: freetype-devel
 %endif
+%if %{_vendor}=="MandrakeSoft" || %{_vendor}=="mandriva"
+Requires:      freetype2
+BuildRequires: libfreetype6-devel
+%endif
 %if %{_vendor}=="redhat" || %{_vendor}=="fedora"
 Requires:      freetype
 BuildRequires: freetype-devel
 BuildRequires: desktop-file-utils
 %endif
-%if %{_vendor}=="suse" || %{_vendor}=="mandriva"
+%if %{_vendor}=="suse"
 Requires:      freetype2
 BuildRequires: freetype2-devel
 %endif
-%if %{_vendor}=="suse"
-BuildRequires: update-desktop-files
-%endif
-
-# recommends works for suse (not sles9) and mandriva, only
-%if 0%{?suse_version} > 910  || %{_vendor}=="mandriva"
-Recommends:	opengfx
-# for 0.8.0
-#Recommends:	opensfx
-%endif
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %description
 OpenTTD is a reimplementation of the Microprose game "Transport Tycoon Deluxe"
-with lots of new features and enhancements. To play the game you need either
-the original data from the game or install the recommend package OpenGFX.
+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
@@ -72,29 +74,22 @@ download of the game.
 %setup -q
 
 %build
-# suse sle <10 has no support for makedepend
-%if 0%{?sles_version} == 9 || 0%{?sles_version} == 10
-%define 	do_makedepend	0
-%else
-%define 	do_makedepend	1
-%endif
 ./configure \
+	--revision=%{version} \
 	--prefix-dir="%{_prefix}" \
-	--binary-name="%{name}" \
-	--enable-strip \
 	--binary-dir="bin" \
-	--data-dir="share/%{name}" \
-	--with-makedepend="%{do_makedepend}" \
-#	--revision="%{ver}%{?prever:-%{prever}}" \
-#	--enable-debug=0 \
-#	--with-sdl \
-#	--with-zlib \
-#	--with-png \
-#	--with-freetype \
-#	--with-fontconfig \
-#	--with-icu \
+	--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" \
@@ -104,6 +99,7 @@ download of the game.
 make %{?_smp_mflags}
 
 %install
+rm -rf "%{buildroot}"
 make install INSTALL_DIR="%{buildroot}"
 
 # Validate menu entrys (vendor specific)
@@ -115,28 +111,13 @@ desktop-file-install \
 	"%{buildroot}/%{_datadir}/applications/%{name}.desktop" \
 #	--delete-original
 %endif
-%if %{_vendor}=="suse"
-%__cat > %{name}.desktop << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Name=OpenTTD
-Comment=OpenTTD - A clone of the Microprose game 'Transport Tycoon Deluxe'
-GenericName=OpenTTD
-Type=Application
-Terminal=false
-Exec=%{name}
-Icon=%{name}
-Categories=Game;StrategyGame;
-EOF
-%suse_update_desktop_file -i %{name} Game StrategyGame
-%endif
 
 %clean
-#rm -rf "%{buildroot}"
+rm -rf "%{buildroot}"
 
 %post
 # Update the icon cache (vendor specific)
-%if %{_vendor}=="mandriva"
+%if %{_vendor}=="MandrakeSoft" || %{_vendor}=="mandriva"
 %update_icon_cache hicolor
 %endif
 
@@ -149,7 +130,7 @@ fi
 
 %postun
 # Update the icon cache (vendor specific)
-%if %{_vendor}=="mandriva"
+%if %{_vendor}=="MandrakeSoft" || %{_vendor}=="mandriva"
 %update_icon_cache hicolor
 %endif
 
@@ -163,39 +144,38 @@ fi
 %files
 %defattr(-, root, games, -)
 %dir %{_datadir}/doc/%{name}
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/lang
-%dir %{_datadir}/%{name}/data
-%dir %{_datadir}/%{name}/gm
-%dir %{_datadir}/%{name}/scripts
+%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}/%{name}/lang/*
-%{_datadir}/%{name}/data/*
-%{_datadir}/%{name}/scripts/*
+%{_datadir}/games/%{name}/lang/*
+%{_datadir}/games/%{name}/data/*
+%{_datadir}/games/%{name}/scripts/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/pixmaps/*
-%{_datadir}/icons/*
-%doc %{_mandir}/man6/%{name}.6.*
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%doc %{_mandir}/man6/%{name}.6.gz
 
 %changelog
-* Sat Sep 26 2009 Marcel Gmür <ammler@openttdcoop.org> - 0.7.2
-- no subfolder games for datadir
-- cleanup: no post and postun anymore
-- Recommends: opengfx (for suse and mandriva)
-- add SUSE support
-
 * Mon Oct 20 2008 Benedikt Brüggemeier <skidd13@openttd.org>
+
 - Added libicu dependency
 
 * Thu Sep 23 2008 Benedikt Brüggemeier <skidd13@openttd.org>
+
 - Merged both versions of the spec file
 
 * Fri Aug 29 2008 Jonathan Coome <maedhros@openttd.org>
+
 - Rewrite spec file from scratch.
 
 * Sat Aug 02 2008 Benedikt Brüggemeier <skidd13@openttd.org>
+
 - Updated spec file
 
 * Thu Mar 27 2008 Denis Burlaka <burlaka@yandex.ru>
+
 - Universal spec file
+

os/win32/installer/install.nsi

@@ -1,23 +1,12 @@
-# Version numbers to update
-!define APPV_MAJOR 1
-!define APPV_MINOR 0
-!define APPV_MAINT 0
-!define APPV_BUILD 2
-!define APPV_EXTRA "-beta3"
-
 !define APPNAME "OpenTTD"   ; Define application name
-!define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"  ; Define application version
-!define APPVERSIONINTERNAL "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}.${APPV_BUILD}" ; Define application version in X.X.X.X
-!define INSTALLERVERSION ${APPV_MAJOR}${APPV_MINOR}${APPV_MAINT}${APPV_BUILD}
+!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 APPURLLINK "http://www.openttd.org"
 !define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}"
 
-!define OPENGFX_BASE_VERSION "0.7.0"
-!define OPENSFX_BASE_VERSION "0.8.0"
-!define NOSOUND_BASE_VERSION "0.8.0"
-
 !define MUI_ICON "..\..\..\media\openttd.ico"
 !define MUI_UNICON "..\..\..\media\openttd.ico"
 !define MUI_WELCOMEFINISHPAGE_BITMAP "welcome.bmp"
@@ -30,7 +19,7 @@ SetCompressor LZMA
 ; Version Info
 Var AddWinPrePopulate
 VIProductVersion "${APPVERSIONINTERNAL}"
-VIAddVersionKey "ProductName" "OpenTTD ${APPBITS}-bit Installer for Windows ${EXTRA_VERSION}"
+VIAddVersionKey "ProductName" "OpenTTD Installer ${APPBITS} bits version ${EXTRA_VERSION}"
 VIAddVersionKey "Comments" "Installs ${APPNAMEANDVERSION}"
 VIAddVersionKey "CompanyName" "OpenTTD Developers"
 VIAddVersionKey "FileDescription" "Installs ${APPNAMEANDVERSION}"
@@ -39,7 +28,7 @@ VIAddVersionKey "InternalName" "InstOpenTTD-${APPARCH}"
 VIAddVersionKey "FileVersion" "${APPVERSION}-${APPARCH}"
 VIAddVersionKey "LegalCopyright" " "
 ; Main Install settings
-Name "${APPNAMEANDVERSION} ${APPBITS}-bit for Windows ${EXTRA_VERSION}"
+Name "${APPNAMEANDVERSION} ${APPBITS} bits version ${EXTRA_VERSION}"
 
 ; NOTE: Keep trailing backslash!
 InstallDirRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Install Folder"
@@ -53,15 +42,17 @@ Var SHORTCUTS
 Var CDDRIVE
 
 ; Modern interface settings
-!include "MUI2.nsh"
-!include "InstallOptions.nsh"
+!include "MUI.nsh"
 
 !define MUI_ABORTWARNING
 !define MUI_WELCOMEPAGE_TITLE_3LINES
 !insertmacro MUI_PAGE_WELCOME
+
+!define MUI_LICENSEPAGE_RADIOBUTTONS
+!insertmacro MUI_DEFAULT MUI_LICENSEPAGE_RADIOBUTTONS_TEXT_ACCEPT "I &accept this agreement"
+!insertmacro MUI_DEFAULT MUI_LICENSEPAGE_RADIOBUTTONS_TEXT_DECLINE "I &do not accept this agreement"
 !insertmacro MUI_PAGE_LICENSE "..\..\..\COPYING"
 
-!define MUI_COMPONENTSPAGE_SMALLDESC
 !insertmacro MUI_PAGE_COMPONENTS
 
 ;---------------------------------
@@ -83,7 +74,7 @@ Page custom SelectCDEnter SelectCDExit ": TTD folder"
 !define MUI_FINISHPAGE_TITLE_3LINES
 !define MUI_FINISHPAGE_RUN_TEXT "Run ${APPNAMEANDVERSION} now!"
 !define MUI_FINISHPAGE_RUN "$INSTDIR\openttd.exe"
-!define MUI_FINISHPAGE_LINK "Visit the OpenTTD site for the latest news, FAQs and downloads"
+!define MUI_FINISHPAGE_LINK "Visit the OpenTTD site for latest news, FAQs and downloads"
 !define MUI_FINISHPAGE_LINK_LOCATION "${APPURLLINK}"
 !define MUI_FINISHPAGE_NOREBOOTSUPPORT
 !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\readme.txt"
@@ -110,35 +101,18 @@ Section "!OpenTTD" Section1
 
 	; Copy language files
 	SetOutPath "$INSTDIR\lang\"
-	File ${PATH_ROOT}bin\lang\english.lng
-
-	; Copy AI files
-	SetOutPath "$INSTDIR\ai\"
-	File ${PATH_ROOT}bin\ai\compat_*.nut
+	File ${PATH_ROOT}bin\lang\*.lng
 
 	; Copy data files
 	SetOutPath "$INSTDIR\data\"
 	File ${PATH_ROOT}bin\data\*.grf
 	File ${PATH_ROOT}bin\data\*.obg
-	File ${PATH_ROOT}bin\data\*.obs
 	File ${PATH_ROOT}bin\data\opntitle.dat
 
-	; Copy the music base metadata files
-	SetOutPath "$INSTDIR\gm\"
-	File ${PATH_ROOT}bin\gm\*.obm
-
 	; Copy the scripts
 	SetOutPath "$INSTDIR\scripts\"
 	File ${PATH_ROOT}bin\scripts\*.*
 
-	; Copy some documention files
-	SetOutPath "$INSTDIR\docs\"
-	File ${PATH_ROOT}docs\obg_format.txt
-	File ${PATH_ROOT}docs\obm_format.txt
-	File ${PATH_ROOT}docs\obs_format.txt
-	File ${PATH_ROOT}docs\multiplayer.txt
-	File ${PATH_ROOT}docs\32bpp.txt
-
 	; Copy the rest of the stuff
 	SetOutPath "$INSTDIR\"
 
@@ -184,84 +158,9 @@ Section "!OpenTTD" Section1
 	!insertmacro MUI_STARTMENU_WRITE_END
 SectionEnd
 
-;--------------------------------------------------------------
-; OpenTTD translation install section. Copies only translations
-Section "OpenTTD translations" Section6
-	; Overwrite files by default, but don't complain on failure
-	SetOverwrite try
-
-	; Copy language files
-	SetOutPath "$INSTDIR\lang\"
-	File ${PATH_ROOT}bin\lang\*.lng
-SectionEnd
-
-;----------------------------------------------------------------------------------
-; OpenGFX files install section. Downloads OpenGFX and installs it
-Section "Download OpenGFX (free graphics set)" Section3
-	SetOverwrite try
-
-	NSISdl::download "http://binaries.openttd.org/installer/opengfx-${OPENGFX_BASE_VERSION}.7z" "$INSTDIR\data\opengfx.7z"
-	Pop $R0 ;Get the return value
-	StrCmp $R0 "success" +3
-		MessageBox MB_OK "Downloading of OpenGFX failed"
-		Goto Done
-
-	; Let's extract the files
-	SetOutPath "$INSTDIR\data\"
-	NSIS7z::Extract "$INSTDIR\data\opengfx.7z"
-
-	Delete "$INSTDIR\data\opengfx.7z"
-	SetOutPath "$INSTDIR\"
-Done:
-
-SectionEnd
-
-;----------------------------------------------------------------------------------
-; OpenSFX files install section. Downloads OpenSFX and installs it
-Section "Download OpenSFX (free sound set)" Section4
-	SetOverwrite try
-
-	NSISdl::download "http://binaries.openttd.org/installer/opensfx-${OPENSFX_BASE_VERSION}.7z" "$INSTDIR\data\opensfx.7z"
-	Pop $R0 ;Get the return value
-	StrCmp $R0 "success" +3
-		MessageBox MB_OK "Downloading of OpenSFX failed"
-		Goto Done
-
-	; Let's extract the files
-	SetOutPath "$INSTDIR\data\"
-	NSIS7z::Extract "$INSTDIR\data\opensfx.7z"
-
-	Delete "$INSTDIR\data\opensfx.7z"
-	SetOutPath "$INSTDIR\"
-Done:
-
-SectionEnd
-
-;----------------------------------------------------------------------------------
-; NoSound files install section. Downloads NoSound and installs it
-Section "Download NoSound (free sound set)" Section5
-	SetOverwrite try
-
-	NSISdl::download "http://binaries.openttd.org/installer/nosound-${NOSOUND_BASE_VERSION}.7z" "$INSTDIR\data\nosound.7z"
-	Pop $R0 ;Get the return value
-	StrCmp $R0 "success" +3
-		MessageBox MB_OK "Downloading of NoSound failed"
-		Goto Done
-
-	; Let's extract the files
-	SetOutPath "$INSTDIR\data\"
-	NSIS7z::Extract "$INSTDIR\data\nosound.7z"
-
-	Delete "$INSTDIR\data\nosound.7z"
-	SetOutPath "$INSTDIR\"
-Done:
-
-SectionEnd
-
 ;----------------------------------------------------------------------------------
 ; TTDLX files install section. Copies all needed TTDLX files from CD or install dir
-Section /o "Copy data from Transport Tycoon Deluxe CD-ROM" Section2
-	SetOverwrite try
+Section "Copy Game Graphics" Section2
 	; Let's copy the files with size approximation
 	SetOutPath "$INSTDIR\gm"
 	CopyFiles "$CDDRIVE\gm\*.gm" "$INSTDIR\gm\" 1028
@@ -290,12 +189,8 @@ SectionEnd
 
 ; Modern install component descriptions
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-	!insertmacro MUI_DESCRIPTION_TEXT ${Section1} "Minimal OpenTTD installation in English. You need at least one of the game graphics and sound sets installed."
-	!insertmacro MUI_DESCRIPTION_TEXT ${Section6} "Translations of OpenTTD."
-	!insertmacro MUI_DESCRIPTION_TEXT ${Section3} "Download the free OpenGFX game graphics set. This download is about 3 MiB."
-	!insertmacro MUI_DESCRIPTION_TEXT ${Section4} "Download the free OpenSFX game sound set. This download is about 10 MiB."
-	!insertmacro MUI_DESCRIPTION_TEXT ${Section5} "Download the free NoSound game sound set. You will not hear anything with this. This download is about 7 KiB."
-	!insertmacro MUI_DESCRIPTION_TEXT ${Section2} "Copies the game graphics and sounds from the Transport Tycoon Deluxe CD."
+	!insertmacro MUI_DESCRIPTION_TEXT ${Section1} "OpenTTD is a fully functional clone of TTD and is very playable."
+	!insertmacro MUI_DESCRIPTION_TEXT ${Section2} "Copies the game graphics. Requires TTD (for Windows)."
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 ;-----------------------------------------------
@@ -354,9 +249,6 @@ Section "Uninstall"
 	Delete "$INSTDIR\cached_sprites.*"
 	Delete "$INSTDIR\save\autosave\network*.tmp" ; temporary network file
 
-	; AI files
-	Delete "$INSTDIR\ai\compat_*.nut"
-
 	; Data files
 	Delete "$INSTDIR\data\opntitle.dat"
 
@@ -375,8 +267,6 @@ Section "Uninstall"
 	Delete "$INSTDIR\data\orig_win.obg"
 	Delete "$INSTDIR\data\orig_dos.obg"
 	Delete "$INSTDIR\data\orig_dos_de.obg"
-	Delete "$INSTDIR\data\orig_win.obs"
-	Delete "$INSTDIR\data\orig_dos.obs"
 
 	Delete "$INSTDIR\data\sample.cat"
 	; Windows Data files
@@ -395,36 +285,18 @@ Section "Uninstall"
 	; Music
 	Delete "$INSTDIR\gm\*.gm"
 
-	; Downloaded OpenGFX/OpenSFX/NoSound
-	Delete "$INSTDIR\data\opengfx\*"
-	RMDir  "$INSTDIR\data\opengfx"
-	Delete "$INSTDIR\data\opensfx\*"
-	RMDir  "$INSTDIR\data\opensfx"
-	Delete "$INSTDIR\data\nosound\*"
-	RMDir  "$INSTDIR\data\nosound"
-
 	; Language files
 	Delete "$INSTDIR\lang\*.lng"
 
 	; Scripts
 	Delete "$INSTDIR\scripts\*.*"
 
-	; Documentation
-	Delete "$INSTDIR\docs\*.*"
-
-	; Base sets for music
-	Delete "$INSTDIR\gm\orig_win.obm"
-	Delete "$INSTDIR\gm\no_music.obm"
-
 	; Remove remaining directories
 	RMDir "$SMPROGRAMS\$SHORTCUTS\Extras\"
 	RMDir "$SMPROGRAMS\$SHORTCUTS"
-	RMDir "$INSTDIR\ai"
-	RMDir "$INSTDIR\data"
 	RMDir "$INSTDIR\gm"
 	RMDir "$INSTDIR\lang"
-	RMDir "$INSTDIR\scripts"
-	RMDir "$INSTDIR\docs"
+	RMDir "$INSTDIR\data"
 	RMDir "$INSTDIR"
 
 SectionEnd
@@ -443,7 +315,7 @@ NoAbort:
 
 	GetTempFileName $R0
 	!insertmacro MUI_HEADER_TEXT "Locate TTD" "Setup needs the location of Transport Tycoon Deluxe in order to continue."
-	!insertmacro INSTALLOPTIONS_EXTRACT_AS "CDFinder.ini" "CDFinder"
+	!insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "CDFinder.ini" "CDFinder"
 
 	ClearErrors
 	; Now, let's populate $CDDRIVE
@@ -458,18 +330,18 @@ NoTTD:
 	StrCpy $AddWinPrePopulate "Setup couldn't find TTD. Please enter the path where the graphics files from TTD are stored and press Next to continue."
 TruFinish:
 	ClearErrors
-	!insertmacro INSTALLOPTIONS_WRITE "CDFinder" "Field 2" "State" $CDDRIVE          ; TTDLX path
-	!insertmacro INSTALLOPTIONS_WRITE "CDFinder" "Field 3" "Text" $AddWinPrePopulate ; Caption
+	!insertmacro MUI_INSTALLOPTIONS_WRITE "CDFinder" "Field 2" "State" $CDDRIVE          ; TTDLX path
+	!insertmacro MUI_INSTALLOPTIONS_WRITE "CDFinder" "Field 3" "Text" $AddWinPrePopulate ; Caption
 DoneCD:
 	; Initialize the dialog *AFTER* we've changed the text otherwise we won't see the changes
-	!insertmacro INSTALLOPTIONS_INITDIALOG "CDFinder"
-	!insertmacro INSTALLOPTIONS_SHOW
+	!insertmacro MUI_INSTALLOPTIONS_INITDIALOG "CDFinder"
+	!insertmacro MUI_INSTALLOPTIONS_SHOW
 FunctionEnd
 
 ;----------------------------------------------------------------
 ; Custom page function when 'next' is selected for the TTDLX path
 Function SelectCDExit
-	!insertmacro INSTALLOPTIONS_READ $CDDRIVE "CDFinder" "Field 2" "State"
+	!insertmacro MUI_INSTALLOPTIONS_READ $CDDRIVE "CDFinder" "Field 2" "State"
 	; If trg1r.grf does not exist at the path, retry with DOS version
 	IfFileExists $CDDRIVE\trg1r.grf "" DosCD
 	IfFileExists $CDDRIVE\trgir.grf "" NoCD
@@ -479,11 +351,22 @@ DosCD:
 	IfFileExists $CDDRIVE\TRGI.GRF "" NoCD
 	IfFileExists $CDDRIVE\SAMPLE.CAT hasCD NoCD
 NoCD:
-	MessageBox MB_OK "Setup cannot continue without the Transport Tycoon Deluxe location!"
+	MessageBox MB_OK "Setup cannot continue without the Transport Tycoon Deluxe Location!"
 	Abort
 hasCD:
 FunctionEnd
 
+;----------------------------------------------------------------------------------
+; Disable the "Back" button on finish page if the installer is run on Win9x systems
+Function DisableBack
+	Call GetWindowsVersion
+	Pop $R0
+	StrCmp $R0 "win9x" 0 WinNT
+	!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "BackEnabled" "0"
+WinNT:
+	ClearErrors
+FunctionEnd
+
 ;-------------------------------------------------------------------------------
 ; Determine windows version, returns "win9x" if Win9x/Me or "winnt" on the stack
 Function GetWindowsVersion
@@ -507,12 +390,12 @@ Function CheckProcessorArchitecture
 	IntCmp $R0 64 Win64 0
 	ClearErrors
 	IntCmp ${APPBITS} 64 0 Done
-	MessageBox MB_OKCANCEL|MB_ICONSTOP "You are trying to install the 64-bit OpenTTD on a 32-bit operating system. This is not going to work. Please download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
+	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 are trying to install the 32-bit OpenTTD on a 64-bit operating system. This is not advised, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
+	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
@@ -528,12 +411,12 @@ Function CheckWindowsVersion
 	StrCmp $R0 "win9x" 0 WinNT
 	ClearErrors
 	StrCmp ${APPARCH} "win9x" Done 0
-	MessageBox MB_OKCANCEL|MB_ICONSTOP "You are trying to install the Windows 2000, XP and Vista version on Windows 95, 98 or ME. This is will not work. Please download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
+	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 are trying to install the Windows 95, 98 and ME version on Windows 2000, XP or Vista. This is not advised, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
+	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:
@@ -543,14 +426,10 @@ Var OLDVERSION
 Var UninstallString
 
 ;-----------------------------------------------------------------------------------
-; NSIS Initialize function, determine if we are going to install/upgrade or uninstall
+; NSIS Initialize function, determin if we are going to install/upgrade or uninstall
 Function .onInit
 	StrCpy $SHORTCUTS "OpenTTD"
 
-	SectionSetSize ${Section3} 6144
-	SectionSetSize ${Section4} 13312
-	SectionSetSize ${Section5} 30
-
 	SectionSetFlags 0 17
 
 	; Starts Setup - let's look for an older version of OpenTTD
@@ -572,16 +451,13 @@ WelcomeToSetup:
 		"Welcome to ${APPNAMEANDVERSION} Setup.$\n \
 		This will allow you to upgrade from version $OLDVERSION."
 	SectionSetFlags ${Section2} 0x80 ; set bit 7
-	SectionSetFlags ${Section3} 0x80 ; set bit 7
-	SectionSetFlags ${Section4} 0x80 ; set bit 7
-	SectionSetFlags ${Section5} 0x80 ; set bit 7
 	Goto FinishCallback
 
 VersionsAreEqual:
 	ReadRegStr $UninstallString HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "UninstallString"
 	IfFileExists "$UninstallString" "" FinishCallback
 	MessageBox MB_YESNO|MB_ICONQUESTION \
-		"Setup detected ${APPNAMEANDVERSION} on your system. This is the same version that this program will install.$\n \
+		"Setup detected ${APPNAMEANDVERSION} on your system. That's the version this program will install.$\n \
 		Are you trying to uninstall it?" \
 		IDYES DoUninstall IDNO FinishCallback
 DoUninstall: ; You have the same version as this installer.  This allows you to uninstall.

os/win32/installer/version_win32.txt

@@ -1,5 +1,5 @@
 !define APPBITS 32          ; Define number of bits for the architecture
-!define EXTRA_VERSION "2000, XP, Vista and 7"
+!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 +1,5 @@
 !define APPBITS 64          ; Define number of bits for the architecture
-!define EXTRA_VERSION "XP, Vista and 7"
+!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 +1,5 @@
 !define APPBITS 32          ; Define number of bits for the architecture
-!define EXTRA_VERSION "95, 98 and ME"
+!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

@@ -1,12 +1,5 @@
 Option Explicit
 
-' $Id$
-'
-' This file is part of OpenTTD.
-' OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-' OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-' See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-
 Dim FSO
 Set FSO = CreateObject("Scripting.FileSystemObject")
 
@@ -39,13 +32,13 @@ Sub UpdateFiles(version)
 		modified = Mid(version, InStrRev(version, Chr(9)) + 1)
 		version  = Mid(version, 1, InStr(version, Chr(9)) - 1)
 	Else
-		version = "1.0.0-beta3"
+		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/os/windows/ottdres.rc"
+	UpdateFile modified, revision, version, cur_date, "../src/ottdres.rc"
 End Sub
 
 Function ReadRegistryKey(shive, subkey, valuename, architecture)
@@ -287,6 +280,6 @@ End Function
 
 Dim version
 version = DetermineSVNVersion
-If Not (IsCachedVersion(version) And CheckFile("../src/rev.cpp") And CheckFile("../src/os/windows/ottdres.rc")) Then
+If Not (IsCachedVersion(version) And CheckFile("../src/rev.cpp") And CheckFile("../src/ottdres.rc")) Then
 	UpdateFiles version
 End If

projects/generate

@@ -1,12 +1,5 @@
 #!/bin/bash
 
-# $Id$
-
-# This file is part of OpenTTD.
-# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-
 # This file generates all project files based on sources.list, so everyone who
 #  can start a bash process, can update the project files.
 

projects/generate.vbs

@@ -1,12 +1,5 @@
 Option Explicit
 
-' $Id$
-'
-' This file is part of OpenTTD.
-' OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-' OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-' See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-
 Dim FSO
 Set FSO = CreateObject("Scripting.FileSystemObject")
 

projects/langs_vs80.vcproj

@@ -301,21 +301,6 @@
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\greek.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating greek 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\greek.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\hebrew.txt"
 			>
@@ -466,21 +451,6 @@
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\malay.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating malay 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\malay.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\norwegian_bokmal.txt"
 			>
@@ -511,6 +481,21 @@
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\src\lang\piglatin.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					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"
+					Outputs="..\bin\lang\piglatin.lng"
+				/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="..\src\lang\polish.txt"
 			>

projects/langs_vs90.vcproj

@@ -302,21 +302,6 @@
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\greek.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating greek 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\greek.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\hebrew.txt"
 			>
@@ -467,21 +452,6 @@
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\malay.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating malay 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\malay.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\norwegian_bokmal.txt"
 			>
@@ -512,6 +482,21 @@
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\src\lang\piglatin.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					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"
+					Outputs="..\bin\lang\piglatin.lng"
+				/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="..\src\lang\polish.txt"
 			>

projects/openttd_vs80.vcproj

@@ -16,7 +16,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\src\os\windows\masm64.rules"
+			RelativePath="..\src\masm64.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -60,7 +60,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				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"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -97,7 +97,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -169,7 +169,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				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;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -197,7 +197,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -273,7 +273,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				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"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -310,7 +310,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -383,7 +383,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				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"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -413,7 +413,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -471,10 +471,18 @@
 				RelativePath=".\..\src\autoreplace.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\aystar.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\bmp.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\callback_table.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\cargopacket.cpp"
 				>
@@ -499,10 +507,6 @@
 				RelativePath=".\..\src\console_cmds.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\crashlog.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\currency.cpp"
 				>
@@ -591,6 +595,14 @@
 				RelativePath=".\..\src\map.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\md5.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\minilzo.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\misc.cpp"
 				>
@@ -603,6 +615,10 @@
 				RelativePath=".\..\src\music.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\namegen.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\network\network.cpp"
 				>
@@ -631,6 +647,14 @@
 				RelativePath=".\..\src\network\network_udp.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\npf.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\oldpool.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\openttd.cpp"
 				>
@@ -639,10 +663,22 @@
 				RelativePath=".\..\src\os_timer.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\ottdres.rc"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfind.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\pbs.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\queue.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\rail.cpp"
 				>
@@ -655,10 +691,6 @@
 				RelativePath=".\..\src\road.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\roadstop.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\screenshot.cpp"
 				>
@@ -683,10 +715,6 @@
 				RelativePath=".\..\src\sound.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\sprite.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\spritecache.cpp"
 				>
@@ -703,10 +731,6 @@
 				RelativePath=".\..\src\strings.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\subsidy.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\texteff.cpp"
 				>
@@ -716,11 +740,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\tile_map.cpp"
+				RelativePath=".\..\src\thread_win32.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\townname.cpp"
+				RelativePath=".\..\src\tile_map.cpp"
 				>
 			</File>
 			<File
@@ -743,6 +767,10 @@
 				RelativePath=".\..\src\widget.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\win32.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\window.cpp"
 				>
@@ -759,6 +787,10 @@
 				RelativePath=".\..\src\airport.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\airport_movement.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\animated_tile_func.h"
 				>
@@ -788,15 +820,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\base_media_base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\base_media_func.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\base_station_base.h"
+				RelativePath=".\..\src\aystar.h"
 				>
 			</File>
 			<File
@@ -807,6 +831,10 @@
 				RelativePath=".\..\src\bridge.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\callback_table.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\cargo_type.h"
 				>
@@ -875,10 +903,6 @@
 				RelativePath=".\..\src\console_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\crashlog.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\currency.h"
 				>
@@ -887,10 +911,6 @@
 				RelativePath=".\..\src\date_func.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\date_gui.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\date_type.h"
 				>
@@ -1043,14 +1063,6 @@
 				RelativePath=".\..\src\highscore.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\house.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\house_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\industry.h"
 				>
@@ -1059,10 +1071,6 @@
 				RelativePath=".\..\src\industry_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\industrytype.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\ini_type.h"
 				>
@@ -1079,6 +1087,10 @@
 				RelativePath=".\..\src\livery.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\lzoconf.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\map_func.h"
 				>
@@ -1087,10 +1099,26 @@
 				RelativePath=".\..\src\map_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\md5.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\minilzo.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\mixer.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\music.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\namegen_func.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\network\network.h"
 				>
@@ -1179,10 +1207,6 @@
 				RelativePath=".\..\src\newgrf_industrytiles.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\newgrf_properties.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\newgrf_sound.h"
 				>
@@ -1223,6 +1247,10 @@
 				RelativePath=".\..\src\news_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\npf.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\music\null_m.h"
 				>
@@ -1235,6 +1263,14 @@
 				RelativePath=".\..\src\video\null_v.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\oldpool.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\oldpool_func.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\openttd.h"
 				>
@@ -1251,6 +1287,10 @@
 				RelativePath=".\..\src\order_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\pathfind.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\pbs.h"
 				>
@@ -1259,6 +1299,10 @@
 				RelativePath=".\..\src\querystring_gui.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\queue.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\rail.h"
 				>
@@ -1295,10 +1339,6 @@
 				RelativePath=".\..\src\road_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\roadstop_base.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\roadveh.h"
 				>
@@ -1427,18 +1467,6 @@
 				RelativePath=".\..\src\strings_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\subsidy_base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\subsidy_func.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\subsidy_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\tar_type.h"
 				>
@@ -1460,7 +1488,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\tilearea_type.h"
+				RelativePath=".\..\src\thread.h"
 				>
 			</File>
 			<File
@@ -1495,14 +1523,6 @@
 				RelativePath=".\..\src\town_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\townname_func.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\townname_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\track_func.h"
 				>
@@ -1576,11 +1596,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\waypoint_base.h"
+				RelativePath=".\..\src\waypoint.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\waypoint_func.h"
+				RelativePath=".\..\src\waypoint_type.h"
 				>
 			</File>
 			<File
@@ -1588,7 +1608,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\os\windows\win32.h"
+				RelativePath=".\..\src\win32.h"
 				>
 			</File>
 			<File
@@ -1659,22 +1679,10 @@
 				RelativePath=".\..\src\core\enum_type.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\core\geometry_func.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\core\geometry_func.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\core\geometry_type.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\core\math_func.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\core\math_func.hpp"
 				>
@@ -1687,14 +1695,6 @@
 				RelativePath=".\..\src\core\overflowsafe_type.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\core\pool_func.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\core\pool_type.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\core\random_func.cpp"
 				>
@@ -1755,10 +1755,6 @@
 				RelativePath=".\..\src\console_gui.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\date_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\depot_gui.cpp"
 				>
@@ -1907,10 +1903,6 @@
 				RelativePath=".\..\src\vehicle_gui.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\viewport_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\waypoint_gui.cpp"
 				>
@@ -2095,10 +2087,6 @@
 				RelativePath=".\..\src\saveload\industry_sl.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\saveload\labelmaps_sl.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\saveload\map_sl.cpp"
 				>
@@ -2171,18 +2159,6 @@
 		<Filter
 			Name="Tables"
 			>
-			<File
-				RelativePath=".\..\src\table\airport_defaults.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\airporttiles.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\airport_movement.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\table\animcursors.h"
 				>
@@ -2219,6 +2195,10 @@
 				RelativePath=".\..\src\table\engines.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\files.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\table\genland.h"
 				>
@@ -2231,6 +2211,10 @@
 				RelativePath=".\..\src\table\landscape_sprite.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\namegen.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\table\palette_convert.h"
 				>
@@ -2239,10 +2223,6 @@
 				RelativePath=".\..\src\table\palettes.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\table\pricebase.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\table\railtypes.h"
 				>
@@ -2255,10 +2235,6 @@
 				RelativePath=".\..\src\table\roadveh_movement.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\table\settings.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\table\sprites.h"
 				>
@@ -2267,10 +2243,6 @@
 				RelativePath=".\..\src\table\station_land.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\table\strgen_tables.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\..\objs\langs\table\strings.h"
 				>
@@ -2279,10 +2251,6 @@
 				RelativePath=".\..\src\table\town_land.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\table\townname.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\table\track_land.h"
 				>
@@ -2308,37 +2276,9 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="MD5"
-			>
-			<File
-				RelativePath=".\..\src\3rdparty\md5\md5.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\3rdparty\md5\md5.h"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="Script"
 			>
-			<File
-				RelativePath=".\..\src\script\script_info.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\script_info.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\script_scanner.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\script_scanner.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\script\squirrel.cpp"
 				>
@@ -2415,10 +2355,6 @@
 				RelativePath=".\..\src\3rdparty\squirrel\sqstdlib\sqstdaux.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\3rdparty\squirrel\sqstdlib\sqstdmath.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\3rdparty\squirrel\squirrel\sqtable.cpp"
 				>
@@ -2611,10 +2547,6 @@
 				RelativePath=".\..\src\ai\api\ai_base.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\ai\api\ai_basestation.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\ai\api\ai_bridge.hpp"
 				>
@@ -2831,10 +2763,6 @@
 				RelativePath=".\..\src\ai\api\ai_base.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\ai\api\ai_basestation.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\ai\api\ai_bridge.cpp"
 				>
@@ -3335,6 +3263,10 @@
 				RelativePath=".\..\src\misc\str.hpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\misc\strapi.hpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Network Core"
@@ -3420,127 +3352,71 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="Pathfinder"
-			>
-			<File
-				RelativePath=".\..\src\pathfinder\follow_track.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\opf\opf_ship.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\opf\opf_ship.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\pathfinder_func.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\pathfinder_type.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\pf_performance_timer.hpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="NPF"
-			>
-			<File
-				RelativePath=".\..\src\pathfinder\npf\aystar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\npf\aystar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\npf\npf.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\npf\npf_func.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\npf\queue.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\npf\queue.h"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="YAPF"
 			>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\nodelist.hpp"
+				RelativePath=".\..\src\yapf\follow_track.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf.h"
+				RelativePath=".\..\src\yapf\nodelist.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf.hpp"
+				RelativePath=".\..\src\yapf\yapf.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_base.hpp"
+				RelativePath=".\..\src\yapf\yapf.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_cache.h"
+				RelativePath=".\..\src\yapf\yapf_base.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_common.hpp"
+				RelativePath=".\..\src\yapf\yapf_common.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_costbase.hpp"
+				RelativePath=".\..\src\yapf\yapf_costbase.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_costcache.hpp"
+				RelativePath=".\..\src\yapf\yapf_costcache.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_costrail.hpp"
+				RelativePath=".\..\src\yapf\yapf_costrail.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_destrail.hpp"
+				RelativePath=".\..\src\yapf\yapf_destrail.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_node.hpp"
+				RelativePath=".\..\src\yapf\yapf_node.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_node_rail.hpp"
+				RelativePath=".\..\src\yapf\yapf_node_rail.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_node_road.hpp"
+				RelativePath=".\..\src\yapf\yapf_node_road.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_rail.cpp"
+				RelativePath=".\..\src\yapf\yapf_rail.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_road.cpp"
+				RelativePath=".\..\src\yapf\yapf_road.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_ship.cpp"
+				RelativePath=".\..\src\yapf\yapf_ship.cpp"
 				>
 			</File>
 		</Filter>
@@ -3568,11 +3444,11 @@
 			Name="Music"
 			>
 			<File
-				RelativePath=".\..\src\music\dmusic.cpp"
+				RelativePath=".\..\src\music\null_m.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\music\null_m.cpp"
+				RelativePath=".\..\src\music\dmusic.cpp"
 				>
 			</File>
 			<File
@@ -3596,40 +3472,12 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="Windows files"
-			>
-			<File
-				RelativePath=".\..\src\os\windows\crashlog_win.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\os\windows\ottdres.rc"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\os\windows\win32.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Threading"
-			>
-			<File
-				RelativePath=".\..\src\thread\thread.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\thread\thread_win32.cpp"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="64-bit Specific Files"
 			Filter="asm"
 			>
 			<File
-				RelativePath=".\..\src\os\windows\win64.asm"
+				RelativePath=".\..\src\win64.asm"
 				>
 				<FileConfiguration
 					Name="Release|Win32"

projects/openttd_vs80.vcproj.in

@@ -16,7 +16,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\src\os\windows\masm64.rules"
+			RelativePath="..\src\masm64.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -60,7 +60,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				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"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -97,7 +97,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -169,7 +169,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				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;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -197,7 +197,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -273,7 +273,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				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"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -310,7 +310,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -383,7 +383,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				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"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -413,7 +413,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -458,7 +458,7 @@
 			Filter="asm"
 			>
 			<File
-				RelativePath=".\..\src\os\windows\win64.asm"
+				RelativePath=".\..\src\win64.asm"
 				>
 				<FileConfiguration
 					Name="Release|Win32"

projects/openttd_vs90.vcproj

@@ -17,7 +17,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\src\os\windows\masm64.rules"
+			RelativePath="..\src\masm64.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -61,7 +61,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				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"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -98,7 +98,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -168,7 +168,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				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;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -196,7 +196,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -271,7 +271,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				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"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -308,7 +308,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -380,7 +380,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				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"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -410,7 +410,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -468,10 +468,18 @@
 				RelativePath=".\..\src\autoreplace.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\aystar.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\bmp.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\callback_table.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\cargopacket.cpp"
 				>
@@ -496,10 +504,6 @@
 				RelativePath=".\..\src\console_cmds.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\crashlog.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\currency.cpp"
 				>
@@ -588,6 +592,14 @@
 				RelativePath=".\..\src\map.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\md5.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\minilzo.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\misc.cpp"
 				>
@@ -600,6 +612,10 @@
 				RelativePath=".\..\src\music.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\namegen.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\network\network.cpp"
 				>
@@ -628,6 +644,14 @@
 				RelativePath=".\..\src\network\network_udp.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\npf.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\oldpool.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\openttd.cpp"
 				>
@@ -636,10 +660,22 @@
 				RelativePath=".\..\src\os_timer.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\ottdres.rc"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfind.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\pbs.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\queue.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\rail.cpp"
 				>
@@ -652,10 +688,6 @@
 				RelativePath=".\..\src\road.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\roadstop.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\screenshot.cpp"
 				>
@@ -680,10 +712,6 @@
 				RelativePath=".\..\src\sound.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\sprite.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\spritecache.cpp"
 				>
@@ -700,10 +728,6 @@
 				RelativePath=".\..\src\strings.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\subsidy.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\texteff.cpp"
 				>
@@ -713,11 +737,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\tile_map.cpp"
+				RelativePath=".\..\src\thread_win32.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\townname.cpp"
+				RelativePath=".\..\src\tile_map.cpp"
 				>
 			</File>
 			<File
@@ -740,6 +764,10 @@
 				RelativePath=".\..\src\widget.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\win32.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\window.cpp"
 				>
@@ -756,6 +784,10 @@
 				RelativePath=".\..\src\airport.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\airport_movement.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\animated_tile_func.h"
 				>
@@ -785,15 +817,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\base_media_base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\base_media_func.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\base_station_base.h"
+				RelativePath=".\..\src\aystar.h"
 				>
 			</File>
 			<File
@@ -804,6 +828,10 @@
 				RelativePath=".\..\src\bridge.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\callback_table.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\cargo_type.h"
 				>
@@ -872,10 +900,6 @@
 				RelativePath=".\..\src\console_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\crashlog.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\currency.h"
 				>
@@ -884,10 +908,6 @@
 				RelativePath=".\..\src\date_func.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\date_gui.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\date_type.h"
 				>
@@ -1040,14 +1060,6 @@
 				RelativePath=".\..\src\highscore.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\house.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\house_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\industry.h"
 				>
@@ -1056,10 +1068,6 @@
 				RelativePath=".\..\src\industry_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\industrytype.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\ini_type.h"
 				>
@@ -1076,6 +1084,10 @@
 				RelativePath=".\..\src\livery.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\lzoconf.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\map_func.h"
 				>
@@ -1084,10 +1096,26 @@
 				RelativePath=".\..\src\map_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\md5.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\minilzo.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\mixer.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\music.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\namegen_func.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\network\network.h"
 				>
@@ -1176,10 +1204,6 @@
 				RelativePath=".\..\src\newgrf_industrytiles.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\newgrf_properties.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\newgrf_sound.h"
 				>
@@ -1220,6 +1244,10 @@
 				RelativePath=".\..\src\news_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\npf.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\music\null_m.h"
 				>
@@ -1232,6 +1260,14 @@
 				RelativePath=".\..\src\video\null_v.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\oldpool.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\oldpool_func.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\openttd.h"
 				>
@@ -1248,6 +1284,10 @@
 				RelativePath=".\..\src\order_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\pathfind.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\pbs.h"
 				>
@@ -1256,6 +1296,10 @@
 				RelativePath=".\..\src\querystring_gui.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\queue.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\rail.h"
 				>
@@ -1292,10 +1336,6 @@
 				RelativePath=".\..\src\road_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\roadstop_base.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\roadveh.h"
 				>
@@ -1424,18 +1464,6 @@
 				RelativePath=".\..\src\strings_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\subsidy_base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\subsidy_func.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\subsidy_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\tar_type.h"
 				>
@@ -1457,7 +1485,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\tilearea_type.h"
+				RelativePath=".\..\src\thread.h"
 				>
 			</File>
 			<File
@@ -1492,14 +1520,6 @@
 				RelativePath=".\..\src\town_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\townname_func.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\townname_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\track_func.h"
 				>
@@ -1573,11 +1593,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\waypoint_base.h"
+				RelativePath=".\..\src\waypoint.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\waypoint_func.h"
+				RelativePath=".\..\src\waypoint_type.h"
 				>
 			</File>
 			<File
@@ -1585,7 +1605,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\os\windows\win32.h"
+				RelativePath=".\..\src\win32.h"
 				>
 			</File>
 			<File
@@ -1656,22 +1676,10 @@
 				RelativePath=".\..\src\core\enum_type.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\core\geometry_func.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\core\geometry_func.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\core\geometry_type.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\core\math_func.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\core\math_func.hpp"
 				>
@@ -1684,14 +1692,6 @@
 				RelativePath=".\..\src\core\overflowsafe_type.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\core\pool_func.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\core\pool_type.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\core\random_func.cpp"
 				>
@@ -1752,10 +1752,6 @@
 				RelativePath=".\..\src\console_gui.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\date_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\depot_gui.cpp"
 				>
@@ -1904,10 +1900,6 @@
 				RelativePath=".\..\src\vehicle_gui.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\viewport_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\waypoint_gui.cpp"
 				>
@@ -2092,10 +2084,6 @@
 				RelativePath=".\..\src\saveload\industry_sl.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\saveload\labelmaps_sl.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\saveload\map_sl.cpp"
 				>
@@ -2168,18 +2156,6 @@
 		<Filter
 			Name="Tables"
 			>
-			<File
-				RelativePath=".\..\src\table\airport_defaults.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\airporttiles.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\table\airport_movement.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\table\animcursors.h"
 				>
@@ -2216,6 +2192,10 @@
 				RelativePath=".\..\src\table\engines.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\files.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\table\genland.h"
 				>
@@ -2228,6 +2208,10 @@
 				RelativePath=".\..\src\table\landscape_sprite.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\namegen.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\table\palette_convert.h"
 				>
@@ -2236,10 +2220,6 @@
 				RelativePath=".\..\src\table\palettes.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\table\pricebase.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\table\railtypes.h"
 				>
@@ -2252,10 +2232,6 @@
 				RelativePath=".\..\src\table\roadveh_movement.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\table\settings.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\table\sprites.h"
 				>
@@ -2264,10 +2240,6 @@
 				RelativePath=".\..\src\table\station_land.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\table\strgen_tables.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\..\objs\langs\table\strings.h"
 				>
@@ -2276,10 +2248,6 @@
 				RelativePath=".\..\src\table\town_land.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\table\townname.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\table\track_land.h"
 				>
@@ -2305,37 +2273,9 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="MD5"
-			>
-			<File
-				RelativePath=".\..\src\3rdparty\md5\md5.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\3rdparty\md5\md5.h"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="Script"
 			>
-			<File
-				RelativePath=".\..\src\script\script_info.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\script_info.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\script_scanner.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\script\script_scanner.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\script\squirrel.cpp"
 				>
@@ -2412,10 +2352,6 @@
 				RelativePath=".\..\src\3rdparty\squirrel\sqstdlib\sqstdaux.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\3rdparty\squirrel\sqstdlib\sqstdmath.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\3rdparty\squirrel\squirrel\sqtable.cpp"
 				>
@@ -2608,10 +2544,6 @@
 				RelativePath=".\..\src\ai\api\ai_base.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\ai\api\ai_basestation.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\ai\api\ai_bridge.hpp"
 				>
@@ -2828,10 +2760,6 @@
 				RelativePath=".\..\src\ai\api\ai_base.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\ai\api\ai_basestation.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\ai\api\ai_bridge.cpp"
 				>
@@ -3332,6 +3260,10 @@
 				RelativePath=".\..\src\misc\str.hpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\misc\strapi.hpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Network Core"
@@ -3417,127 +3349,71 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="Pathfinder"
-			>
-			<File
-				RelativePath=".\..\src\pathfinder\follow_track.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\opf\opf_ship.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\opf\opf_ship.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\pathfinder_func.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\pathfinder_type.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\pf_performance_timer.hpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="NPF"
-			>
-			<File
-				RelativePath=".\..\src\pathfinder\npf\aystar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\npf\aystar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\npf\npf.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\npf\npf_func.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\npf\queue.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\npf\queue.h"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="YAPF"
 			>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\nodelist.hpp"
+				RelativePath=".\..\src\yapf\follow_track.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf.h"
+				RelativePath=".\..\src\yapf\nodelist.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf.hpp"
+				RelativePath=".\..\src\yapf\yapf.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_base.hpp"
+				RelativePath=".\..\src\yapf\yapf.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_cache.h"
+				RelativePath=".\..\src\yapf\yapf_base.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_common.hpp"
+				RelativePath=".\..\src\yapf\yapf_common.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_costbase.hpp"
+				RelativePath=".\..\src\yapf\yapf_costbase.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_costcache.hpp"
+				RelativePath=".\..\src\yapf\yapf_costcache.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_costrail.hpp"
+				RelativePath=".\..\src\yapf\yapf_costrail.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_destrail.hpp"
+				RelativePath=".\..\src\yapf\yapf_destrail.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_node.hpp"
+				RelativePath=".\..\src\yapf\yapf_node.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_node_rail.hpp"
+				RelativePath=".\..\src\yapf\yapf_node_rail.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_node_road.hpp"
+				RelativePath=".\..\src\yapf\yapf_node_road.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_rail.cpp"
+				RelativePath=".\..\src\yapf\yapf_rail.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_road.cpp"
+				RelativePath=".\..\src\yapf\yapf_road.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfinder\yapf\yapf_ship.cpp"
+				RelativePath=".\..\src\yapf\yapf_ship.cpp"
 				>
 			</File>
 		</Filter>
@@ -3565,11 +3441,11 @@
 			Name="Music"
 			>
 			<File
-				RelativePath=".\..\src\music\dmusic.cpp"
+				RelativePath=".\..\src\music\null_m.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\music\null_m.cpp"
+				RelativePath=".\..\src\music\dmusic.cpp"
 				>
 			</File>
 			<File
@@ -3593,40 +3469,12 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="Windows files"
-			>
-			<File
-				RelativePath=".\..\src\os\windows\crashlog_win.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\os\windows\ottdres.rc"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\os\windows\win32.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Threading"
-			>
-			<File
-				RelativePath=".\..\src\thread\thread.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\thread\thread_win32.cpp"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="64-bit Specific Files"
 			Filter="asm"
 			>
 			<File
-				RelativePath=".\..\src\os\windows\win64.asm"
+				RelativePath=".\..\src\win64.asm"
 				>
 				<FileConfiguration
 					Name="Release|Win32"

projects/openttd_vs90.vcproj.in

@@ -17,7 +17,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\src\os\windows\masm64.rules"
+			RelativePath="..\src\masm64.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -61,7 +61,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				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"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -98,7 +98,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -168,7 +168,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				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;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -196,7 +196,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -271,7 +271,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				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"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -308,7 +308,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -380,7 +380,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				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"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -410,7 +410,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib lzo2.lib dxguid.lib libfreetype2.lib libicu.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib libicu.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -455,7 +455,7 @@
 			Filter="asm"
 			>
 			<File
-				RelativePath=".\..\src\os\windows\win64.asm"
+				RelativePath=".\..\src\win64.asm"
 				>
 				<FileConfiguration
 					Name="Release|Win32"

projects/version_vs80.vcproj

@@ -35,7 +35,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\src\os\windows\ottdres.rc.in"
+			RelativePath="..\src\ottdres.rc.in"
 			>
 		</File>
 		<File

projects/version_vs90.vcproj

@@ -36,7 +36,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\src\os\windows\ottdres.rc.in"
+			RelativePath="..\src\ottdres.rc.in"
 			>
 		</File>
 		<File

readme.txt

@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2010-01-21
-Release version: 1.0.0-beta3
+Last updated:    2009-08-18
+Release version: 0.7.2
 ------------------------------------------------------------------------
 
 
@@ -19,8 +19,9 @@ Table of Contents:
 7.0) Compiling
  * 7.1) Required/optional libraries
 8.0) Translating
- * 8.1 Translation
- * 8.2 Previewing
+ * 8.1 Guidelines
+ * 8.2 Translation
+ * 8.3 Previewing
 9.0) Troubleshooting
 X.X) Credits
 
@@ -65,10 +66,9 @@ When you are sure it is not already reported you should:
  * 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 reproducible for the developers. In other words, create a savegame
+ * 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, crash.log and crash screenshot which are
-   created on crashes.
+   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.
 
@@ -87,9 +87,9 @@ following information in your bug report:
 
 2.2) Reporting Desyncs:
 ---- ------------------
-As desyncs are hard to make reproducible OpenTTD has the ability to log all
+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 reproducible. You need to turn this ability on. When turned
+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
@@ -148,7 +148,7 @@ are:
   DOS                  - Allegro
   FreeBSD              - SDL
   Linux                - SDL or Allegro
-  MacOS X (universal)  - Cocoa video and sound drivers
+  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
@@ -175,61 +175,39 @@ 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)
 
-OpenTTD comes without AIs, so if you want to play with AIs you have to download
-them. The easiest way is via the "Check Online Content" button in the main menu.
-You can select some AIs that you think are compatible with your playing style.
-Another way is manually downloading the AIs from the forum although then you
-need to make sure that you install all the required AI libraries too; they get
-automatically selected (and downloaded) if you get the AIs via the "Check
-Online Content". If you do not have an AI but have configured OpenTTD to start
-an AI a message will be shown that the 'dummy' AI has been started.
-
 4.1) (Required) 3rd party files:
 ---- ---------------------------
 
-Before you run OpenTTD, you need to put the game's data files into a data/
+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.
 
-For OpenTTD you need to acquire some third party data files. For this you have
-the choice of using the original Transport Tycoon Deluxe data files or a set
-of free data files.
+List of the required files:
+	- 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
+
+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.
 
-4.1.1) Free graphics and sound files
------- -----------------------------
-The free data files, split into OpenGFX for graphics and OpenSFX for sounds
-can be found at:
- - http://bundles.openttdcoop.org/opengfx/releases/ for OpenGFX
- - http://bundles.openttdcoop.org/opensfx/releases/ for OpenSFX
-Please follow the readme of these packages about the installation procedure.
-The Windows installer can optionally download and install these packages.
-
-4.1.2) Original Transport Tycoon Deluxe graphics and sound files
------- ---------------------------------------------------------
-If you want to play with the original Transport Tycoon Deluxe data files you
-have to copy the data files from the CD-ROM into the data/ directory. It does
-not matter whether you copy them from the DOS or Windows version of Transport
-Tycoon Deluxe. The Windows install can optionally copy these files.
-You need to copy the following files:
- - sample.cat
- - trg1r.grf or TRG1.GRF
- - trgcr.grf or TRGC.GRF
- - trghr.grf or TRGH.GRF
- - trgir.grf or TRGI.GRF
- - trgtr.grf or TRGT.GRF
-
-4.1.3) Original Transport Tycoon Deluxe music
------- --------------------------------------
-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). The music from the DOS version does not work.
-
-4.1.4) AIs
------- ---
 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
@@ -263,17 +241,17 @@ can be placed in a few different locations:
 	5. The installation directory (Linux only)
 		Linux:   /usr/share/games/openttd
 	6. The application bundle (Mac OSX only)
-		It includes the OpenTTD files (grf+lng) and it will work as long as they aren't touched
+		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.
+	- 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 preferred setup:
+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).
@@ -321,7 +299,7 @@ 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 bug reports because of this. To reduce time spent with
+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.
 
@@ -330,15 +308,15 @@ 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 OpenTTD / TTDPatch / TTD version
-* Running a modified OpenTTD build
-* Changing settings affecting NewGRF behaviour (non-network-safe settings)
+* 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 game log by typing 'gamelog' in the console or by running
+You can show the gamelog by typing 'gamelog' in the console or by running
 OpenTTD in debug mode.
 
 
@@ -360,9 +338,9 @@ Windows:
   you need to add WITH_SDL to the project settings.
   PNG (WITH_PNG) and ZLIB (WITH_ZLIB) support is enabled by default. For these
   to work you need their development files. For best results, download the
-  openttd-useful.zip file from http://www.openttd.org/download-openttd-useful
-  Put the header files into your compiler's include/ directory and the
-  library (.lib) files into the lib/ directory.
+  openttd-useful.zip file from SourceForge under the Files tab. Put the header
+  files into your compiler's include/ directory and the library (.lib) files
+  into the lib/ directory.
   For more help with VS see docs/Readme_Windows_MSVC.txt.
 
   You can also build it using the Makefile with MSYS/MinGW or Cygwin/MinGW.
@@ -410,7 +388,6 @@ DOS:
 The following libraries are used by OpenTTD for:
   - libSDL/liballegro: hardware access (video, sound, mouse)
   - zlib: (de)compressing of savegames
-  - liblzo2: (de)compressing of old (pre 0.3.0) savegames
   - libpng: making screenshots and loading heightmaps
   - libfreetype: loading generic fonts and rendering them
   - libfontconfig: searching for fonts, resolving font names to actual fonts
@@ -432,11 +409,15 @@ simply follow the guidelines in the FAQ of the translator website.
 If for some reason the website is down for a longer period of time, the
 information below might be of help.
 
-Please contact the translations manager (http://www.openttd.org/contact)
-before beginning the translation process! This avoids double work, as
-someone else may have already started translating to the same language.
+8.1) Guidelines:
+---- -------------------
+Here are some translation guidelines which you should follow closely.
 
-8.1) Translation:
+    * Please contact the development team before beginning the translation
+      process! This avoids double work, as someone else may have already
+      started translating to the same language.
+
+8.2) Translation:
 ---- -------------------
 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
@@ -454,7 +435,7 @@ Note: Do not alter the following parts of the file:
     * Lines beginning with ## (such as ##id), other than the first two lines of
       the file
 
-8.2) Previewing:
+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:
@@ -491,7 +472,7 @@ The most frequent problem is missing data files. Don't forget to put all GRF
 files from TTD into your data/ folder including sample.cat!
 
 Under Windows 98 and lower it is impossible to use a dedicated server; it will
-fail to start. Perhaps this is for the better because those OSes are not known
+fail to start. Perhaps this is for the better because those OS's are not known
 for their stability.
 
 With the added support for font-based text selecting a non-latin language will
@@ -500,7 +481,7 @@ file and add a desired font for small/medium/-and large_font. This can be a font
 name like "Tahoma" or a path to a font.
 
 Any NewGRF file used in a game is stored inside the savegame and will refuse
-to load if you don't have that NewGRF file available. A list of missing files
+to load if you don't have that grf file available. A list of missing files
 will be output to the console at the moment, so use the '-d' flag (on windows)
 to see this list. You just have to find the files (http://grfcrawler.tt-forums.net/)
 put them in the data/ folder and you're set to go.
@@ -508,7 +489,6 @@ put them in the data/ folder and you're set to go.
 X.X) Credits:
 ---- --------
 The OpenTTD team (in alphabetical order):
-  Albert Hofkamp (Alberth)       - GUI expert
   Jean-Francois Claeys (Belugas) - GUI, newindustries and more
   Bjarni Corfitzen (Bjarni)      - MacOSX port, coder and vehicles
   Matthijs Kooijman (blathijs)   - Pathfinder-guru, pool rework
@@ -547,6 +527,7 @@ Thanks to:
   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

source.list

@@ -3,14 +3,15 @@ airport.cpp
 animated_tile.cpp
 articulated_vehicles.cpp
 autoreplace.cpp
+aystar.cpp
 bmp.cpp
+callback_table.cpp
 cargopacket.cpp
 cargotype.cpp
 cheat.cpp
 command.cpp
 console.cpp
 console_cmds.cpp
-crashlog.cpp
 currency.cpp
 date.cpp
 debug.cpp
@@ -33,9 +34,12 @@ highscore.cpp
 ini.cpp
 landscape.cpp
 map.cpp
+md5.cpp
+minilzo.cpp
 misc.cpp
 mixer.cpp
 music.cpp
+namegen.cpp
 network/network.cpp
 network/network_client.cpp
 network/network_command.cpp
@@ -43,13 +47,22 @@ network/network_content.cpp
 network/network_gamelist.cpp
 network/network_server.cpp
 network/network_udp.cpp
+npf.cpp
+oldpool.cpp
 openttd.cpp
 os_timer.cpp
+#if WIN32
+	ottdres.rc
+#end
+#if WINCE
+	ottdres.rc
+#end
+pathfind.cpp
 pbs.cpp
+queue.cpp
 rail.cpp
 rev.cpp
 road.cpp
-roadstop.cpp
 screenshot.cpp
 #if SDL
 	sdl.cpp
@@ -58,29 +71,39 @@ settings.cpp
 signal.cpp
 signs.cpp
 sound.cpp
-sprite.cpp
 spritecache.cpp
 station.cpp
 string.cpp
 strings.cpp
-subsidy.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
 tile_map.cpp
-townname.cpp
 #if WIN32
 #else
 	#if WINCE
+		win32.cpp
 	#else
 		#if OS2
-			os/os2/os2.cpp
+			os2.cpp
 		#else
-			#if OSX
-				os/macosx/crashlog_osx.cpp
-			#else
-				os/unix/crashlog_unix.cpp
-			#end
-			os/unix/unix.cpp
+			unix.cpp
 		#end
 	#end
 #end
@@ -89,6 +112,9 @@ vehiclelist.cpp
 viewport.cpp
 waypoint.cpp
 widget.cpp
+#if WIN32
+	win32.cpp
+#end
 window.cpp
 
 # Header Files
@@ -99,6 +125,7 @@ window.cpp
 #end
 aircraft.h
 airport.h
+airport_movement.h
 animated_tile_func.h
 articulated_vehicles.h
 autoreplace_base.h
@@ -106,11 +133,10 @@ autoreplace_func.h
 autoreplace_gui.h
 autoreplace_type.h
 autoslope.h
-base_media_base.h
-base_media_func.h
-base_station_base.h
+aystar.h
 bmp.h
 bridge.h
+callback_table.h
 cargo_type.h
 cargopacket.h
 cargotype.h
@@ -128,10 +154,8 @@ console_func.h
 console_gui.h
 console_internal.h
 console_type.h
-crashlog.h
 currency.h
 date_func.h
-date_gui.h
 date_type.h
 debug.h
 video/dedicated_v.h
@@ -170,18 +194,20 @@ group_type.h
 gui.h
 heightmap.h
 highscore.h
-house.h
-house_type.h
 industry.h
 industry_type.h
-industrytype.h
 ini_type.h
 landscape.h
 landscape_type.h
 livery.h
+lzoconf.h
 map_func.h
 map_type.h
+md5.h
+minilzo.h
 mixer.h
+music.h
+namegen_func.h
 network/network.h
 network/network_base.h
 network/network_client.h
@@ -204,7 +230,6 @@ newgrf_generic.h
 newgrf_house.h
 newgrf_industries.h
 newgrf_industrytiles.h
-newgrf_properties.h
 newgrf_sound.h
 newgrf_spritegroup.h
 newgrf_station.h
@@ -215,15 +240,20 @@ newgrf_townname.h
 news_func.h
 news_gui.h
 news_type.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
+pathfind.h
 pbs.h
 querystring_gui.h
+queue.h
 rail.h
 rail_gui.h
 rail_type.h
@@ -233,7 +263,6 @@ road_func.h
 road_gui.h
 road_internal.h
 road_type.h
-roadstop_base.h
 roadveh.h
 screenshot.h
 sdl.h
@@ -266,15 +295,12 @@ string_func.h
 string_type.h
 strings_func.h
 strings_type.h
-subsidy_base.h
-subsidy_func.h
-subsidy_type.h
 tar_type.h
 terraform_gui.h
 textbuf_gui.h
 texteff.hpp
 tgp.h
-tilearea_type.h
+thread.h
 tile_cmd.h
 tile_type.h
 tilehighlight_func.h
@@ -283,8 +309,6 @@ timetable.h
 toolbar_gui.h
 town.h
 town_type.h
-townname_func.h
-townname_type.h
 track_func.h
 track_type.h
 train.h
@@ -303,10 +327,10 @@ vehiclelist.h
 viewport_func.h
 viewport_type.h
 water.h
-waypoint_base.h
-waypoint_func.h
+waypoint.h
+waypoint_type.h
 widget_type.h
-os/windows/win32.h
+win32.h
 music/win32_m.h
 sound/win32_s.h
 video/win32_v.h
@@ -318,7 +342,6 @@ zoom_type.h
 #if WIN32
 #else
 music/bemidi.h
-music/cocoa_m.h
 music/extmidi.h
 music/libtimidity.h
 music/os2_m.h
@@ -340,15 +363,10 @@ core/bitmath_func.hpp
 core/endian_func.hpp
 core/endian_type.hpp
 core/enum_type.hpp
-core/geometry_func.cpp
-core/geometry_func.hpp
 core/geometry_type.hpp
-core/math_func.cpp
 core/math_func.hpp
 core/mem_func.hpp
 core/overflowsafe_type.hpp
-core/pool_func.hpp
-core/pool_type.hpp
 core/random_func.cpp
 core/random_func.hpp
 core/smallmap_type.hpp
@@ -365,7 +383,6 @@ build_vehicle_gui.cpp
 cheat_gui.cpp
 company_gui.cpp
 console_gui.cpp
-date_gui.cpp
 depot_gui.cpp
 dock_gui.cpp
 engine_gui.cpp
@@ -403,7 +420,6 @@ train_gui.cpp
 transparency_gui.cpp
 tree_gui.cpp
 vehicle_gui.cpp
-viewport_gui.cpp
 waypoint_gui.cpp
 
 # Widgets
@@ -453,7 +469,6 @@ saveload/engine_sl.cpp
 saveload/gamelog_sl.cpp
 saveload/group_sl.cpp
 saveload/industry_sl.cpp
-saveload/labelmaps_sl.cpp
 saveload/map_sl.cpp
 saveload/misc_sl.cpp
 saveload/newgrf_sl.cpp
@@ -473,9 +488,6 @@ saveload/vehicle_sl.cpp
 saveload/waypoint_sl.cpp
 
 # Tables
-table/airport_defaults.h
-table/airporttiles.h
-table/airport_movement.h
 table/animcursors.h
 table/autorail.h
 table/bridge_land.h
@@ -485,22 +497,20 @@ 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/pricebase.h
 table/railtypes.h
 table/road_land.h
 table/roadveh_movement.h
-table/settings.h
 table/sprites.h
 table/station_land.h
-table/strgen_tables.h
 ../objs/langs/table/strings.h
 table/town_land.h
-table/townname.h
 table/track_land.h
 table/train_cmd.h
 table/tree_land.h
@@ -508,15 +518,7 @@ table/unicode.h
 table/unmovable_land.h
 table/water_land.h
 
-# MD5
-3rdparty/md5/md5.cpp
-3rdparty/md5/md5.h
-
 # Script
-script/script_info.cpp
-script/script_info.hpp
-script/script_scanner.cpp
-script/script_scanner.hpp
 script/squirrel.cpp
 script/squirrel.hpp
 script/squirrel_class.hpp
@@ -537,7 +539,6 @@ script/squirrel_std.hpp
 3rdparty/squirrel/squirrel/sqobject.cpp
 3rdparty/squirrel/squirrel/sqstate.cpp
 3rdparty/squirrel/sqstdlib/sqstdaux.cpp
-3rdparty/squirrel/sqstdlib/sqstdmath.cpp
 3rdparty/squirrel/squirrel/sqtable.cpp
 3rdparty/squirrel/squirrel/sqvm.cpp
 
@@ -589,7 +590,6 @@ ai/api/ai_abstractlist.hpp
 ai/api/ai_accounting.hpp
 ai/api/ai_airport.hpp
 ai/api/ai_base.hpp
-ai/api/ai_basestation.hpp
 ai/api/ai_bridge.hpp
 ai/api/ai_bridgelist.hpp
 ai/api/ai_cargo.hpp
@@ -645,7 +645,6 @@ ai/api/ai_abstractlist.cpp
 ai/api/ai_accounting.cpp
 ai/api/ai_airport.cpp
 ai/api/ai_base.cpp
-ai/api/ai_basestation.cpp
 ai/api/ai_bridge.cpp
 ai/api/ai_bridgelist.cpp
 ai/api/ai_cargo.cpp
@@ -782,6 +781,7 @@ misc/dbg_helpers.h
 misc/fixedsizearray.hpp
 misc/hashtable.hpp
 misc/str.hpp
+misc/strapi.hpp
 
 # Network Core
 network/core/address.cpp
@@ -805,39 +805,23 @@ network/core/tcp_game.h
 network/core/udp.cpp
 network/core/udp.h
 
-# Pathfinder
-pathfinder/follow_track.hpp
-pathfinder/opf/opf_ship.cpp
-pathfinder/opf/opf_ship.h
-pathfinder/pathfinder_func.h
-pathfinder/pathfinder_type.h
-pathfinder/pf_performance_timer.hpp
-
-# NPF
-pathfinder/npf/aystar.cpp
-pathfinder/npf/aystar.h
-pathfinder/npf/npf.cpp
-pathfinder/npf/npf_func.h
-pathfinder/npf/queue.cpp
-pathfinder/npf/queue.h
-
 # YAPF
-pathfinder/yapf/nodelist.hpp
-pathfinder/yapf/yapf.h
-pathfinder/yapf/yapf.hpp
-pathfinder/yapf/yapf_base.hpp
-pathfinder/yapf/yapf_cache.h
-pathfinder/yapf/yapf_common.hpp
-pathfinder/yapf/yapf_costbase.hpp
-pathfinder/yapf/yapf_costcache.hpp
-pathfinder/yapf/yapf_costrail.hpp
-pathfinder/yapf/yapf_destrail.hpp
-pathfinder/yapf/yapf_node.hpp
-pathfinder/yapf/yapf_node_rail.hpp
-pathfinder/yapf/yapf_node_road.hpp
-pathfinder/yapf/yapf_rail.cpp
-pathfinder/yapf/yapf_road.cpp
-pathfinder/yapf/yapf_ship.cpp
+yapf/follow_track.hpp
+yapf/nodelist.hpp
+yapf/yapf.h
+yapf/yapf.hpp
+yapf/yapf_base.hpp
+yapf/yapf_common.hpp
+yapf/yapf_costbase.hpp
+yapf/yapf_costcache.hpp
+yapf/yapf_costrail.hpp
+yapf/yapf_destrail.hpp
+yapf/yapf_node.hpp
+yapf/yapf_node_rail.hpp
+yapf/yapf_node_road.hpp
+yapf/yapf_rail.cpp
+yapf/yapf_road.cpp
+yapf/yapf_ship.cpp
 
 # Video
 video/dedicated_v.cpp
@@ -859,6 +843,7 @@ video/null_v.cpp
 #end
 
 # Music
+music/null_m.cpp
 #if DEDICATED
 #else
 #if ALLEGRO
@@ -867,10 +852,6 @@ video/null_v.cpp
 #if DIRECTMUSIC
 	music/dmusic.cpp
 #end
-#end
-music/null_m.cpp
-#if DEDICATED
-#else
 #if WIN32
 	music/win32_m.cpp
 #else
@@ -923,39 +904,7 @@ sound/null_s.cpp
 		video/cocoa/fullscreen.mm
 		video/cocoa/wnd_quartz.mm
 		video/cocoa/wnd_quickdraw.mm
-		music/cocoa_m.cpp
 		sound/cocoa_s.cpp
 		os/macosx/splash.cpp
 	#end
 #end
-
-# Windows files
-#if WIN32
-	os/windows/crashlog_win.cpp
-	os/windows/ottdres.rc
-	os/windows/win32.cpp
-#end
-#if WINCE
-	os/windows/ottdres.rc
-	os/windows/win32.cpp
-#end
-
-# Threading
-thread/thread.h
-#if HAVE_THREAD
-	#if WIN32
-		thread/thread_win32.cpp
-	#else
-		#if OS2
-			thread/thread_os2.cpp
-		#else
-			#if MORPHOS
-				thread/thread_morphos.cpp
-			#else
-				thread/thread_pthread.cpp
-			#end
-		#end
-	#end
-#else
-	thread/thread_none.cpp
-#end

src/3rdparty/squirrel/COMPILE

@@ -1,4 +1,4 @@
-Squirrel 2.2.4 stable
+Squirrel 2.2.1 stable
 --------------------------------------------------------
 What is in this distribution?
 

src/3rdparty/squirrel/COPYRIGHT

@@ -1,4 +1,4 @@
-Copyright (c) 2003-2009 Alberto Demichelis
+Copyright (c) 2003-2008 Alberto Demichelis
 
 This software is provided 'as-is', without any
 express or implied warranty. In no event will the

src/3rdparty/squirrel/HISTORY

@@ -1,21 +1,3 @@
-***version 2.2.4 stable***
--fixed bug in functions with default parameters
-
-***2009-06-30          ***
-***version 2.2.3 stable***
--added sq_getfunctioninfo
--added compile time flag SQUSEDOUBLE to use double precision floats
--added global slot _floatsize_ int the base lib to recognize single precision and double precision builds
--sq_wakeupvm can now resume the vm with an exception
--added sqstd_format
--generators can now be instantiated by calling sq_call() or closure.call()
--fixed a bug in sqstd_printcallstack(thx takayuki_h)
--fixed modulo by zero(thx jup)
--fixed negative enums and constants
--fixed generator crash bug if invoked as tail call (thx Mr.Accident)
--fixed some minor bug
-
-***2008-09-24          ***
 ***version 2.2.2 stable***
 -fixed some behaviour inconsistencies in thread.call() and thread.wakeup() (thx Mr.Accident)
 -fixed coroutine error propagation

src/3rdparty/squirrel/README

@@ -1,4 +1,4 @@
-The programming language SQUIRREL 2.2.4 stable
+The programming language SQUIRREL 2.2.1 stable
 
 --------------------------------------------------
 The project has been compiled and run on Windows(Windows XP/2000 on Intel x86 Windows XP Pro on AMD x64) and

src/3rdparty/squirrel/include/sqstdstring.h

@@ -22,8 +22,6 @@ SQUIRREL_API SQBool sqstd_rex_searchrange(SQRex* exp,const SQChar* text_begin,co
 SQUIRREL_API SQInteger sqstd_rex_getsubexpcount(SQRex* exp);
 SQUIRREL_API SQBool sqstd_rex_getsubexp(SQRex* exp, SQInteger n, SQRexMatch *subexp);
 
-SQUIRREL_API SQRESULT sqstd_format(HSQUIRRELVM v,SQInteger nformatstringidx,SQInteger *outlen,SQChar **output);
-
 SQUIRREL_API SQRESULT sqstd_register_stringlib(HSQUIRRELVM v);
 
 #ifdef __cplusplus

src/3rdparty/squirrel/include/squirrel.h

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2009 Alberto Demichelis
+Copyright (c) 2003-2008 Alberto Demichelis
 
 This software is provided 'as-is', without any
 express or implied warranty. In no event will the
@@ -68,24 +68,7 @@ typedef unsigned int SQHash; /*should be the same size of a pointer*/
 #endif
 
 
-#ifdef SQUSEDOUBLE
-typedef double SQFloat;
-#else
 typedef float SQFloat;
-#endif
-
-#if defined(SQUSEDOUBLE) && !defined(_SQ64)
-#ifdef _MSC_VER
-typedef __int64 SQRawObjectVal; //must be 64bits
-#else
-typedef long SQRawObjectVal; //must be 64bits
-#endif
-#define SQ_OBJECT_RAWINIT() { _unVal.raw = 0; }
-#else
-typedef SQUnsignedInteger SQRawObjectVal; //is 32 bits on 32 bits builds and 64 bits otherwise
-#define SQ_OBJECT_RAWINIT()
-#endif
-
 typedef void* SQUserPointer;
 typedef SQUnsignedInteger SQBool;
 typedef SQInteger SQRESULT;
@@ -176,8 +159,8 @@ typedef char SQChar;
 #define MAX_CHAR 0xFF
 #endif
 
-#define SQUIRREL_VERSION	_SC("Squirrel 2.2.4 stable - With custom OpenTTD modifications")
-#define SQUIRREL_COPYRIGHT	_SC("Copyright (C) 2003-2009 Alberto Demichelis")
+#define SQUIRREL_VERSION	_SC("Squirrel 2.2.2 stable - With custom OpenTTD modifications")
+#define SQUIRREL_COPYRIGHT	_SC("Copyright (C) 2003-2008 Alberto Demichelis")
 #define SQUIRREL_AUTHOR		_SC("Alberto Demichelis")
 
 #define SQ_VMSTATE_IDLE			0
@@ -257,7 +240,6 @@ typedef union tagSQObjectValue
 	struct SQClass *pClass;
 	struct SQInstance *pInstance;
 	struct SQWeakRef *pWeakRef;
-	SQRawObjectVal raw;
 }SQObjectValue;
 
 
@@ -292,13 +274,6 @@ typedef struct tagSQRegFunction{
 	const SQChar *typemask;
 }SQRegFunction;
 
-typedef struct tagSQFunctionInfo {
-	SQUserPointer funcid;
-	const SQChar *name;
-	const SQChar *source;
-}SQFunctionInfo;
-
-
 /*vm*/
 SQUIRREL_API bool sq_can_suspend(HSQUIRRELVM v);
 SQUIRREL_API HSQUIRRELVM sq_open(SQInteger initialstacksize);
@@ -312,9 +287,8 @@ SQUIRREL_API SQPRINTFUNCTION sq_getprintfunc(HSQUIRRELVM v);
 SQUIRREL_API SQRESULT sq_suspendvm(HSQUIRRELVM v);
 SQUIRREL_API bool sq_resumecatch(HSQUIRRELVM v, int suspend = -1);
 SQUIRREL_API bool sq_resumeerror(HSQUIRRELVM v);
-SQUIRREL_API SQRESULT sq_wakeupvm(HSQUIRRELVM v,SQBool resumedret,SQBool retval,SQBool raiseerror,SQBool throwerror);
+SQUIRREL_API SQRESULT sq_wakeupvm(HSQUIRRELVM v,SQBool resumedret,SQBool retval,SQBool raiseerror);
 SQUIRREL_API SQInteger sq_getvmstate(HSQUIRRELVM v);
-SQUIRREL_API void sq_decreaseops(HSQUIRRELVM v, int amount);
 
 /*compiler*/
 SQUIRREL_API SQRESULT sq_compile(HSQUIRRELVM v,SQLEXREADFUNC read,SQUserPointer p,const SQChar *sourcename,SQBool raiseerror);
@@ -364,7 +338,6 @@ SQUIRREL_API SQRESULT sq_settypetag(HSQUIRRELVM v,SQInteger idx,SQUserPointer ty
 SQUIRREL_API SQRESULT sq_gettypetag(HSQUIRRELVM v,SQInteger idx,SQUserPointer *typetag);
 SQUIRREL_API void sq_setreleasehook(HSQUIRRELVM v,SQInteger idx,SQRELEASEHOOK hook);
 SQUIRREL_API SQChar *sq_getscratchpad(HSQUIRRELVM v,SQInteger minsize);
-SQUIRREL_API SQRESULT sq_getfunctioninfo(HSQUIRRELVM v,SQInteger idx,SQFunctionInfo *fi);
 SQUIRREL_API SQRESULT sq_getclosureinfo(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger *nparams,SQUnsignedInteger *nfreevars);
 SQUIRREL_API SQRESULT sq_setnativeclosurename(HSQUIRRELVM v,SQInteger idx,const SQChar *name);
 SQUIRREL_API SQRESULT sq_setinstanceup(HSQUIRRELVM v, SQInteger idx, SQUserPointer p);

src/3rdparty/squirrel/samples/ackermann.nut

@@ -20,4 +20,3 @@ if(ARGS.len()!=0) {
 }
 print("n="+n+"\n");
 print("Ack(3,"+ n+ "):"+ Ack(3, n));
-

src/3rdparty/squirrel/sq/sq.c

@@ -59,9 +59,6 @@ void printfunc(HSQUIRRELVM v,const SQChar *s,...)
 void PrintVersionInfos()
 {
 	scfprintf(stdout,_SC("%s %s (%d bits)\n"),SQUIRREL_VERSION,SQUIRREL_COPYRIGHT,sizeof(SQInteger)*8);
-	if(sizeof(SQFloat) != sizeof(float)) {
-		scfprintf(stdout,_SC("[%d bits floats]\n"),sizeof(SQFloat)*8);
-	}
 }
 
 void PrintUsage()

src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp

@@ -9,7 +9,6 @@ void sqstd_printcallstack(HSQUIRRELVM v)
 	if(pf) {
 		SQStackInfos si;
 		SQInteger i;
-		SQBool b;
 		SQFloat f;
 		const SQChar *s;
 		SQInteger level=1; //1 is to skip this function that is level 0
@@ -84,8 +83,8 @@ void sqstd_printcallstack(HSQUIRRELVM v)
 					pf(v,_SC("[%s] WEAKREF\n"),name);
 					break;
 				case OT_BOOL:{
-					sq_getbool(v,-1,&b);
-					pf(v,_SC("[%s] %s\n"),name,b?_SC("true"):_SC("false"));
+					sq_getinteger(v,-1,&i);
+					pf(v,_SC("[%s] %s\n"),name,i?_SC("true"):_SC("false"));
 							 }
 					break;
 				default: assert(0); break;

src/3rdparty/squirrel/sqstdlib/sqstdmath.cpp

@@ -4,24 +4,21 @@
 #include <stdlib.h>
 #include <sqstdmath.h>
 
-#define SINGLE_ARG_FUNC(_funcname, num_ops) static SQInteger math_##_funcname(HSQUIRRELVM v){ \
+#define SINGLE_ARG_FUNC(_funcname) static SQInteger math_##_funcname(HSQUIRRELVM v){ \
 	SQFloat f; \
-	sq_decreaseops(v,num_ops); \
 	sq_getfloat(v,2,&f); \
 	sq_pushfloat(v,(SQFloat)_funcname(f)); \
 	return 1; \
 }
 
-#define TWO_ARGS_FUNC(_funcname, num_ops) static SQInteger math_##_funcname(HSQUIRRELVM v){ \
+#define TWO_ARGS_FUNC(_funcname) static SQInteger math_##_funcname(HSQUIRRELVM v){ \
 	SQFloat p1,p2; \
-	sq_decreaseops(v,num_ops); \
 	sq_getfloat(v,2,&p1); \
 	sq_getfloat(v,3,&p2); \
 	sq_pushfloat(v,(SQFloat)_funcname(p1,p2)); \
 	return 1; \
 }
 
-#ifdef EXPORT_DEFAULT_SQUIRREL_FUNCTIONS
 static SQInteger math_srand(HSQUIRRELVM v)
 {
 	SQInteger i;
@@ -36,7 +33,6 @@ static SQInteger math_rand(HSQUIRRELVM v)
 	sq_pushinteger(v,rand());
 	return 1;
 }
-#endif /* EXPORT_DEFAULT_SQUIRREL_FUNCTIONS */
 
 static SQInteger math_abs(HSQUIRRELVM v)
 {
@@ -46,21 +42,21 @@ static SQInteger math_abs(HSQUIRRELVM v)
 	return 1;
 }
 
-SINGLE_ARG_FUNC(sqrt, 100)
-SINGLE_ARG_FUNC(fabs, 1)
-SINGLE_ARG_FUNC(sin, 100)
-SINGLE_ARG_FUNC(cos, 100)
-SINGLE_ARG_FUNC(asin, 100)
-SINGLE_ARG_FUNC(acos, 100)
-SINGLE_ARG_FUNC(log, 100)
-SINGLE_ARG_FUNC(log10, 100)
-SINGLE_ARG_FUNC(tan, 100)
-SINGLE_ARG_FUNC(atan, 100)
-TWO_ARGS_FUNC(atan2, 100)
-TWO_ARGS_FUNC(pow, 100)
-SINGLE_ARG_FUNC(floor, 1)
-SINGLE_ARG_FUNC(ceil, 1)
-SINGLE_ARG_FUNC(exp, 100)
+SINGLE_ARG_FUNC(sqrt)
+SINGLE_ARG_FUNC(fabs)
+SINGLE_ARG_FUNC(sin)
+SINGLE_ARG_FUNC(cos)
+SINGLE_ARG_FUNC(asin)
+SINGLE_ARG_FUNC(acos)
+SINGLE_ARG_FUNC(log)
+SINGLE_ARG_FUNC(log10)
+SINGLE_ARG_FUNC(tan)
+SINGLE_ARG_FUNC(atan)
+TWO_ARGS_FUNC(atan2)
+TWO_ARGS_FUNC(pow)
+SINGLE_ARG_FUNC(floor)
+SINGLE_ARG_FUNC(ceil)
+SINGLE_ARG_FUNC(exp)
 
 #define _DECL_FUNC(name,nparams,tycheck) {_SC(#name),math_##name,nparams,tycheck}
 static SQRegFunction mathlib_funcs[] = {
@@ -78,10 +74,8 @@ static SQRegFunction mathlib_funcs[] = {
 	_DECL_FUNC(floor,2,_SC(".n")),
 	_DECL_FUNC(ceil,2,_SC(".n")),
 	_DECL_FUNC(exp,2,_SC(".n")),
-#ifdef EXPORT_DEFAULT_SQUIRREL_FUNCTIONS
 	_DECL_FUNC(srand,2,_SC(".n")),
 	_DECL_FUNC(rand,1,NULL),
-#endif /* EXPORT_DEFAULT_SQUIRREL_FUNCTIONS */
 	_DECL_FUNC(fabs,2,_SC(".n")),
 	_DECL_FUNC(abs,2,_SC(".n")),
 	{0,0,0,0},
@@ -102,11 +96,9 @@ SQRESULT sqstd_register_mathlib(HSQUIRRELVM v)
 		sq_createslot(v,-3);
 		i++;
 	}
-#ifdef EXPORT_DEFAULT_SQUIRREL_FUNCTIONS
 	sq_pushstring(v,_SC("RAND_MAX"),-1);
 	sq_pushinteger(v,RAND_MAX);
 	sq_createslot(v,-3);
-#endif /* EXPORT_DEFAULT_SQUIRREL_FUNCTIONS */
 	sq_pushstring(v,_SC("PI"),-1);
 	sq_pushfloat(v,(SQFloat)M_PI);
 	sq_createslot(v,-3);

src/3rdparty/squirrel/sqstdlib/sqstdrex.cpp

@@ -558,12 +558,12 @@ SQRex *sqstd_rex_compile(const SQChar *pattern,const SQChar **error)
 #endif
 		exp->_matches = (SQRexMatch *) sq_malloc(exp->_nsubexpr * sizeof(SQRexMatch));
 		memset(exp->_matches,0,exp->_nsubexpr * sizeof(SQRexMatch));
+		return exp;
 	}
 	catch (...) {
 		sqstd_rex_free(exp);
 		return NULL;
 	}
-	return exp;
 }
 
 void sqstd_rex_free(SQRex *exp)

src/3rdparty/squirrel/sqstdlib/sqstdstring.cpp

@@ -79,16 +79,15 @@ static void _append_string(SQInteger &i, SQChar *dest, SQInteger allocated, cons
 	va_end(va);
 }
 
-
-SQRESULT sqstd_format(HSQUIRRELVM v,SQInteger nformatstringidx,SQInteger *outlen,SQChar **output)
+static SQInteger _string_format(HSQUIRRELVM v)
 {
 	const SQChar *format;
 	SQChar *dest;
 	SQChar fmt[MAX_FORMAT_LEN];
-	sq_getstring(v,nformatstringidx,&format);
-	SQInteger allocated = (sq_getsize(v,nformatstringidx)+2)*sizeof(SQChar);
+	sq_getstring(v,2,&format);
+	SQInteger allocated = (sq_getsize(v,2)+1)*sizeof(SQChar);
 	dest = sq_getscratchpad(v,allocated);
-	SQInteger n = 0,i = 0, nparam = nformatstringidx+1, w = 0;
+	SQInteger n = 0,i = 0, nparam = 3, w = 0;
 	while(format[n] != '\0') {
 		if(format[n] != '%') {
 			assert(i < allocated);
@@ -133,7 +132,7 @@ SQRESULT sqstd_format(HSQUIRRELVM v,SQInteger nformatstringidx,SQInteger *outlen
 				return sq_throwerror(v,_SC("invalid format"));
 			}
 			n++;
-			allocated += addlen + sizeof(SQChar);
+			allocated += addlen;
 			dest = sq_getscratchpad(v,allocated);
 			switch(valtype) {
 			case 's': _append_string(i,dest,allocated,fmt,ts); break;
@@ -143,19 +142,7 @@ SQRESULT sqstd_format(HSQUIRRELVM v,SQInteger nformatstringidx,SQInteger *outlen
 			nparam ++;
 		}
 	}
-	*outlen = i;
-	dest[i] = '\0';
-	*output = dest;
-	return SQ_OK;
-}
-
-static SQInteger _string_format(HSQUIRRELVM v)
-{
-	SQChar *dest = NULL;
-	SQInteger length = 0;
-	if(SQ_FAILED(sqstd_format(v,2,&length,&dest)))
-		return -1;
-	sq_pushstring(v,dest,length);
+	sq_pushstring(v,dest,i);
 	return 1;
 }
 

src/3rdparty/squirrel/squirrel/sqapi.cpp

@@ -90,11 +90,6 @@ SQInteger sq_getvmstate(HSQUIRRELVM v)
 	}
 }
 
-void sq_decreaseops(HSQUIRRELVM v, int amount)
-{
-	v->DecreaseOps(amount);
-}
-
 bool sq_can_suspend(HSQUIRRELVM v)
 {
 	return v->_nnativecalls <= 2;
@@ -989,7 +984,7 @@ SQRESULT sq_suspendvm(HSQUIRRELVM v)
 	return v->Suspend();
 }
 
-SQRESULT sq_wakeupvm(HSQUIRRELVM v,SQBool wakeupret,SQBool retval,SQBool raiseerror,SQBool throwerror)
+SQRESULT sq_wakeupvm(HSQUIRRELVM v,SQBool wakeupret,SQBool retval,SQBool raiseerror)
 {
 	SQObjectPtr ret;
 	if(!v->_suspended)
@@ -999,10 +994,8 @@ SQRESULT sq_wakeupvm(HSQUIRRELVM v,SQBool wakeupret,SQBool retval,SQBool raiseer
 		v->Pop();
 	} else v->GetAt(v->_stackbase+v->_suspended_target)=_null_;
 	v->_can_suspend = false;
-	if(!v->Execute(_null_,v->_top,-1,-1,ret,raiseerror,throwerror?SQVM::ET_RESUME_THROW_VM : SQVM::ET_RESUME_VM))
+	if(!v->Execute(_null_,v->_top,-1,-1,ret,raiseerror,SQVM::ET_RESUME_VM)) {
 		return SQ_ERROR;
-	if(sq_getvmstate(v) == SQ_VMSTATE_IDLE) {
-		while (v->_top > 1) v->_stack[--v->_top] = _null_;
 	}
 	if(retval)
 		v->Push(ret);

src/3rdparty/squirrel/squirrel/sqbaselib.cpp

@@ -277,9 +277,6 @@ void sq_base_register(HSQUIRRELVM v)
 	sq_pushstring(v,_SC("_intsize_"),-1);
 	sq_pushinteger(v,sizeof(SQInteger));
 	sq_createslot(v,-3);
-	sq_pushstring(v,_SC("_floatsize_"),-1);
-	sq_pushinteger(v,sizeof(SQFloat));
-	sq_createslot(v,-3);
 	sq_pop(v,1);
 }
 
@@ -818,7 +815,7 @@ static SQInteger thread_wakeup(HSQUIRRELVM v)
 		if(wakeupret) {
 			sq_move(thread,v,2);
 		}
-		if(SQ_SUCCEEDED(sq_wakeupvm(thread,wakeupret,SQTrue,SQTrue,SQFalse))) {
+		if(SQ_SUCCEEDED(sq_wakeupvm(thread,wakeupret,SQTrue,SQFalse))) {
 			sq_move(v,thread,-1);
 			sq_pop(thread,1); //pop retval
 			if(sq_getvmstate(thread) == SQ_VMSTATE_IDLE) {

src/3rdparty/squirrel/squirrel/sqdebug.cpp

@@ -9,23 +9,6 @@
 #include "sqclosure.h"
 #include "sqstring.h"
 
-SQRESULT sq_getfunctioninfo(HSQUIRRELVM v,SQInteger level,SQFunctionInfo *fi)
-{
-	SQInteger cssize = v->_callsstacksize;
-	if (cssize > level) {
-		SQVM::CallInfo &ci = v->_callsstack[cssize-level-1];
-		if(sq_isclosure(ci._closure)) {
-			SQClosure *c = _closure(ci._closure);
-			SQFunctionProto *proto = _funcproto(c->_function);
-			fi->funcid = proto;
-			fi->name = type(proto->_name) == OT_STRING?_stringval(proto->_name):_SC("unknown");
-			fi->source = type(proto->_name) == OT_STRING?_stringval(proto->_sourcename):_SC("unknown");
-			return SQ_OK;
-		}
-	}
-	return sq_throwerror(v,_SC("the object is not a closure"));
-}
-
 SQRESULT sq_stackinfos(HSQUIRRELVM v, SQInteger level, SQStackInfos *si)
 {
 	SQInteger cssize = v->_callsstacksize;

src/3rdparty/squirrel/squirrel/sqfuncstate.cpp

@@ -86,7 +86,7 @@ void DumpLiteral(SQObjectPtr &o)
 		case OT_INTEGER: scprintf(_SC("{%d}"),_integer(o));break;
 #endif
 		case OT_BOOL: scprintf(_SC("%s"),_integer(o)?_SC("true"):_SC("false"));break;
-		default: scprintf(_SC("(%s %p)"),GetTypeName(o),(void*)_rawval(o));break; break; //shut up compiler
+		default: scprintf(_SC("(%s %p)"),GetTypeName(o),_rawval(o));break; break; //shut up compiler
 	}
 }
 

src/3rdparty/squirrel/squirrel/sqobject.cpp

@@ -201,7 +201,7 @@ const SQChar* SQFunctionProto::GetLocal(SQVM *vm,SQUnsignedInteger stackbase,SQU
 	SQUnsignedInteger nvars=_nlocalvarinfos;
 	const SQChar *res=NULL;
 	if(nvars>=nseq){
-		for(SQUnsignedInteger i=0;i<nvars;i++){
+ 		for(SQUnsignedInteger i=0;i<nvars;i++){
 			if(_localvarinfos[i]._start_op<=nop && _localvarinfos[i]._end_op>=nop)
 			{
 				if(nseq==0){

src/3rdparty/squirrel/squirrel/sqobject.h

@@ -117,7 +117,7 @@ struct SQObjectPtr;
 #define _delegable(obj) ((SQDelegable *)(obj)._unVal.pDelegable)
 #define _weakref(obj) ((obj)._unVal.pWeakRef)
 #define _refcounted(obj) ((obj)._unVal.pRefCounted)
-#define _rawval(obj) ((obj)._unVal.raw)
+#define _rawval(obj) ((obj)._unVal.pRefCounted)
 
 #define _stringval(obj) (obj)._unVal.pString->_val
 #define _userdataval(obj) (obj)._unVal.pUserData->_val
@@ -130,27 +130,23 @@ struct SQObjectPtr : public SQObject
 {
 	SQObjectPtr()
 	{
-		SQ_OBJECT_RAWINIT()
 		_type=OT_NULL;
 		_unVal.pUserPointer=NULL;
 	}
 	SQObjectPtr(const SQObjectPtr &o)
 	{
-		SQ_OBJECT_RAWINIT()
 		_type=o._type;
 		_unVal=o._unVal;
 		__AddRef(_type,_unVal);
 	}
 	SQObjectPtr(const SQObject &o)
 	{
-		SQ_OBJECT_RAWINIT()
 		_type=o._type;
 		_unVal=o._unVal;
 		__AddRef(_type,_unVal);
 	}
 	SQObjectPtr(SQTable *pTable)
 	{
-		SQ_OBJECT_RAWINIT()
 		_type=OT_TABLE;
 		_unVal.pTable=pTable;
 		assert(_unVal.pTable);
@@ -158,7 +154,6 @@ struct SQObjectPtr : public SQObject
 	}
 	SQObjectPtr(SQClass *pClass)
 	{
-		SQ_OBJECT_RAWINIT()
 		_type=OT_CLASS;
 		_unVal.pClass=pClass;
 		assert(_unVal.pClass);
@@ -166,7 +161,6 @@ struct SQObjectPtr : public SQObject
 	}
 	SQObjectPtr(SQInstance *pInstance)
 	{
-		SQ_OBJECT_RAWINIT()
 		_type=OT_INSTANCE;
 		_unVal.pInstance=pInstance;
 		assert(_unVal.pInstance);
@@ -174,7 +168,6 @@ struct SQObjectPtr : public SQObject
 	}
 	SQObjectPtr(SQArray *pArray)
 	{
-		SQ_OBJECT_RAWINIT()
 		_type=OT_ARRAY;
 		_unVal.pArray=pArray;
 		assert(_unVal.pArray);
@@ -182,7 +175,6 @@ struct SQObjectPtr : public SQObject
 	}
 	SQObjectPtr(SQClosure *pClosure)
 	{
-		SQ_OBJECT_RAWINIT()
 		_type=OT_CLOSURE;
 		_unVal.pClosure=pClosure;
 		assert(_unVal.pClosure);
@@ -190,7 +182,6 @@ struct SQObjectPtr : public SQObject
 	}
 	SQObjectPtr(SQGenerator *pGenerator)
 	{
-		SQ_OBJECT_RAWINIT()
 		_type=OT_GENERATOR;
 		_unVal.pGenerator=pGenerator;
 		assert(_unVal.pGenerator);
@@ -198,7 +189,6 @@ struct SQObjectPtr : public SQObject
 	}
 	SQObjectPtr(SQNativeClosure *pNativeClosure)
 	{
-		SQ_OBJECT_RAWINIT()
 		_type=OT_NATIVECLOSURE;
 		_unVal.pNativeClosure=pNativeClosure;
 		assert(_unVal.pNativeClosure);
@@ -206,7 +196,6 @@ struct SQObjectPtr : public SQObject
 	}
 	SQObjectPtr(SQString *pString)
 	{
-		SQ_OBJECT_RAWINIT()
 		_type=OT_STRING;
 		_unVal.pString=pString;
 		assert(_unVal.pString);
@@ -214,7 +203,6 @@ struct SQObjectPtr : public SQObject
 	}
 	SQObjectPtr(SQUserData *pUserData)
 	{
-		SQ_OBJECT_RAWINIT()
 		_type=OT_USERDATA;
 		_unVal.pUserData=pUserData;
 		assert(_unVal.pUserData);
@@ -222,7 +210,6 @@ struct SQObjectPtr : public SQObject
 	}
 	SQObjectPtr(SQVM *pThread)
 	{
-		SQ_OBJECT_RAWINIT()
 		_type=OT_THREAD;
 		_unVal.pThread=pThread;
 		assert(_unVal.pThread);
@@ -230,7 +217,6 @@ struct SQObjectPtr : public SQObject
 	}
 	SQObjectPtr(SQWeakRef *pWeakRef)
 	{
-		SQ_OBJECT_RAWINIT()
 		_type=OT_WEAKREF;
 		_unVal.pWeakRef=pWeakRef;
 		assert(_unVal.pWeakRef);
@@ -238,7 +224,6 @@ struct SQObjectPtr : public SQObject
 	}
 	SQObjectPtr(SQFunctionProto *pFunctionProto)
 	{
-		SQ_OBJECT_RAWINIT()
 		_type=OT_FUNCPROTO;
 		_unVal.pFunctionProto=pFunctionProto;
 		assert(_unVal.pFunctionProto);
@@ -246,25 +231,24 @@ struct SQObjectPtr : public SQObject
 	}
 	SQObjectPtr(SQInteger nInteger)
 	{
-		SQ_OBJECT_RAWINIT()
+		_unVal.pUserPointer=NULL;
 		_type=OT_INTEGER;
 		_unVal.nInteger=nInteger;
 	}
 	SQObjectPtr(SQFloat fFloat)
 	{
-		SQ_OBJECT_RAWINIT()
+		_unVal.pUserPointer=NULL;
 		_type=OT_FLOAT;
 		_unVal.fFloat=fFloat;
 	}
 	SQObjectPtr(bool bBool)
 	{
-		SQ_OBJECT_RAWINIT()
+		_unVal.pUserPointer=NULL;
 		_type = OT_BOOL;
 		_unVal.nInteger = bBool?1:0;
 	}
 	SQObjectPtr(SQUserPointer pUserPointer)
 	{
-		SQ_OBJECT_RAWINIT()
 		_type=OT_USERPOINTER;
 		_unVal.pUserPointer=pUserPointer;
 	}

src/3rdparty/squirrel/squirrel/sqvm.cpp

@@ -17,21 +17,6 @@
 
 #define TOP() (_stack._vals[_top-1])
 
-#define CLEARSTACK(_last_top) { if((_last_top) >= _top) ClearStack(_last_top); }
-void SQVM::ClearStack(SQInteger last_top)
-{
-	SQObjectType tOldType;
-	SQObjectValue unOldVal;
-	while (last_top >= _top) {
-		SQObjectPtr &o = _stack._vals[last_top--];
-		tOldType = o._type;
-		unOldVal = o._unVal;
-		o._type = OT_NULL;
-		o._unVal.pUserPointer = NULL;
-		__Release(tOldType,unOldVal);
-	}
-}
-
 bool SQVM::BW_OP(SQUnsignedInteger op,SQObjectPtr &trg,const SQObjectPtr &o1,const SQObjectPtr &o2)
 {
 	SQInteger res;
@@ -305,10 +290,12 @@ void SQVM::TypeOf(const SQObjectPtr &obj1,SQObjectPtr &dest)
 bool SQVM::Init(SQVM *friendvm, SQInteger stacksize)
 {
 	_stack.resize(stacksize);
+	//_callsstack.reserve(4);
 	_alloccallsstacksize = 4;
 	_callstackdata.resize(_alloccallsstacksize);
 	_callsstacksize = 0;
 	_callsstack = &_callstackdata[0];
+	//_callsstack = (CallInfo*)sq_malloc(_alloccallsstacksize*sizeof(CallInfo));
 	_stackbase = 0;
 	_top = 0;
 	if(!friendvm)
@@ -334,8 +321,12 @@ bool SQVM::StartCall(SQClosure *closure,SQInteger target,SQInteger args,SQIntege
 	SQInteger nargs = args;
 	if (paramssize != nargs) {
 		SQInteger ndef = func->_ndefaultparams;
-		SQInteger diff;
-		if(ndef && nargs < paramssize && (diff = paramssize - nargs) <= ndef) {
+		if(ndef && nargs < paramssize) {
+			SQInteger diff = paramssize - nargs;
+			if (diff > ndef) {
+				Raise_Error(_SC("wrong number of parameters"));
+				return false;
+			}
 			for(SQInteger n = ndef - diff; n < ndef; n++) {
 				_stack._vals[stackbase + (nargs++)] = closure->_defaultparams[n];
 			}
@@ -436,7 +427,7 @@ bool SQVM::LOCAL_INC(SQInteger op,SQObjectPtr &target, SQObjectPtr &a, SQObjectP
 
 bool SQVM::PLOCAL_INC(SQInteger op,SQObjectPtr &target, SQObjectPtr &a, SQObjectPtr &incr)
 {
-	SQObjectPtr trg;
+ 	SQObjectPtr trg;
 	_RET_ON_FAIL(ARITH_OP( op , trg, a, incr));
 	target = a;
 	a = trg;
@@ -455,7 +446,7 @@ bool SQVM::DerefInc(SQInteger op,SQObjectPtr &target, SQObjectPtr &self, SQObjec
 
 #define arg0 (_i_._arg0)
 #define arg1 (_i_._arg1)
-#define sarg1 (*(const_cast<SQInt32 *>(&_i_._arg1)))
+#define sarg1 (*((SQInt32 *)&_i_._arg1))
 #define arg2 (_i_._arg2)
 #define arg3 (_i_._arg3)
 #define sarg3 ((SQInteger)*((signed char *)&_i_._arg3))
@@ -687,25 +678,13 @@ bool SQVM::Execute(SQObjectPtr &closure, SQInteger target, SQInteger nargs, SQIn
 	bool ct_tailcall;
 
 	switch(et) {
-		case ET_CALL: {
-			SQInteger last_top = _top;
-			temp_reg = closure;
-			if(!StartCall(_closure(temp_reg), _top - nargs, nargs, stackbase, false)) {
+		case ET_CALL:
+			if(!StartCall(_closure(closure), _top - nargs, nargs, stackbase, false)) {
 				//call the handler if there are no calls in the stack, if not relies on the previous node
 				if(ci == NULL) CallErrorHandler(_lasterror);
 				return false;
 			}
-			if (_funcproto(_closure(temp_reg)->_function)->_bgenerator) {
-				//SQFunctionProto *f = _funcproto(_closure(temp_reg)->_function);
-				SQGenerator *gen = SQGenerator::Create(_ss(this), _closure(temp_reg));
-				_GUARD(gen->Yield(this));
-				Return(1, ci->_target, temp_reg);
-				outres = gen;
-				CLEARSTACK(last_top);
-				return true;
-			}
 			ci->_root = SQTrue;
-					  }
 			break;
 		case ET_RESUME_GENERATOR: _generator(closure)->Resume(this, target); ci->_root = SQTrue; traps += ci->_etraps; break;
 		case ET_RESUME_VM:
@@ -745,7 +724,7 @@ exception_restore:
 			case _OP_DLOAD: TARGET = ci->_literals[arg1]; STK(arg2) = ci->_literals[arg3];continue;
 			case _OP_TAILCALL:
 				temp_reg = STK(arg1);
-				if (type(temp_reg) == OT_CLOSURE && !_funcproto(_closure(temp_reg)->_function)->_bgenerator){
+				if (type(temp_reg) == OT_CLOSURE){
 					ct_tailcall = true;
 					if(ci->_vargs.size) PopVarArgs(ci->_vargs);
 					for (SQInteger i = 0; i < arg3; i++) STK(i) = STK(arg2 + i);
@@ -771,7 +750,7 @@ common_call:
 							Return(1, ct_target, clo);
 							STK(ct_target) = gen;
 						}
-						CLEARSTACK(last_top);
+						while (last_top >= _top) _stack._vals[last_top--].Null();
 						}
 						continue;
 					case OT_NATIVECLOSURE: {
@@ -1050,7 +1029,7 @@ exception_trap:
 						_stackbase = et._stackbase;
 						_stack._vals[_stackbase+et._extarget] = currerror;
 						_etraps.pop_back(); traps--; ci->_etraps--;
-						CLEARSTACK(last_top);
+						while(last_top >= _top) _stack._vals[last_top--].Null();
 						goto exception_restore;
 					}
 					//if is a native closure
@@ -1078,7 +1057,7 @@ exception_trap:
 				if( (ci && type(ci->_closure) != OT_CLOSURE) || exitafterthisone) break;
 			} while(_callsstacksize);
 
-			CLEARSTACK(last_top);
+			while(last_top >= _top) _stack._vals[last_top--].Null();
 		}
 		_lasterror = currerror;
 		return false;
@@ -1090,6 +1069,8 @@ bool SQVM::CreateClassInstance(SQClass *theclass, SQObjectPtr &inst, SQObjectPtr
 {
 	inst = theclass->CreateInstance();
 	if(!theclass->Get(_ss(this)->_constructoridx,constructor)) {
+		//if(!Call(constr,nargs,stackbase,constr,false))
+		//	return false;
 		constructor = _null_;
 	}
 	return true;

src/3rdparty/squirrel/squirrel/sqvm.h

@@ -108,7 +108,6 @@ public:
 	_INLINE bool PLOCAL_INC(SQInteger op,SQObjectPtr &target, SQObjectPtr &a, SQObjectPtr &incr);
 	_INLINE bool DerefInc(SQInteger op,SQObjectPtr &target, SQObjectPtr &self, SQObjectPtr &key, SQObjectPtr &incr, bool postfix);
 	void PopVarArgs(VarArgs &vargs);
-	void ClearStack(SQInteger last_top);
 #ifdef _DEBUG_DUMP
 	void dumpstack(SQInteger stackbase=-1, bool dumpall = false);
 #endif

src/ai/ai.hpp

@@ -1,12 +1,5 @@
 /* $Id$ */
 
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
 /** @file ai.hpp Base functions for all AIs. */
 
 #ifndef AI_HPP
@@ -15,11 +8,12 @@
 #include "api/ai_event_types.hpp"
 #include "../date_type.h"
 #include "../core/string_compare_type.hpp"
-#include <map>
 
 typedef std::map<const char *, class AIInfo *, StringCompare> AIInfoList;
 
 
+void CcAI(bool success, TileIndex tile, uint32 p1, uint32 p2);
+
 class AI {
 public:
 	/**
@@ -43,9 +37,8 @@ public:
 	/**
 	 * Start a new AI company.
 	 * @param company At which slot the AI company should start.
-	 * @param rerandomise_ai Whether to rerandomise the configured AI.
 	 */
-	static void StartNew(CompanyID company, bool rerandomise_ai = true);
+	static void StartNew(CompanyID company);
 
 	/**
 	 * Called every game-tick to let AIs do something.
@@ -60,7 +53,7 @@ public:
 	/**
 	 * Stop a company to be controlled by an AI.
 	 * @param company The company from which the AI needs to detach.
-	 * @pre Company::IsValidAiID(company)
+	 * @pre !IsHumanCompany(company).
 	 */
 	static void Stop(CompanyID company);
 

src/ai/ai_config.cpp

@@ -1,12 +1,5 @@
 /* $Id$ */
 
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
 /** @file ai_config.cpp Implementation of AIConfig. */
 
 #include "../stdafx.h"
@@ -16,13 +9,12 @@
 #include "ai.hpp"
 #include "ai_config.hpp"
 
-void AIConfig::ChangeAI(const char *name, int version, bool is_random_ai)
+void AIConfig::ChangeAI(const char *name, int version)
 {
 	free((void *)this->name);
 	this->name = (name == NULL) ? NULL : strdup(name);
 	this->info = (name == NULL) ? NULL : AI::FindInfo(this->name, version);
 	this->version = (info == NULL) ? -1 : info->GetVersion();
-	this->is_random_ai = is_random_ai;
 	if (this->config_list != NULL) delete this->config_list;
 	this->config_list = (info == NULL) ? NULL : new AIConfigItemList();
 	if (this->config_list != NULL) this->config_list->push_back(_start_date_config);
@@ -57,7 +49,6 @@ AIConfig::AIConfig(const AIConfig *config)
 	this->info = config->info;
 	this->version = config->version;
 	this->config_list = NULL;
-	this->is_random_ai = config->is_random_ai;
 
 	for (SettingValueList::const_iterator it = config->settings.begin(); it != config->settings.end(); it++) {
 		this->settings[strdup((*it).first)] = (*it).second;
@@ -72,7 +63,7 @@ AIConfig::~AIConfig()
 	if (this->config_list != NULL) delete this->config_list;
 }
 
-AIInfo *AIConfig::GetInfo() const
+AIInfo *AIConfig::GetInfo()
 {
 	return this->info;
 }
@@ -105,9 +96,9 @@ AIConfig *AIConfig::GetConfig(CompanyID company, bool forceNewgameSetting)
 	return *config;
 }
 
-int AIConfig::GetSetting(const char *name) const
+int AIConfig::GetSetting(const char *name)
 {
-	SettingValueList::const_iterator it = this->settings.find(name);
+	SettingValueList::iterator it = this->settings.find(name);
 	/* Return the default value if the setting is not set, or if we are in a not-custom difficult level */
 	if (it == this->settings.end() || ((_game_mode == GM_MENU) ? _settings_newgame.difficulty.diff_level : _settings_game.difficulty.diff_level) != 3) {
 		if (this->info == NULL) {
@@ -164,22 +155,17 @@ void AIConfig::AddRandomDeviation()
 	}
 }
 
-bool AIConfig::HasAI() const
+bool AIConfig::HasAI()
 {
 	return this->info != NULL;
 }
 
-bool AIConfig::IsRandomAI() const
-{
-	return this->is_random_ai;
-}
-
-const char *AIConfig::GetName() const
+const char *AIConfig::GetName()
 {
 	return this->name;
 }
 
-int AIConfig::GetVersion() const
+int AIConfig::GetVersion()
 {
 	return this->version;
 }
@@ -210,10 +196,10 @@ void AIConfig::StringToSettings(const char *value)
 	free(value_copy);
 }
 
-void AIConfig::SettingsToString(char *string, size_t size) const
+void AIConfig::SettingsToString(char *string, size_t size)
 {
 	string[0] = '\0';
-	for (SettingValueList::const_iterator it = this->settings.begin(); it != this->settings.end(); it++) {
+	for (SettingValueList::iterator it = this->settings.begin(); it != this->settings.end(); it++) {
 		char no[10];
 		snprintf(no, sizeof(no), "%d", (*it).second);
 

src/ai/ai_config.hpp

@@ -1,12 +1,5 @@
 /* $Id$ */
 
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
 /** @file ai_config.hpp AIConfig stores the configuration settings of every AI. */
 
 #ifndef AI_CONFIG_HPP
@@ -15,7 +8,6 @@
 #include <map>
 #include "ai_info.hpp"
 #include "../core/string_compare_type.hpp"
-#include "../company_type.h"
 
 class AIConfig {
 private:
@@ -26,8 +18,7 @@ public:
 		name(NULL),
 		version(-1),
 		info(NULL),
-		config_list(NULL),
-		is_random_ai(false)
+		config_list(NULL)
 	{}
 	AIConfig(const AIConfig *config);
 	~AIConfig();
@@ -36,9 +27,8 @@ public:
 	 * Set another AI to be loaded in this slot.
 	 * @param name The name of the AI.
 	 * @param version The version of the AI to load, or -1 of latest.
-	 * @param is_random Is the AI chosen randomly?
 	 */
-	void ChangeAI(const char *name, int version = -1, bool is_random = false);
+	void ChangeAI(const char *name, int version = -1);
 
 	/**
 	 * When ever the AI Scanner is reloaded, all infos become invalid. This
@@ -51,7 +41,7 @@ public:
 	/**
 	 * Get the AIInfo linked to this AIConfig.
 	 */
-	class AIInfo *GetInfo() const;
+	class AIInfo *GetInfo();
 
 	/**
 	 * Get the config list for this AIConfig.
@@ -70,7 +60,7 @@ public:
 	 * @return The (default) value of the setting, or -1 if the setting was not
 	 *  found.
 	 */
-	int GetSetting(const char *name) const;
+	int GetSetting(const char *name);
 
 	/**
 	 * Set the value of a setting for this config.
@@ -90,22 +80,17 @@ public:
 	/**
 	 * Is this config attached to an AI?
 	 */
-	bool HasAI() const;
-
-	/**
-	 * Is the current AI a randomly chosen AI?
-	 */
-	bool IsRandomAI() const;
+	bool HasAI();
 
 	/**
 	 * Get the name of the AI.
 	 */
-	const char *GetName() const;
+	const char *GetName();
 
 	/**
 	 * Get the version of the AI.
 	 */
-	int GetVersion() const;
+	int GetVersion();
 
 	/**
 	 * Convert a string which is stored in the config file or savegames to
@@ -117,7 +102,7 @@ public:
 	 * Convert the custom settings to a string that can be stored in the config
 	 *  file or savegames.
 	 */
-	void SettingsToString(char *string, size_t size) const;
+	void SettingsToString(char *string, size_t size);
 
 private:
 	const char *name;
@@ -125,7 +110,6 @@ private:
 	class AIInfo *info;
 	SettingValueList settings;
 	AIConfigItemList *config_list;
-	bool is_random_ai;
 };
 
 #endif /* AI_CONFIG_HPP */

src/ai/ai_core.cpp

@@ -1,12 +1,5 @@
 /* $Id$ */
 
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
 /** @file ai_core.cpp Implementation of AI. */
 
 #include "../stdafx.h"
@@ -15,12 +8,13 @@
 #include "../company_func.h"
 #include "../debug.h"
 #include "../network/network.h"
+#include "../settings_type.h"
 #include "../window_func.h"
 #include "../command_func.h"
+#include "ai.hpp"
 #include "ai_scanner.hpp"
 #include "ai_instance.hpp"
 #include "ai_config.hpp"
-#include "api/ai_error.hpp"
 
 /* static */ uint AI::frame_counter = 0;
 /* static */ AIScanner *AI::ai_scanner = NULL;
@@ -31,24 +25,23 @@
 	return !_networking || (_network_server && _settings_game.ai.ai_in_multiplayer);
 }
 
-/* static */ void AI::StartNew(CompanyID company, bool rerandomise_ai)
+/* static */ void AI::StartNew(CompanyID company)
 {
-	assert(Company::IsValidID(company));
+	assert(IsValidCompanyID(company));
 
 	/* Clients shouldn't start AIs */
 	if (_networking && !_network_server) return;
 
-	AIConfig *config = AIConfig::GetConfig(company);
-	AIInfo *info = config->GetInfo();
-	if (info == NULL || (rerandomise_ai && config->IsRandomAI())) {
+	AIInfo *info = AIConfig::GetConfig(company)->GetInfo();
+	if (info == NULL) {
 		info = AI::ai_scanner->SelectRandomAI();
 		assert(info != NULL);
 		/* Load default data and store the name in the settings */
-		config->ChangeAI(info->GetName(), -1, true);
+		AIConfig::GetConfig(company)->ChangeAI(info->GetName());
 	}
 
 	_current_company = company;
-	Company *c = Company::Get(company);
+	Company *c = GetCompany(company);
 
 	c->ai_info = info;
 	assert(c->ai_instance == NULL);
@@ -70,7 +63,7 @@
 
 	const Company *c;
 	FOR_ALL_COMPANIES(c) {
-		if (c->is_ai) {
+		if (!IsHumanCompany(c->index)) {
 			_current_company = c->index;
 			c->ai_instance->GameLoop();
 		}
@@ -80,7 +73,7 @@
 	 * Effectively collecting garbage once every two months per AI. */
 	if ((AI::frame_counter & 255) == 0) {
 		CompanyID cid = (CompanyID)GB(AI::frame_counter, 8, 4);
-		if (Company::IsValidAiID(cid)) Company::Get(cid)->ai_instance->CollectGarbage();
+		if (IsValidCompanyID(cid) && !IsHumanCompany(cid)) GetCompany(cid)->ai_instance->CollectGarbage();
 	}
 
 	_current_company = OWNER_NONE;
@@ -97,7 +90,7 @@
 
 	CompanyID old_company = _current_company;
 	_current_company = company;
-	Company *c = Company::Get(company);
+	Company *c = GetCompany(company);
 
 	delete c->ai_instance;
 	c->ai_instance = NULL;
@@ -110,11 +103,11 @@
 /* static */ void AI::KillAll()
 {
 	/* It might happen there are no companies .. than we have nothing to loop */
-	if (Company::GetPoolSize() == 0) return;
+	if (GetCompanyPoolSize() == 0) return;
 
 	const Company *c;
 	FOR_ALL_COMPANIES(c) {
-		if (c->is_ai) AI::Stop(c->index);
+		if (!IsHumanCompany(c->index)) AI::Stop(c->index);
 	}
 }
 
@@ -184,7 +177,7 @@
 	}
 
 	/* Only AIs can have an event-queue */
-	if (!Company::IsValidAiID(company)) {
+	if (!IsValidCompanyID(company) || IsHumanCompany(company)) {
 		event->Release();
 		return;
 	}
@@ -217,29 +210,28 @@
 	event->Release();
 }
 
-void CcAI(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcAI(bool success, TileIndex tile, uint32 p1, uint32 p2)
 {
-	AIObject::SetLastCommandRes(result.Succeeded());
+	AIObject::SetLastCommandRes(success);
 
-	if (result.Failed()) {
-		AIObject::SetLastError(AIError::StringToError(result.GetErrorMessage()));
+	if (!success) {
+		AIObject::SetLastError(AIError::StringToError(_error_message));
 	} else {
-		AIObject::IncreaseDoCommandCosts(result.GetCost());
-		AIObject::SetLastCost(result.GetCost());
+		AIObject::IncreaseDoCommandCosts(AIObject::GetLastCost());
 	}
 
-	Company::Get(_current_company)->ai_instance->Continue();
+	GetCompany(_current_company)->ai_instance->Continue();
 }
 
 /* static */ void AI::Save(CompanyID company)
 {
 	if (!_networking || _network_server) {
-		Company *c = Company::GetIfValid(company);
-		assert(c != NULL && c->ai_instance != NULL);
+		assert(IsValidCompanyID(company));
+		assert(GetCompany(company)->ai_instance != NULL);
 
 		CompanyID old_company = _current_company;
 		_current_company = company;
-		c->ai_instance->Save();
+		GetCompany(company)->ai_instance->Save();
 		_current_company = old_company;
 	} else {
 		AIInstance::SaveEmpty();
@@ -249,12 +241,12 @@ void CcAI(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
 /* static */ void AI::Load(CompanyID company, int version)
 {
 	if (!_networking || _network_server) {
-		Company *c = Company::GetIfValid(company);
-		assert(c != NULL && c->ai_instance != NULL);
+		assert(IsValidCompanyID(company));
+		assert(GetCompany(company)->ai_instance != NULL);
 
 		CompanyID old_company = _current_company;
 		_current_company = company;
-		c->ai_instance->Load(version);
+		GetCompany(company)->ai_instance->Load(version);
 		_current_company = old_company;
 	} else {
 		/* Read, but ignore, the load data */
@@ -266,7 +258,7 @@ void CcAI(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
 {
 	/* Find the first company which doesn't exist yet */
 	for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) {
-		if (!Company::IsValidID(c)) return AIConfig::GetConfig(c)->GetSetting("start_date");
+		if (!IsValidCompanyID(c)) return AIConfig::GetConfig(c)->GetSetting("start_date");
 	}
 
 	/* Currently no AI can be started, check again in a year. */
@@ -295,7 +287,7 @@ void CcAI(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
 
 /* static */ bool AI::ImportLibrary(const char *library, const char *class_name, int version, HSQUIRRELVM vm)
 {
-	return AI::ai_scanner->ImportLibrary(library, class_name, version, vm, Company::Get(_current_company)->ai_instance->GetController());
+	return AI::ai_scanner->ImportLibrary(library, class_name, version, vm, GetCompany(_current_company)->ai_instance->GetController());
 }
 
 /* static */ void AI::Rescan()