(svn r7538) Release 0.5.0-RC1

.gitignore

@@ -1,11 +0,0 @@
-Makefile*
-bin/*
-!bin/data/chars.grf
-!bin/data/openttdd.grf
-!bin/data/openttdw.grf
-!bin/data/opntitle.grf
-!bin/scenario/README
-!bin/scripts*
-config.*
-objs/*
-src/rev.cpp

BUGS

@@ -0,0 +1,7 @@
+/* $Id$ */
+
+KNOWN BUGS / PROBLEMS:
+
+Normal and elrail depots look the same. Use 'X' (transparent buildings)
+   to distinguish between them
+Missing curors / icons for construction (currently using the conventional ones)

COPYING

@@ -1,12 +1,12 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-                            Preamble
+			    Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+the GNU Library General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
+
+		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-                            NO WARRANTY
+			    NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,9 +303,10 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -335,5 +336,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
+library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.

Doxyfile

@@ -5,6 +5,7 @@ PROJECT_NAME           = openttd
 OUTPUT_DIRECTORY       = docs/source/
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = NO
 BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = YES
 ABBREVIATE_BRIEF       = "The $name class" \
@@ -83,7 +84,6 @@ FILE_PATTERNS          = *.c \
                          *.cpp \
                          *.c++ \
                          *.h \
-                         *.hpp \
                          table/*.h
 RECURSIVE              = YES
 EXCLUDE                =
@@ -158,7 +158,7 @@ RTF_EXTENSIONS_FILE    =
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
-GENERATE_MAN           = NO
+GENERATE_MAN           = YES
 MAN_OUTPUT             = man
 MAN_EXTENSION          = .3
 MAN_LINKS              = NO
@@ -185,13 +185,13 @@ PERLMOD_MAKEVAR_PREFIX =
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = YES
-EXPAND_ONLY_PREDEF     = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           =
 INCLUDE_FILE_PATTERNS  =
 PREDEFINED             =
-EXPAND_AS_DEFINED      = DEF_COMMAND
+EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
@@ -220,6 +220,8 @@ DIRECTORY_GRAPH        = YES
 DOT_IMAGE_FORMAT       = png
 DOT_PATH               =
 DOTFILE_DIRS           =
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
 MAX_DOT_GRAPH_DEPTH    = 1000
 DOT_TRANSPARENT        = NO
 DOT_MULTI_TARGETS      = NO

Makefile.bundle.in

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

Makefile.in

@@ -1,152 +0,0 @@
-# Check if we want to show what we are doing
-ifdef VERBOSE
-	Q =
-else
-	Q = @
-endif
-
-include Makefile.am
-
-SOURCE_LIST = !!SOURCE_LIST!!
-CONFIG_CACHE_SOURCE_LIST = !!CONFIG_CACHE_SOURCE_LIST!!
-CONFIG_CACHE_PWD = !!CONFIG_CACHE_PWD!!
-CONFIGURE_FILES = !!CONFIGURE_FILES!!
-LIPO = !!LIPO!!
-BIN_DIR = !!BIN_DIR!!
-ICON_THEME_DIR = !!ICON_THEME_DIR!!
-MAN_DIR = !!MAN_DIR!!
-MENU_DIR = !!MENU_DIR!!
-SRC_DIR = !!SRC_DIR!!
-ROOT_DIR = !!ROOT_DIR!!
-BUNDLE_DIR = "$(ROOT_DIR)/bundle"
-BUNDLES_DIR = "$(ROOT_DIR)/bundles"
-INSTALL_DIR = !!INSTALL_DIR!!
-INSTALL_BINARY_DIR = "$(INSTALL_DIR)/"!!BINARY_DIR!!
-INSTALL_MAN_DIR = "$(INSTALL_DIR)/$(MAN_DIR)"
-INSTALL_MENU_DIR = "$(INSTALL_DIR)/$(MENU_DIR)"
-INSTALL_ICON_DIR = "$(INSTALL_DIR)/"!!ICON_DIR!!
-INSTALL_ICON_THEME_DIR = "$(INSTALL_DIR)/$(ICON_THEME_DIR)"
-INSTALL_DATA_DIR = "$(INSTALL_DIR)/"!!DATA_DIR!!
-INSTALL_DOC_DIR = "$(INSTALL_DIR)/"!!DOC_DIR!!
-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 )
-
-all: config.pwd config.cache
-ifdef DISTCC
-	@if [ -z "`echo '$(MFLAGS)' | grep '\-j'`" ]; then echo; echo "WARNING: you enabled distcc support, but you don't seem to be using the -jN paramter"; echo; fi
-endif
-	@for dir in $(DIRS); do \
-		$(MAKE) -C $$dir all; \
-	done
-ifdef LIPO
-# Lipo is an OSX thing. If it is defined, it means we are building for universal,
-# and so we have have to combine the binaries into one big binary
-
-# Remove the last binary made by the last compiled target
-	$(Q)rm -f $(BIN_DIR)/$(TTD)
-# Make all the binaries into one
-	$(Q)$(LIPO) -create -output $(BIN_DIR)/$(TTD) $(TTDS)
-endif
-
-help:
-	@echo "Available make commands:"
-	@echo ""
-	@echo "Compilation:"
-	@echo "  all           compile the executable and the lang files"
-	@echo "  lang          compile the lang files only"
-	@echo "Clean up:"
-	@echo "  clean         remove the files generated during compilation"
-	@echo "  mrproper      remove the files generated during configuration and compilation"
-	@echo "Run after compilation:"
-	@echo "  run           execute openttd after the compilation"
-	@echo "  run-gdb       execute openttd in debug mode after the compilation"
-	@echo "  run-prof      execute openttd in profiling mode after the compilation"
-	@echo "Installation:"
-	@echo "  install       install the compiled files and the data-files after the compilation"
-	@echo "  bundle        create the base for an installation bundle"
-	@echo "  bundle_zip    create the zip installation bundle"
-	@echo "  bundle_gzip   create the gzip installation bundle"
-	@echo "  bundle_bzip2  create the bzip2 installation bundle"
-	@echo "  bundle_lha    create the lha installation bundle"
-	@echo "  bundle_dmg    create the dmg installation bundle"
-
-config.pwd: $(CONFIG_CACHE_PWD)
-	$(MAKE) reconfigure
-
-config.cache: $(CONFIG_CACHE_SOURCE_LIST) $(CONFIGURE_FILES)
-	$(MAKE) reconfigure
-
-reconfigure:
-ifeq ($(shell if test -f config.cache; then echo 1; fi), 1)
-	@echo "----------------"
-	@echo "The system detected that source.list or any configure file is altered."
-	@echo " Going to reconfigure with last known settings..."
-	@echo "----------------"
-# Make sure we don't lock config.cache
-	@$(shell cat config.cache | sed 's/\\ /\\\\ /g') || exit 1
-	@echo "----------------"
-	@echo "Reconfig done. Please re-execute make."
-	@echo "----------------"
-else
-	@echo "----------------"
-	@echo "Have not found a configuration, please run configure first."
-	@echo "----------------"
-	@exit 1
-endif
-
-clean:
-	@for dir in $(DIRS); do \
-		$(MAKE) -C $$dir clean; \
-	done
-	$(Q)rm -rf $(BUNDLE_TARGET)
-
-lang:
-	@for dir in $(LANG_DIRS); do \
-		$(MAKE) -C $$dir all; \
-	done
-
-mrproper:
-	@for dir in $(DIRS); do \
-		$(MAKE) -C $$dir mrproper; \
-		rm -f $$dir/Makefile; \
-	done
-	$(Q)rm -rf objs
-	$(Q)rm -f Makefile Makefile.am Makefile.bundle
-	$(Q)rm -f media/openttd.desktop
-	$(Q)rm -f $(CONFIG_CACHE_SOURCE_LIST) config.cache config.pwd config.log $(CONFIG_CACHE_PWD)
-	$(Q)rm -rf $(BUNDLE_DIR)
-	$(Q)rm -rf $(BUNDLES_DIR)
-
-depend:
-	@for dir in $(SRC_DIRS); do \
-		$(MAKE) -C $$dir depend; \
-	done
-
-run: all
-	$(Q)cd !!BIN_DIR!! && ./!!TTD!! $(OPENTTD_ARGS)
-
-run-gdb: all
-	$(Q)cd !!BIN_DIR!! && gdb --ex run --args ./!!TTD!! $(OPENTTD_ARGS)
-
-run-prof: all
-	$(Q)cd !!BIN_DIR!! && ./!!TTD!! $(OPENTTD_ARGS) && gprof !!TTD!! | less
-
-%.o:
-	@for dir in $(SRC_DIRS); do \
-		$(MAKE) -C $$dir $(@:src/%=%); \
-	done
-
-%.lng:
-	@for dir in $(LANG_DIRS); do \
-		$(MAKE) -C $$dir $@; \
-	done
-
-include Makefile.bundle

Makefile.lang.in

@@ -1,87 +0,0 @@
-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 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)
-
-# Check if we want to show what we are doing
-ifdef VERBOSE
-	Q =
-	E = @true
-else
-	Q = @
-	E = @echo
-endif
-
-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
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<
-
-string.o: $(SRC_DIR)/string.cpp endian_host.h
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<
-
-alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<
-
-lang/english.txt: $(LANG_DIR)/english.txt
-	$(Q)mkdir -p lang
-	$(Q)cp $(LANG_DIR)/english.txt lang/english.txt
-
-$(STRGEN): alloc_func.o string.o strgen.o
-	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $^ -o $@
-
-table/strings.h: lang/english.txt $(STRGEN)
-	$(E) '$(STAGE) Generating $@'
-	@mkdir -p table
-	$(Q)./$(STRGEN) -s $(LANG_DIR) -d table
-
-$(LANGS): %.lng: $(LANG_DIR)/%.txt $(STRGEN) lang/english.txt
-	$(E) '$(STAGE) Compiling language $(*F)'
-	$(Q)./$(STRGEN) $(STRGEN_FLAGS) -s $(LANG_DIR) -d $(LANG_OBJS_DIR) $< $(LANG_ERRORS) && cp $@ $(BIN_DIR)/lang || true # Do not fail all languages when one fails
-
-# The targets to compile the endian-code
-
-endian_host.h: $(ENDIAN_CHECK)
-	$(E) '$(STAGE) Testing endianness for host'
-	$(Q)./$(ENDIAN_CHECK) > $@
-
-$(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
-	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $< -o $@
-
-depend:
-
-clean:
-	$(E) '$(STAGE) Cleaning up language files'
-	$(Q)rm -f strgen.o string.o table/strings.h $(STRGEN) $(LANGS) $(LANGS:%=$(BIN_DIR)/lang/%) lang/english.* $(ENDIAN_TARGETS)
-
-mrproper: clean
-
-%.lng:
-	@echo '$(STAGE) No such language: $(@:%.lng=%)'
-
-.PHONY: all mrproper depend clean

Makefile.msvc

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

Makefile.src.in

@@ -1,296 +0,0 @@
-CC_HOST      = !!CC_HOST!!
-CXX_HOST     = !!CXX_HOST!!
-CC_BUILD     = !!CC_BUILD!!
-CXX_BUILD    = !!CXX_BUILD!!
-WINDRES      = !!WINDRES!!
-STRIP        = !!STRIP!!
-CC_CFLAGS    = !!CC_CFLAGS!!
-CFLAGS       = !!CFLAGS!!
-CFLAGS_BUILD = !!CFLAGS_BUILD!!
-LIBS         = !!LIBS!!
-LDFLAGS      = !!LDFLAGS!!
-ROOT_DIR     = !!ROOT_DIR!!
-BIN_DIR      = !!BIN_DIR!!
-LANG_DIR     = !!LANG_DIR!!
-SRC_OBJS_DIR = !!SRC_OBJS_DIR!!
-LANG_OBJS_DIR= !!LANG_OBJS_DIR!!
-SRC_DIR      = !!SRC_DIR!!
-MEDIA_DIR    = !!MEDIA_DIR!!
-TTD          = !!TTD!!
-STRGEN       = !!STRGEN!!
-ENDIAN_CHECK = !!ENDIAN_CHECK!!
-ENDIAN_FORCE = !!ENDIAN_FORCE!!
-OS           = !!OS!!
-STAGE        = !!STAGE!!
-MAKEDEPEND   = !!MAKEDEPEND!!
-CFLAGS_MAKEDEP= !!CFLAGS_MAKEDEP!!
-SORT         = !!SORT!!
-REVISION     = !!REVISION!!
-AWK          = !!AWK!!
-GCC295       = !!GCC295!!
-CONFIG_CACHE_COMPILER = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_COMPILER!!
-CONFIG_CACHE_LINKER   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_LINKER!!
-CONFIG_CACHE_ENDIAN   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_ENDIAN!!
-CONFIG_CACHE_SOURCE   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_SOURCE!!
-CONFIG_CACHE_VERSION  = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_VERSION!!
-
-OBJS_C   := !!OBJS_C!!
-OBJS_CPP := !!OBJS_CPP!!
-OBJS_MM  := !!OBJS_MM!!
-OBJS_RC  := !!OBJS_RC!!
-OBJS     := $(OBJS_C) $(OBJS_CPP) $(OBJS_MM) $(OBJS_RC)
-SRCS     := !!SRCS!!
-
-# All C-files depend on those 3 files
-FILE_DEP := $(CONFIG_CACHE_COMPILER) $(LANG_OBJS_DIR)/table/strings.h endian_target.h
-# Create all dirs and subdirs
-RES      := $(shell mkdir -p $(BIN_DIR) $(sort $(dir $(OBJS))))
-
-# Make sure endian_target.h is reasable as if it was in the src/ dir
-CFLAGS += -I $(SRC_OBJS_DIR) -I $(LANG_OBJS_DIR)
-
-ENDIAN_TARGETS := endian_target.h $(ENDIAN_CHECK)
-
-# This 'sed' basicly just removes 'const' from the line if it is a 2+D array
-# For more information, please check:
-#  http://maillist.openttd.org/pipermail/devs/2007-April/000284.html
-#  http://maillist.openttd.org/pipermail/devs/2007-February/000248.html
-GCC295_FIX=sed -r 's/^(\t*)(.*)( const )([A-Za-z0-9_ ]+(\[.*\]){2,})(( = \{)|(;))(.*)$$/\1\2 \4\6\8\9/g'
-# This 'sed' removes the 3rd '4' in the # lines of the -E output of
-#  gcc 2.95.3 and lower, as it should indicate that it is a C-linkage, but the
-#  compiler can't handle that information (just don't ask). So we remove it
-#  and then it compiles happily and without bitching :)
-# Furthermore gcc 2.95 has some trouble with protected and private when
-#  accessing the protected/private stuff of the enclosing class (or the
-#  super class of the enclosing class).
-GCC295_FIX_2=sed -e 's|\(^\# [0-9][0-9]* "[^"]*"[ 0-9]*\) 4$$|\1|g;s|private:|public:|g;s|protected:|public:|g'
-
-# Check if we want to show what we are doing
-ifdef VERBOSE
-	Q =
-	E = @true
-else
-	Q = @
-	E = @echo
-endif
-
-# Our default target
-all: $(BIN_DIR)/$(TTD)
-
-# This are 2 rules that are pointing back to STRGEN stuff.
-#  There is not really a need to have them here, but in case
-#  some weirdo wants to run 'make' in the 'src' dir and expects
-#  the languages to be recompiled, this catches that case and
-#  takes care of it nicely.
-$(LANG_OBJS_DIR)/$(STRGEN):
-	$(MAKE) -C $(LANG_OBJS_DIR) $(STRGEN)
-
-$(LANG_OBJS_DIR)/table/strings.h: $(LANG_DIR)/english.txt $(LANG_OBJS_DIR)/$(STRGEN)
-	$(MAKE) -C $(LANG_OBJS_DIR) table/strings.h
-
-# Always run version detection, so we always have an accurate modified
-# flag
-VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh")
-MODIFIED := $(shell echo "$(VERSIONS)" | cut -f 3)
-
-ifdef REVISION
-# Use specified revision (which should be of the form "r000").
-REV := $(REVISION)
-REV_NR := $(shell echo $(REVISION) | sed "s/[^0-9]//g")
-else
-# Use autodetected revisions
-REV      := $(shell echo "$(VERSIONS)" | cut -f 1)
-REV_NR   := $(shell echo "$(VERSIONS)" | cut -f 2)
-endif
-
-# Make sure we have something in REV and REV_NR
-ifeq ($(REV),)
-REV := norev000
-endif
-ifeq ($(REV_NR),)
-REV_NR := 0
-endif
-
-# This helps to recompile if flags change
-RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CC_CFLAGS) $(CFLAGS)" ]; then echo "$(CC_CFLAGS) $(CFLAGS)" > $(CONFIG_CACHE_COMPILER); fi )
-RES := $(shell if [ "`cat $(CONFIG_CACHE_LINKER) 2>/dev/null`" != "$(LDFLAGS) $(LIBS)" ]; then echo "$(LDFLAGS) $(LIBS)" > $(CONFIG_CACHE_LINKER); fi )
-RES := $(shell if [ "`cat $(CONFIG_CACHE_ENDIAN) 2>/dev/null`" != "$(ENDIAN_FORCE)" ]; then echo "$(ENDIAN_FORCE)" > $(CONFIG_CACHE_ENDIAN); fi )
-
-# If there is a change in the source-file-list, make sure we recheck the deps
-RES := $(shell if [ "`cat $(CONFIG_CACHE_SOURCE) 2>/dev/null`" != "$(SRCS)" ]; then echo "$(SRCS)" > $(CONFIG_CACHE_SOURCE); fi )
-# If there is a change in the revision, make sure we recompile rev.cpp
-RES := $(shell if [ "`cat $(CONFIG_CACHE_VERSION) 2>/dev/null`" != "$(REV) $(MODIFIED)" ]; then echo "$(REV) $(MODIFIED)" > $(CONFIG_CACHE_VERSION); fi )
-
-ifndef MAKEDEPEND
-# The slow, but always correct, dep-check
-DEP_MASK := %.d
-DEPS     := $(OBJS:%.o=%.d)
-
-# Only include the deps if we are compiling everything
-ifeq ($(filter $(ENDIAN_TARGETS) %.o clean mrproper, $(MAKECMDGOALS)),)
--include $(DEPS)
-else
-# In case we want to compile a single target, include the .d file for it
-ifneq ($(filter %.o, $(MAKECMDGOALS)),)
-SINGLE_DEP := $(filter %.o, $(MAKECMDGOALS))
--include $(SINGLE_DEP:%.o=%.d)
-endif
-endif
-
-# Find the deps via GCC. Rarely wrong, but a bit slow
-
-$(OBJS_C:%.o=%.d): %.d: $(SRC_DIR)/%.c $(FILE_DEP)
-	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.c=%.c)'
-	$(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:%.d=%.o):#' > $@
-
-$(OBJS_CPP:%.o=%.d): %.d: $(SRC_DIR)/%.cpp $(FILE_DEP)
-	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CFLAGS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:%.d=%.o):#' > $@
-
-$(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)/%.mm=%.mm)'
-	$(Q)touch $@
-
-else
-# The much faster, but can be wrong, dep-check
-DEP_MASK :=
-DEPS     := Makefile.dep
-
-# Only include the deps if we are not cleaning
-ifeq ($(filter $(ENDIAN_TARGETS) depend clean mrproper, $(MAKECMDGOALS)),)
--include Makefile.dep
-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)
-else
-Makefile.dep: FORCE
-endif
-	$(E) '$(STAGE) DEP CHECK (all files)'
-	$(Q)rm -f Makefile.dep.tmp
-	$(Q)touch Makefile.dep.tmp
-
-# Calculate the deps via makedepend
-	$(Q)$(MAKEDEPEND) -f$(SRC_OBJS_DIR)/Makefile.dep.tmp -o.o -Y -v -- $(CFLAGS_MAKEDEP) -- $(SRCS:%=$(SRC_DIR)/%) 2>/dev/null
-
-# Convert x:/... paths to /x/... for mingw
-ifeq ($(OS), MINGW)
-	@cat Makefile.dep.tmp | sed 's@\([a-zA-Z]\):\/@\/\1\/@g' > Makefile.dep.tmp.mingw
-	@cp Makefile.dep.tmp.mingw Makefile.dep.tmp
-	@rm -f Makefile.dep.tmp.mingw
-endif
-
-# Remove all comments and includes that don't start with $(SRC_DIR)
-# Remove $(SRC_DIR) from object-file-name
-	@$(AWK) '                           \
-	/^# DO NOT/ { print $$0 ; next}     \
-	/^#/ {next}                         \
-	/:/ {                               \
-		left = NF - 1;                    \
-		for (n = 2; n <= NF; n++) {       \
-			if (match($$n, "^$(SRC_DIR)") == 0) { \
-				$$n = "";                     \
-				left--;                       \
-			}                               \
-		}                                 \
-		gsub("$(SRC_DIR)/", "", $$1);     \
-		if (left > 0) {                   \
-			print $$0;                      \
-			$$1 = "Makefile.dep:";          \
-			print $$0;                      \
-		}                                 \
-		next                              \
-	}                                   \
-	{                                   \
-		print $$0                         \
-	}                                   \
-	' < Makefile.dep.tmp | sed 's/  */ /g;s/ $$//' | $(SORT) > Makefile.dep
-
-	$(Q)rm -f Makefile.dep.tmp Makefile.dep.tmp.bak
-
-endif
-
-# Avoid problems with deps if a .h/.hpp file is deleted without the deps
-#  being updated. Now the Makefile continues, the deps are recreated
-#  and all will be fine.
-%.h %.hpp:
-	@true
-
-
-# Compile all the files according to the targets
-
-$(OBJS_C): %.o: $(SRC_DIR)/%.c $(DEP_MASK) $(FILE_DEP)
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.c=%.c)'
-	$(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -c -o $@ $<
-
-$(OBJS_CPP): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-ifeq ($(GCC295), 1)
-	$(Q)$(CXX_HOST) -E $(CFLAGS) $< | $(GCC295_FIX) | $(GCC295_FIX_2) | $(CXX_HOST) $(CFLAGS) -c -o $@ -x c++ -
-else
-	$(Q)$(CXX_HOST) $(CFLAGS) -c -o $@ $<
-endif
-
-$(OBJS_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP)
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.mm=%.mm)'
-	$(Q)$(CC_HOST) $(CFLAGS) -c -o $@ $<
-
-$(OBJS_RC): %.o: $(SRC_DIR)/%.rc $(FILE_DEP)
-	$(E) '$(STAGE) Compiling resource $(<:$(SRC_DIR)/%.rc=%.rc)'
-	$(Q)$(WINDRES) -o $@ -I $(MEDIA_DIR) $<
-
-$(BIN_DIR)/$(TTD): $(TTD)
-	$(Q)cp $< $@
-
-$(TTD): $(OBJS) $(CONFIG_CACHE_LINKER)
-	$(E) '$(STAGE) Linking $@'
-ifeq ($(OS), PSP)
-	# Because of a bug in the PSP GCC tools, linking via CXX results
-	#  in total chaos and more problems then you can handle. So we need
-	#  CC to link OpenTTD for PSP
-	$(Q)$(CC_HOST) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
-else
-	$(Q)$(CXX_HOST) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
-endif
-ifdef STRIP
-	$(Q)$(STRIP) $@
-endif
-
-# The targets to compile the endian-code
-
-endian_target.h: $(ENDIAN_CHECK) $(CONFIG_CACHE_ENDIAN)
-	$(E) '$(STAGE) Testing endianness for target'
-	$(Q)./$(ENDIAN_CHECK) $(ENDIAN_FORCE) > $@
-
-$(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
-	$(E) '$(STAGE) Compiling and Linking $@'
-	$(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)/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:
-
-depend: $(DEPS)
-
-clean:
-	$(E) '$(STAGE) Cleaning up object files'
-	$(Q)rm -f $(DEPS) $(OBJS) $(TTD) $(TTD:%=$(BIN_DIR)/%) $(CONFIG_CACHE_COMPILER) $(CONFIG_CACHE_LINKER) $(CONFIG_CACHE_ENDIAN) $(CONFIG_CACHE_SOURCE) $(ENDIAN_TARGETS)
-
-mrproper: clean
-	$(Q)rm -f $(SRC_DIR)/rev.cpp $(SRC_DIR)/ottdres.rc
-
-%.o:
-	@echo '$(STAGE) No such source-file: $(@:%.o=%).[c|cpp|mm|rc]'
-
-.PHONY: all mrproper depend clean FORCE

ai/ai.c

@@ -3,18 +3,10 @@
 #include "../stdafx.h"
 #include "../openttd.h"
 #include "../variables.h"
-#include "../command_func.h"
-#include "../network/network.h"
-#include "../core/alloc_func.hpp"
-#include "../player_func.h"
-#include "../player_base.h"
+#include "../command.h"
+#include "../network.h"
 #include "ai.h"
 #include "default/default.h"
-#include "trolly/trolly.h"
-#include "../signal_func.h"
-
-AIStruct _ai;
-AIPlayer _ai_player[MAX_PLAYERS];
 
 /**
  * Dequeues commands put in the queue via AI_PutCommandInQueue.
@@ -52,17 +44,17 @@ static void AI_DequeueCommands(PlayerID player)
  * Needed for SP; we need to delay DoCommand with 1 tick, because else events
  *  will make infinite loops (AIScript).
  */
-static void AI_PutCommandInQueue(PlayerID player, TileIndex tile, uint32 p1, uint32 p2, uint32 procc, CommandCallback* callback)
+static void AI_PutCommandInQueue(PlayerID player, TileIndex tile, uint32 p1, uint32 p2, uint procc, CommandCallback* callback)
 {
 	AICommand *com;
 
 	if (_ai_player[player].queue_tail == NULL) {
 		/* There is no item in the queue yet, create the queue */
-		_ai_player[player].queue = MallocT<AICommand>(1);
+		_ai_player[player].queue = malloc(sizeof(AICommand));
 		_ai_player[player].queue_tail = _ai_player[player].queue;
 	} else {
 		/* Add an item at the end */
-		_ai_player[player].queue_tail->next = MallocT<AICommand>(1);
+		_ai_player[player].queue_tail->next = malloc(sizeof(AICommand));
 		_ai_player[player].queue_tail = _ai_player[player].queue_tail->next;
 	}
 
@@ -88,10 +80,10 @@ static void AI_PutCommandInQueue(PlayerID player, TileIndex tile, uint32 p1, uin
 /**
  * Executes a raw DoCommand for the AI.
  */
-CommandCost AI_DoCommandCc(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint32 procc, CommandCallback* callback)
+int32 AI_DoCommandCc(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc, CommandCallback* callback)
 {
 	PlayerID old_lp;
-	CommandCost res;
+	int32 res = 0;
 	const char* tmp_cmdtext;
 
 	/* If you enable DC_EXEC with DC_QUERY_COST you are a really strange
@@ -111,6 +103,11 @@ CommandCost AI_DoCommandCc(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, u
 	/* Restore _cmd_text */
 	_cmd_text = tmp_cmdtext;
 
+	/* If we did a DC_EXEC, and the command did not return an error, execute it
+	 * over the network */
+	if (flags & DC_AUTO)     procc |= CMD_AUTO;
+	if (flags & DC_NO_WATER) procc |= CMD_NO_WATER;
+
 	/* NetworkSend_Command needs _local_player to be set correctly, so
 	 * adjust it, and put it back right after the function */
 	old_lp = _local_player;
@@ -137,7 +134,7 @@ CommandCost AI_DoCommandCc(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, u
 }
 
 
-CommandCost AI_DoCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint32 procc)
+int32 AI_DoCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc)
 {
 	return AI_DoCommandCc(tile, p1, p2, flags, procc, NULL);
 }
@@ -161,9 +158,6 @@ static void AI_RunTick(PlayerID player)
 		AiDoGameLoop(p);
 		_is_old_ai_player = false;
 	}
-
-	/* AI could change some track, so update signals */
-	UpdateSignalsInBuffer();
 }
 
 
@@ -171,7 +165,7 @@ static void AI_RunTick(PlayerID player)
  * The gameloop for AIs.
  *  Handles one tick for all the AIs.
  */
-void AI_RunGameLoop()
+void AI_RunGameLoop(void)
 {
 	/* Don't do anything if ai is disabled */
 	if (!_ai.enabled) return;
@@ -224,19 +218,12 @@ void AI_PlayerDied(PlayerID player)
 {
 	/* Called if this AI died */
 	_ai_player[player].active = false;
-
-	if (_players_ainew[player].pathfinder == NULL) return;
-
-	AyStarMain_Free(_players_ainew[player].pathfinder);
-	delete _players_ainew[player].pathfinder;
-	_players_ainew[player].pathfinder = NULL;
-
 }
 
 /**
  * Initialize some AI-related stuff.
  */
-void AI_Initialize()
+void AI_Initialize(void)
 {
 	/* First, make sure all AIs are DEAD! */
 	AI_Uninitialize();
@@ -250,7 +237,11 @@ void AI_Initialize()
 /**
  * Deinitializer for AI-related stuff.
  */
-void AI_Uninitialize()
+void AI_Uninitialize(void)
 {
-	for (PlayerID p = PLAYER_FIRST; p < MAX_PLAYERS; p++) AI_PlayerDied(p);
+	const Player* p;
+
+	FOR_ALL_PLAYERS(p) {
+		if (p->is_active && p->is_ai) AI_PlayerDied(p->index);
+	}
 }

ai/ai.h

@@ -1,58 +1,56 @@
-/* $Id$ */
-
 #ifndef AI_H
 #define AI_H
 
-#include "../network/network.h"
-#include "../command_type.h"
-#include "../core/random_func.hpp"
-#include "../settings_type.h"
+#include "../functions.h"
+#include "../network.h"
+#include "../player.h"
+#include "../command.h"
 
 /* How DoCommands look like for an AI */
-struct AICommand {
+typedef struct AICommand {
 	uint32 tile;
 	uint32 p1;
 	uint32 p2;
 	uint32 procc;
-	CommandCallback *callback;
+	CommandCallback* callback;
 
 	char *text;
 	uint uid;
 
-	AICommand *next;
-};
+	struct AICommand *next;
+} AICommand;
 
 /* The struct for an AIScript Player */
-struct AIPlayer {
+typedef struct AIPlayer {
 	bool active;            ///< Is this AI active?
 	AICommand *queue;       ///< The commands that he has in his queue
 	AICommand *queue_tail;  ///< The tail of this queue
-};
+} AIPlayer;
 
 /* The struct to keep some data about the AI in general */
-struct AIStruct {
+typedef struct AIStruct {
 	/* General */
 	bool enabled;           ///< Is AI enabled?
 	uint tick;              ///< The current tick (something like _frame_counter, only for AIs)
-};
+} AIStruct;
 
-extern AIStruct _ai;
-extern AIPlayer _ai_player[MAX_PLAYERS];
+VARDEF AIStruct _ai;
+VARDEF AIPlayer _ai_player[MAX_PLAYERS];
 
 // ai.c
 void AI_StartNewAI(PlayerID player);
 void AI_PlayerDied(PlayerID player);
-void AI_RunGameLoop();
-void AI_Initialize();
-void AI_Uninitialize();
-CommandCost AI_DoCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc);
-CommandCost AI_DoCommandCc(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc, CommandCallback* callback);
+void AI_RunGameLoop(void);
+void AI_Initialize(void);
+void AI_Uninitialize(void);
+int32 AI_DoCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc);
+int32 AI_DoCommandCc(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc, CommandCallback* callback);
 
 /** Is it allowed to start a new AI.
  * This function checks some boundries to see if we should launch a new AI.
  * @return True if we can start a new AI.
  */
-static inline bool AI_AllowNewAI()
+static inline bool AI_AllowNewAI(void)
 {
 	/* If disabled, no AI */
 	if (!_ai.enabled)
@@ -79,8 +77,8 @@ static inline bool AI_AllowNewAI()
 	return true;
 }
 
-#define AI_CHANCE16(a, b)    ((uint16)     AI_Random()  <= (uint16)((65536 * a) / b))
-#define AI_CHANCE16R(a, b, r) ((uint16)(r = AI_Random()) <= (uint16)((65536 * a) / b))
+#define AI_CHANCE16(a,b)    ((uint16)     AI_Random()  <= (uint16)((65536 * a) / b))
+#define AI_CHANCE16R(a,b,r) ((uint16)(r = AI_Random()) <= (uint16)((65536 * a) / b))
 
 /**
  * The random-function that should be used by ALL AIs.
@@ -99,7 +97,7 @@ static inline uint AI_RandomRange(uint max)
 /**
  * The random-function that should be used by ALL AIs.
  */
-static inline uint32 AI_Random()
+static inline uint32 AI_Random(void)
 {
 /* We pick RandomRange if we are in SP (so when saved, we do the same over and over)
 	 *   but we pick InteractiveRandomRange if we are a network_server or network-client.

ai/default/default.h

@@ -0,0 +1,8 @@
+/* $Id$ */
+
+#ifndef DEFAULT_H
+#define DEFAULT_H
+
+void AiDoGameLoop(Player*);
+
+#endif

ai/trolly/build.c

@@ -3,20 +3,18 @@
 #include "../../stdafx.h"
 #include "../../openttd.h"
 #include "../../debug.h"
+#include "../../functions.h"
+#include "../../map.h"
 #include "../../road_map.h"
-#include "../../command_func.h"
+#include "../../tile.h"
+#include "../../vehicle.h"
+#include "../../command.h"
 #include "trolly.h"
 #include "../../engine.h"
 #include "../../station.h"
 #include "../../variables.h"
 #include "../../bridge.h"
-#include "../../vehicle_func.h"
-#include "../../vehicle_base.h"
-#include "../../player_base.h"
-#include "../../player_func.h"
 #include "../ai.h"
-#include "../../tunnelbridge.h"
-
 
 // Build HQ
 //  Params:
@@ -38,15 +36,15 @@ bool AiNew_Build_CompanyHQ(Player *p, TileIndex tile)
 //    numtracks : in case of AI_TRAIN: tracks of station
 //    direction : the direction of the station
 //    flag : flag passed to DoCommand (normally 0 to get the cost or DC_EXEC to build it)
-CommandCost AiNew_Build_Station(Player *p, byte type, TileIndex tile, byte length, byte numtracks, byte direction, byte flag)
+int AiNew_Build_Station(Player *p, byte type, TileIndex tile, byte length, byte numtracks, byte direction, byte flag)
 {
 	if (type == AI_TRAIN)
 		return AI_DoCommand(tile, direction + (numtracks << 8) + (length << 16), 0, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_RAILROAD_STATION);
 
 	if (type == AI_BUS)
-		return AI_DoCommand(tile, direction, ROADTYPES_ROAD << 2 | RoadStop::BUS, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_ROAD_STOP);
+		return AI_DoCommand(tile, direction, RS_BUS, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_ROAD_STOP);
 
-	return AI_DoCommand(tile, direction, ROADTYPES_ROAD << 2 | RoadStop::TRUCK, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_ROAD_STOP);
+	return AI_DoCommand(tile, direction, RS_TRUCK, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_ROAD_STOP);
 }
 
 
@@ -55,12 +53,12 @@ CommandCost AiNew_Build_Station(Player *p, byte type, TileIndex tile, byte lengt
 //   tile_a : starting point
 //   tile_b : end point
 //   flag : flag passed to DoCommand
-CommandCost AiNew_Build_Bridge(Player *p, TileIndex tile_a, TileIndex tile_b, byte flag)
+int AiNew_Build_Bridge(Player *p, TileIndex tile_a, TileIndex tile_b, byte flag)
 {
 	int bridge_type, bridge_len, type, type2;
 
 	// Find a good bridgetype (the best money can buy)
-	bridge_len = GetTunnelBridgeLength(tile_a, tile_b);
+	bridge_len = GetBridgeLength(tile_a, tile_b);
 	type = type2 = 0;
 	for (bridge_type = MAX_BRIDGES-1; bridge_type >= 0; bridge_type--) {
 		if (CheckBridge_Stuff(bridge_type, bridge_len)) {
@@ -74,10 +72,10 @@ CommandCost AiNew_Build_Bridge(Player *p, TileIndex tile_a, TileIndex tile_b, by
 	if (type2 == 0 && type != 0) type2 = type;
 
 	// Now, simply, build the bridge!
-	if (_players_ainew[p->index].tbt == AI_TRAIN) {
+	if (p->ainew.tbt == AI_TRAIN) {
 		return AI_DoCommand(tile_a, tile_b, (0x00 << 8) + type2, flag | DC_AUTO, CMD_BUILD_BRIDGE);
 	} else {
-		return AI_DoCommand(tile_a, tile_b, ((0x80 | ROADTYPES_ROAD) << 8) + type2, flag | DC_AUTO, CMD_BUILD_BRIDGE);
+		return AI_DoCommand(tile_a, tile_b, (0x80 << 8) + type2, flag | DC_AUTO, CMD_BUILD_BRIDGE);
 	}
 }
 
@@ -92,45 +90,45 @@ CommandCost AiNew_Build_Bridge(Player *p, TileIndex tile_a, TileIndex tile_b, by
 //   part : Which part we need to build
 //
 // TODO: skip already builded road-pieces (e.g.: cityroad)
-CommandCost AiNew_Build_RoutePart(Player *p, Ai_PathFinderInfo *PathFinderInfo, byte flag)
+int AiNew_Build_RoutePart(Player *p, Ai_PathFinderInfo *PathFinderInfo, byte flag)
 {
 	int part = PathFinderInfo->position;
 	byte *route_extra = PathFinderInfo->route_extra;
 	TileIndex *route = PathFinderInfo->route;
 	int dir;
 	int old_dir = -1;
-	CommandCost cost;
-	CommandCost res;
+	int cost = 0;
+	int res;
 	// We need to calculate the direction with the parent of the parent.. so we skip
 	//  the first pieces and the last piece
 	if (part < 1) part = 1;
 	// When we are done, stop it
 	if (part >= PathFinderInfo->route_length - 1) {
 		PathFinderInfo->position = -2;
-		return CommandCost();
+		return 0;
 	}
 
 
 	if (PathFinderInfo->rail_or_road) {
 		// Tunnel code
 		if ((AI_PATHFINDER_FLAG_TUNNEL & route_extra[part]) != 0) {
-			cost.AddCost(AI_DoCommand(route[part], 0, 0, flag, CMD_BUILD_TUNNEL));
+			cost += AI_DoCommand(route[part], 0, 0, flag, CMD_BUILD_TUNNEL);
 			PathFinderInfo->position++;
 			// TODO: problems!
 			if (CmdFailed(cost)) {
-				DEBUG(ai, 0, "[BuildPath] tunnel could not be built (0x%X)", route[part]);
-				return CommandCost();
+				DEBUG(ai,0)("[AiNew - BuildPath] We have a serious problem: tunnel could not be built!");
+				return 0;
 			}
 			return cost;
 		}
 		// Bridge code
 		if ((AI_PATHFINDER_FLAG_BRIDGE & route_extra[part]) != 0) {
-			cost.AddCost(AiNew_Build_Bridge(p, route[part], route[part - 1], flag));
+			cost += AiNew_Build_Bridge(p, route[part], route[part-1], flag);
 			PathFinderInfo->position++;
 			// TODO: problems!
 			if (CmdFailed(cost)) {
-				DEBUG(ai, 0, "[BuildPath] bridge could not be built (0x%X, 0x%X)", route[part], route[part - 1]);
-				return CommandCost();
+				DEBUG(ai,0)("[AiNew - BuildPath] We have a serious problem: bridge could not be built!");
+				return 0;
 			}
 			return cost;
 		}
@@ -148,10 +146,10 @@ CommandCost AiNew_Build_RoutePart(Player *p, Ai_PathFinderInfo *PathFinderInfo,
 				res = AI_DoCommand(route[part], 0, dir, flag, CMD_BUILD_SINGLE_RAIL);
 				if (CmdFailed(res)) {
 					// Problem.. let's just abort it all!
-					_players_ainew[p->index].state = AI_STATE_NOTHING;
-					return CommandCost();
+					p->ainew.state = AI_STATE_NOTHING;
+					return 0;
 				}
-				cost.AddCost(res);
+				cost += res;
 				// Go to the next tile
 				part++;
 				// Check if it is still in range..
@@ -164,33 +162,33 @@ CommandCost AiNew_Build_RoutePart(Player *p, Ai_PathFinderInfo *PathFinderInfo,
 	} else {
 		// Tunnel code
 		if ((AI_PATHFINDER_FLAG_TUNNEL & route_extra[part]) != 0) {
-			cost.AddCost(AI_DoCommand(route[part], 0x200 | ROADTYPES_ROAD, 0, flag, CMD_BUILD_TUNNEL));
+			cost += AI_DoCommand(route[part], 0x200, 0, flag, CMD_BUILD_TUNNEL);
 			PathFinderInfo->position++;
 			// TODO: problems!
 			if (CmdFailed(cost)) {
-				DEBUG(ai, 0, "[BuildPath] tunnel could not be built (0x%X)", route[part]);
-				return CommandCost();
+				DEBUG(ai,0)("[AiNew - BuildPath] We have a serious problem: tunnel could not be built!");
+				return 0;
 			}
 			return cost;
 		}
 		// Bridge code
 		if ((AI_PATHFINDER_FLAG_BRIDGE & route_extra[part]) != 0) {
-			cost.AddCost(AiNew_Build_Bridge(p, route[part], route[part + 1], flag));
+			cost += AiNew_Build_Bridge(p, route[part], route[part+1], flag);
 			PathFinderInfo->position++;
 			// TODO: problems!
 			if (CmdFailed(cost)) {
-				DEBUG(ai, 0, "[BuildPath] bridge could not be built (0x%X, 0x%X)", route[part], route[part + 1]);
-				return CommandCost();
+				DEBUG(ai,0)("[AiNew - BuildPath] We have a serious problem: bridge could not be built!");
+				return 0;
 			}
 			return cost;
 		}
 
 		// Build normal road
 		// Keep it doing till we go an other way
-		// EnsureNoVehicleOnGround makes sure we don't build on a tile where a vehicle is. This way
+		// EnsureNoVehicle makes sure we don't build on a tile where a vehicle is. This way
 		//  it will wait till the vehicle is gone..
-		if (route_extra[part-1] == 0 && route_extra[part] == 0 && (flag != DC_EXEC || EnsureNoVehicleOnGround(route[part]))) {
-			while (route_extra[part] == 0 && (flag != DC_EXEC || EnsureNoVehicleOnGround(route[part]))) {
+		if (route_extra[part-1] == 0 && route_extra[part] == 0 && (flag != DC_EXEC || EnsureNoVehicle(route[part]))) {
+			while (route_extra[part] == 0 && (flag != DC_EXEC || EnsureNoVehicle(route[part]))) {
 				// Get the current direction
 				dir = AiNew_GetRoadDirection(route[part-1], route[part], route[part+1]);
 				// Is it the same as the last one?
@@ -201,14 +199,14 @@ CommandCost AiNew_Build_RoutePart(Player *p, Ai_PathFinderInfo *PathFinderInfo,
 					// Build the tile
 					res = AI_DoCommand(route[part], dir, 0, flag | DC_NO_WATER, CMD_BUILD_ROAD);
 					// Currently, we ignore CMD_ERRORs!
-					if (CmdFailed(res) && flag == DC_EXEC && !IsTileType(route[part], MP_ROAD) && !EnsureNoVehicleOnGround(route[part])) {
+					if (CmdFailed(res) && flag == DC_EXEC && !IsTileType(route[part], MP_STREET) && !EnsureNoVehicle(route[part])) {
 						// Problem.. let's just abort it all!
-						DEBUG(ai, 0, "[BuidPath] route building failed at tile 0x%X, aborting", route[part]);
-						_players_ainew[p->index].state = AI_STATE_NOTHING;
-						return CommandCost();
+						DEBUG(ai,0)("Darn, the route could not be built.. aborting!");
+						p->ainew.state = AI_STATE_NOTHING;
+						return 0;
 					}
 
-					if (CmdSucceeded(res)) cost.AddCost(res);
+					if (!CmdFailed(res)) cost += res;
 				}
 				// Go to the next tile
 				part++;
@@ -218,7 +216,7 @@ CommandCost AiNew_Build_RoutePart(Player *p, Ai_PathFinderInfo *PathFinderInfo,
 			part--;
 			// We want to return the last position, so we go back one
 		}
-		if (!EnsureNoVehicleOnGround(route[part]) && flag == DC_EXEC) part--;
+		if (!EnsureNoVehicle(route[part]) && flag == DC_EXEC) part--;
 		PathFinderInfo->position = part;
 	}
 
@@ -230,35 +228,36 @@ CommandCost AiNew_Build_RoutePart(Player *p, Ai_PathFinderInfo *PathFinderInfo,
 // It returns INVALID_ENGINE if not suitable engine is found
 EngineID AiNew_PickVehicle(Player *p)
 {
-	if (_players_ainew[p->index].tbt == AI_TRAIN) {
+	if (p->ainew.tbt == AI_TRAIN) {
 		// Not supported yet
 		return INVALID_ENGINE;
 	} else {
 		EngineID best_veh_index = INVALID_ENGINE;
 		int32 best_veh_rating = 0;
+		EngineID start = ROAD_ENGINES_INDEX;
+		EngineID end   = ROAD_ENGINES_INDEX + NUM_ROAD_ENGINES;
 		EngineID i;
 
 		/* Loop through all road vehicles */
-		FOR_ALL_ENGINEIDS_OF_TYPE(i, VEH_ROAD) {
+		for (i = start; i != end; i++) {
 			const RoadVehicleInfo *rvi = RoadVehInfo(i);
 			const Engine* e = GetEngine(i);
+			int32 rating;
+			int32 ret;
 
 			/* Skip vehicles which can't take our cargo type */
-			if (rvi->cargo_type != _players_ainew[p->index].cargo && !CanRefitTo(i, _players_ainew[p->index].cargo)) continue;
-
-			/* Skip trams */
-			if (HasBit(EngInfo(i)->misc_flags, EF_ROAD_TRAM)) continue;
+			if (rvi->cargo_type != p->ainew.cargo && !CanRefitTo(i, p->ainew.cargo)) continue;
 
 			// Is it availiable?
 			// Also, check if the reliability of the vehicle is above the AI_VEHICLE_MIN_RELIABILTY
-			if (!HasBit(e->player_avail, _current_player) || e->reliability * 100 < AI_VEHICLE_MIN_RELIABILTY << 16) continue;
+			if (!HASBIT(e->player_avail, _current_player) || e->reliability * 100 < AI_VEHICLE_MIN_RELIABILTY << 16) continue;
 
 			/* Rate and compare the engine by speed & capacity */
-			int rating = rvi->max_speed * rvi->capacity;
+			rating = rvi->max_speed * rvi->capacity;
 			if (rating <= best_veh_rating) continue;
 
 			// Can we build it?
-			CommandCost ret = AI_DoCommand(0, i, 0, DC_QUERY_COST, CMD_BUILD_ROAD_VEH);
+			ret = AI_DoCommand(0, i, 0, DC_QUERY_COST, CMD_BUILD_ROAD_VEH);
 			if (CmdFailed(ret)) continue;
 
 			best_veh_rating = rating;
@@ -275,31 +274,31 @@ void CcAI(bool success, TileIndex tile, uint32 p1, uint32 p2)
 	Player* p = GetPlayer(_current_player);
 
 	if (success) {
-		_players_ainew[p->index].state = AI_STATE_GIVE_ORDERS;
-		_players_ainew[p->index].veh_id = _new_vehicle_id;
+		p->ainew.state = AI_STATE_GIVE_ORDERS;
+		p->ainew.veh_id = _new_vehicle_id;
 
-		if (GetVehicle(_players_ainew[p->index].veh_id)->cargo_type != _players_ainew[p->index].cargo) {
+		if (GetVehicle(p->ainew.veh_id)->cargo_type != p->ainew.cargo) {
 			/* Cargo type doesn't match, so refit it */
-			if (CmdFailed(DoCommand(tile, _players_ainew[p->index].veh_id, _players_ainew[p->index].cargo, DC_EXEC, CMD_REFIT_ROAD_VEH))) {
+			if (CmdFailed(DoCommand(tile, p->ainew.veh_id, p->ainew.cargo, DC_EXEC, CMD_REFIT_ROAD_VEH))) {
 				/* Refit failed, so sell the vehicle */
-				DoCommand(tile, _players_ainew[p->index].veh_id, 0, DC_EXEC, CMD_SELL_ROAD_VEH);
-				_players_ainew[p->index].state = AI_STATE_NOTHING;
+				DoCommand(tile, p->ainew.veh_id, 0, DC_EXEC, CMD_SELL_ROAD_VEH);
+				p->ainew.state = AI_STATE_NOTHING;
 			}
 		}
 	} else {
 		/* XXX this should be handled more gracefully */
-		_players_ainew[p->index].state = AI_STATE_NOTHING;
+		p->ainew.state = AI_STATE_NOTHING;
 	}
 }
 
 
 // Builds the best vehicle possible
-CommandCost AiNew_Build_Vehicle(Player *p, TileIndex tile, byte flag)
+int AiNew_Build_Vehicle(Player *p, TileIndex tile, byte flag)
 {
 	EngineID i = AiNew_PickVehicle(p);
 
 	if (i == INVALID_ENGINE) return CMD_ERROR;
-	if (_players_ainew[p->index].tbt == AI_TRAIN) return CMD_ERROR;
+	if (p->ainew.tbt == AI_TRAIN) return CMD_ERROR;
 
 	if (flag & DC_EXEC) {
 		return AI_DoCommandCc(tile, i, 0, flag, CMD_BUILD_ROAD_VEH, CcAI);
@@ -308,19 +307,18 @@ CommandCost AiNew_Build_Vehicle(Player *p, TileIndex tile, byte flag)
 	}
 }
 
-CommandCost AiNew_Build_Depot(Player* p, TileIndex tile, DiagDirection direction, byte flag)
+int AiNew_Build_Depot(Player* p, TileIndex tile, DiagDirection direction, byte flag)
 {
-	CommandCost ret, ret2;
-	if (_players_ainew[p->index].tbt == AI_TRAIN) {
+	int ret, ret2;
+	if (p->ainew.tbt == AI_TRAIN) {
 		return AI_DoCommand(tile, 0, direction, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_TRAIN_DEPOT);
 	} else {
 		ret = AI_DoCommand(tile, direction, 0, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_ROAD_DEPOT);
-		if (CmdFailed(ret2)) return ret;
+		if (CmdFailed(ret)) return ret;
 		// Try to build the road from the depot
 		ret2 = AI_DoCommand(tile + TileOffsByDiagDir(direction), DiagDirToRoadBits(ReverseDiagDir(direction)), 0, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_ROAD);
 		// If it fails, ignore it..
 		if (CmdFailed(ret2)) return ret;
-		ret.AddCost(ret2);
-		return ret;
+		return ret + ret2;
 	}
 }

ai/trolly/pathfinder.c

@@ -4,18 +4,15 @@
 #include "../../openttd.h"
 #include "../../bridge_map.h"
 #include "../../debug.h"
-#include "../../command_func.h"
+#include "../../functions.h"
+#include "../../map.h"
+#include "../../tile.h"
+#include "../../command.h"
 #include "trolly.h"
 #include "../../depot.h"
 #include "../../tunnel_map.h"
 #include "../../bridge.h"
-#include "../../tunnelbridge_map.h"
 #include "../ai.h"
-#include "../../variables.h"
-#include "../../player_base.h"
-#include "../../player_func.h"
-#include "../../tunnelbridge.h"
-
 
 #define TEST_STATION_NO_DIR 0xFF
 
@@ -26,27 +23,30 @@ static bool TestCanBuildStationHere(TileIndex tile, byte dir)
 	Player *p = GetPlayer(_current_player);
 
 	if (dir == TEST_STATION_NO_DIR) {
-		CommandCost ret;
+		int32 ret;
 		// TODO: currently we only allow spots that can be access from al 4 directions...
 		//  should be fixed!!!
 		for (dir = 0; dir < 4; dir++) {
-			ret = AiNew_Build_Station(p, _players_ainew[p->index].tbt, tile, 1, 1, dir, DC_QUERY_COST);
-			if (CmdSucceeded(ret)) return true;
+			ret = AiNew_Build_Station(p, p->ainew.tbt, tile, 1, 1, dir, DC_QUERY_COST);
+			if (!CmdFailed(ret)) return true;
 		}
 		return false;
 	}
 
 	// return true if command succeeded, so the inverse of CmdFailed()
-	return CmdSucceeded(AiNew_Build_Station(p, _players_ainew[p->index].tbt, tile, 1, 1, dir, DC_QUERY_COST));
+	return !CmdFailed(AiNew_Build_Station(p, p->ainew.tbt, tile, 1, 1, dir, DC_QUERY_COST));
 }
 
 
 static bool IsRoad(TileIndex tile)
 {
 	return
-		// MP_ROAD, but not a road depot?
-		(IsTileType(tile, MP_ROAD) && !IsTileDepotType(tile, TRANSPORT_ROAD)) ||
-		(IsTileType(tile, MP_TUNNELBRIDGE) && GetTunnelBridgeTransportType(tile) == TRANSPORT_ROAD);
+		// MP_STREET, but not a road depot?
+		(IsTileType(tile, MP_STREET) && !IsTileDepotType(tile, TRANSPORT_ROAD)) ||
+		(IsTileType(tile, MP_TUNNELBRIDGE) && (
+			(IsTunnel(tile) && GetTunnelTransportType(tile) == TRANSPORT_ROAD) ||
+			(IsBridge(tile) && GetBridgeTransportType(tile) == TRANSPORT_ROAD)
+		));
 }
 
 
@@ -57,7 +57,7 @@ static bool IsRoad(TileIndex tile)
 // Check if the current tile is in our end-area
 static int32 AyStar_AiPathFinder_EndNodeCheck(AyStar *aystar, OpenListNode *current)
 {
-	const Ai_PathFinderInfo* PathFinderInfo = (Ai_PathFinderInfo*)aystar->user_target;
+	const Ai_PathFinderInfo* PathFinderInfo = aystar->user_target;
 
 	// It is not allowed to have a station on the end of a bridge or tunnel ;)
 	if (current->path.node.user_data[0] != 0) return AYSTAR_DONE;
@@ -82,7 +82,7 @@ static uint AiPathFinder_Hash(uint key1, uint key2)
 static void AyStar_AiPathFinder_Free(AyStar *aystar)
 {
 	AyStarMain_Free(aystar);
-	delete aystar;
+	free(aystar);
 }
 
 
@@ -99,7 +99,7 @@ AyStar *new_AyStar_AiPathFinder(int max_tiles_around, Ai_PathFinderInfo *PathFin
 	uint x;
 	uint y;
 	// Create AyStar
-	AyStar *result = new AyStar();
+	AyStar *result = malloc(sizeof(AyStar));
 	init_AyStar(result, AiPathFinder_Hash, 1 << 10);
 	// Set the function pointers
 	result->CalculateG = AyStar_AiPathFinder_CalculateG;
@@ -170,7 +170,7 @@ void clean_AyStar_AiPathFinder(AyStar *aystar, Ai_PathFinderInfo *PathFinderInfo
 // The h-value, simple calculation
 static int32 AyStar_AiPathFinder_CalculateH(AyStar *aystar, AyStarNode *current, OpenListNode *parent)
 {
-	const Ai_PathFinderInfo* PathFinderInfo = (Ai_PathFinderInfo*)aystar->user_target;
+	const Ai_PathFinderInfo* PathFinderInfo = aystar->user_target;
 	int r, r2;
 
 	if (PathFinderInfo->end_direction != AI_PATHFINDER_NO_DIRECTION) {
@@ -200,21 +200,22 @@ static void AyStar_AiPathFinder_FoundEndNode(AyStar *aystar, OpenListNode *curre
 		PathFinderInfo->route[i++] = parent->node.tile;
 		if (i > lengthof(PathFinderInfo->route)) {
 			// We ran out of space for the PathFinder
-			DEBUG(ai, 0, "No more space in pathfinder route[] array");
+			DEBUG(ai, 0)("[AiPathFinder] Ran out of space in the route[] array!!!");
 			PathFinderInfo->route_length = -1; // -1 indicates out of space
 			return;
 		}
 		parent = parent->parent;
 	} while (parent != NULL);
 	PathFinderInfo->route_length = i;
-	DEBUG(ai, 1, "Found route of %d nodes long in %d nodes of searching", i, Hash_Size(&aystar->ClosedListHash));
+	DEBUG(ai, 1)("[Ai-PathFinding] Found route of %d nodes long in %d nodes of searching", i, Hash_Size(&aystar->ClosedListHash));
 }
 
 
 // What tiles are around us.
 static void AyStar_AiPathFinder_GetNeighbours(AyStar *aystar, OpenListNode *current)
 {
-	CommandCost ret;
+	uint i;
+	int ret;
 	int dir;
 
 	Ai_PathFinderInfo *PathFinderInfo = (Ai_PathFinderInfo*)aystar->user_target;
@@ -222,7 +223,7 @@ static void AyStar_AiPathFinder_GetNeighbours(AyStar *aystar, OpenListNode *curr
 	aystar->num_neighbours = 0;
 
 	// Go through all surrounding tiles and check if they are within the limits
-	for (DiagDirection i = DIAGDIR_BEGIN; i < DIAGDIR_END; i++) {
+	for (i = 0; i < 4; i++) {
 		TileIndex ctile = current->path.node.tile; // Current tile
 		TileIndex atile = ctile + TileOffsByDiagDir(i); // Adjacent tile
 
@@ -234,7 +235,18 @@ static void AyStar_AiPathFinder_GetNeighbours(AyStar *aystar, OpenListNode *curr
 			// If the next step is a bridge, we have to enter it the right way
 			if (!PathFinderInfo->rail_or_road && IsRoad(atile)) {
 				if (IsTileType(atile, MP_TUNNELBRIDGE)) {
-					if (GetTunnelBridgeDirection(atile) != i) continue;
+					if (IsTunnel(atile)) {
+						if (GetTunnelDirection(atile) != i) continue;
+					} else {
+						if ((_m[atile].m5 & 1U) != DiagDirToAxis(i)) continue;
+					}
+				}
+			}
+			// But also if we are on a bridge, we can only move a certain direction
+			if (!PathFinderInfo->rail_or_road && IsRoad(ctile)) {
+				if (IsTileType(ctile, MP_TUNNELBRIDGE)) {
+					// An existing bridge/tunnel... let's test the direction ;)
+					if ((_m[ctile].m5 & 1U) != (i & 1)) continue;
 				}
 			}
 
@@ -242,7 +254,7 @@ static void AyStar_AiPathFinder_GetNeighbours(AyStar *aystar, OpenListNode *curr
 					(AI_PATHFINDER_FLAG_TUNNEL & current->path.node.user_data[0]) != 0) {
 				// We are a bridge/tunnel, how cool!!
 				//  This means we can only point forward.. get the direction from the user_data
-				if ((uint)i != (current->path.node.user_data[0] >> 8)) continue;
+				if (i != (current->path.node.user_data[0] >> 8)) continue;
 			}
 			dir = 0;
 
@@ -280,9 +292,9 @@ static void AyStar_AiPathFinder_GetNeighbours(AyStar *aystar, OpenListNode *curr
 							dir = 0;
 						} else {
 							// It already has road.. check if we miss any bits!
-							if ((GetAnyRoadBits(ctile, ROADTYPE_ROAD) & dir) != dir) {
+							if ((_m[ctile].m5 & dir) != dir) {
 								// We do miss some pieces :(
-								dir &= ~GetAnyRoadBits(ctile, ROADTYPE_ROAD);
+								dir &= ~_m[ctile].m5;
 							} else {
 								dir = 0;
 							}
@@ -315,13 +327,13 @@ static void AyStar_AiPathFinder_GetNeighbours(AyStar *aystar, OpenListNode *curr
 		// Bridges can only be build on land that is not flat
 		//  And if there is a road or rail blocking
 		if (tileh != SLOPE_FLAT ||
-				(PathFinderInfo->rail_or_road && IsTileType(tile + TileOffsByDiagDir(dir), MP_ROAD)) ||
+				(PathFinderInfo->rail_or_road && IsTileType(tile + TileOffsByDiagDir(dir), MP_STREET)) ||
 				(!PathFinderInfo->rail_or_road && IsTileType(tile + TileOffsByDiagDir(dir), MP_RAILWAY))) {
 			for (;;) {
 				new_tile += TileOffsByDiagDir(dir);
 
 				// Precheck, is the length allowed?
-				if (!CheckBridge_Stuff(0, GetTunnelBridgeLength(tile, new_tile))) break;
+				if (!CheckBridge_Stuff(0, GetBridgeLength(tile, new_tile))) break;
 
 				// Check if we hit the station-tile.. we don't like that!
 				if (TILES_BETWEEN(new_tile, PathFinderInfo->end_tile_tl, PathFinderInfo->end_tile_br)) break;
@@ -341,11 +353,14 @@ static void AyStar_AiPathFinder_GetNeighbours(AyStar *aystar, OpenListNode *curr
 		// Next, check for tunnels!
 		// Tunnels can only be built on slopes corresponding to the direction
 		//  For now, we check both sides for this tile.. terraforming gives fuzzy result
-		if (tileh == InclinedSlope(dir)) {
+		if ((dir == DIAGDIR_NE && tileh == SLOPE_NE) ||
+				(dir == DIAGDIR_SE && tileh == SLOPE_SE) ||
+				(dir == DIAGDIR_SW && tileh == SLOPE_SW) ||
+				(dir == DIAGDIR_NW && tileh == SLOPE_NW)) {
 			// Now simply check if a tunnel can be build
 			ret = AI_DoCommand(tile, (PathFinderInfo->rail_or_road?0:0x200), 0, DC_AUTO, CMD_BUILD_TUNNEL);
 			tileh = GetTileSlope(_build_tunnel_endtile, NULL);
-			if (CmdSucceeded(ret) && IsInclinedSlope(tileh)) {
+			if (!CmdFailed(ret) && (tileh == SLOPE_SW || tileh == SLOPE_SE || tileh == SLOPE_NW || tileh == SLOPE_NE)) {
 				aystar->neighbours[aystar->num_neighbours].tile = _build_tunnel_endtile;
 				aystar->neighbours[aystar->num_neighbours].user_data[0] = AI_PATHFINDER_FLAG_TUNNEL + (dir << 8);
 				aystar->neighbours[aystar->num_neighbours++].direction = 0;
@@ -355,14 +370,18 @@ static void AyStar_AiPathFinder_GetNeighbours(AyStar *aystar, OpenListNode *curr
 }
 
 
-extern Foundation GetRailFoundation(Slope tileh, TrackBits bits); // XXX function declaration in .c
-extern Foundation GetRoadFoundation(Slope tileh, RoadBits bits); // XXX function declaration in .c
+extern uint GetRailFoundation(Slope tileh, TrackBits bits); // XXX function declaration in .c
+extern uint GetRoadFoundation(Slope tileh, uint bits); // XXX function declaration in .c
+extern uint GetBridgeFoundation(Slope tileh, Axis); // XXX function declaration in .c
+enum {
+	BRIDGE_NO_FOUNDATION = 1 << 0 | 1 << 3 | 1 << 6 | 1 << 9 | 1 << 12,
+};
 
 // The most important function: it calculates the g-value
 static int32 AyStar_AiPathFinder_CalculateG(AyStar *aystar, AyStarNode *current, OpenListNode *parent)
 {
 	Ai_PathFinderInfo *PathFinderInfo = (Ai_PathFinderInfo*)aystar->user_target;
-	int res = 0;
+	int r, res = 0;
 	Slope tileh = GetTileSlope(current->tile, NULL);
 	Slope parent_tileh = GetTileSlope(parent->path.node.tile, NULL);
 
@@ -398,16 +417,17 @@ static int32 AyStar_AiPathFinder_CalculateG(AyStar *aystar, AyStarNode *current,
 		// Skip if the tile was from a bridge or tunnel
 		if (parent->path.node.user_data[0] == 0 && current->user_data[0] == 0) {
 			if (PathFinderInfo->rail_or_road) {
-				Foundation f = GetRailFoundation(parent_tileh, (TrackBits)(1 << AiNew_GetRailDirection(parent->path.parent->node.tile, parent->path.node.tile, current->tile)));
-				if (IsInclinedFoundation(f) || (!IsFoundation(f) && IsInclinedSlope(parent_tileh))) {
+				r = GetRailFoundation(parent_tileh, 1 << AiNew_GetRailDirection(parent->path.parent->node.tile, parent->path.node.tile, current->tile));
+				// Maybe is BRIDGE_NO_FOUNDATION a bit strange here, but it contains just the right information..
+				if (r >= 15 || (r == 0 && HASBIT(BRIDGE_NO_FOUNDATION, tileh))) {
 					res += AI_PATHFINDER_TILE_GOES_UP_PENALTY;
 				} else {
 					res += AI_PATHFINDER_FOUNDATION_PENALTY;
 				}
 			} else {
 				if (!IsRoad(parent->path.node.tile) || !IsTileType(parent->path.node.tile, MP_TUNNELBRIDGE)) {
-					Foundation f = GetRoadFoundation(parent_tileh, (RoadBits)AiNew_GetRoadDirection(parent->path.parent->node.tile, parent->path.node.tile, current->tile));
-					if (IsInclinedFoundation(f) || (!IsFoundation(f) && IsInclinedSlope(parent_tileh))) {
+					r = GetRoadFoundation(parent_tileh, AiNew_GetRoadDirection(parent->path.parent->node.tile, parent->path.node.tile, current->tile));
+					if (r >= 15 || r == 0) {
 						res += AI_PATHFINDER_TILE_GOES_UP_PENALTY;
 					} else {
 						res += AI_PATHFINDER_FOUNDATION_PENALTY;
@@ -419,22 +439,31 @@ static int32 AyStar_AiPathFinder_CalculateG(AyStar *aystar, AyStarNode *current,
 
 	// Are we part of a tunnel?
 	if ((AI_PATHFINDER_FLAG_TUNNEL & current->user_data[0]) != 0) {
-		int r;
 		// Tunnels are very expensive when build on long routes..
 		// Ironicly, we are using BridgeCode here ;)
-		r = AI_PATHFINDER_TUNNEL_PENALTY * GetTunnelBridgeLength(current->tile, parent->path.node.tile);
+		r = AI_PATHFINDER_TUNNEL_PENALTY * GetBridgeLength(current->tile, parent->path.node.tile);
 		res += r + (r >> 8);
 	}
 
 	// Are we part of a bridge?
 	if ((AI_PATHFINDER_FLAG_BRIDGE & current->user_data[0]) != 0) {
 		// That means for every length a penalty
-		res += AI_PATHFINDER_BRIDGE_PENALTY * GetTunnelBridgeLength(current->tile, parent->path.node.tile);
+		res += AI_PATHFINDER_BRIDGE_PENALTY * GetBridgeLength(current->tile, parent->path.node.tile);
 		// Check if we are going up or down, first for the starting point
 		// In user_data[0] is at the 8th bit the direction
-		if (!HasBridgeFlatRamp(parent_tileh, (Axis)((current->user_data[0] >> 8) & 1))) res += AI_PATHFINDER_BRIDGE_GOES_UP_PENALTY;
+		if (!HASBIT(BRIDGE_NO_FOUNDATION, parent_tileh)) {
+			if (GetBridgeFoundation(parent_tileh, (current->user_data[0] >> 8) & 1) < 15) {
+				res += AI_PATHFINDER_BRIDGE_GOES_UP_PENALTY;
+			}
+		}
 		// Second for the end point
-		if (!HasBridgeFlatRamp(tileh, (Axis)((current->user_data[0] >> 8) & 1))) res += AI_PATHFINDER_BRIDGE_GOES_UP_PENALTY;
+		if (!HASBIT(BRIDGE_NO_FOUNDATION, tileh)) {
+			if (GetBridgeFoundation(tileh, (current->user_data[0] >> 8) & 1) < 15) {
+				res += AI_PATHFINDER_BRIDGE_GOES_UP_PENALTY;
+			}
+		}
+		if (parent_tileh == SLOPE_FLAT) res += AI_PATHFINDER_BRIDGE_GOES_UP_PENALTY;
+		if (tileh == SLOPE_FLAT) res += AI_PATHFINDER_BRIDGE_GOES_UP_PENALTY;
 	}
 
 	//  To prevent the AI from taking the fastest way in tiles, but not the fastest way

ai/trolly/shared.c

@@ -3,10 +3,9 @@
 #include "../../stdafx.h"
 #include "../../openttd.h"
 #include "../../debug.h"
-#include "../../map_func.h"
-#include "../../vehicle_base.h"
-#include "../../player_base.h"
+#include "../../map.h"
 #include "trolly.h"
+#include "../../vehicle.h"
 
 int AiNew_GetRailDirection(TileIndex tile_a, TileIndex tile_b, TileIndex tile_c)
 {
@@ -81,8 +80,8 @@ uint AiNew_GetSpecialVehicleFlag(Player* p, Vehicle* v)
 	uint i;
 
 	for (i = 0; i < AI_MAX_SPECIAL_VEHICLES; i++) {
-		if (_players_ainew[p->index].special_vehicles[i].veh_id == v->index) {
-			return _players_ainew[p->index].special_vehicles[i].flag;
+		if (p->ainew.special_vehicles[i].veh_id == v->index) {
+			return p->ainew.special_vehicles[i].flag;
 		}
 	}
 
@@ -97,23 +96,23 @@ bool AiNew_SetSpecialVehicleFlag(Player* p, Vehicle* v, uint flag)
 	uint i;
 
 	for (i = 0; i < AI_MAX_SPECIAL_VEHICLES; i++) {
-		if (_players_ainew[p->index].special_vehicles[i].veh_id == v->index) {
-			_players_ainew[p->index].special_vehicles[i].flag |= flag;
+		if (p->ainew.special_vehicles[i].veh_id == v->index) {
+			p->ainew.special_vehicles[i].flag |= flag;
 			return true;
 		}
 		if (new_id == -1 &&
-				_players_ainew[p->index].special_vehicles[i].veh_id == 0 &&
-				_players_ainew[p->index].special_vehicles[i].flag == 0) {
+				p->ainew.special_vehicles[i].veh_id == 0 &&
+				p->ainew.special_vehicles[i].flag == 0) {
 			new_id = i;
 		}
 	}
 
 	// Out of special_vehicle spots :s
 	if (new_id == -1) {
-		DEBUG(ai, 1, "special_vehicles list is too small");
+		DEBUG(ai, 1)("special_vehicles list is too small :(");
 		return false;
 	}
-	_players_ainew[p->index].special_vehicles[new_id].veh_id = v->index;
-	_players_ainew[p->index].special_vehicles[new_id].flag = flag;
+	p->ainew.special_vehicles[new_id].veh_id = v->index;
+	p->ainew.special_vehicles[new_id].flag = flag;
 	return true;
 }

ai/trolly/trolly.h

@@ -4,9 +4,7 @@
 #define AI_TROLLY_H
 
 #include "../../aystar.h"
-#include "../../player_type.h"
-#include "../../vehicle_type.h"
-#include "../../date_type.h"
+#include "../../player.h"
 
 /*
  * These defines can be altered to change the behavoir of the AI
@@ -241,22 +239,6 @@ typedef void AiNew_StateFunction(Player *p);
 // ai_new.c
 void AiNewDoGameLoop(Player *p);
 
-struct Ai_PathFinderInfo {
-	TileIndex start_tile_tl; ///< tl = top-left
-	TileIndex start_tile_br; ///< br = bottom-right
-	TileIndex end_tile_tl;   ///< tl = top-left
-	TileIndex end_tile_br;   ///< br = bottom-right
-	DiagDirection start_direction; ///< 0 to 3 or AI_PATHFINDER_NO_DIRECTION
-	DiagDirection end_direction;   ///< 0 to 3 or AI_PATHFINDER_NO_DIRECTION
-
-	TileIndex route[500];
-	byte route_extra[500];   ///< Some extra information about the route like bridge/tunnel
-	int route_length;
-	int position;            ///< Current position in the build-path, needed to build the path
-
-	bool rail_or_road;       ///< true = rail, false = road
-};
-
 // ai_pathfinder.c
 AyStar *new_AyStar_AiPathFinder(int max_tiles_around, Ai_PathFinderInfo *PathFinderInfo);
 void clean_AyStar_AiPathFinder(AyStar *aystar, Ai_PathFinderInfo *PathFinderInfo);
@@ -270,71 +252,11 @@ uint AiNew_GetSpecialVehicleFlag(Player *p, Vehicle *v);
 
 // ai_build.c
 bool AiNew_Build_CompanyHQ(Player *p, TileIndex tile);
-CommandCost AiNew_Build_Station(Player *p, byte type, TileIndex tile, byte length, byte numtracks, byte direction, byte flag);
-CommandCost AiNew_Build_Bridge(Player *p, TileIndex tile_a, TileIndex tile_b, byte flag);
-CommandCost AiNew_Build_RoutePart(Player *p, Ai_PathFinderInfo *PathFinderInfo, byte flag);
+int AiNew_Build_Station(Player *p, byte type, TileIndex tile, byte length, byte numtracks, byte direction, byte flag);
+int AiNew_Build_Bridge(Player *p, TileIndex tile_a, TileIndex tile_b, byte flag);
+int AiNew_Build_RoutePart(Player *p, Ai_PathFinderInfo *PathFinderInfo, byte flag);
 EngineID AiNew_PickVehicle(Player *p);
-CommandCost AiNew_Build_Vehicle(Player *p, TileIndex tile, byte flag);
-CommandCost AiNew_Build_Depot(Player* p, TileIndex tile, DiagDirection direction, byte flag);
-
-/* The amount of memory reserved for the AI-special-vehicles */
-#define AI_MAX_SPECIAL_VEHICLES 100
-
-struct Ai_SpecialVehicle {
-	VehicleID veh_id;
-	uint32 flag;
-};
-
-struct PlayerAiNew {
-	uint8 state;
-	uint tick;
-	uint idle;
-
-	int temp;    ///< A value used in more than one function, but it just temporary
-	             ///< The use is pretty simple: with this we can 'think' about stuff
-	             ///<   in more than one tick, and more than one AI. A static will not
-	             ///<   do, because they are not saved. This way, the AI is almost human ;)
-	int counter; ///< For the same reason as temp, we have counter. It can count how
-	             ///<  long we are trying something, and just abort if it takes too long
-
-	/* Pathfinder stuff */
-	Ai_PathFinderInfo path_info;
-	AyStar *pathfinder;
-
-	/* Route stuff */
-
-	CargoID cargo;
-	byte tbt;    ///< train/bus/truck 0/1/2 AI_TRAIN/AI_BUS/AI_TRUCK
-	Money new_cost;
-
-	byte action;
-
-	int last_id; ///< here is stored the last id of the searched city/industry
-	Date last_vehiclecheck_date; // Used in CheckVehicle
-	Ai_SpecialVehicle special_vehicles[AI_MAX_SPECIAL_VEHICLES]; ///< Some vehicles have some special flags
-
-	TileIndex from_tile;
-	TileIndex to_tile;
-
-	DiagDirectionByte from_direction;
-	DiagDirectionByte to_direction;
-
-	bool from_deliver; ///< True if this is the station that GIVES cargo
-	bool to_deliver;
-
-	TileIndex depot_tile;
-	DiagDirectionByte depot_direction;
-
-	byte amount_veh;       ///< How many vehicles we are going to build in this route
-	byte cur_veh;          ///< How many vehicles did we bought?
-	VehicleID veh_id;      ///< Used when bought a vehicle
-	VehicleID veh_main_id; ///< The ID of the first vehicle, for shared copy
-
-	int from_ic;           ///< ic = industry/city. This is the ID of them
-	byte from_type;        ///< AI_NO_TYPE/AI_CITY/AI_INDUSTRY
-	int to_ic;
-	byte to_type;
-};
-extern PlayerAiNew _players_ainew[MAX_PLAYERS];
+int AiNew_Build_Vehicle(Player *p, TileIndex tile, byte flag);
+int AiNew_Build_Depot(Player* p, TileIndex tile, DiagDirection direction, byte flag);
 
 #endif /* AI_TROLLY_H */

aircraft.h

@@ -0,0 +1,26 @@
+/* $Id$ */
+
+#ifndef AIRCRAFT_H
+#define AIRCRAFT_H
+
+#include "station_map.h"
+#include "vehicle.h"
+
+
+static inline bool IsAircraftInHangar(const Vehicle* v)
+{
+	assert(v->type == VEH_Aircraft);
+	return v->vehstatus & VS_HIDDEN && IsHangarTile(v->tile);
+}
+
+static inline bool IsAircraftInHangarStopped(const Vehicle* v)
+{
+	return IsAircraftInHangar(v) && v->vehstatus & VS_STOPPED;
+}
+
+uint16 AircraftDefaultCargoCapacity(CargoID cid, EngineID engine_type);
+
+void CcCloneAircraft(bool success, TileIndex tile, uint32 p1, uint32 p2);
+void HandleAircraftEnterHangar(Vehicle *v);
+
+#endif /* AIRCRAFT_H */

aircraft_gui.c

@@ -0,0 +1,350 @@
+/* $Id$ */
+
+#include "stdafx.h"
+#include "openttd.h"
+#include "aircraft.h"
+#include "debug.h"
+#include "functions.h"
+#include "table/sprites.h"
+#include "table/strings.h"
+#include "map.h"
+#include "window.h"
+#include "gui.h"
+#include "vehicle.h"
+#include "gfx.h"
+#include "command.h"
+#include "engine.h"
+#include "viewport.h"
+#include "player.h"
+#include "depot.h"
+#include "vehicle_gui.h"
+#include "newgrf_engine.h"
+
+
+void CcCloneAircraft(bool success, TileIndex tile, uint32 p1, uint32 p2)
+{
+	if (success) ShowAircraftViewWindow(GetVehicle(_new_vehicle_id));
+}
+
+static void AircraftDetailsWndProc(Window *w, WindowEvent *e)
+{
+	switch (e->event) {
+	case WE_PAINT: {
+		const Vehicle *v = GetVehicle(w->window_number);
+
+		SetWindowWidgetDisabledState(w, 2, v->owner != _local_player);
+
+		/* Disable service-scroller when interval is set to disabled */
+		SetWindowWidgetDisabledState(w, 5, !_patches.servint_aircraft);
+		SetWindowWidgetDisabledState(w, 6, !_patches.servint_aircraft);
+
+		SetDParam(0, v->string_id);
+		SetDParam(1, v->unitnumber);
+		DrawWindowWidgets(w);
+
+		/* Draw running cost */
+		{
+			int year = v->age / 366;
+
+			SetDParam(1, year);
+
+			SetDParam(0, (v->age + 365 < v->max_age) ? STR_AGE : STR_AGE_RED);
+			SetDParam(2, v->max_age / 366);
+			SetDParam(3, _price.aircraft_running * AircraftVehInfo(v->engine_type)->running_cost >> 8);
+			DrawString(2, 15, STR_A00D_AGE_RUNNING_COST_YR, 0);
+		}
+
+		/* Draw max speed */
+		{
+			SetDParam(0, v->max_speed * 128 / 10);
+			DrawString(2, 25, STR_A00E_MAX_SPEED, 0);
+		}
+
+		/* Draw profit */
+		{
+			SetDParam(0, v->profit_this_year);
+			SetDParam(1, v->profit_last_year);
+			DrawString(2, 35, STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR, 0);
+		}
+
+		/* Draw breakdown & reliability */
+		{
+			SetDParam(0, v->reliability * 100 >> 16);
+			SetDParam(1, v->breakdowns_since_last_service);
+			DrawString(2, 45, STR_A010_RELIABILITY_BREAKDOWNS, 0);
+		}
+
+		/* Draw service interval text */
+		{
+			SetDParam(0, v->service_interval);
+			SetDParam(1, v->date_of_last_service);
+			DrawString(13, 103, _patches.servint_ispercent?STR_SERVICING_INTERVAL_PERCENT:STR_883C_SERVICING_INTERVAL_DAYS, 0);
+		}
+
+		DrawAircraftImage(v, 3, 57, INVALID_VEHICLE);
+
+		{
+			const Vehicle *u;
+			int y = 57;
+
+			do {
+				if (v->subtype <= 2) {
+					SetDParam(0, GetCustomEngineName(v->engine_type));
+					SetDParam(1, v->build_year);
+					SetDParam(2, v->value);
+					DrawString(60, y, STR_A011_BUILT_VALUE, 0);
+					y += 10;
+
+					SetDParam(0, v->cargo_type);
+					SetDParam(1, v->cargo_cap);
+					u = v->next;
+					SetDParam(2, u->cargo_type);
+					SetDParam(3, u->cargo_cap);
+					DrawString(60, y, (u->cargo_cap != 0) ? STR_A019_CAPACITY : STR_A01A_CAPACITY, 0);
+					y += 14;
+				}
+
+				if (v->cargo_count != 0) {
+
+					/* Cargo names (fix pluralness) */
+					SetDParam(0, v->cargo_type);
+					SetDParam(1, v->cargo_count);
+					SetDParam(2, v->cargo_source);
+					DrawString(60, y, STR_8813_FROM, 0);
+
+					y += 10;
+				}
+			} while ( (v=v->next) != NULL);
+		}
+	} break;
+
+	case WE_CLICK: {
+		int mod;
+		const Vehicle *v;
+		switch (e->we.click.widget) {
+		case 2: /* rename */
+			v = GetVehicle(w->window_number);
+			SetDParam(0, v->unitnumber);
+			ShowQueryString(v->string_id, STR_A030_NAME_AIRCRAFT, 31, 150, w->window_class, w->window_number, CS_ALPHANUMERAL);
+			break;
+		case 5: /* increase int */
+			mod = _ctrl_pressed? 5 : 10;
+			goto do_change_service_int;
+		case 6: /* decrease int */
+			mod = _ctrl_pressed?- 5 : -10;
+do_change_service_int:
+			v = GetVehicle(w->window_number);
+
+			mod = GetServiceIntervalClamped(mod + v->service_interval);
+			if (mod == v->service_interval) return;
+
+			DoCommandP(v->tile, v->index, mod, NULL, CMD_CHANGE_SERVICE_INT | CMD_MSG(STR_018A_CAN_T_CHANGE_SERVICING));
+			break;
+		}
+	} break;
+
+	case WE_ON_EDIT_TEXT:
+		if (e->we.edittext.str[0] != '\0') {
+			_cmd_text = e->we.edittext.str;
+			DoCommandP(0, w->window_number, 0, NULL,
+				CMD_NAME_VEHICLE | CMD_MSG(STR_A031_CAN_T_NAME_AIRCRAFT));
+		}
+		break;
+	}
+}
+
+
+static const Widget _aircraft_details_widgets[] = {
+{   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,         STR_018B_CLOSE_WINDOW },
+{    WWT_CAPTION,   RESIZE_NONE,    14,    11,   349,     0,    13, STR_A00C_DETAILS, STR_018C_WINDOW_TITLE_DRAG_THIS },
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,    14,   350,   389,     0,    13, STR_01AA_NAME,    STR_A032_NAME_AIRCRAFT },
+{      WWT_PANEL,   RESIZE_NONE,    14,     0,   389,    14,    55, 0x0,              STR_NULL },
+{      WWT_PANEL,   RESIZE_NONE,    14,     0,   389,    56,   101, 0x0,              STR_NULL },
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,    14,     0,    10,   102,   107, STR_0188,         STR_884D_INCREASE_SERVICING_INTERVAL },
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,    14,     0,    10,   108,   113, STR_0189,         STR_884E_DECREASE_SERVICING_INTERVAL },
+{      WWT_PANEL,   RESIZE_NONE,    14,    11,   389,   102,   113, 0x0,              STR_NULL },
+{   WIDGETS_END},
+};
+
+static const WindowDesc _aircraft_details_desc = {
+	WDP_AUTO, WDP_AUTO, 390, 114,
+	WC_VEHICLE_DETAILS, WC_VEHICLE_VIEW,
+	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
+	_aircraft_details_widgets,
+	AircraftDetailsWndProc
+};
+
+
+static void ShowAircraftDetailsWindow(const Vehicle *v)
+{
+	Window *w;
+	VehicleID veh = v->index;
+
+	DeleteWindowById(WC_VEHICLE_ORDERS, veh);
+	DeleteWindowById(WC_VEHICLE_DETAILS, veh);
+
+	w = AllocateWindowDescFront(&_aircraft_details_desc, veh);
+	w->caption_color = v->owner;
+//	w->vscroll.cap = 6;
+//	w->traindetails_d.tab = 0;
+}
+
+
+static const Widget _aircraft_view_widgets[] = {
+{   WWT_CLOSEBOX,  RESIZE_NONE,  14,   0,  10,   0,  13, STR_00C5,                 STR_018B_CLOSE_WINDOW },
+{    WWT_CAPTION, RESIZE_RIGHT,  14,  11, 237,   0,  13, STR_A00A,                 STR_018C_WINDOW_TITLE_DRAG_THIS },
+{  WWT_STICKYBOX,    RESIZE_LR,  14, 238, 249,   0,  13, 0x0,                      STR_STICKY_BUTTON },
+{      WWT_PANEL,    RESIZE_RB,  14,   0, 231,  14, 103, 0x0,                      STR_NULL },
+{      WWT_INSET,    RESIZE_RB,  14,   2, 229,  16, 101, 0x0,                      STR_NULL },
+{    WWT_PUSHBTN,   RESIZE_RTB,  14,   0, 237, 104, 115, 0x0,                      STR_A027_CURRENT_AIRCRAFT_ACTION },
+{ WWT_PUSHIMGBTN,    RESIZE_LR,  14, 232, 249,  14,  31, SPR_CENTRE_VIEW_VEHICLE,  STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT },
+{ WWT_PUSHIMGBTN,    RESIZE_LR,  14, 232, 249,  32,  49, SPR_SEND_AIRCRAFT_TODEPOT,STR_A02A_SEND_AIRCRAFT_TO_HANGAR },
+{ WWT_PUSHIMGBTN,    RESIZE_LR,  14, 232, 249,  50,  67, SPR_REFIT_VEHICLE,        STR_A03B_REFIT_AIRCRAFT_TO_CARRY },
+{ WWT_PUSHIMGBTN,    RESIZE_LR,  14, 232, 249,  68,  85, SPR_SHOW_ORDERS,          STR_A028_SHOW_AIRCRAFT_S_ORDERS },
+{ WWT_PUSHIMGBTN,    RESIZE_LR,  14, 232, 249,  86, 103, SPR_SHOW_VEHICLE_DETAILS, STR_A02B_SHOW_AIRCRAFT_DETAILS },
+{ WWT_PUSHIMGBTN,    RESIZE_LR,  14, 232, 249,  32,  49, SPR_CLONE_AIRCRAFT,       STR_CLONE_AIRCRAFT_INFO },
+{      WWT_PANEL,   RESIZE_LRB,  14, 232, 249, 104, 103, 0x0,                      STR_NULL },
+{  WWT_RESIZEBOX,  RESIZE_LRTB,  14, 238, 249, 104, 115, 0x0,                      STR_NULL },
+{   WIDGETS_END},
+};
+
+
+static void AircraftViewWndProc(Window *w, WindowEvent *e)
+{
+	switch (e->event) {
+	case WE_PAINT: {
+		const Vehicle *v = GetVehicle(w->window_number);
+		StringID str;
+		bool is_localplayer = v->owner == _local_player;
+
+		SetWindowWidgetDisabledState(w,  7, !is_localplayer);
+		SetWindowWidgetDisabledState(w,  8, !IsAircraftInHangarStopped(v) || !is_localplayer);
+		SetWindowWidgetDisabledState(w, 11, !is_localplayer);
+
+
+		/* draw widgets & caption */
+		SetDParam(0, v->string_id);
+		SetDParam(1, v->unitnumber);
+		DrawWindowWidgets(w);
+
+		if (v->vehstatus & VS_CRASHED) {
+			str = STR_8863_CRASHED;
+		} else if (v->vehstatus & VS_STOPPED) {
+			str = STR_8861_STOPPED;
+		} else {
+			switch (v->current_order.type) {
+			case OT_GOTO_STATION: {
+				SetDParam(0, v->current_order.dest);
+				SetDParam(1, v->cur_speed * 128 / 10);
+				str = STR_HEADING_FOR_STATION + _patches.vehicle_speed;
+			} break;
+
+			case OT_GOTO_DEPOT: {
+				/* Aircrafts always go to a station, even if you say depot */
+				SetDParam(0, v->current_order.dest);
+				SetDParam(1, v->cur_speed * 128 / 10);
+				if (HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT) && !HASBIT(v->current_order.flags, OFB_PART_OF_ORDERS)) {
+					str = STR_HEADING_FOR_HANGAR + _patches.vehicle_speed;
+				} else {
+					str = STR_HEADING_FOR_HANGAR_SERVICE + _patches.vehicle_speed;
+				}
+			} break;
+
+			case OT_LOADING:
+				str = STR_882F_LOADING_UNLOADING;
+				break;
+
+			default:
+				if (v->num_orders == 0) {
+					str = STR_NO_ORDERS + _patches.vehicle_speed;
+					SetDParam(0, v->cur_speed * 128 / 10);
+				} else {
+					str = STR_EMPTY;
+				}
+				break;
+			}
+		}
+
+		/* draw the flag plus orders */
+		DrawSprite(v->vehstatus & VS_STOPPED ? SPR_FLAG_VEH_STOPPED : SPR_FLAG_VEH_RUNNING, 2, w->widget[5].top + 1);
+		DrawStringCenteredTruncated(w->widget[5].left + 8, w->widget[5].right, w->widget[5].top + 1, str, 0);
+		DrawWindowViewport(w);
+	} break;
+
+	case WE_CLICK: {
+		const Vehicle *v = GetVehicle(w->window_number);
+
+		switch (e->we.click.widget) {
+		case 5: /* start stop */
+			DoCommandP(v->tile, v->index, 0, NULL, CMD_START_STOP_AIRCRAFT | CMD_MSG(STR_A016_CAN_T_STOP_START_AIRCRAFT));
+			break;
+		case 6: /* center main view */
+			ScrollMainWindowTo(v->x_pos, v->y_pos);
+			break;
+		case 7: /* goto hangar */
+			DoCommandP(v->tile, v->index, _ctrl_pressed ? DEPOT_SERVICE : 0, NULL, CMD_SEND_AIRCRAFT_TO_HANGAR | CMD_MSG(STR_A012_CAN_T_SEND_AIRCRAFT_TO));
+			break;
+		case 8: /* refit */
+			ShowVehicleRefitWindow(v, INVALID_VEH_ORDER_ID);
+			break;
+		case 9: /* show orders */
+			ShowOrdersWindow(v);
+			break;
+		case 10: /* show details */
+			ShowAircraftDetailsWindow(v);
+			break;
+		case 11:
+			/* clone vehicle */
+			DoCommandP(v->tile, v->index, _ctrl_pressed ? 1 : 0, CcCloneAircraft, CMD_CLONE_VEHICLE | CMD_MSG(STR_A008_CAN_T_BUILD_AIRCRAFT));
+			break;
+		}
+	} break;
+
+	case WE_RESIZE:
+		w->viewport->width          += e->we.sizing.diff.x;
+		w->viewport->height         += e->we.sizing.diff.y;
+		w->viewport->virtual_width  += e->we.sizing.diff.x;
+		w->viewport->virtual_height += e->we.sizing.diff.y;
+		break;
+
+	case WE_DESTROY:
+		DeleteWindowById(WC_VEHICLE_ORDERS, w->window_number);
+		DeleteWindowById(WC_VEHICLE_REFIT, w->window_number);
+		DeleteWindowById(WC_VEHICLE_DETAILS, w->window_number);
+		break;
+
+	case WE_MOUSELOOP: {
+		const Vehicle *v = GetVehicle(w->window_number);
+		bool plane_stopped = IsAircraftInHangarStopped(v);
+
+		/* Widget 7 (send to hangar) must be hidden if the plane is already stopped in hangar.
+		 * Widget 11 (clone) should then be shown, since cloning is allowed only while in hangar and stopped.
+		 * This sytem allows to have two buttons, on top of each other*/
+		if (plane_stopped != IsWindowWidgetHidden(w, 7) || plane_stopped == IsWindowWidgetHidden(w, 11)) {
+			SetWindowWidgetHiddenState(w,  7, plane_stopped);  // send to hangar
+			SetWindowWidgetHiddenState(w, 11, !plane_stopped); // clone
+			SetWindowDirty(w);
+		}
+	} break;
+	}
+}
+
+
+static const WindowDesc _aircraft_view_desc = {
+	WDP_AUTO, WDP_AUTO, 250, 116,
+	WC_VEHICLE_VIEW ,0,
+	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
+	_aircraft_view_widgets,
+	AircraftViewWndProc
+};
+
+
+void ShowAircraftViewWindow(const Vehicle *v)
+{
+	Window *w = AllocateWindowDescFront(&_aircraft_view_desc, v->index);
+
+	if (w != NULL) {
+		w->caption_color = v->owner;
+		AssignWindowViewport(w, 3, 17, 0xE2, 0x54, w->window_number | (1 << 31), 0);
+	}
+}

airport.c

@@ -1,16 +1,14 @@
 /* $Id$ */
 
-/** @file airport.cpp */
-
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
+#include "map.h"
 #include "airport.h"
+#include "macros.h"
+#include "variables.h"
 #include "airport_movement.h"
-#include "core/bitmath_func.hpp"
-#include "core/alloc_func.hpp"
-#include "date_func.h"
-#include "settings_type.h"
+#include "date.h"
 
 /* Uncomment this to print out a full report of the airport-structure
  * You should either use
@@ -19,7 +17,6 @@
  * - false: give a summarized report which only shows current and next position */
 //#define DEBUG_AIRPORT false
 
-static AirportFTAClass *DummyAirport;
 static AirportFTAClass *CountryAirport;
 static AirportFTAClass *CityAirport;
 static AirportFTAClass *Oilrig;
@@ -31,273 +28,256 @@ static AirportFTAClass *HeliDepot;
 static AirportFTAClass *IntercontinentalAirport;
 static AirportFTAClass *HeliStation;
 
+static void AirportFTAClass_Constructor(AirportFTAClass *apc,
+	const byte *terminals, const byte *helipads,
+	const byte entry_point,  const byte acc_planes,
+	const AirportFTAbuildup *apFA,
+	const TileIndexDiffC *depots, const byte nof_depots,
+	uint size_x, uint size_y
+);
+static void AirportFTAClass_Destructor(AirportFTAClass *apc);
 
-void InitializeAirports()
+static uint16 AirportGetNofElements(const AirportFTAbuildup *apFA);
+static void AirportBuildAutomata(AirportFTAClass *apc, const AirportFTAbuildup *apFA);
+static byte AirportGetTerminalCount(const byte *terminals, byte *groups);
+static byte AirportTestFTA(const AirportFTAClass *apc);
+
+#ifdef DEBUG_AIRPORT
+static void AirportPrintOut(const AirportFTAClass *apc, bool full_report);
+#endif /* DEBUG_AIRPORT */
+
+void InitializeAirports(void)
 {
-	DummyAirport = new AirportFTAClass(
-		_airport_moving_data_dummy,
-		NULL,
-		NULL,
-		_airport_entries_dummy,
-		AirportFTAClass::ALL,
-		_airport_fta_dummy,
-		NULL,
-		0,
-		0, 0,
-		0,
-		0
-	);
+	// country airport
+	CountryAirport = malloc(sizeof(AirportFTAClass));
 
-	CountryAirport = new AirportFTAClass(
-		_airport_moving_data_country,
+	AirportFTAClass_Constructor(
+		CountryAirport,
 		_airport_terminal_country,
 		NULL,
-		_airport_entries_country,
-		AirportFTAClass::ALL | AirportFTAClass::SHORT_STRIP,
+		16,
+		ALL,
 		_airport_fta_country,
 		_airport_depots_country,
 		lengthof(_airport_depots_country),
-		4, 3,
-		0,
-		4
+		4, 3
 	);
 
-	CityAirport = new AirportFTAClass(
-		_airport_moving_data_town,
+	// city airport
+	CityAirport = malloc(sizeof(AirportFTAClass));
+
+	AirportFTAClass_Constructor(
+		CityAirport,
 		_airport_terminal_city,
 		NULL,
-		_airport_entries_city,
-		AirportFTAClass::ALL,
+		19,
+		ALL,
 		_airport_fta_city,
 		_airport_depots_city,
 		lengthof(_airport_depots_city),
-		6, 6,
-		0,
-		5
+		6, 6
 	);
 
-	MetropolitanAirport = new AirportFTAClass(
-		_airport_moving_data_metropolitan,
+	// metropolitan airport
+	MetropolitanAirport = malloc(sizeof(AirportFTAClass));
+
+	AirportFTAClass_Constructor(
+		MetropolitanAirport,
 		_airport_terminal_metropolitan,
 		NULL,
-		_airport_entries_metropolitan,
-		AirportFTAClass::ALL,
+		20,
+		ALL,
 		_airport_fta_metropolitan,
 		_airport_depots_metropolitan,
 		lengthof(_airport_depots_metropolitan),
-		6, 6,
-		0,
-		6
+		6, 6
 	);
 
-	InternationalAirport = new AirportFTAClass(
-		_airport_moving_data_international,
+	// international airport
+	InternationalAirport = (AirportFTAClass *)malloc(sizeof(AirportFTAClass));
+
+	AirportFTAClass_Constructor(
+		InternationalAirport,
 		_airport_terminal_international,
 		_airport_helipad_international,
-		_airport_entries_international,
-		AirportFTAClass::ALL,
+		37,
+		ALL,
 		_airport_fta_international,
 		_airport_depots_international,
 		lengthof(_airport_depots_international),
-		7, 7,
-		0,
-		8
+		7, 7
 	);
 
-	IntercontinentalAirport = new AirportFTAClass(
-		_airport_moving_data_intercontinental,
+	// intercontintental airport
+	IntercontinentalAirport = (AirportFTAClass *)malloc(sizeof(AirportFTAClass));
+
+	AirportFTAClass_Constructor(
+		IntercontinentalAirport,
 		_airport_terminal_intercontinental,
 		_airport_helipad_intercontinental,
-		_airport_entries_intercontinental,
-		AirportFTAClass::ALL,
+		43,
+		ALL,
 		_airport_fta_intercontinental,
 		_airport_depots_intercontinental,
 		lengthof(_airport_depots_intercontinental),
-		9, 11,
-		0,
-		10
+		9,11
 	);
 
-	Heliport = new AirportFTAClass(
-		_airport_moving_data_heliport,
+	// heliport, oilrig
+	Heliport = (AirportFTAClass *)malloc(sizeof(AirportFTAClass));
+
+	AirportFTAClass_Constructor(
+		Heliport,
 		NULL,
 		_airport_helipad_heliport_oilrig,
-		_airport_entries_heliport_oilrig,
-		AirportFTAClass::HELICOPTERS,
+		7,
+		HELICOPTERS_ONLY,
 		_airport_fta_heliport_oilrig,
 		NULL,
 		0,
-		1, 1,
-		60,
-		4
+		1, 1
 	);
 
-	Oilrig = new AirportFTAClass(
-		_airport_moving_data_oilrig,
-		NULL,
-		_airport_helipad_heliport_oilrig,
-		_airport_entries_heliport_oilrig,
-		AirportFTAClass::HELICOPTERS,
-		_airport_fta_heliport_oilrig,
-		NULL,
-		0,
-		1, 1,
-		54,
-		3
-	);
+	Oilrig = Heliport;  // exactly the same structure for heliport/oilrig, so share state machine
 
-	CommuterAirport = new AirportFTAClass(
-		_airport_moving_data_commuter,
+	// commuter airport
+	CommuterAirport = malloc(sizeof(AirportFTAClass));
+
+	AirportFTAClass_Constructor(
+		CommuterAirport,
 		_airport_terminal_commuter,
 		_airport_helipad_commuter,
-		_airport_entries_commuter,
-		AirportFTAClass::ALL | AirportFTAClass::SHORT_STRIP,
+		22,
+		ALL,
 		_airport_fta_commuter,
 		_airport_depots_commuter,
 		lengthof(_airport_depots_commuter),
-		5, 4,
-		0,
-		4
+		5,4
 	);
 
-	HeliDepot = new AirportFTAClass(
-		_airport_moving_data_helidepot,
+	// helidepot airport
+	HeliDepot = malloc(sizeof(AirportFTAClass));
+
+	AirportFTAClass_Constructor(
+		HeliDepot,
 		NULL,
 		_airport_helipad_helidepot,
-		_airport_entries_helidepot,
-		AirportFTAClass::HELICOPTERS,
+		4,
+		HELICOPTERS_ONLY,
 		_airport_fta_helidepot,
 		_airport_depots_helidepot,
 		lengthof(_airport_depots_helidepot),
-		2, 2,
-		0,
-		4
+		2,2
 	);
 
-	HeliStation = new AirportFTAClass(
-		_airport_moving_data_helistation,
+	// helistation airport
+	HeliStation = malloc(sizeof(AirportFTAClass));
+
+	AirportFTAClass_Constructor(
+		HeliStation,
 		NULL,
 		_airport_helipad_helistation,
-		_airport_entries_helistation,
-		AirportFTAClass::HELICOPTERS,
+		25,
+		HELICOPTERS_ONLY,
 		_airport_fta_helistation,
 		_airport_depots_helistation,
 		lengthof(_airport_depots_helistation),
-		4, 2,
-		0,
-		4
+		4,2
 	);
+
 }
 
-void UnInitializeAirports()
+void UnInitializeAirports(void)
 {
-	delete DummyAirport;
-	delete CountryAirport;
-	delete CityAirport;
-	delete Heliport;
-	delete MetropolitanAirport;
-	delete InternationalAirport;
-	delete CommuterAirport;
-	delete HeliDepot;
-	delete IntercontinentalAirport;
-	delete HeliStation;
+	AirportFTAClass_Destructor(CountryAirport);
+	AirportFTAClass_Destructor(CityAirport);
+	AirportFTAClass_Destructor(Heliport);
+	AirportFTAClass_Destructor(MetropolitanAirport);
+	AirportFTAClass_Destructor(InternationalAirport);
+	AirportFTAClass_Destructor(CommuterAirport);
+	AirportFTAClass_Destructor(HeliDepot);
+	AirportFTAClass_Destructor(IntercontinentalAirport);
+	AirportFTAClass_Destructor(HeliStation);
 }
 
-
-static uint16 AirportGetNofElements(const AirportFTAbuildup *apFA);
-static AirportFTA* AirportBuildAutomata(uint nofelements, const AirportFTAbuildup *apFA);
-static byte AirportGetTerminalCount(const byte *terminals, byte *groups);
-static byte AirportTestFTA(uint nofelements, const AirportFTA *layout, const byte *terminals);
-
-#ifdef DEBUG_AIRPORT
-static void AirportPrintOut(uint nofelements, const AirportFTA *layout, bool full_report);
-#endif
-
-
-AirportFTAClass::AirportFTAClass(
-	const AirportMovingData *moving_data_,
-	const byte *terminals_,
-	const byte *helipads_,
-	const byte *entry_points_,
-	Flags flags_,
+static void AirportFTAClass_Constructor(AirportFTAClass *apc,
+	const byte *terminals, const byte *helipads,
+	const byte entry_point, const byte acc_planes,
 	const AirportFTAbuildup *apFA,
-	const TileIndexDiffC *depots_,
-	const byte nof_depots_,
-	uint size_x_,
-	uint size_y_,
-	byte delta_z_,
-	byte catchment_
-) :
-	moving_data(moving_data_),
-	terminals(terminals_),
-	helipads(helipads_),
-	airport_depots(depots_),
-	flags(flags_),
-	nof_depots(nof_depots_),
-	nofelements(AirportGetNofElements(apFA)),
-	entry_points(entry_points_),
-	size_x(size_x_),
-	size_y(size_y_),
-	delta_z(delta_z_),
-	catchment(catchment_)
+	const TileIndexDiffC *depots, const byte nof_depots,
+	uint size_x, uint size_y
+)
 {
+	byte nofterminals, nofhelipads;
 	byte nofterminalgroups, nofhelipadgroups;
 
+	apc->size_x = size_x;
+	apc->size_y = size_y;
+
 	/* Set up the terminal and helipad count for an airport.
 	 * TODO: If there are more than 10 terminals or 4 helipads, internal variables
 	 * need to be changed, so don't allow that for now */
-	uint nofterminals = AirportGetTerminalCount(terminals, &nofterminalgroups);
+	nofterminals = AirportGetTerminalCount(terminals, &nofterminalgroups);
 	if (nofterminals > MAX_TERMINALS) {
-		DEBUG(misc, 0, "[Ap] only a maximum of %d terminals are supported (requested %d)", MAX_TERMINALS, nofterminals);
+		DEBUG(misc, 0) ("[Ap] Currently only maximum of %d terminals are supported (you wanted %d)", MAX_TERMINALS, nofterminals);
 		assert(nofterminals <= MAX_TERMINALS);
 	}
+	apc->terminals = terminals;
 
-	uint nofhelipads = AirportGetTerminalCount(helipads, &nofhelipadgroups);
+	nofhelipads = AirportGetTerminalCount(helipads, &nofhelipadgroups);
 	if (nofhelipads > MAX_HELIPADS) {
-		DEBUG(misc, 0, "[Ap] only a maximum of %d helipads are supported (requested %d)", MAX_HELIPADS, nofhelipads);
+		DEBUG(misc, 0) ("[Ap] Currently only maximum of %d helipads are supported (you wanted %d)", MAX_HELIPADS, nofhelipads);
 		assert(nofhelipads <= MAX_HELIPADS);
 	}
+	apc->helipads = helipads;
 
 	/* Get the number of elements from the source table. We also double check this
 	 * with the entry point which must be within bounds and use this information
 	 * later on to build and validate the state machine */
-	for (DiagDirection i = DIAGDIR_BEGIN; i < DIAGDIR_END; i++) {
-		if (entry_points[i] >= nofelements) {
-			DEBUG(misc, 0, "[Ap] entry (%d) must be within the airport (maximum %d)", entry_points[i], nofelements);
-			assert(entry_points[i] < nofelements);
-		}
+	apc->nofelements = AirportGetNofElements(apFA);
+	if (entry_point >= apc->nofelements) {
+		DEBUG(misc, 0) ("[Ap] Entry (%d) must be within the airport (maximum %d)", entry_point, apc->nofelements);
+		assert(entry_point < apc->nofelements);
 	}
 
+	apc->acc_planes     = acc_planes;
+	apc->entry_point    = entry_point;
+	apc->airport_depots = depots;
+	apc->nof_depots     = nof_depots;
+
 	/* Build the state machine itself */
-	layout = AirportBuildAutomata(nofelements, apFA);
-	DEBUG(misc, 2, "[Ap] #count %3d; #term %2d (%dgrp); #helipad %2d (%dgrp); entries %3d, %3d, %3d, %3d",
-		nofelements, nofterminals, nofterminalgroups, nofhelipads, nofhelipadgroups,
-		entry_points[DIAGDIR_NE], entry_points[DIAGDIR_SE], entry_points[DIAGDIR_SW], entry_points[DIAGDIR_NW]);
+	AirportBuildAutomata(apc, apFA);
+	DEBUG(misc, 1) ("[Ap] #count %3d; #term %2d (%dgrp); #helipad %2d (%dgrp); entry %3d",
+		apc->nofelements, nofterminals, nofterminalgroups, nofhelipads, nofhelipadgroups, apc->entry_point);
 
 	/* Test if everything went allright. This is only a rude static test checking
 	 * the symantic correctness. By no means does passing the test mean that the
 	 * airport is working correctly or will not deadlock for example */
-	uint ret = AirportTestFTA(nofelements, layout, terminals);
-	if (ret != MAX_ELEMENTS) DEBUG(misc, 0, "[Ap] problem with element: %d", ret - 1);
-	assert(ret == MAX_ELEMENTS);
+	{ byte ret = AirportTestFTA(apc);
+		if (ret != MAX_ELEMENTS) DEBUG(misc, 0) ("[Ap] ERROR with element: %d", ret - 1);
+		assert(ret == MAX_ELEMENTS);
+	}
 
 #ifdef DEBUG_AIRPORT
-	AirportPrintOut(nofelements, layout, DEBUG_AIRPORT);
+	AirportPrintOut(apc, DEBUG_AIRPORT);
 #endif
 }
 
-
-AirportFTAClass::~AirportFTAClass()
+static void AirportFTAClass_Destructor(AirportFTAClass *apc)
 {
-	for (uint i = 0; i < nofelements; i++) {
-		AirportFTA *current = layout[i].next;
+	int i;
+	AirportFTA *current, *next;
+
+	for (i = 0; i < apc->nofelements; i++) {
+		current = apc->layout[i].next;
 		while (current != NULL) {
-			AirportFTA *next = current->next;
+			next = current->next;
 			free(current);
 			current = next;
 		};
 	}
-	free(layout);
+	free(apc->layout);
+	free(apc);
 }
 
 /** Get the number of elements of a source Airport state automata
@@ -305,10 +285,11 @@ AirportFTAClass::~AirportFTAClass()
  * know one element from the other by differing 'position' identifiers */
 static uint16 AirportGetNofElements(const AirportFTAbuildup *apFA)
 {
+	int i;
 	uint16 nofelements = 0;
 	int temp = apFA[0].position;
 
-	for (uint i = 0; i < MAX_ELEMENTS; i++) {
+	for (i = 0; i < MAX_ELEMENTS; i++) {
 		if (temp != apFA[i].position) {
 			nofelements++;
 			temp = apFA[i].position;
@@ -323,11 +304,12 @@ static uint16 AirportGetNofElements(const AirportFTAbuildup *apFA)
  * groups there are, and then the number of terminals for each group */
 static byte AirportGetTerminalCount(const byte *terminals, byte *groups)
 {
+	byte i;
 	byte nof_terminals = 0;
 	*groups = 0;
 
 	if (terminals != NULL) {
-		uint i = terminals[0];
+		i = terminals[0];
 		*groups = i;
 		while (i-- > 0) {
 			terminals++;
@@ -338,14 +320,16 @@ static byte AirportGetTerminalCount(const byte *terminals, byte *groups)
 	return nof_terminals;
 }
 
-
-static AirportFTA* AirportBuildAutomata(uint nofelements, const AirportFTAbuildup *apFA)
+static void AirportBuildAutomata(AirportFTAClass *apc, const AirportFTAbuildup *apFA)
 {
-	AirportFTA *FAutomata = MallocT<AirportFTA>(nofelements);
+	AirportFTA *current;
+	AirportFTA *FAutomata = malloc(sizeof(AirportFTA) * apc->nofelements);
 	uint16 internalcounter = 0;
+	uint16 i;
 
-	for (uint i = 0; i < nofelements; i++) {
-		AirportFTA *current = &FAutomata[i];
+	apc->layout = FAutomata;
+	for (i = 0; i < apc->nofelements; i++) {
+		current = &apc->layout[i];
 		current->position      = apFA[internalcounter].position;
 		current->heading       = apFA[internalcounter].heading;
 		current->block         = apFA[internalcounter].block;
@@ -353,7 +337,7 @@ static AirportFTA* AirportBuildAutomata(uint nofelements, const AirportFTAbuildu
 
 		// outgoing nodes from the same position, create linked list
 		while (current->position == apFA[internalcounter + 1].position) {
-			AirportFTA *newNode = MallocT<AirportFTA>(1);
+			AirportFTA *newNode = malloc(sizeof(AirportFTA));
 
 			newNode->position      = apFA[internalcounter + 1].position;
 			newNode->heading       = apFA[internalcounter + 1].heading;
@@ -363,31 +347,31 @@ static AirportFTA* AirportBuildAutomata(uint nofelements, const AirportFTAbuildu
 			current->next = newNode;
 			current = current->next;
 			internalcounter++;
-		}
+		} // while
 		current->next = NULL;
 		internalcounter++;
 	}
-	return FAutomata;
 }
 
-
-static byte AirportTestFTA(uint nofelements, const AirportFTA *layout, const byte *terminals)
+static byte AirportTestFTA(const AirportFTAClass *apc)
 {
-	uint next_position = 0;
+	byte position, i, next_position;
+	AirportFTA *current, *first;
+	next_position = 0;
 
-	for (uint i = 0; i < nofelements; i++) {
-		uint position = layout[i].position;
+	for (i = 0; i < apc->nofelements; i++) {
+		position = apc->layout[i].position;
 		if (position != next_position) return i;
-		const AirportFTA *first = &layout[i];
+		current = first = &apc->layout[i];
 
-		for (const AirportFTA *current = first; current != NULL; current = current->next) {
+		for (; current != NULL; current = current->next) {
 			/* A heading must always be valid. The only exceptions are
 			 * - multiple choices as start, identified by a special value of 255
 			 * - terminal group which is identified by a special value of 255 */
 			if (current->heading > MAX_HEADINGS) {
 				if (current->heading != 255) return i;
 				if (current == first && current->next == NULL) return i;
-				if (current != first && current->next_position > terminals[0]) return i;
+				if (current != first && current->next_position > apc->terminals[0]) return i;
 			}
 
 			/* If there is only one choice, it must be at the end */
@@ -395,7 +379,7 @@ static byte AirportTestFTA(uint nofelements, const AirportFTA *layout, const byt
 			/* Obviously the elements of the linked list must have the same identifier */
 			if (position != current->position) return i;
 			/* A next position must be within bounds */
-			if (current->next_position >= nofelements) return i;
+			if (current->next_position >= apc->nofelements) return i;
 		}
 		next_position++;
 	}
@@ -430,17 +414,32 @@ static const char* const _airport_heading_strings[] = {
 	"DUMMY" // extra heading for 255
 };
 
-static void AirportPrintOut(uint nofelements, const AirportFTA *layout, bool full_report)
+static uint AirportBlockToString(uint32 block)
 {
+	uint i = 0;
+	if (block & 0xffff0000) { block >>= 16; i += 16; }
+	if (block & 0x0000ff00) { block >>=  8; i +=  8; }
+	if (block & 0x000000f0) { block >>=  4; i +=  4; }
+	if (block & 0x0000000c) { block >>=  2; i +=  2; }
+	if (block & 0x00000002) { i += 1; }
+	return i;
+}
+
+static void AirportPrintOut(const AirportFTAClass *apc, bool full_report)
+{
+	uint16 i;
+
 	if (!full_report) printf("(P = Current Position; NP = Next Position)\n");
 
-	for (uint i = 0; i < nofelements; i++) {
-		for (const AirportFTA *current = &layout[i]; current != NULL; current = current->next) {
+	for (i = 0; i < apc->nofelements; i++) {
+		AirportFTA *current = &apc->layout[i];
+
+		for (; current != NULL; current = current->next) {
 			if (full_report) {
 				byte heading = (current->heading == 255) ? MAX_HEADINGS + 1 : current->heading;
 				printf("\tPos:%2d NPos:%2d Heading:%15s Block:%2d\n", current->position,
 					    current->next_position, _airport_heading_strings[heading],
-							FindLastBit(current->block));
+							AirportBlockToString(current->block));
 			} else {
 				printf("P:%2d NP:%2d", current->position, current->next_position);
 			}
@@ -466,23 +465,25 @@ const AirportFTAClass *GetAirport(const byte airport_type)
 		case AT_HELIDEPOT:     return HeliDepot;
 		case AT_INTERCON:      return IntercontinentalAirport;
 		case AT_HELISTATION:   return HeliStation;
-		case AT_DUMMY:         return DummyAirport;
 	}
 }
 
-
-uint32 GetValidAirports()
+const AirportMovingData *GetAirportMovingData(byte airport_type, byte position)
 {
-	uint32 mask = 0;
-
-	if (_cur_year <  1960 || _patches.always_small_airport) SetBit(mask, 0);  // small airport
-	if (_cur_year >= 1955) SetBit(mask, 1); // city airport
-	if (_cur_year >= 1963) SetBit(mask, 2); // heliport
-	if (_cur_year >= 1980) SetBit(mask, 3); // metropolitan airport
-	if (_cur_year >= 1990) SetBit(mask, 4); // international airport
-	if (_cur_year >= 1983) SetBit(mask, 5); // commuter airport
-	if (_cur_year >= 1976) SetBit(mask, 6); // helidepot
-	if (_cur_year >= 2002) SetBit(mask, 7); // intercontinental airport
-	if (_cur_year >= 1980) SetBit(mask, 8); // helistation
-	return mask;
+	assert(airport_type < lengthof(_airport_moving_datas));
+	assert(position < GetAirport(airport_type)->nofelements);
+	return &_airport_moving_datas[airport_type][position];
+}
+
+uint32 GetValidAirports(void)
+{
+	uint32 bytemask = _avail_aircraft; /// sets the first 3 bytes, 0 - 2, @see AdjustAvailAircraft()
+
+	if (_cur_year >= 1980) SETBIT(bytemask, 3); // metropolitan airport
+	if (_cur_year >= 1990) SETBIT(bytemask, 4); // international airport
+	if (_cur_year >= 1983) SETBIT(bytemask, 5); // commuter airport
+	if (_cur_year >= 1976) SETBIT(bytemask, 6); // helidepot
+	if (_cur_year >= 2002) SETBIT(bytemask, 7); // intercontinental airport
+	if (_cur_year >= 1980) SETBIT(bytemask, 8); // helistation
+	return bytemask;
 }

airport.h

@@ -0,0 +1,163 @@
+/* $Id$ */
+
+#ifndef AIRPORT_H
+#define AIRPORT_H
+
+enum {MAX_TERMINALS =  10};
+enum {MAX_HELIPADS  =   4};
+enum {MAX_ELEMENTS  = 255};
+enum {MAX_HEADINGS  =  22};
+
+// Airport types
+enum {
+	AT_SMALL         =  0,
+	AT_LARGE         =  1,
+	AT_HELIPORT      =  2,
+	AT_METROPOLITAN  =  3,
+	AT_INTERNATIONAL =  4,
+	AT_COMMUTER      =  5,
+	AT_HELIDEPOT     =  6,
+	AT_INTERCON      =  7,
+	AT_HELISTATION   =  8,
+	AT_OILRIG        = 15
+};
+
+// do not change unless you change v->subtype too. This aligns perfectly with its current setting
+enum {
+	AIRCRAFT_ONLY    = 0,
+	ALL              = 1,
+	HELICOPTERS_ONLY = 2,
+};
+
+enum {
+	AMED_NOSPDCLAMP = 1 << 0,
+	AMED_TAKEOFF    = 1 << 1,
+	AMED_SLOWTURN   = 1 << 2,
+	AMED_LAND       = 1 << 3,
+	AMED_EXACTPOS   = 1 << 4,
+	AMED_BRAKE      = 1 << 5,
+	AMED_HELI_RAISE = 1 << 6,
+	AMED_HELI_LOWER = 1 << 7,
+};
+
+/* Movement States on Airports (headings target) */
+enum {
+	TO_ALL         =  0,
+	HANGAR         =  1,
+	TERM1          =  2,
+	TERM2          =  3,
+	TERM3          =  4,
+	TERM4          =  5,
+	TERM5          =  6,
+	TERM6          =  7,
+	HELIPAD1       =  8,
+	HELIPAD2       =  9,
+	TAKEOFF        = 10,
+	STARTTAKEOFF   = 11,
+	ENDTAKEOFF     = 12,
+	HELITAKEOFF    = 13,
+	FLYING         = 14,
+	LANDING        = 15,
+	ENDLANDING     = 16,
+	HELILANDING    = 17,
+	HELIENDLANDING = 18,
+	TERM7          = 19,
+	TERM8          = 20,
+	HELIPAD3       = 21,
+	HELIPAD4       = 22
+};
+
+// this maps the terminal to its corresponding state and block flag
+// currently set for 10 terms, 4 helipads
+static const byte _airport_terminal_state[] = {2, 3, 4, 5, 6, 7, 19, 20, 0, 0, 8, 9, 21, 22};
+static const byte _airport_terminal_flag[] =  {0, 1, 2, 3, 4, 5, 22, 23, 0, 0, 6, 7, 24, 25};
+
+/* Movement Blocks on Airports */
+// blocks (eg_airport_flags)
+enum {
+	TERM1_block              = 1 <<  0,
+	TERM2_block              = 1 <<  1,
+	TERM3_block              = 1 <<  2,
+	TERM4_block              = 1 <<  3,
+	TERM5_block              = 1 <<  4,
+	TERM6_block              = 1 <<  5,
+	HELIPAD1_block           = 1 <<  6,
+	HELIPAD2_block           = 1 <<  7,
+	RUNWAY_IN_OUT_block      = 1 <<  8,
+	RUNWAY_IN_block          = 1 <<  8,
+	AIRPORT_BUSY_block       = 1 <<  8,
+	RUNWAY_OUT_block         = 1 <<  9,
+	TAXIWAY_BUSY_block       = 1 << 10,
+	OUT_WAY_block            = 1 << 11,
+	IN_WAY_block             = 1 << 12,
+	AIRPORT_ENTRANCE_block   = 1 << 13,
+	TERM_GROUP1_block        = 1 << 14,
+	TERM_GROUP2_block        = 1 << 15,
+	HANGAR2_AREA_block       = 1 << 16,
+	TERM_GROUP2_ENTER1_block = 1 << 17,
+	TERM_GROUP2_ENTER2_block = 1 << 18,
+	TERM_GROUP2_EXIT1_block  = 1 << 19,
+	TERM_GROUP2_EXIT2_block  = 1 << 20,
+	PRE_HELIPAD_block        = 1 << 21,
+
+// blocks for new airports
+	TERM7_block              = 1 << 22,
+	TERM8_block              = 1 << 23,
+	TERM9_block              = 1 << 24,
+	HELIPAD3_block           = 1 << 24,
+	TERM10_block             = 1 << 25,
+	HELIPAD4_block           = 1 << 25,
+	HANGAR1_AREA_block       = 1 << 26,
+	OUT_WAY2_block           = 1 << 27,
+	IN_WAY2_block            = 1 << 28,
+	RUNWAY_IN2_block         = 1 << 29,
+	RUNWAY_OUT2_block        = 1 << 10,   // note re-uses TAXIWAY_BUSY
+	HELIPAD_GROUP_block      = 1 << 13,   // note re-uses AIRPORT_ENTRANCE
+	OUT_WAY_block2           = 1 << 31,
+// end of new blocks
+
+	NOTHING_block            = 1 << 30
+};
+
+typedef struct AirportMovingData {
+	int x,y;
+	byte flag;
+	byte direction;
+} AirportMovingData;
+
+// Finite sTate mAchine --> FTA
+typedef struct AirportFTAClass {
+	byte nofelements;                     // number of positions the airport consists of
+	const byte *terminals;
+	const byte *helipads;
+	byte entry_point;                     // when an airplane arrives at this airport, enter it at position entry_point
+	byte acc_planes;                      // accept airplanes or helicopters or both
+	const TileIndexDiffC *airport_depots; // gives the position of the depots on the airports
+	byte nof_depots;                      // number of depots this airport has
+	struct AirportFTA *layout;            // state machine for airport
+	byte size_x;
+	byte size_y;
+} AirportFTAClass;
+
+// internal structure used in openttd - Finite sTate mAchine --> FTA
+typedef struct AirportFTA {
+	byte position;           // the position that an airplane is at
+	byte next_position;      // next position from this position
+	uint32 block;            // 32 bit blocks (st->airport_flags), should be enough for the most complex airports
+	byte heading;            // heading (current orders), guiding an airplane to its target on an airport
+	struct AirportFTA *next; // possible extra movement choices from this position
+} AirportFTA;
+
+void InitializeAirports(void);
+void UnInitializeAirports(void);
+const AirportFTAClass *GetAirport(const byte airport_type);
+const AirportMovingData *GetAirportMovingData(byte airport_type, byte position);
+
+/** Get buildable airport bitmask.
+ * @return get all buildable airports at this given time, bitmasked.
+ * Bit 0 means the small airport is buildable, etc.
+ * @todo set availability of airports by year, instead of airplane
+ */
+uint32 GetValidAirports(void);
+
+#endif /* AIRPORT_H */

airport_gui.c

@@ -1,30 +1,25 @@
 /* $Id$ */
 
-/** @file airport_gui.cpp */
-
 #include "stdafx.h"
 #include "openttd.h"
-#include "window_gui.h"
+#include "table/sprites.h"
+#include "table/strings.h"
+#include "functions.h"
+#include "map.h"
+#include "window.h"
 #include "gui.h"
-#include "station_gui.h"
-#include "terraform_gui.h"
-#include "command_func.h"
+#include "viewport.h"
+#include "gfx.h"
+#include "sound.h"
+#include "command.h"
+#include "vehicle.h"
 #include "station.h"
 #include "airport.h"
 #include "depot.h"
-#include "sound_func.h"
-#include "window_func.h"
-#include "settings_type.h"
-#include "viewport_func.h"
-#include "gfx_func.h"
-#include "player_func.h"
-
-#include "table/sprites.h"
-#include "table/strings.h"
 
 static byte _selected_airport_type;
 
-static void ShowBuildAirportPicker();
+static void ShowBuildAirportPicker(void);
 
 
 void CcBuildAirport(bool success, TileIndex tile, uint32 p1, uint32 p2)
@@ -37,12 +32,12 @@ void CcBuildAirport(bool success, TileIndex tile, uint32 p1, uint32 p2)
 
 static void PlaceAirport(TileIndex tile)
 {
-	DoCommandP(tile, _selected_airport_type, _ctrl_pressed, CcBuildAirport, CMD_BUILD_AIRPORT | CMD_NO_WATER | CMD_MSG(STR_A001_CAN_T_BUILD_AIRPORT_HERE));
+	DoCommandP(tile, _selected_airport_type, 0, CcBuildAirport, CMD_BUILD_AIRPORT | CMD_AUTO | CMD_NO_WATER | CMD_MSG(STR_A001_CAN_T_BUILD_AIRPORT_HERE));
 }
 
 static void PlaceAir_DemolishArea(TileIndex tile)
 {
-	VpStartPlaceSizing(tile, VPM_X_AND_Y, DDSP_DEMOLISH_AREA);
+	VpStartPlaceSizing(tile, 4);
 }
 
 
@@ -54,19 +49,24 @@ enum {
 
 static void BuildAirClick_Airport(Window *w)
 {
-	if (HandlePlacePushButton(w, ATW_AIRPORT, SPR_CURSOR_AIRPORT, VHM_RECT, PlaceAirport)) ShowBuildAirportPicker();
+	if (HandlePlacePushButton(w, ATW_AIRPORT, SPR_CURSOR_AIRPORT, 1, PlaceAirport)) ShowBuildAirportPicker();
 }
 
 static void BuildAirClick_Demolish(Window *w)
 {
-	HandlePlacePushButton(w, ATW_DEMOLISH, ANIMCURSOR_DEMOLISH, VHM_RECT, PlaceAir_DemolishArea);
+	HandlePlacePushButton(w, ATW_DEMOLISH, ANIMCURSOR_DEMOLISH, 1, PlaceAir_DemolishArea);
 }
 
+static void BuildAirClick_Landscaping(Window *w)
+{
+	ShowTerraformToolbar();
+}
 
 typedef void OnButtonClick(Window *w);
 static OnButtonClick * const _build_air_button_proc[] = {
 	BuildAirClick_Airport,
 	BuildAirClick_Demolish,
+	BuildAirClick_Landscaping,
 };
 
 static void BuildAirToolbWndProc(Window *w, WindowEvent *e)
@@ -85,6 +85,7 @@ static void BuildAirToolbWndProc(Window *w, WindowEvent *e)
 		switch (e->we.keypress.keycode) {
 			case '1': BuildAirClick_Airport(w); break;
 			case '2': BuildAirClick_Demolish(w); break;
+			case 'l': BuildAirClick_Landscaping(w); break;
 			default: return;
 		}
 	} break;
@@ -94,21 +95,21 @@ static void BuildAirToolbWndProc(Window *w, WindowEvent *e)
 		break;
 
 	case WE_PLACE_DRAG:
-		VpSelectTilesWithMethod(e->we.place.pt.x, e->we.place.pt.y, e->we.place.select_method);
+		VpSelectTilesWithMethod(e->we.place.pt.x, e->we.place.pt.y, e->we.place.userdata);
 		break;
 
 	case WE_PLACE_MOUSEUP:
-		if (e->we.place.pt.x != -1 && e->we.place.select_proc == DDSP_DEMOLISH_AREA) {
+		if (e->we.place.pt.x != -1) {
 			DoCommandP(e->we.place.tile, e->we.place.starttile, 0, CcPlaySound10, CMD_CLEAR_AREA | CMD_MSG(STR_00B5_CAN_T_CLEAR_THIS_AREA));
 		}
 		break;
 
 	case WE_ABORT_PLACE_OBJ:
-		w->RaiseButtons();
+		RaiseWindowButtons(w);
 
 		w = FindWindowById(WC_BUILD_STATION, 0);
 		if (w != 0)
-			WP(w, def_d).close = true;
+			WP(w,def_d).close = true;
 		break;
 
 	case WE_DESTROY:
@@ -119,53 +120,55 @@ static void BuildAirToolbWndProc(Window *w, WindowEvent *e)
 
 static const Widget _air_toolbar_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,     7,     0,    10,     0,    13, STR_00C5,            STR_018B_CLOSE_WINDOW },
-{    WWT_CAPTION,   RESIZE_NONE,     7,    11,    51,     0,    13, STR_A000_AIRPORTS,   STR_018C_WINDOW_TITLE_DRAG_THIS },
-{  WWT_STICKYBOX,   RESIZE_NONE,     7,    52,    63,     0,    13, 0x0,                 STR_STICKY_BUTTON },
+{    WWT_CAPTION,   RESIZE_NONE,     7,    11,    73,     0,    13, STR_A000_AIRPORTS,   STR_018C_WINDOW_TITLE_DRAG_THIS },
+{  WWT_STICKYBOX,   RESIZE_NONE,     7,    74,    85,     0,    13, 0x0,                 STR_STICKY_BUTTON },
 {     WWT_IMGBTN,   RESIZE_NONE,     7,     0,    41,    14,    35, SPR_IMG_AIRPORT,     STR_A01E_BUILD_AIRPORT },
 {     WWT_IMGBTN,   RESIZE_NONE,     7,    42,    63,    14,    35, SPR_IMG_DYNAMITE,    STR_018D_DEMOLISH_BUILDINGS_ETC },
+{     WWT_IMGBTN,   RESIZE_NONE,     7,    64,    85,    14,    35, SPR_IMG_LANDSCAPING, STR_LANDSCAPING_TOOLBAR_TIP },
 {   WIDGETS_END},
 };
 
 
 static const WindowDesc _air_toolbar_desc = {
-	WDP_ALIGN_TBR, 22, 64, 36, 64, 36,
-	WC_BUILD_TOOLBAR, WC_NONE,
+	WDP_ALIGN_TBR, 22, 86, 36,
+	WC_BUILD_TOOLBAR, 0,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
 	_air_toolbar_widgets,
 	BuildAirToolbWndProc
 };
 
-void ShowBuildAirToolbar()
+void ShowBuildAirToolbar(void)
 {
 	if (!IsValidPlayer(_current_player)) return;
 
 	DeleteWindowById(WC_BUILD_TOOLBAR, 0);
-	Window *w = AllocateWindowDescFront(&_air_toolbar_desc, 0);
-	if (_patches.link_terraform_toolbar) ShowTerraformToolbar(w);
+	AllocateWindowDescFront(&_air_toolbar_desc, 0);
+	if (_patches.link_terraform_toolbar) ShowTerraformToolbar();
 }
 
 static void BuildAirportPickerWndProc(Window *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_CREATE:
-		w->SetWidgetLoweredState(16, !_station_show_coverage);
-		w->SetWidgetLoweredState(17, _station_show_coverage);
-		w->LowerWidget(_selected_airport_type + 7);
+		SetWindowWidgetLoweredState(w, 16, !_station_show_coverage);
+		SetWindowWidgetLoweredState(w, 17, _station_show_coverage);
+		LowerWindowWidget(w, _selected_airport_type + 7);
 		break;
 
 	case WE_PAINT: {
 		int i; // airport enabling loop
+		int rad = 4; // default catchment radious
 		uint32 avail_airports;
 		const AirportFTAClass *airport;
 
-		if (WP(w, def_d).close) return;
+		if (WP(w,def_d).close) return;
 
 		avail_airports = GetValidAirports();
 
-		w->RaiseWidget(_selected_airport_type + 7);
-		if (!HasBit(avail_airports, 0) && _selected_airport_type == AT_SMALL) _selected_airport_type = AT_LARGE;
-		if (!HasBit(avail_airports, 1) && _selected_airport_type == AT_LARGE) _selected_airport_type = AT_SMALL;
-		w->LowerWidget(_selected_airport_type + 7);
+		RaiseWindowWidget(w, _selected_airport_type + 7);
+		if (!HASBIT(avail_airports, 0) && _selected_airport_type == AT_SMALL) _selected_airport_type = AT_LARGE;
+		if (!HASBIT(avail_airports, 1) && _selected_airport_type == AT_LARGE) _selected_airport_type = AT_SMALL;
+		LowerWindowWidget(w, _selected_airport_type + 7);
 
 		/* 'Country Airport' starts at widget 7, and if its bit is set, it is
 		 * available, so take its opposite value to set the disabled state.
@@ -173,41 +176,49 @@ static void BuildAirportPickerWndProc(Window *w, WindowEvent *e)
 		 * XXX TODO : all airports should be held in arrays, with all relevant data.
 		 * This should be part of newgrf-airports, i suppose
 		 */
-		for (i = 0; i < 9; i++) w->SetWidgetDisabledState(i + 7, !HasBit(avail_airports, i));
+		for (i = 0; i < 9; i++) SetWindowWidgetDisabledState(w, i + 7, !HASBIT(avail_airports, i));
 
 		// select default the coverage area to 'Off' (16)
 		airport = GetAirport(_selected_airport_type);
 		SetTileSelectSize(airport->size_x, airport->size_y);
 
-		int rad = _patches.modified_catchment ? airport->catchment : (uint)CA_UNMODIFIED;
+		if (_patches.modified_catchment) {
+			switch (_selected_airport_type) {
+				case AT_OILRIG:        rad = CA_AIR_OILPAD;   break;
+				case AT_HELIPORT:      rad = CA_AIR_HELIPORT; break;
+				case AT_SMALL:         rad = CA_AIR_SMALL;    break;
+				case AT_LARGE:         rad = CA_AIR_LARGE;    break;
+				case AT_METROPOLITAN:  rad = CA_AIR_METRO;    break;
+				case AT_INTERNATIONAL: rad = CA_AIR_INTER;    break;
+				case AT_COMMUTER:      rad = CA_AIR_COMMUTER; break;
+				case AT_HELIDEPOT:     rad = CA_AIR_HELIDEPOT; break;
+				case AT_INTERCON:      rad = CA_AIR_INTERCON; break;
+				case AT_HELISTATION:   rad = CA_AIR_HELISTATION; break;
+			}
+		}
 
 		if (_station_show_coverage) SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);
 
 		DrawWindowWidgets(w);
 		// strings such as 'Size' and 'Coverage Area'
 		// 'Coverage Area'
-		int text_end = DrawStationCoverageAreaText(2, 206, SCT_ALL, rad) + 4;
-		if (text_end > w->widget[6].bottom) {
-			SetWindowDirty(w);
-			ResizeWindowForWidget(w, 6, 0, text_end - w->widget[6].bottom);
-			SetWindowDirty(w);
-		}
+		DrawStationCoverageAreaText(2, 206, (uint)-1, rad);
 		break;
 	}
 
 	case WE_CLICK: {
 		switch (e->we.click.widget) {
 		case 7: case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
-			w->RaiseWidget(_selected_airport_type + 7);
+			RaiseWindowWidget(w, _selected_airport_type + 7);
 			_selected_airport_type = e->we.click.widget - 7;
-			w->LowerWidget(_selected_airport_type + 7);
+			LowerWindowWidget(w, _selected_airport_type + 7);
 			SndPlayFx(SND_15_BEEP);
 			SetWindowDirty(w);
 			break;
 		case 16: case 17:
-			_station_show_coverage = (e->we.click.widget != 16);
-			w->SetWidgetLoweredState(16, !_station_show_coverage);
-			w->SetWidgetLoweredState(17, _station_show_coverage);
+			_station_show_coverage = e->we.click.widget - 16;
+			SetWindowWidgetLoweredState(w, 16, !_station_show_coverage);
+			SetWindowWidgetLoweredState(w, 17, _station_show_coverage);
 			SndPlayFx(SND_15_BEEP);
 			SetWindowDirty(w);
 			break;
@@ -215,7 +226,7 @@ static void BuildAirportPickerWndProc(Window *w, WindowEvent *e)
 	} break;
 
 	case WE_MOUSELOOP: {
-		if (WP(w, def_d).close) {
+		if (WP(w,def_d).close) {
 			DeleteWindow(w);
 			return;
 		}
@@ -224,7 +235,7 @@ static void BuildAirportPickerWndProc(Window *w, WindowEvent *e)
 	} break;
 
 	case WE_DESTROY:
-		if (!WP(w, def_d).close) ResetObjectToPlace();
+		if (!WP(w,def_d).close) ResetObjectToPlace();
 		break;
 	}
 }
@@ -257,19 +268,19 @@ static const Widget _build_airport_picker_widgets[] = {
 };
 
 static const WindowDesc _build_airport_desc = {
-	WDP_AUTO, WDP_AUTO, 148, 240, 148, 240,
+	WDP_AUTO, WDP_AUTO, 148, 240,
 	WC_BUILD_STATION, WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_build_airport_picker_widgets,
 	BuildAirportPickerWndProc
 };
 
-static void ShowBuildAirportPicker()
+static void ShowBuildAirportPicker(void)
 {
 	AllocateWindowDesc(&_build_airport_desc);
 }
 
-void InitializeAirportGui()
+void InitializeAirportGui(void)
 {
 	_selected_airport_type = AT_SMALL;
 }

airport_movement.h

@@ -0,0 +1,794 @@
+/* $Id$ */
+
+#ifndef AIRPORT_MOVEMENT_H
+#define AIRPORT_MOVEMENT_H
+
+
+// state machine input struct (from external file, etc.)
+// Finite sTate mAchine --> FTA
+typedef struct AirportFTAbuildup {
+	byte position; // the position that an airplane is at
+	byte heading;  // the current orders (eg. TAKEOFF, HANGAR, ENDLANDING, etc.)
+	uint32 block;  // the block this position is on on the airport (st->airport_flags)
+	byte next;     // next position from this position
+} AirportFTAbuildup;
+
+///////////////////////////////////////////////////////////////////////
+/////*********Movement Positions on Airports********************///////
+// Country Airfield (small) 4x3
+static const AirportMovingData _airport_moving_data_country[22] = {
+	{   53,    3, AMED_EXACTPOS,                   3 }, // 00 In Hangar
+	{   53,   27, 0,                               0 }, // 01 Taxi to right outside depot
+	{   32,   23, AMED_EXACTPOS,                   7 }, // 02 Terminal 1
+	{   10,   23, AMED_EXACTPOS,                   7 }, // 03 Terminal 2
+	{   43,   37, 0,                               0 }, // 04 Going towards terminal 2
+	{   24,   37, 0,                               0 }, // 05 Going towards terminal 2
+	{   53,   37, 0,                               0 }, // 06 Going for takeoff
+	{   61,   40, AMED_EXACTPOS,                   1 }, // 07 Taxi to start of runway (takeoff)
+	{    3,   40, AMED_NOSPDCLAMP,                 0 }, // 08 Accelerate to end of runway
+	{  -79,   40, AMED_NOSPDCLAMP | AMED_TAKEOFF,  0 }, // 09 Take off
+	{  177,   40, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 10 Fly to landing position in air
+	{   56,   40, AMED_NOSPDCLAMP | AMED_LAND,     0 }, // 11 Going down for land
+	{    3,   40, AMED_NOSPDCLAMP | AMED_BRAKE,    0 }, // 12 Just landed, brake until end of runway
+	{    7,   40, 0,                               0 }, // 13 Just landed, turn around and taxi 1 square
+	{   53,   40, 0,                               0 }, // 14 Taxi from runway to crossing
+	{  -31,  193, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 15 Fly around waiting for a landing spot (north-east)
+	{    1,    1, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 16 Fly around waiting for a landing spot (north-west)
+	{  257,    1, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 17 Fly around waiting for a landing spot (south-west)
+	{  273,   49, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 18 Fly around waiting for a landing spot (south)
+	{   44,   37, AMED_HELI_RAISE,                 0 }, // 19 Helicopter takeoff
+	{   44,   40, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 20 In position above landing spot helicopter
+	{   44,   40, AMED_HELI_LOWER,                 0 }, // 21 Helicopter landing
+};
+
+// Commuter Airfield (small) 5x4
+static const AirportMovingData _airport_moving_data_commuter[37] = {
+	{   69,    3, AMED_EXACTPOS,                   3 }, // 00 In Hangar
+	{   72,   22, 0,                               0 }, // 01 Taxi to right outside depot
+	{    8,   22, AMED_EXACTPOS,                   5 }, // 01 Taxi to right outside depot
+	{   24,   36, AMED_EXACTPOS,                   3 }, // 03 Terminal 1
+	{   40,   36, AMED_EXACTPOS,                   3 }, // 04 Terminal 2
+	{   56,   36, AMED_EXACTPOS,                   3 }, // 05 Terminal 3
+	{   40,    8, AMED_EXACTPOS,                   1 }, // 06 Helipad 1
+	{   56,    8, AMED_EXACTPOS,                   1 }, // 07 Helipad 2
+	{   24,   22, 0,                               5 }, // 08 Taxiing
+	{   40,   22, 0,                               5 }, // 09 Taxiing
+	{   56,   22, 0,                               5 }, // 10 Taxiing
+	{   72,   40, 0,                               3 }, // 11 Airport OUTWAY
+	{   72,   54, AMED_EXACTPOS,                   1 }, // 12 Accelerate to end of runway
+	{    7,   54, AMED_NOSPDCLAMP,                 0 }, // 13 Release control of runway, for smoother movement
+	{    5,   54, AMED_NOSPDCLAMP,                 0 }, // 14 End of runway
+	{  -79,   54, AMED_NOSPDCLAMP | AMED_TAKEOFF,  0 }, // 15 Take off
+	{  145,   54, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 16 Fly to landing position in air
+	{   73,   54, AMED_NOSPDCLAMP | AMED_LAND,     0 }, // 17 Going down for land
+	{    3,   54, AMED_NOSPDCLAMP | AMED_BRAKE,    0 }, // 18 Just landed, brake until end of runway
+	{   12,   54, 0,                               7 }, // 19 Just landed, turn around and taxi
+	{    8,   32, 0,                               7 }, // 20 Taxi from runway to crossing
+	{  -31,  149, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 21 Fly around waiting for a landing spot (north-east)
+	{    1,    6, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 22 Fly around waiting for a landing spot (north-west)
+	{  193,    6, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 23 Fly around waiting for a landing spot (south-west)
+	{  225,   81, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 24 Fly around waiting for a landing spot (south)
+	// Helicopter
+	{   80,    0, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 25 Bufferspace before helipad
+	{   80,    0, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 26 Bufferspace before helipad
+	{   32,    8, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 27 Get in position for Helipad1
+	{   48,    8, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 28 Get in position for Helipad2
+	{   32,    8, AMED_HELI_LOWER,                 0 }, // 29 Land at Helipad1
+	{   48,    8, AMED_HELI_LOWER,                 0 }, // 30 Land at Helipad2
+	{   32,    8, AMED_HELI_RAISE,                 0 }, // 31 Takeoff Helipad1
+	{   48,    8, AMED_HELI_RAISE,                 0 }, // 32 Takeoff Helipad2
+	{   64,   22, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 33 Go to position for Hangarentrance in air
+	{   64,   22, AMED_HELI_LOWER,                 0 }, // 34 Land in front of hangar
+	{   40,    8, AMED_EXACTPOS,                   0 }, // pre-helitakeoff helipad 1
+	{   56,    8, AMED_EXACTPOS,                   0 }, // pre-helitakeoff helipad 2
+};
+
+// City Airport (large) 6x6
+static const AirportMovingData _airport_moving_data_town[25] = {
+	{   85,    3, AMED_EXACTPOS,                   3 }, // 00 In Hangar
+	{   85,   27, 0,                               0 }, // 01 Taxi to right outside depot
+	{   26,   41, AMED_EXACTPOS,                   5 }, // 02 Terminal 1
+	{   56,   20, AMED_EXACTPOS,                   3 }, // 03 Terminal 2
+	{   38,    8, AMED_EXACTPOS,                   5 }, // 04 Terminal 3
+	{   65,    6, 0,                               0 }, // 05 Taxi to right in infront of terminal 2/3
+	{   80,   27, 0,                               0 }, // 06 Taxiway terminals 2-3
+	{   44,   63, 0,                               0 }, // 07 Taxi to Airport center
+	{   58,   71, 0,                               0 }, // 08 Towards takeoff
+	{   72,   85, 0,                               0 }, // 09 Taxi to runway (takeoff)
+	{   89,   85, AMED_EXACTPOS,                   1 }, // 10 Taxi to start of runway (takeoff)
+	{    3,   85, AMED_NOSPDCLAMP,                 0 }, // 11 Accelerate to end of runway
+	{  -79,   85, AMED_NOSPDCLAMP | AMED_TAKEOFF,  0 }, // 12 Take off
+	{  177,   85, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 13 Fly to landing position in air
+	{   89,   85, AMED_NOSPDCLAMP | AMED_LAND,     0 }, // 14 Going down for land
+	{    3,   85, AMED_NOSPDCLAMP | AMED_BRAKE,    0 }, // 15 Just landed, brake until end of runway
+	{   20,   87, 0,                               0 }, // 16 Just landed, turn around and taxi 1 square
+	{   36,   71, 0,                               0 }, // 17 Taxi from runway to crossing
+	{  -31,  193, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 18 Fly around waiting for a landing spot (north-east)
+	{    1,    1, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 19 Fly around waiting for a landing spot (north-west)
+	{  257,    1, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 20 Fly around waiting for a landing spot (south-west)
+	{  273,   49, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 21 Fly around waiting for a landing spot (south)
+	{   44,   63, AMED_HELI_RAISE,                 0 }, // 22 Helicopter takeoff
+	{   28,   74, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 23 In position above landing spot helicopter
+	{   28,   74, AMED_HELI_LOWER,                 0 }, // 24 Helicopter landing
+};
+
+// Metropolitan Airport (metropolitan) - 2 runways
+static const AirportMovingData _airport_moving_data_metropolitan[27] = {
+	{   85,    3, AMED_EXACTPOS,                   3 }, // 00 In Hangar
+	{   85,   27, 0,                               0 }, // 01 Taxi to right outside depot
+	{   26,   41, AMED_EXACTPOS,                   5 }, // 02 Terminal 1
+	{   56,   20, AMED_EXACTPOS,                   3 }, // 03 Terminal 2
+	{   38,    8, AMED_EXACTPOS,                   5 }, // 04 Terminal 3
+	{   65,    6, 0,                               0 }, // 05 Taxi to right in infront of terminal 2/3
+	{   70,   33, 0,                               0 }, // 06 Taxiway terminals 2-3
+	{   44,   58, 0,                               0 }, // 07 Taxi to Airport center
+	{   72,   58, 0,                               0 }, // 08 Towards takeoff
+	{   72,   69, 0,                               0 }, // 09 Taxi to runway (takeoff)
+	{   89,   69, AMED_EXACTPOS,                   1 }, // 10 Taxi to start of runway (takeoff)
+	{    3,   69, AMED_NOSPDCLAMP,                 0 }, // 11 Accelerate to end of runway
+	{  -79,   69, AMED_NOSPDCLAMP | AMED_TAKEOFF,  0 }, // 12 Take off
+	{  177,   85, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 13 Fly to landing position in air
+	{   89,   85, AMED_NOSPDCLAMP | AMED_LAND,     0 }, // 14 Going down for land
+	{    3,   85, AMED_NOSPDCLAMP | AMED_BRAKE,    0 }, // 15 Just landed, brake until end of runway
+	{   21,   85, 0,                               0 }, // 16 Just landed, turn around and taxi 1 square
+	{   21,   69, 0,                               0 }, // 17 On Runway-out taxiing to In-Way
+	{   21,   54, AMED_EXACTPOS,                   5 }, // 18 Taxi from runway to crossing
+	{  -31,  193, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 19 Fly around waiting for a landing spot (north-east)
+	{    1,    1, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 20 Fly around waiting for a landing spot (north-west)
+	{  257,    1, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 21 Fly around waiting for a landing spot (south-west)
+	{  273,   49, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 22 Fly around waiting for a landing spot (south)
+	{   44,   58, 0,                               0 }, // 23 Helicopter takeoff spot on ground (to clear airport sooner)
+	{   44,   63, AMED_HELI_RAISE,                 0 }, // 24 Helicopter takeoff
+	{   15,   54, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 25 Get in position above landing spot helicopter
+	{   15,   54, AMED_HELI_LOWER,                 0 }, // 26 Helicopter landing
+};
+
+// International Airport (international) - 2 runways, 6 terminals, dedicated helipod
+static const AirportMovingData _airport_moving_data_international[51] = {
+	{    7,   55, AMED_EXACTPOS,                   3 }, // 00 In Hangar 1
+	{  100,   21, AMED_EXACTPOS,                   3 }, // 01 In Hangar 2
+	{    7,   70, 0,                               0 }, // 02 Taxi to right outside depot
+	{  100,   36, 0,                               0 }, // 03 Taxi to right outside depot
+	{   38,   70, AMED_EXACTPOS,                   5 }, // 04 Terminal 1
+	{   38,   54, AMED_EXACTPOS,                   5 }, // 05 Terminal 2
+	{   38,   38, AMED_EXACTPOS,                   5 }, // 06 Terminal 3
+	{   70,   70, AMED_EXACTPOS,                   1 }, // 07 Terminal 4
+	{   70,   54, AMED_EXACTPOS,                   1 }, // 08 Terminal 5
+	{   70,   38, AMED_EXACTPOS,                   1 }, // 09 Terminal 6
+	{  104,   71, AMED_EXACTPOS,                   1 }, // 10 Helipad 1
+	{  104,   55, AMED_EXACTPOS,                   1 }, // 11 Helipad 2
+	{   22,   87, 0,                               0 }, // 12 Towards Terminals 4/5/6, Helipad 1/2
+	{   60,   87, 0,                               0 }, // 13 Towards Terminals 4/5/6, Helipad 1/2
+	{   66,   87, 0,                               0 }, // 14 Towards Terminals 4/5/6, Helipad 1/2
+	{   86,   87, AMED_EXACTPOS,                   7 }, // 15 Towards Terminals 4/5/6, Helipad 1/2
+	{   86,   70, 0,                               0 }, // 16 In Front of Terminal 4 / Helipad 1
+	{   86,   54, 0,                               0 }, // 17 In Front of Terminal 5 / Helipad 2
+	{   86,   38, 0,                               0 }, // 18 In Front of Terminal 6
+	{   86,   22, 0,                               0 }, // 19 Towards Terminals Takeoff (Taxiway)
+	{   66,   22, 0,                               0 }, // 20 Towards Terminals Takeoff (Taxiway)
+	{   60,   22, 0,                               0 }, // 21 Towards Terminals Takeoff (Taxiway)
+	{   38,   22, 0,                               0 }, // 22 Towards Terminals Takeoff (Taxiway)
+	{   22,   70, 0,                               0 }, // 23 In Front of Terminal 1
+	{   22,   58, 0,                               0 }, // 24 In Front of Terminal 2
+	{   22,   38, 0,                               0 }, // 25 In Front of Terminal 3
+	{   22,   22, AMED_EXACTPOS,                   7 }, // 26 Going for Takeoff
+	{   22,    6, 0,                               0 }, // 27 On Runway-out, prepare for takeoff
+	{    3,    6, AMED_EXACTPOS,                   5 }, // 28 Accelerate to end of runway
+	{   60,    6, AMED_NOSPDCLAMP,                 0 }, // 29 Release control of runway, for smoother movement
+	{  105,    6, AMED_NOSPDCLAMP,                 0 }, // 30 End of runway
+	{  190,    6, AMED_NOSPDCLAMP | AMED_TAKEOFF,  0 }, // 31 Take off
+	{  193,  104, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 32 Fly to landing position in air
+	{  105,  104, AMED_NOSPDCLAMP | AMED_LAND,     0 }, // 33 Going down for land
+	{    3,  104, AMED_NOSPDCLAMP | AMED_BRAKE,    0 }, // 34 Just landed, brake until end of runway
+	{   12,  104, 0,                               0 }, // 35 Just landed, turn around and taxi 1 square
+	{    7,   84, 0,                               0 }, // 36 Taxi from runway to crossing
+	{  -31,  209, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 37 Fly around waiting for a landing spot (north-east)
+	{    1,    6, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 38 Fly around waiting for a landing spot (north-west)
+	{  273,    6, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 39 Fly around waiting for a landing spot (south-west)
+	{  305,   81, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 40 Fly around waiting for a landing spot (south)
+	// Helicopter
+	{  128,   80, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 41 Bufferspace before helipad
+	{  128,   80, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 42 Bufferspace before helipad
+	{   96,   71, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 43 Get in position for Helipad1
+	{   96,   55, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 44 Get in position for Helipad2
+	{   96,   71, AMED_HELI_LOWER,                 0 }, // 45 Land at Helipad1
+	{   96,   55, AMED_HELI_LOWER,                 0 }, // 46 Land at Helipad2
+	{  104,   71, AMED_HELI_RAISE,                 0 }, // 47 Takeoff Helipad1
+	{  104,   55, AMED_HELI_RAISE,                 0 }, // 48 Takeoff Helipad2
+	{  104,   32, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 49 Go to position for Hangarentrance in air
+	{  104,   32, AMED_HELI_LOWER,                 0} // 50 Land in HANGAR2_AREA to go to hangar
+};
+
+// Intercontinental Airport - 4 runways, 8 terminals, 2 dedicated helipads
+static const AirportMovingData _airport_moving_data_intercontinental[77] = {
+	{    7,   87, AMED_EXACTPOS,                   3 }, // 00 In Hangar 1
+	{  135,   72, AMED_EXACTPOS,                   3 }, // 01 In Hangar 2
+	{    7,  104, 0,                               0 }, // 02 Taxi to right outside depot 1
+	{  135,   88, 0, 0 }, // 03 Taxi to right outside depot 2
+	{   56,  120, AMED_EXACTPOS,                   6 }, // 04 Terminal 1
+	{   56,  104, AMED_EXACTPOS,                   5 }, // 05 Terminal 2
+	{   56,   88, AMED_EXACTPOS,                   5 }, // 06 Terminal 3
+	{   56,   72, AMED_EXACTPOS,                   5 }, // 07 Terminal 4
+	{   88,  120, AMED_EXACTPOS,                   0 }, // 08 Terminal 5
+	{   88,  104, AMED_EXACTPOS,                   1 }, // 09 Terminal 6
+	{   88,   88, AMED_EXACTPOS,                   1 }, // 10 Terminal 7
+	{   88,   72, AMED_EXACTPOS,                   1 }, // 11 Terminal 8
+	{   88,   56, AMED_EXACTPOS,                   3 }, // 12 Helipad 1
+	{   72,   56, AMED_EXACTPOS,                   1 }, // 13 Helipad 2
+	{   40,  136, 0,                               0 }, // 14 Term group 2 enter 1 a
+	{   56,  136, 0,                               0 }, // 15 Term group 2 enter 1 b
+	{   88,  136, 0,                               0 }, // 16 Term group 2 enter 2 a
+	{  104,  136, 0,                               0 }, // 17 Term group 2 enter 2 b
+	{  104,  120, 0,                               0 }, // 18 Term group 2 - opp term 5
+	{  104,  104, 0,                               0 }, // 19 Term group 2 - opp term 6 & exit2
+	{  104,   88, 0,                               0 }, // 20 Term group 2 - opp term 7 & hangar area 2
+	{  104,   72, 0,                               0 }, // 21 Term group 2 - opp term 8
+	{  104,   56, 0,                               0 }, // 22 Taxi Term group 2 exit a
+	{  104,   40, 0,                               0 }, // 23 Taxi Term group 2 exit b
+	{   56,   40, 0,                               0 }, // 24 Term group 2 exit 2a
+	{   40,   40, 0,                               0 }, // 25 Term group 2 exit 2b
+	{   40,  120, 0,                               0 }, // 26 Term group 1 - opp term 1
+	{   40,  104, 0,                               0 }, // 27 Term group 1 - opp term 2 & hangar area 1
+	{   40,   88, 0,                               0 }, // 28 Term group 1 - opp term 3
+	{   40,   72, 0,                               0 }, // 29 Term group 1 - opp term 4
+	{   18,   72, 0,                               7 }, // 30 Outway 1
+	{    8,   40, 0,                               7 }, // 31 Airport OUTWAY
+	{    8,   24, AMED_EXACTPOS,                   5 }, // 32 Accelerate to end of runway
+	{  119,   24, AMED_NOSPDCLAMP,                 0 }, // 33 Release control of runway, for smoother movement
+	{  117,   24, AMED_NOSPDCLAMP,                 0 }, // 34 End of runway
+	{  197,   24, AMED_NOSPDCLAMP | AMED_TAKEOFF,  0 }, // 35 Take off
+	{  254,   84, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 36 Flying to landing position in air
+	{  117,  168, AMED_NOSPDCLAMP | AMED_LAND,     0 }, // 37 Going down for land
+	{    3,  168, AMED_NOSPDCLAMP | AMED_BRAKE,    0 }, // 38 Just landed, brake until end of runway
+	{    8,  168, 0,                               0 }, // 39 Just landed, turn around and taxi
+	{    8,  144, 0,                               7 }, // 40 Taxi from runway
+	{    8,  128, 0,                               7 }, // 41 Taxi from runway
+	{    8,  120, AMED_EXACTPOS,                   5 }, // 42 Airport entrance
+	{   56,  344, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 43 Fly around waiting for a landing spot (north-east)
+	{ -200,   88, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 44 Fly around waiting for a landing spot (north-west)
+	{   56, -168, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 45 Fly around waiting for a landing spot (south-west)
+	{  312,   88, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 46 Fly around waiting for a landing spot (south)
+	// Helicopter
+	{   96,   40, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 47 Bufferspace before helipad
+	{   96,   40, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 48 Bufferspace before helipad
+	{   82,   54, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 49 Get in position for Helipad1
+	{   64,   56, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 50 Get in position for Helipad2
+	{   81,   55, AMED_HELI_LOWER,                 0 }, // 51 Land at Helipad1
+	{   64,   56, AMED_HELI_LOWER,                 0 }, // 52 Land at Helipad2
+	{   80,   56, AMED_HELI_RAISE,                 0 }, // 53 Takeoff Helipad1
+	{   64,   56, AMED_HELI_RAISE,                 0 }, // 54 Takeoff Helipad2
+	{  136,   96, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 55 Go to position for Hangarentrance in air
+	{  136,   96, AMED_HELI_LOWER,                 0 }, // 56 Land in front of hangar2
+	{  126,  104, 0,                               3 }, // 57 Outway 2
+	{  136,  136, 0,                               1 }, // 58 Airport OUTWAY 2
+	{  136,  152, AMED_EXACTPOS,                   5 }, // 59 Accelerate to end of runway2
+	{   16,  152, AMED_NOSPDCLAMP,                 0 }, // 60 Release control of runway2, for smoother movement
+	{   20,  152, AMED_NOSPDCLAMP,                 0 }, // 61 End of runway2
+	{  -56,  152, AMED_NOSPDCLAMP | AMED_TAKEOFF,  0 }, // 62 Take off2
+	{   24,    8, AMED_NOSPDCLAMP | AMED_LAND,     0 }, // 63 Going down for land2
+	{  136,    8, AMED_NOSPDCLAMP | AMED_BRAKE,    0 }, // 64 Just landed, brake until end of runway2in
+	{  136,    8, 0,                               0 }, // 65 Just landed, turn around and taxi
+	{  136,   24, 0,                               3 }, // 66 Taxi from runway 2in
+	{  136,   40, 0,                               3 }, // 67 Taxi from runway 2in
+	{  136,   56, AMED_EXACTPOS,                   1 }, // 68 Airport entrance2
+	{  -56,    8, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 69 Fly to landing position in air2
+	{   88,   40, 0,                               0 }, // 70 Taxi Term group 2 exit - opp heli1
+	{   72,   40, 0,                               0 }, // 71 Taxi Term group 2 exit - opp heli2
+	{   88,   57, AMED_EXACTPOS,                   3 }, // 72 pre-helitakeoff helipad 1
+	{   71,   56, AMED_EXACTPOS,                   1 }, // 73 pre-helitakeoff helipad 2
+	{    8,  120, AMED_HELI_RAISE,                 0 }, // 74 Helitakeoff outside depot 1
+	{  136,  104, AMED_HELI_RAISE,                 0 }, // 75 Helitakeoff outside depot 2
+	{  197,  168, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0} // 76 Fly to landing position in air1
+};
+
+
+// Heliport (heliport)
+static const AirportMovingData _airport_moving_data_heliport[9] = {
+	{    5,    9, AMED_EXACTPOS,                   1 }, // 0 - At heliport terminal
+	{    2,    9, AMED_HELI_RAISE,                 0 }, // 1 - Take off (play sound)
+	{   -3,    9, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 2 - In position above landing spot helicopter
+	{   -3,    9, AMED_HELI_LOWER,                 0 }, // 3 - Land
+	{    2,    9, 0,                               0 }, // 4 - Goto terminal on ground
+	{  -31,   59, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 5 - Circle #1 (north-east)
+	{  -31,  -49, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 6 - Circle #2 (north-west)
+	{   49,  -49, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 7 - Circle #3 (south-west)
+	{   70,    9, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 8 - Circle #4 (south)
+};
+
+// HeliDepot 2x2 (heliport)
+static const AirportMovingData _airport_moving_data_helidepot[18] = {
+	{   24,    4, AMED_EXACTPOS,                   1 }, // 0 - At depot
+	{   24,   28, 0,                               0 }, // 1 Taxi to right outside depot
+	{    5,   38, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 2 Flying
+	{  -15,  -15, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 3 - Circle #1 (north-east)
+	{  -15,  -49, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 4 - Circle #2 (north-west)
+	{   49,  -49, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 5 - Circle #3 (south-west)
+	{   49,  -15, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 6 - Circle #4 (south-east)
+	{    8,   32, AMED_NOSPDCLAMP | AMED_SLOWTURN, 7 }, // 7 - PreHelipad
+	{    8,   32, AMED_NOSPDCLAMP | AMED_SLOWTURN, 7 }, // 8 - Helipad
+	{    8,   16, AMED_NOSPDCLAMP | AMED_SLOWTURN, 7 }, // 9 - Land
+	{    8,   16, AMED_HELI_LOWER,                 7 }, // 10 - Land
+	{    8,   24, AMED_HELI_RAISE,                 0 }, // 11 - Take off (play sound)
+	{   32,   24, AMED_NOSPDCLAMP | AMED_SLOWTURN, 7 }, // 12 Air to above hangar area
+	{   32,   24, AMED_HELI_LOWER,                 7 }, // 13 Taxi to right outside depot
+	{    8,   24, AMED_EXACTPOS,                   7 }, // 14 - on helipad1
+	{   24,   28, AMED_HELI_RAISE,                 0 }, // 15 Takeoff right outside depot
+	{    8,   24, AMED_HELI_RAISE,                 5 }, // 16 - Take off (play sound)
+	{    8,   24, AMED_SLOWTURN | AMED_EXACTPOS,   2 }, // 17 - turn on helipad1 for takeoff
+};
+
+// HeliDepot 2x2 (heliport)
+static const AirportMovingData _airport_moving_data_helistation[33] = {
+	{    8,    3, AMED_EXACTPOS,                   3 }, // 00 In Hangar2
+	{    8,   22, 0,                               0 }, // 01 outside hangar 2
+	{  116,   24, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 02 Fly to landing position in air
+	{   14,   22, AMED_HELI_RAISE,                 0 }, // 03 Helitakeoff outside hangar1(play sound)
+	{   24,   22, 0,                               0 }, // 04 taxiing
+	{   40,   22, 0,                               0 }, // 05 taxiing
+	{   40,    8, AMED_EXACTPOS,                   1 }, // 06 Helipad 1
+	{   56,    8, AMED_EXACTPOS,                   1 }, // 07 Helipad 2
+	{   56,   24, AMED_EXACTPOS,                   1 }, // 08 Helipad 3
+	{   40,    8, AMED_EXACTPOS,                   0 }, // 09 pre-helitakeoff helipad 1
+	{   56,    8, AMED_EXACTPOS,                   0 }, // 10 pre-helitakeoff helipad 2
+	{   56,   24, AMED_EXACTPOS,                   0 }, // 11 pre-helitakeoff helipad 3
+	{   32,    8, AMED_HELI_RAISE,                 0 }, // 12 Takeoff Helipad1
+	{   48,    8, AMED_HELI_RAISE,                 0 }, // 13 Takeoff Helipad2
+	{   48,   24, AMED_HELI_RAISE,                 0 }, // 14 Takeoff Helipad3
+	{   84,   24, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 15 Bufferspace before helipad
+	{   68,   24, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 16 Bufferspace before helipad
+	{   32,    8, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 17 Get in position for Helipad1
+	{   48,    8, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 18 Get in position for Helipad2
+	{   48,   24, AMED_NOSPDCLAMP | AMED_SLOWTURN, 1 }, // 19 Get in position for Helipad3
+	{   40,    8, AMED_HELI_LOWER,                 0 }, // 20 Land at Helipad1
+	{   48,    8, AMED_HELI_LOWER,                 0 }, // 21 Land at Helipad2
+	{   48,   24, AMED_HELI_LOWER,                 0 }, // 22 Land at Helipad3
+	{    0,   22, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 23 Go to position for Hangarentrance in air
+	{    0,   22, AMED_HELI_LOWER,                 0 }, // 24 Land in front of hangar
+	{  148,   -8, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 25 Fly around waiting for a landing spot (south-east)
+	{  148,    8, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 26 Fly around waiting for a landing spot (south-west)
+	{  132,   24, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 27 Fly around waiting for a landing spot (south-west)
+	{  100,   24, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 28 Fly around waiting for a landing spot (north-east)
+	{   84,    8, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 29 Fly around waiting for a landing spot (south-east)
+	{   84,   -8, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 30 Fly around waiting for a landing spot (south-west)
+	{  100,  -24, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 31 Fly around waiting for a landing spot (north-west)
+	{  132,  -24, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 32 Fly around waiting for a landing spot (north-east)
+};
+
+// Oilrig
+static const AirportMovingData _airport_moving_data_oilrig[9] = {
+	{   31,    9, AMED_EXACTPOS,                   1 }, // 0 - At oilrig terminal
+	{   28,    9, AMED_HELI_RAISE,                 0 }, // 1 - Take off (play sound)
+	{   23,    9, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 2 - In position above landing spot helicopter
+	{   23,    9, AMED_HELI_LOWER,                 0 }, // 3 - Land
+	{   28,    9, 0,                               0 }, // 4 - Goto terminal on ground
+	{  -31,   69, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 5 - circle #1 (north-east)
+	{  -31,  -49, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 6 - circle #2 (north-west)
+	{   69,  -49, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 7 - circle #3 (south-west)
+	{   70,    9, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 8 - circle #4 (south)
+};
+
+///////////////////////////////////////////////////////////////////////
+/////**********Movement Machine on Airports*********************///////
+/* First element of terminals array tells us how many depots there are (to know size of array)
+ * this may be changed later when airports are moved to external file  */
+static const TileIndexDiffC _airport_depots_country[] = {{3, 0}};
+static const byte _airport_terminal_country[] = {1, 2};
+static const AirportFTAbuildup _airport_fta_country[] = {
+	{  0, HANGAR, NOTHING_block, 1 },
+	{  1, 255, AIRPORT_BUSY_block, 0 }, { 1, HANGAR, 0, 0 }, { 1, TERM1, TERM1_block, 2 }, { 1, TERM2, 0, 4 }, { 1, HELITAKEOFF, 0, 19 }, { 1, 0, 0, 6 },
+	{  2, TERM1, TERM1_block, 1 },
+	{  3, TERM2, TERM2_block, 5 },
+	{  4, 255, AIRPORT_BUSY_block, 0 }, { 4, TERM2, 0, 5 }, { 4, HANGAR, 0, 1 }, { 4, TAKEOFF, 0, 6 }, { 4, HELITAKEOFF, 0, 1 },
+	{  5, 255, AIRPORT_BUSY_block, 0 }, { 5, TERM2, TERM2_block, 3 }, { 5, 0, 0, 4 },
+	{  6, 0, AIRPORT_BUSY_block, 7 },
+	// takeoff
+	{  7, TAKEOFF, AIRPORT_BUSY_block, 8 },
+	{  8, STARTTAKEOFF, NOTHING_block, 9 },
+	{  9, ENDTAKEOFF, NOTHING_block, 0 },
+	// landing
+	{ 10, FLYING, NOTHING_block, 15 }, { 10, LANDING, 0, 11 }, { 10, HELILANDING, 0, 20 },
+	{ 11, LANDING, AIRPORT_BUSY_block, 12 },
+	{ 12, 0, AIRPORT_BUSY_block, 13 },
+	{ 13, ENDLANDING, AIRPORT_BUSY_block, 14 }, { 13, TERM2, 0, 5 }, { 13, 0, 0, 14 },
+	{ 14, 0, AIRPORT_BUSY_block, 1 },
+	// In air
+	{ 15, 0, NOTHING_block, 16 },
+	{ 16, 0, NOTHING_block, 17 },
+	{ 17, 0, NOTHING_block, 18 },
+	{ 18, 0, NOTHING_block, 10 },
+	{ 19, HELITAKEOFF, NOTHING_block, 0 },
+	{ 20, HELILANDING, AIRPORT_BUSY_block, 21 },
+	{ 21, HELIENDLANDING, AIRPORT_BUSY_block, 1 },
+	{ MAX_ELEMENTS, 0, 0, 0 } // end marker. DO NOT REMOVE
+};
+
+static const TileIndexDiffC _airport_depots_commuter[] = { { 4, 0 } };
+static const byte _airport_terminal_commuter[] = { 1, 3 };
+static const byte _airport_helipad_commuter[] = { 1, 2 };
+static const AirportFTAbuildup _airport_fta_commuter[] = {
+	{  0, HANGAR, NOTHING_block, 1 }, { 0, HELITAKEOFF, HELIPAD2_block, 1 }, { 0, 0, 0, 1 },
+	{  1, 255, TAXIWAY_BUSY_block, 0 }, { 1, HANGAR, 0, 0 }, { 1, TAKEOFF, 0, 11 }, { 1, TERM1, TAXIWAY_BUSY_block, 10 }, { 1, TERM2, TAXIWAY_BUSY_block, 10 }, { 1, TERM3, TAXIWAY_BUSY_block, 10 }, { 1, HELIPAD1, TAXIWAY_BUSY_block, 10 }, { 1, HELIPAD2, TAXIWAY_BUSY_block, 10 }, { 1, HELITAKEOFF, TAXIWAY_BUSY_block, 10 }, { 1, 0, 0, 0 },
+	{  2, 255, AIRPORT_ENTRANCE_block, 2 }, { 2, HANGAR, 0, 8 }, { 2, TERM1, 0, 8 }, { 2, TERM2, 0, 8 }, { 2, TERM3, 0, 8 }, { 2, HELIPAD1, 0, 8 }, { 2, HELIPAD2, 0, 8 }, { 2, HELITAKEOFF, 0, 8 }, { 2, 0, 0, 2 },
+	{  3, TERM1, TERM1_block, 8 }, { 3, HANGAR, 0, 8 }, { 3, TAKEOFF, 0, 8 }, { 3, 0, 0, 3 },
+	{  4, TERM2, TERM2_block, 9 }, { 4, HANGAR, 0, 9 }, { 4, TAKEOFF, 0, 9 }, { 4, 0, 0, 4 },
+	{  5, TERM3, TERM3_block, 10 }, { 5, HANGAR, 0, 10 }, { 5, TAKEOFF, 0, 10 }, { 5, 0, 0, 5 },
+	{  6, HELIPAD1, HELIPAD1_block, 6 }, { 6, HANGAR, TAXIWAY_BUSY_block, 9 }, { 6, HELITAKEOFF, 0, 35 },
+	{  7, HELIPAD2, HELIPAD2_block, 7 }, { 7, HANGAR, TAXIWAY_BUSY_block, 10 }, { 7, HELITAKEOFF, 0, 36 },
+	{  8, 255, TAXIWAY_BUSY_block, 8 }, { 8, TAKEOFF, TAXIWAY_BUSY_block, 9 }, { 8, HANGAR, TAXIWAY_BUSY_block, 9 }, { 8, TERM1, TERM1_block, 3 }, { 8, 0, TAXIWAY_BUSY_block, 9 },
+	{  9, 255, TAXIWAY_BUSY_block, 9 }, { 9, TAKEOFF, TAXIWAY_BUSY_block, 10 }, { 9, HANGAR, TAXIWAY_BUSY_block, 10 }, { 9, TERM2, TERM2_block, 4 }, { 9, HELIPAD1, HELIPAD1_block, 6 }, { 9, HELITAKEOFF, HELIPAD1_block, 6 }, { 9, TERM1, TAXIWAY_BUSY_block, 8 }, { 9, 0, TAXIWAY_BUSY_block, 10 },
+	{ 10, 255, TAXIWAY_BUSY_block, 10 }, { 10, TERM3, TERM3_block, 5 }, { 10, HELIPAD1, 0, 9 }, { 10, HELIPAD2, HELIPAD2_block, 7 }, { 10, HELITAKEOFF, HELIPAD2_block, 7 }, { 10, TAKEOFF, TAXIWAY_BUSY_block, 1 }, { 10, HANGAR, TAXIWAY_BUSY_block, 1 }, { 10, 0, TAXIWAY_BUSY_block, 9 },
+	{ 11, 0, OUT_WAY_block, 12 },
+	// takeoff
+	{ 12, TAKEOFF, RUNWAY_IN_OUT_block, 13 },
+	{ 13, 0, RUNWAY_IN_OUT_block, 14 },
+	{ 14, STARTTAKEOFF, RUNWAY_IN_OUT_block, 15 },
+	{ 15, ENDTAKEOFF, NOTHING_block, 0 },
+	// landing
+	{ 16, FLYING, NOTHING_block, 21 }, { 16, LANDING, IN_WAY_block, 17 }, { 16, HELILANDING, 0, 25 },
+	{ 17, LANDING, RUNWAY_IN_OUT_block, 18 },
+	{ 18, 0, RUNWAY_IN_OUT_block, 19 },
+	{ 19, 0, RUNWAY_IN_OUT_block, 20 },
+	{ 20, ENDLANDING, IN_WAY_block, 2 },
+	// In Air
+	{ 21, 0, NOTHING_block, 22 },
+	{ 22, 0, NOTHING_block, 23 },
+	{ 23, 0, NOTHING_block, 24 },
+	{ 24, 0, NOTHING_block, 16 },
+	// Helicopter -- stay in air in special place as a buffer to choose from helipads
+	{ 25, HELILANDING, PRE_HELIPAD_block, 26 },
+	{ 26, HELIENDLANDING, PRE_HELIPAD_block, 26 }, { 26, HELIPAD1, 0, 27 }, { 26, HELIPAD2, 0, 28 }, { 26, HANGAR, 0, 33 },
+	{ 27, 0, NOTHING_block, 29 }, //helipad1 approach
+	{ 28, 0, NOTHING_block, 30 },
+	// landing
+	{ 29, 255, NOTHING_block, 0 }, { 29, HELIPAD1, HELIPAD1_block, 6 },
+	{ 30, 255, NOTHING_block, 0 }, { 30, HELIPAD2, HELIPAD2_block, 7 },
+	// Helicopter -- takeoff
+	{ 31, HELITAKEOFF, NOTHING_block, 0 },
+	{ 32, HELITAKEOFF, NOTHING_block, 0 },
+	{ 33, 0, TAXIWAY_BUSY_block, 34 }, // need to go to hangar when waiting in air
+	{ 34, 0, TAXIWAY_BUSY_block, 1 },
+	{ 35, 0, HELIPAD1_block, 31 },
+	{ 36, 0, HELIPAD2_block, 32 },
+	{ MAX_ELEMENTS, 0, 0, 0 } // end marker. DO NOT REMOVE
+};
+
+static const TileIndexDiffC _airport_depots_city[] = { { 5, 0 } };
+static const byte _airport_terminal_city[] = { 1, 3 };
+static const AirportFTAbuildup _airport_fta_city[] = {
+	{  0, HANGAR, NOTHING_block, 1 }, { 0, TAKEOFF, OUT_WAY_block, 1 }, { 0, 0, 0, 1 },
+	{  1, 255, TAXIWAY_BUSY_block, 0 }, { 1, HANGAR, 0, 0 }, { 1, TERM2, 0, 6 }, { 1, TERM3, 0, 6 }, { 1, 0, 0, 7 }, // for all else, go to 7
+	{  2, TERM1, TERM1_block, 7 }, { 2, TAKEOFF, OUT_WAY_block, 7 }, { 2, 0, 0, 7 },
+	{  3, TERM2, TERM2_block, 5 }, { 3, TAKEOFF, OUT_WAY_block, 5 }, { 3, 0, 0, 5 },
+	{  4, TERM3, TERM3_block, 5 }, { 4, TAKEOFF, OUT_WAY_block, 5 }, { 4, 0, 0, 5 },
+	{  5, 255, TAXIWAY_BUSY_block, 0 }, { 5, TERM2, TERM2_block, 3 }, { 5, TERM3, TERM3_block, 4 }, { 5, 0, 0, 6 },
+	{  6, 255, TAXIWAY_BUSY_block, 0 }, { 6, TERM2, 0, 5 }, { 6, TERM3, 0, 5 }, { 6, HANGAR, 0, 1 }, { 6, 0, 0, 7 },
+	{  7, 255, TAXIWAY_BUSY_block, 0 }, { 7, TERM1, TERM1_block, 2 }, { 7, TAKEOFF, OUT_WAY_block, 8 }, { 7, HELITAKEOFF, 0, 22 }, { 7, HANGAR, 0, 1 }, { 7, 0, 0, 6 },
+	{  8, 0, OUT_WAY_block, 9 },
+	{  9, 0, RUNWAY_IN_OUT_block, 10 },
+	// takeoff
+	{ 10, TAKEOFF, RUNWAY_IN_OUT_block, 11 },
+	{ 11, STARTTAKEOFF, NOTHING_block, 12 },
+	{ 12, ENDTAKEOFF, NOTHING_block, 0 },
+	// landing
+	{ 13, FLYING, NOTHING_block, 18 }, { 13, LANDING, 0, 14 }, { 13, HELILANDING, 0, 23 },
+	{ 14, LANDING, RUNWAY_IN_OUT_block, 15 },
+	{ 15, 0, RUNWAY_IN_OUT_block, 16 },
+	{ 16, 0, RUNWAY_IN_OUT_block, 17 },
+	{ 17, ENDLANDING, IN_WAY_block, 7 },
+	// In Air
+	{ 18, 0, NOTHING_block, 19 },
+	{ 19, 0, NOTHING_block, 20 },
+	{ 20, 0, NOTHING_block, 21 },
+	{ 21, 0, NOTHING_block, 13 },
+	// helicopter
+	{ 22, HELITAKEOFF, NOTHING_block, 0 },
+	{ 23, HELILANDING, IN_WAY_block, 24 },
+	{ 24, HELIENDLANDING, IN_WAY_block, 17 },
+	{ MAX_ELEMENTS, 0, 0, 0 } // end marker. DO NOT REMOVE
+};
+
+static const TileIndexDiffC _airport_depots_metropolitan[] = { { 5, 0 } };
+static const byte _airport_terminal_metropolitan[] = { 1, 3 };
+static const AirportFTAbuildup _airport_fta_metropolitan[] = {
+	{  0, HANGAR, NOTHING_block, 1 },
+	{  1, 255, TAXIWAY_BUSY_block, 0 }, { 1, HANGAR, 0, 0 }, { 1, TERM2, 0, 6 }, { 1, TERM3, 0, 6 }, { 1, 0, 0, 7 }, // for all else, go to 7
+	{  2, TERM1, TERM1_block, 7 },
+	{  3, TERM2, TERM2_block, 5 },
+	{  4, TERM3, TERM3_block, 5 },
+	{  5, 255, TAXIWAY_BUSY_block, 0 }, { 5, TERM2, TERM2_block, 3 }, { 5, TERM3, TERM3_block, 4 }, { 5, 0, 0, 6 },
+	{  6, 255, TAXIWAY_BUSY_block, 0 }, { 6, TERM2, 0, 5 }, { 6, TERM3, 0, 5 }, { 6, HANGAR, 0, 1 }, { 6, 0, 0, 7 },
+	{  7, 255, TAXIWAY_BUSY_block, 0 }, { 7, TERM1, TERM1_block, 2 }, { 7, TAKEOFF, 0, 8 }, { 7, HELITAKEOFF, 0, 23 }, { 7, HANGAR, 0, 1 }, { 7, 0, 0, 6 },
+	{  8, 0, OUT_WAY_block, 9 },
+	{  9, 0, RUNWAY_OUT_block, 10 },
+	// takeoff
+	{ 10, TAKEOFF, RUNWAY_OUT_block, 11 },
+	{ 11, STARTTAKEOFF, NOTHING_block, 12 },
+	{ 12, ENDTAKEOFF, NOTHING_block, 0 },
+	// landing
+	{ 13, FLYING, NOTHING_block, 19 }, { 13, LANDING, 0, 14 }, { 13, HELILANDING, 0, 25 },
+	{ 14, LANDING, RUNWAY_IN_block, 15 },
+	{ 15, 0, RUNWAY_IN_block, 16 },
+	{ 16, 255, RUNWAY_IN_block, 0 }, { 16, ENDLANDING, IN_WAY_block, 17 },
+	{ 17, 255, RUNWAY_OUT_block, 0 }, { 17, ENDLANDING, IN_WAY_block, 18 },
+	{ 18, ENDLANDING, IN_WAY_block, 7 },
+	// In Air
+	{ 19, 0, NOTHING_block, 20 },
+	{ 20, 0, NOTHING_block, 21 },
+	{ 21, 0, NOTHING_block, 22 },
+	{ 22, 0, NOTHING_block, 13 },
+	// helicopter
+	{ 23, 0, NOTHING_block, 24 },
+	{ 24, HELITAKEOFF, NOTHING_block, 0 },
+	{ 25, HELILANDING, IN_WAY_block, 26 },
+	{ 26, HELIENDLANDING, IN_WAY_block, 18 },
+	{ MAX_ELEMENTS, 0, 0, 0 } // end marker. DO NOT REMOVE
+};
+
+static const TileIndexDiffC _airport_depots_international[] = { { 0, 3 }, { 6, 1 } };
+static const byte _airport_terminal_international[] = { 2, 3, 3 };
+static const byte _airport_helipad_international[] = { 1, 2 };
+static const AirportFTAbuildup _airport_fta_international[] = {
+	{  0, HANGAR, NOTHING_block, 2 }, { 0, 255, TERM_GROUP1_block, 0 }, { 0, 255, TERM_GROUP2_ENTER1_block, 1 }, { 0, HELITAKEOFF, HELIPAD1_block, 2 }, { 0, 0, 0, 2 },
+	{  1, HANGAR, NOTHING_block, 3 }, { 1, 255, HANGAR2_AREA_block, 1 }, { 1, HELITAKEOFF, HELIPAD2_block, 3 }, { 1, 0, 0, 3 },
+	{  2, 255, AIRPORT_ENTRANCE_block, 0 }, { 2, HANGAR, 0, 0 }, { 2, TERM4, 0, 12 }, { 2, TERM5, 0, 12 }, { 2, TERM6, 0, 12 }, { 2, HELIPAD1, 0, 12 }, { 2, HELIPAD2, 0, 12 }, { 2, HELITAKEOFF, 0, 12 }, { 2, 0, 0, 23 },
+	{  3, 255, HANGAR2_AREA_block, 0 }, { 3, HANGAR, 0, 1 }, { 3, 0, 0, 18 },
+	{  4, TERM1, TERM1_block, 23 }, { 4, HANGAR, AIRPORT_ENTRANCE_block, 23 }, { 4, 0, 0, 23 },
+	{  5, TERM2, TERM2_block, 24 }, { 5, HANGAR, AIRPORT_ENTRANCE_block, 24 }, { 5, 0, 0, 24 },
+	{  6, TERM3, TERM3_block, 25 }, { 6, HANGAR, AIRPORT_ENTRANCE_block, 25 }, { 6, 0, 0, 25 },
+	{  7, TERM4, TERM4_block, 16 }, { 7, HANGAR, HANGAR2_AREA_block, 16 }, { 7, 0, 0, 16 },
+	{  8, TERM5, TERM5_block, 17 }, { 8, HANGAR, HANGAR2_AREA_block, 17 }, { 8, 0, 0, 17 },
+	{  9, TERM6, TERM6_block, 18 }, { 9, HANGAR, HANGAR2_AREA_block, 18 }, { 9, 0, 0, 18 },
+	{ 10, HELIPAD1, HELIPAD1_block, 10 }, { 10, HANGAR, HANGAR2_AREA_block, 16 }, { 10, HELITAKEOFF, 0, 47 },
+	{ 11, HELIPAD2, HELIPAD2_block, 11 }, { 11, HANGAR, HANGAR2_AREA_block, 17 }, { 11, HELITAKEOFF, 0, 48 },
+	{ 12, 0, TERM_GROUP2_ENTER1_block, 13 },
+	{ 13, 0, TERM_GROUP2_ENTER1_block, 14 },
+	{ 14, 0, TERM_GROUP2_ENTER2_block, 15 },
+	{ 15, 0, TERM_GROUP2_ENTER2_block, 16 },
+	{ 16, 255, TERM_GROUP2_block, 0 }, { 16, TERM4, TERM4_block, 7 }, { 16, HELIPAD1, HELIPAD1_block, 10 }, { 16, HELITAKEOFF, HELIPAD1_block, 10 }, { 16, 0, 0, 17 },
+	{ 17, 255, TERM_GROUP2_block, 0 }, { 17, TERM5, TERM5_block, 8 }, { 17, TERM4, 0, 16 }, { 17, HELIPAD1, 0, 16 }, { 17, HELIPAD2, HELIPAD2_block, 11 }, { 17, HELITAKEOFF, HELIPAD2_block, 11 }, { 17, 0, 0, 18 },
+	{ 18, 255, TERM_GROUP2_block, 0 }, { 18, TERM6, TERM6_block, 9 }, { 18, TAKEOFF, 0, 19 }, { 18, HANGAR, HANGAR2_AREA_block, 3 }, { 18, 0, 0, 17 },
+	{ 19, 0, TERM_GROUP2_EXIT1_block, 20 },
+	{ 20, 0, TERM_GROUP2_EXIT1_block, 21 },
+	{ 21, 0, TERM_GROUP2_EXIT2_block, 22 },
+	{ 22, 0, TERM_GROUP2_EXIT2_block, 26 },
+	{ 23, 255, TERM_GROUP1_block, 0 }, { 23, TERM1, TERM1_block, 4 }, { 23, HANGAR, AIRPORT_ENTRANCE_block, 2 }, { 23, 0, 0, 24 },
+	{ 24, 255, TERM_GROUP1_block, 0 }, { 24, TERM2, TERM2_block, 5 }, { 24, TERM1, 0, 23 }, { 24, HANGAR, 0, 23 }, { 24, 0, 0, 25 },
+	{ 25, 255, TERM_GROUP1_block, 0 }, { 25, TERM3, TERM3_block, 6 }, { 25, TAKEOFF, 0, 26 }, { 25, 0, 0, 24 },
+	{ 26, 255, TAXIWAY_BUSY_block, 0 }, { 26, TAKEOFF, 0, 27 }, { 26, 0, 0, 25 },
+	{ 27, 0, OUT_WAY_block, 28 },
+	// takeoff
+	{ 28, TAKEOFF, OUT_WAY_block, 29 },
+	{ 29, 0, RUNWAY_OUT_block, 30 },
+	{ 30, STARTTAKEOFF, NOTHING_block, 31 },
+	{ 31, ENDTAKEOFF, NOTHING_block, 0 },
+	// landing
+	{ 32, FLYING, NOTHING_block, 37 }, { 32, LANDING, 0, 33 }, { 32, HELILANDING, 0, 41 },
+	{ 33, LANDING, RUNWAY_IN_block, 34 },
+	{ 34, 0, RUNWAY_IN_block, 35 },
+	{ 35, 0, RUNWAY_IN_block, 36 },
+	{ 36, ENDLANDING, IN_WAY_block, 36 }, { 36, 255, TERM_GROUP1_block, 0 }, { 36, 255, TERM_GROUP2_ENTER1_block, 1 }, { 36, TERM4, 0, 12 }, { 36, TERM5, 0, 12 }, { 36, TERM6, 0, 12 }, { 36, 0, 0, 2 },
+	// In Air
+	{ 37, 0, NOTHING_block, 38 },
+	{ 38, 0, NOTHING_block, 39 },
+	{ 39, 0, NOTHING_block, 40 },
+	{ 40, 0, NOTHING_block, 32 },
+	// Helicopter -- stay in air in special place as a buffer to choose from helipads
+	{ 41, HELILANDING, PRE_HELIPAD_block, 42 },
+	{ 42, HELIENDLANDING, PRE_HELIPAD_block, 42 }, { 42, HELIPAD1, 0, 43 }, { 42, HELIPAD2, 0, 44 }, { 42, HANGAR, 0, 49 },
+	{ 43, 0, NOTHING_block, 45 },
+	{ 44, 0, NOTHING_block, 46 },
+	// landing
+	{ 45, 255, NOTHING_block, 0 }, { 45, HELIPAD1, HELIPAD1_block, 10 },
+	{ 46, 255, NOTHING_block, 0 }, { 46, HELIPAD2, HELIPAD2_block, 11 },
+	// Helicopter -- takeoff
+	{ 47, HELITAKEOFF, NOTHING_block, 0 },
+	{ 48, HELITAKEOFF, NOTHING_block, 0 },
+	{ 49, 0, HANGAR2_AREA_block, 50 }, // need to go to hangar when waiting in air
+	{ 50, 0, HANGAR2_AREA_block, 3 },
+	{ MAX_ELEMENTS, 0, 0, 0 } // end marker. DO NOT REMOVE
+};
+
+// intercontinental
+static const TileIndexDiffC _airport_depots_intercontinental[] = { { 0, 5 }, { 8, 4 } };
+static const byte _airport_terminal_intercontinental[] = { 2, 4, 4 };
+static const byte _airport_helipad_intercontinental[] = { 1, 2 };
+static const AirportFTAbuildup _airport_fta_intercontinental[] = {
+	{  0, HANGAR, NOTHING_block, 2 }, { 0, 255, HANGAR1_AREA_block | TERM_GROUP1_block, 0 }, { 0, 255, HANGAR1_AREA_block | TERM_GROUP1_block, 1 }, { 0, TAKEOFF, HANGAR1_AREA_block | TERM_GROUP1_block, 2 }, { 0, 0, 0, 2 },
+	{  1, HANGAR, NOTHING_block, 3 }, { 1, 255, HANGAR2_AREA_block, 1 }, { 1, 255, HANGAR2_AREA_block, 0 }, { 1, 0, 0, 3 },
+	{  2, 255, HANGAR1_AREA_block, 0 }, { 2, 255, TERM_GROUP1_block, 0 }, { 2, 255, TERM_GROUP1_block, 1 }, { 2, HANGAR, 0, 0 }, { 2, TAKEOFF, TERM_GROUP1_block, 27 }, { 2, TERM5, 0, 26 }, { 2, TERM6, 0, 26 }, { 2, TERM7, 0, 26 }, { 2, TERM8, 0, 26 }, { 2, HELIPAD1, 0, 26 }, { 2, HELIPAD2, 0, 26 }, { 2, HELITAKEOFF, 0, 74 }, { 2, 0, 0, 27 },
+	{  3, 255, HANGAR2_AREA_block, 0 }, { 3, HANGAR, 0, 1 }, { 3, HELITAKEOFF, 0, 75 }, { 3, 0, 0, 20 },
+	{  4, TERM1, TERM1_block, 26 }, { 4, HANGAR, HANGAR1_AREA_block | TERM_GROUP1_block, 26 }, { 4, 0, 0, 26 },
+	{  5, TERM2, TERM2_block, 27 }, { 5, HANGAR, HANGAR1_AREA_block | TERM_GROUP1_block, 27 }, { 5, 0, 0, 27 },
+	{  6, TERM3, TERM3_block, 28 }, { 6, HANGAR, HANGAR1_AREA_block | TERM_GROUP1_block, 28 }, { 6, 0, 0, 28 },
+	{  7, TERM4, TERM4_block, 29 }, { 7, HANGAR, HANGAR1_AREA_block | TERM_GROUP1_block, 29 }, { 7, 0, 0, 29 },
+	{  8, TERM5, TERM5_block, 18 }, { 8, HANGAR, HANGAR2_AREA_block, 18 }, { 8, 0, 0, 18 },
+	{  9, TERM6, TERM6_block, 19 }, { 9, HANGAR, HANGAR2_AREA_block, 19 }, { 9, 0, 0, 19 },
+	{ 10, TERM7, TERM7_block, 20 }, { 10, HANGAR, HANGAR2_AREA_block, 20 }, { 10, 0, 0, 20 },
+	{ 11, TERM8, TERM8_block, 21 }, { 11, HANGAR, HANGAR2_AREA_block, 21 }, { 11, 0, 0, 21 },
+	{ 12, HELIPAD1, HELIPAD1_block, 12 }, { 12, HANGAR, 0, 70 }, { 12, HELITAKEOFF, 0, 72 },
+	{ 13, HELIPAD2, HELIPAD2_block, 13 }, { 13, HANGAR, 0, 71 }, { 13, HELITAKEOFF, 0, 73 },
+	{ 14, 0, TERM_GROUP2_ENTER1_block, 15 },
+	{ 15, 0, TERM_GROUP2_ENTER1_block, 16 },
+	{ 16, 0, TERM_GROUP2_ENTER2_block, 17 },
+	{ 17, 0, TERM_GROUP2_ENTER2_block, 18 },
+	{ 18, 255, TERM_GROUP2_block, 0 }, { 18, TERM5, TERM5_block, 8 }, { 18, TAKEOFF, 0, 19 }, { 18, HELITAKEOFF, HELIPAD1_block, 19 }, { 18, 0, TERM_GROUP2_EXIT1_block, 19 },
+	{ 19, 255, TERM_GROUP2_block, 0 }, { 19, TERM6, TERM6_block, 9 }, { 19, TERM5, 0, 18 }, { 19, TAKEOFF, 0, 57 }, { 19, HELITAKEOFF, HELIPAD1_block, 20 }, { 19, 0, TERM_GROUP2_EXIT1_block, 20 }, // add exit to runway out 2
+	{ 20, 255, TERM_GROUP2_block, 0 }, { 20, TERM7, TERM7_block, 10 }, { 20, TERM5, 0, 19 }, { 20, TERM6, 0, 19 }, { 20, HANGAR, HANGAR2_AREA_block, 3 }, { 20, TAKEOFF, 0, 19 }, { 20, 0, TERM_GROUP2_EXIT1_block, 21 },
+	{ 21, 255, TERM_GROUP2_block, 0 }, { 21, TERM8, TERM8_block, 11 }, { 21, HANGAR, HANGAR2_AREA_block, 20 }, { 21, TERM5, 0, 20 }, { 21, TERM6, 0, 20 }, { 21, TERM7, 0, 20 }, { 21, TAKEOFF, 0, 20 }, { 21, 0, TERM_GROUP2_EXIT1_block, 22 },
+	{ 22, 255, TERM_GROUP2_block, 0 }, { 22, HANGAR, 0, 21 }, { 22, TERM5, 0, 21 }, { 22, TERM6, 0, 21 }, { 22, TERM7, 0, 21 }, { 22, TERM8, 0, 21 }, { 22, TAKEOFF, 0, 21 }, { 22, 0, 0, 23 },
+	{ 23, 0, TERM_GROUP2_EXIT1_block, 70 },
+	{ 24, 0, TERM_GROUP2_EXIT2_block, 25 },
+	{ 25, 255, TERM_GROUP2_EXIT2_block, 0 }, { 25, HANGAR, HANGAR1_AREA_block | TERM_GROUP1_block, 29 }, { 25, 0, 0, 29 },
+	{ 26, 255, TERM_GROUP1_block, 0 }, { 26, TERM1, TERM1_block, 4 }, { 26, HANGAR, HANGAR1_AREA_block, 27 }, { 26, TERM5, TERM_GROUP2_ENTER1_block, 14 }, { 26, TERM6, TERM_GROUP2_ENTER1_block, 14 }, { 26, TERM7, TERM_GROUP2_ENTER1_block, 14 }, { 26, TERM8, TERM_GROUP2_ENTER1_block, 14 }, { 26, HELIPAD1, TERM_GROUP2_ENTER1_block, 14 }, { 26, HELIPAD2, TERM_GROUP2_ENTER1_block, 14 }, { 26, HELITAKEOFF, TERM_GROUP2_ENTER1_block, 14 }, { 26, 0, 0, 27 },
+	{ 27, 255, TERM_GROUP1_block, 0 }, { 27, TERM2, TERM2_block, 5 }, { 27, HANGAR, HANGAR1_AREA_block, 2 }, { 27, TERM1, 0, 26 }, { 27, TERM5, 0, 26 }, { 27, TERM6, 0, 26 }, { 27, TERM7, 0, 26 }, { 27, TERM8, 0, 26 }, { 27, HELIPAD1, 0, 14 }, { 27, HELIPAD2, 0, 14 }, { 27, 0, 0, 28 },
+	{ 28, 255, TERM_GROUP1_block, 0 }, { 28, TERM3, TERM3_block, 6 }, { 28, HANGAR, HANGAR1_AREA_block, 27 }, { 28, TERM1, 0, 27 }, { 28, TERM2, 0, 27 }, { 28, TERM4, 0, 29 }, { 28, TERM5, 0, 14 }, { 28, TERM6, 0, 14 }, { 28, TERM7, 0, 14 }, { 28, TERM8, 0, 14 }, { 28, HELIPAD1, 0, 14 }, { 28, HELIPAD2, 0, 14 }, { 28, 0, 0, 29 },
+	{ 29, 255, TERM_GROUP1_block, 0 }, { 29, TERM4, TERM4_block, 7 }, { 29, HANGAR, HANGAR1_AREA_block, 27 }, { 29, TAKEOFF, 0, 30 }, { 29, 0, 0, 28 },
+	{ 30, 0, OUT_WAY_block2, 31 },
+	{ 31, 0, OUT_WAY_block, 32 },
+	// takeoff
+	{ 32, TAKEOFF, RUNWAY_OUT_block, 33 },
+	{ 33, 0, RUNWAY_OUT_block, 34 },
+	{ 34, STARTTAKEOFF, NOTHING_block, 35 },
+	{ 35, ENDTAKEOFF, NOTHING_block, 0 },
+	// landing
+	{ 36, 0, 0, 0 },
+	{ 37, LANDING, RUNWAY_IN_block, 38 },
+	{ 38, 0, RUNWAY_IN_block, 39 },
+	{ 39, 0, RUNWAY_IN_block, 40 },
+	{ 40, ENDLANDING, RUNWAY_IN_block, 41 },
+	{ 41, 0, IN_WAY_block, 42 },
+	{ 42, 255, IN_WAY_block, 0 }, { 42, 255, TERM_GROUP1_block, 0 }, { 42, 255, TERM_GROUP1_block, 1 }, { 42, HANGAR, 0, 2 }, { 42, 0, 0, 26 },
+	// In Air
+	{ 43, 0, 0, 44 },
+	{ 44, FLYING, 0, 45 }, { 44, HELILANDING, 0, 47 }, { 44, LANDING, 0, 69 }, { 44, 0, 0, 45 },
+	{ 45, 0, 0, 46 },
+	{ 46, FLYING, 0, 43 }, { 46, LANDING, 0, 76 }, { 46, 0, 0, 43 },
+	// Helicopter -- stay in air in special place as a buffer to choose from helipads
+	{ 47, HELILANDING, PRE_HELIPAD_block, 48 },
+	{ 48, HELIENDLANDING, PRE_HELIPAD_block, 48 }, { 48, HELIPAD1, 0, 49 }, { 48, HELIPAD2, 0, 50 }, { 48, HANGAR, 0, 55 },
+	{ 49, 0, NOTHING_block, 51 },
+	{ 50, 0, NOTHING_block, 52 },
+	// landing
+	{ 51, 255, NOTHING_block, 0 }, { 51, HELIPAD1, HELIPAD1_block, 12 }, { 51, HANGAR, 0, 55 }, { 51, 0, 0, 12 },
+	{ 52, 255, NOTHING_block, 0 }, { 52, HELIPAD2, HELIPAD2_block, 13 }, { 52, HANGAR, 0, 55 }, { 52, 0, 0, 13 },
+	// Helicopter -- takeoff
+	{ 53, HELITAKEOFF, NOTHING_block, 0 },
+	{ 54, HELITAKEOFF, NOTHING_block, 0 },
+	{ 55, 0, HANGAR2_AREA_block, 56 }, // need to go to hangar when waiting in air
+	{ 56, 0, HANGAR2_AREA_block, 3 },
+	// runway 2 out support
+	{ 57, 255, OUT_WAY2_block, 0 }, { 57, TAKEOFF, 0, 58 }, { 57, 0, 0, 58 },
+	{ 58, 0, OUT_WAY2_block, 59 },
+	{ 59, TAKEOFF, RUNWAY_OUT2_block, 60 }, // takeoff
+	{ 60, 0, RUNWAY_OUT2_block, 61 },
+	{ 61, STARTTAKEOFF, NOTHING_block, 62 },
+	{ 62, ENDTAKEOFF, NOTHING_block, 0 },
+	// runway 2 in support
+	{ 63, LANDING, RUNWAY_IN2_block, 64 },
+	{ 64, 0, RUNWAY_IN2_block, 65 },
+	{ 65, 0, RUNWAY_IN2_block, 66 },
+	{ 66, ENDLANDING, RUNWAY_IN2_block, 0 }, { 66, 255, 0, 1 }, { 66, 255, 0, 0 }, { 66, 0, 0, 67 },
+	{ 67, 0, IN_WAY2_block, 68 },
+	{ 68, 255, IN_WAY2_block, 0 }, { 68, 255, TERM_GROUP2_block, 1 }, { 68, 255, TERM_GROUP1_block, 0 }, { 68, HANGAR, HANGAR2_AREA_block, 22 }, { 68, 0, 0, 22 },
+	{ 69, 255, RUNWAY_IN2_block, 0 }, { 69, 0, RUNWAY_IN2_block, 63 },
+	{ 70, 255, TERM_GROUP2_EXIT1_block, 0 }, { 70, HELIPAD1, HELIPAD1_block, 12 }, { 70, HELITAKEOFF, HELIPAD1_block, 12 }, { 70, 0, 0, 71 },
+	{ 71, 255, TERM_GROUP2_EXIT1_block, 0 }, { 71, HELIPAD2, HELIPAD2_block, 13 }, { 71, HELITAKEOFF, HELIPAD1_block, 12 }, { 71, 0, 0, 24 },
+	{ 72, 0, HELIPAD1_block, 53 },
+	{ 73, 0, HELIPAD2_block, 54 },
+	{ 74, HELITAKEOFF, NOTHING_block, 0 },
+	{ 75, HELITAKEOFF, NOTHING_block, 0 },
+	{ 76, 255, RUNWAY_IN_block, 0 }, { 76, 0, RUNWAY_IN_block, 37 },
+	{ MAX_ELEMENTS, 0, 0, 0 } // end marker. DO NOT REMOVE
+};
+
+
+// heliports, oilrigs don't have depots
+static const byte _airport_helipad_heliport_oilrig[] = { 1, 1 };
+static const AirportFTAbuildup _airport_fta_heliport_oilrig[] = {
+	{ 0, HELIPAD1, HELIPAD1_block, 1 },
+	{ 1, HELITAKEOFF, NOTHING_block, 0 }, // takeoff
+	{ 2, 255, AIRPORT_BUSY_block, 0 }, { 2, HELILANDING, 0, 3 }, { 2, HELITAKEOFF, 0, 1 },
+	{ 3, HELILANDING, AIRPORT_BUSY_block, 4 },
+	{ 4, HELIENDLANDING, AIRPORT_BUSY_block, 4 }, { 4, HELIPAD1, HELIPAD1_block, 0 }, { 4, HELITAKEOFF, 0, 2 },
+	// In Air
+	{ 5, 0, NOTHING_block, 6 },
+	{ 6, 0, NOTHING_block, 7 },
+	{ 7, 0, NOTHING_block, 8 },
+	{ 8, FLYING, NOTHING_block, 5 }, { 8, HELILANDING, HELIPAD1_block, 2 }, // landing
+	{ MAX_ELEMENTS, 0, 0, 0 } // end marker. DO NOT REMOVE
+};
+
+// helidepots
+static const TileIndexDiffC _airport_depots_helidepot[] = { { 1, 0 } };
+static const byte _airport_helipad_helidepot[] = { 1, 1 };
+static const AirportFTAbuildup _airport_fta_helidepot[] = {
+	{  0, HANGAR, NOTHING_block, 1 },
+	{  1, 255, HANGAR2_AREA_block, 0 }, { 1, HANGAR, 0, 0 }, { 1, HELIPAD1, HELIPAD1_block, 14 }, { 1, HELITAKEOFF, 0, 15 }, { 1, 0, 0, 0 },
+	{  2, FLYING, NOTHING_block, 3 }, { 2, HELILANDING, PRE_HELIPAD_block, 7 }, { 2, HANGAR, 0, 12 }, { 2, HELITAKEOFF, NOTHING_block, 16 },
+	// In Air
+	{  3, 0, NOTHING_block, 4 },
+	{  4, 0, NOTHING_block, 5 },
+	{  5, 0, NOTHING_block, 6 },
+	{  6, 0, NOTHING_block, 2 },
+	// Helicopter -- stay in air in special place as a buffer to choose from helipads
+	{  7, HELILANDING, PRE_HELIPAD_block, 8 },
+	{  8, HELIENDLANDING, PRE_HELIPAD_block, 8 }, { 8, HELIPAD1, 0, 9 }, { 8, HANGAR, 0, 12 }, { 8, 0, 0, 2 },
+	{  9, 0, NOTHING_block, 10 },
+	// landing
+	{ 10, 255, NOTHING_block, 10 }, { 10, HELIPAD1, HELIPAD1_block, 14 }, { 10, HANGAR, 0, 1 }, { 10, 0, 0, 14 },
+	// Helicopter -- takeoff
+	{ 11, HELITAKEOFF, NOTHING_block, 0 },
+	{ 12, 0, HANGAR2_AREA_block, 13 }, // need to go to hangar when waiting in air
+	{ 13, 0, HANGAR2_AREA_block, 1 },
+	{ 14, HELIPAD1, HELIPAD1_block, 14 }, { 14, HANGAR, 0, 1 }, { 14, HELITAKEOFF, 0, 17 },
+	{ 15, HELITAKEOFF, NOTHING_block, 0 }, // takeoff outside depot
+	{ 16, HELITAKEOFF, 0, 14 },
+	{ 17, 0, NOTHING_block, 11 },
+	{ MAX_ELEMENTS, 0, 0, 0 } // end marker. DO NOT REMOVE
+};
+
+// helistation
+static const TileIndexDiffC _airport_depots_helistation[] = { { 0, 0 } };
+static const byte _airport_helipad_helistation[] = { 1, 3 };
+static const AirportFTAbuildup _airport_fta_helistation[] = {
+	{  0, HANGAR, NOTHING_block, 8 },    { 0, HELIPAD1, 0, 1 }, { 0, HELIPAD2, 0, 1 }, { 0, HELIPAD3, 0, 1 }, { 0, HELITAKEOFF, 0, 1 }, { 0, 0, 0, 0 },
+	{  1, 255, HANGAR2_AREA_block, 0 },  { 1, HANGAR, 0, 0 }, { 1, HELITAKEOFF, 0, 3 }, { 1, 0, 0, 4 },
+	// landing
+	{  2, FLYING, NOTHING_block, 28 },   { 2, HELILANDING, 0, 15 }, { 2, 0, 0, 28 },
+	// helicopter side
+	{  3, HELITAKEOFF, NOTHING_block, 0 }, // helitakeoff outside hangar2
+	{  4, 255, TAXIWAY_BUSY_block, 0 },  { 4, HANGAR, HANGAR2_AREA_block, 1 }, { 4, HELITAKEOFF, 0, 1 }, { 4, 0, 0, 5 },
+	{  5, 255, TAXIWAY_BUSY_block, 0 },  { 5, HELIPAD1, HELIPAD1_block, 6 }, { 5, HELIPAD2, HELIPAD2_block, 7 }, { 5, HELIPAD3, HELIPAD3_block, 8 }, { 5, 0, 0, 4 },
+	{  6, HELIPAD1, HELIPAD1_block, 5 }, { 6, HANGAR, HANGAR2_AREA_block, 5 }, { 6, HELITAKEOFF, 0, 9 }, { 6, 0, 0, 6 },
+	{  7, HELIPAD2, HELIPAD2_block, 5 }, { 7, HANGAR, HANGAR2_AREA_block, 5 }, { 7, HELITAKEOFF, 0, 10 }, { 7, 0, 0, 7 },
+	{  8, HELIPAD3, HELIPAD3_block, 5 }, { 8, HANGAR, HANGAR2_AREA_block, 5 }, { 8, HELITAKEOFF, 0, 11 }, { 8, 0, 0, 8 },
+	{  9, 0, HELIPAD1_block, 12 },
+	{ 10, 0, HELIPAD2_block, 13 },
+	{ 11, 0, HELIPAD3_block, 14 },
+	{ 12, HELITAKEOFF, NOTHING_block, 0 },
+	{ 13, HELITAKEOFF, NOTHING_block, 0 },
+	{ 14, HELITAKEOFF, NOTHING_block, 0 },
+	// heli - in flight moves
+	{ 15, HELILANDING, PRE_HELIPAD_block, 16 },
+	{ 16, HELIENDLANDING, PRE_HELIPAD_block, 16 }, { 16, HELIPAD1, 0, 17 }, { 16, HELIPAD2, 0, 18 }, { 16, HELIPAD3, 0, 19 }, { 16, HANGAR, 0, 23 },
+	{ 17, 0, NOTHING_block, 20 },
+	{ 18, 0, NOTHING_block, 21 },
+	{ 19, 0, NOTHING_block, 22 },
+	// heli landing
+	{ 20, 255, NOTHING_block, 0 }, { 20, HELIPAD1, HELIPAD1_block, 6 }, { 20, HANGAR, 0, 23 }, { 20, 0, 0, 6 },
+	{ 21, 255, NOTHING_block, 0 }, { 21, HELIPAD2, HELIPAD2_block, 7 }, { 21, HANGAR, 0, 23 }, { 21, 0, 0, 7 },
+	{ 22, 255, NOTHING_block, 0 }, { 22, HELIPAD3, HELIPAD3_block, 8 }, { 22, HANGAR, 0, 23 }, { 22, 0, 0, 8 },
+	{ 23, 0, HANGAR2_AREA_block, 24 }, // need to go to helihangar when waiting in air
+	{ 24, 0, HANGAR2_AREA_block, 1 },
+	{ 25, 0, NOTHING_block, 26 },
+	{ 26, 0, NOTHING_block, 27 },
+	{ 27, 0, NOTHING_block, 2 },
+	{ 28, 0, NOTHING_block, 29 },
+	{ 29, 0, NOTHING_block, 30 },
+	{ 30, 0, NOTHING_block, 31 },
+	{ 31, 0, NOTHING_block, 32 },
+	{ 32, 0, NOTHING_block, 25 },
+	{ MAX_ELEMENTS, 0, 0, 0 } // end marker. DO NOT REMOVE
+};
+
+
+static const AirportMovingData * const _airport_moving_datas[] = {
+	_airport_moving_data_country,           // Country Airfield (small) 4x3
+	_airport_moving_data_town,              // City Airport (large) 6x6
+	_airport_moving_data_heliport,          // Heliport
+	_airport_moving_data_metropolitan,      // Metropolitain Airport (large) - 2 runways
+	_airport_moving_data_international,     // International Airport (xlarge) - 2 runways
+	_airport_moving_data_commuter,          // Commuter Airfield (small) 5x4
+	_airport_moving_data_helidepot,         // Helidepot
+	_airport_moving_data_intercontinental,  // Intercontinental Airport (xxlarge) - 4 runways
+	_airport_moving_data_helistation,       // Helistation
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	_airport_moving_data_oilrig             // Oilrig
+};
+
+#endif /* AIRPORT_MOVEMENT_H */

aystar.c

@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/** @file aystar.cpp */
-
 /*
  * This file has the core function for AyStar
  *  AyStar is a fast pathfinding routine and is used for things like
@@ -21,7 +19,6 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "aystar.h"
-#include "core/alloc_func.hpp"
 
 int _aystar_stats_open_size;
 int _aystar_stats_closed_size;
@@ -38,7 +35,7 @@ static PathNode* AyStarMain_ClosedList_IsInList(AyStar *aystar, const AyStarNode
 static void AyStarMain_ClosedList_Add(AyStar *aystar, const PathNode *node)
 {
 	// Add a node to the ClosedList
-	PathNode *new_node = MallocT<PathNode>(1);
+	PathNode *new_node = malloc(sizeof(*new_node));
 	*new_node = *node;
 	Hash_Set(&aystar->ClosedListHash, node->node.tile, node->node.direction, new_node);
 }
@@ -69,7 +66,7 @@ static OpenListNode *AyStarMain_OpenList_Pop(AyStar *aystar)
 static void AyStarMain_OpenList_Add(AyStar *aystar, PathNode *parent, const AyStarNode *node, int f, int g)
 {
 	// Add a new Node to the OpenList
-	OpenListNode *new_node = MallocT<OpenListNode>(1);
+	OpenListNode *new_node = malloc(sizeof(*new_node));
 	new_node->g = g;
 	new_node->path.parent = parent;
 	new_node->path.node = *node;

aystar.h

@@ -1,6 +1,6 @@
 /* $Id$ */
 
-/** @file aystar.h
+/*
  * This file has the header for AyStar
  *  AyStar is a fast pathfinding routine and is used for things like
  *  AI_pathfinding and Train_pathfinding.
@@ -12,7 +12,6 @@
 #define AYSTAR_H
 
 #include "queue.h"
-#include "tile_type.h"
 
 //#define AYSTAR_DEBUG
 enum {
@@ -28,13 +27,15 @@ enum{
 	AYSTAR_INVALID_NODE = -1,
 };
 
+typedef struct AyStarNode AyStarNode;
 struct AyStarNode {
 	TileIndex tile;
-	int direction;
+	uint direction;
 	uint user_data[2];
 };
 
 // The resulting path has nodes looking like this.
+typedef struct PathNode PathNode;
 struct PathNode {
 	AyStarNode node;
 	// The parent of this item
@@ -44,12 +45,13 @@ struct PathNode {
 // For internal use only
 // We do not save the h-value, because it is only needed to calculate the f-value.
 //  h-value should _always_ be the distance left to the end-tile.
+typedef struct OpenListNode OpenListNode;
 struct OpenListNode {
 	int g;
 	PathNode path;
 };
 
-struct AyStar;
+typedef struct AyStar AyStar;
 /*
  * This function is called to check if the end-tile is found
  *  return values can be:

bmp.c

@@ -1,14 +1,12 @@
 /* $Id$ */
 
-/** @file bmp.cpp */
-
 #include "stdafx.h"
+#include "openttd.h"
+#include "gfx.h"
 #include "bmp.h"
-#include "core/bitmath_func.hpp"
-#include "core/alloc_func.hpp"
+#include "macros.h"
 
-void BmpInitializeBuffer(BmpBuffer *buffer, FILE *file)
-{
+void BmpInitializeBuffer(BmpBuffer *buffer, FILE *file) {
 	buffer->pos      = -1;
 	buffer->file     = file;
 	buffer->read     = 0;
@@ -330,7 +328,7 @@ bool BmpReadHeader(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
 		}
 		if (info->palette_size == 0) info->palette_size = 1 << info->bpp;
 
-		data->palette = CallocT<Colour>(info->palette_size);
+		data->palette = calloc(info->palette_size, sizeof(*(data->palette)));
 		if (data->palette == NULL) return false;
 
 		for (i = 0; i < info->palette_size; i++) {
@@ -352,7 +350,7 @@ bool BmpReadBitmap(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
 {
 	assert(info != NULL && data != NULL);
 
-	data->bitmap = CallocT<byte>(info->width * info->height * ((info->bpp == 24) ? 3 : 1));
+	data->bitmap = calloc(info->width * info->height, ((info->bpp == 24) ? 3 : 1) * sizeof(byte));
 	if (data->bitmap == NULL) return false;
 
 	/* Load image */

bmp.h

@@ -1,13 +1,9 @@
 /* $Id$ */
 
-/** @file bmp.h */
-
 #ifndef BMP_H
 #define BMP_H
 
-#include "gfx_type.h"
-
-struct BmpInfo {
+typedef struct {
 	uint32 offset;       ///< offset of bitmap data from .bmp file begining
 	uint32 width;        ///< bitmap width
 	uint32 height;       ///< bitmap height
@@ -15,22 +11,22 @@ struct BmpInfo {
 	uint16 bpp;          ///< bits per pixel
 	uint32 compression;  ///< compression method (0 = none, 1 = 8-bit RLE, 2 = 4-bit RLE)
 	uint32 palette_size; ///< number of colors in palette
-};
+} BmpInfo;
 
-struct BmpData {
+typedef struct {
 	Colour *palette;
 	byte   *bitmap;
-};
+} BmpData;
 
 #define BMP_BUFFER_SIZE 1024
 
-struct BmpBuffer {
+typedef struct {
 	byte data[BMP_BUFFER_SIZE];
 	int pos;
 	int read;
 	FILE *file;
 	uint real_pos;
-};
+} BmpBuffer;
 
 void BmpInitializeBuffer(BmpBuffer *buffer, FILE *file);
 bool BmpReadHeader(BmpBuffer *buffer, BmpInfo *info, BmpData *data);

bridge.h

@@ -0,0 +1,31 @@
+/* $Id$ */
+
+/** @file bridge.h Header file for bridges */
+
+#ifndef BRIDGE_H
+#define BRIDGE_H
+
+enum {
+	MAX_BRIDGES = 13
+};
+
+/** Struct containing information about a single bridge type
+ */
+typedef struct Bridge {
+	Year avail_year;     ///< the year in which the bridge becomes available
+	byte min_length;     ///< the minimum length of the bridge (not counting start and end tile)
+	byte max_length;     ///< the maximum length of the bridge (not counting start and end tile)
+	uint16 price;        ///< the relative price of the bridge
+	uint16 speed;        ///< maximum travel speed
+	PalSpriteID sprite;  ///< the sprite which is used in the GUI (possibly with a recolor sprite)
+	StringID material;   ///< the string that contains the bridge description
+	PalSpriteID **sprite_table; ///< table of sprites for drawing the bridge
+	byte flags;          ///< bit 0 set: disable drawing of far pillars.
+} Bridge;
+
+extern const Bridge orig_bridge[MAX_BRIDGES];
+extern Bridge _bridge[MAX_BRIDGES];
+
+uint GetBridgeFoundation(Slope tileh, Axis axis);
+
+#endif /* BRIDGE_H */

bridge_gui.c

@@ -0,0 +1,167 @@
+/* $Id$ */
+
+/** @file bridge_gui.c Graphical user interface for bridge construction*/
+
+#include "stdafx.h"
+#include "openttd.h"
+#include "table/strings.h"
+#include "functions.h"
+#include "map.h"
+#include "window.h"
+#include "gui.h"
+#include "viewport.h"
+#include "gfx.h"
+#include "command.h"
+#include "sound.h"
+#include "variables.h"
+#include "bridge.h"
+
+static struct BridgeData {
+	uint count;
+	TileIndex start_tile;
+	TileIndex end_tile;
+	byte type;
+	byte indexes[MAX_BRIDGES];
+	int32 costs[MAX_BRIDGES];
+} _bridgedata;
+
+void CcBuildBridge(bool success, TileIndex tile, uint32 p1, uint32 p2)
+{
+	if (success) SndPlayTileFx(SND_27_BLACKSMITH_ANVIL, tile);
+}
+
+static void BuildBridge(Window *w, int i)
+{
+	DeleteWindow(w);
+	DoCommandP(_bridgedata.end_tile, _bridgedata.start_tile,
+		_bridgedata.indexes[i] | (_bridgedata.type << 8), CcBuildBridge,
+		CMD_BUILD_BRIDGE | CMD_AUTO | CMD_MSG(STR_5015_CAN_T_BUILD_BRIDGE_HERE));
+}
+
+static void BuildBridgeWndProc(Window *w, WindowEvent *e)
+{
+	switch (e->event) {
+	case WE_PAINT: {
+		uint i;
+
+		DrawWindowWidgets(w);
+
+		for (i = 0; i < 4 && i + w->vscroll.pos < _bridgedata.count; i++) {
+			const Bridge *b = &_bridge[_bridgedata.indexes[i + w->vscroll.pos]];
+
+			SetDParam(2, _bridgedata.costs[i + w->vscroll.pos]);
+			SetDParam(1, b->speed);
+			SetDParam(0, b->material);
+			DrawSprite(b->sprite, 3, 15 + i * 22);
+
+			DrawString(44, 15 + i * 22 , STR_500D, 0);
+		}
+	} break;
+
+	case WE_KEYPRESS: {
+		uint i = e->we.keypress.keycode - '1';
+		if (i < 9 && i < _bridgedata.count) {
+			e->we.keypress.cont = false;
+			BuildBridge(w, i);
+		}
+
+		break;
+	}
+
+	case WE_CLICK:
+		if (e->we.click.widget == 2) {
+			uint ind = ((int)e->we.click.pt.y - 14) / 22;
+			if (ind < 4 && (ind += w->vscroll.pos) < _bridgedata.count)
+				BuildBridge(w, ind);
+		}
+		break;
+	}
+}
+
+static const Widget _build_bridge_widgets[] = {
+{   WWT_CLOSEBOX,   RESIZE_NONE,     7,     0,    10,     0,    13, STR_00C5,                    STR_018B_CLOSE_WINDOW},
+{    WWT_CAPTION,   RESIZE_NONE,     7,    11,   199,     0,    13, STR_100D_SELECT_RAIL_BRIDGE, STR_018C_WINDOW_TITLE_DRAG_THIS},
+{     WWT_MATRIX,   RESIZE_NONE,     7,     0,   187,    14,   101, 0x401,                       STR_101F_BRIDGE_SELECTION_CLICK},
+{  WWT_SCROLLBAR,   RESIZE_NONE,     7,   188,   199,    14,   101, 0x0,                         STR_0190_SCROLL_BAR_SCROLLS_LIST},
+{   WIDGETS_END},
+};
+
+static const WindowDesc _build_bridge_desc = {
+	WDP_AUTO, WDP_AUTO, 200, 102,
+	WC_BUILD_BRIDGE, WC_BUILD_TOOLBAR,
+	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
+	_build_bridge_widgets,
+	BuildBridgeWndProc
+};
+
+
+static const Widget _build_road_bridge_widgets[] = {
+{   WWT_CLOSEBOX,   RESIZE_NONE,     7,     0,    10,     0,    13, STR_00C5,                    STR_018B_CLOSE_WINDOW},
+{    WWT_CAPTION,   RESIZE_NONE,     7,    11,   199,     0,    13, STR_1803_SELECT_ROAD_BRIDGE, STR_018C_WINDOW_TITLE_DRAG_THIS},
+{     WWT_MATRIX,   RESIZE_NONE,     7,     0,   187,    14,   101, 0x401,                       STR_101F_BRIDGE_SELECTION_CLICK},
+{  WWT_SCROLLBAR,   RESIZE_NONE,     7,   188,   199,    14,   101, 0x0,                         STR_0190_SCROLL_BAR_SCROLLS_LIST},
+{   WIDGETS_END},
+};
+
+static const WindowDesc _build_road_bridge_desc = {
+	WDP_AUTO, WDP_AUTO, 200, 102,
+	WC_BUILD_BRIDGE, WC_BUILD_TOOLBAR,
+	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
+	_build_road_bridge_widgets,
+	BuildBridgeWndProc
+};
+
+
+void ShowBuildBridgeWindow(TileIndex start, TileIndex end, byte bridge_type)
+{
+	uint j = 0;
+	int32 ret;
+	StringID errmsg;
+
+	DeleteWindowById(WC_BUILD_BRIDGE, 0);
+
+	_bridgedata.type = bridge_type;
+	_bridgedata.start_tile = start;
+	_bridgedata.end_tile = end;
+
+	errmsg = INVALID_STRING_ID;
+
+	// only query bridge building possibility once, result is the same for all bridges!
+	// returns CMD_ERROR on failure, and price on success
+	ret = DoCommand(end, start, (bridge_type << 8), DC_AUTO | DC_QUERY_COST, CMD_BUILD_BRIDGE);
+
+	if (CmdFailed(ret)) {
+		errmsg = _error_message;
+	} else {
+		// check which bridges can be built
+		int bridge_len;         // length of the middle parts of the bridge
+		int tot_bridgedata_len; // total length of bridge
+
+		// get absolute bridge length
+		bridge_len = GetBridgeLength(start, end);
+		tot_bridgedata_len = bridge_len + 2;
+
+		tot_bridgedata_len = CalcBridgeLenCostFactor(tot_bridgedata_len);
+
+		for (bridge_type = 0; bridge_type != MAX_BRIDGES; bridge_type++) { // loop for all bridgetypes
+			if (CheckBridge_Stuff(bridge_type, bridge_len)) {
+				const Bridge *b = &_bridge[bridge_type];
+				// bridge is accepted, add to list
+				// add to terraforming & bulldozing costs the cost of the bridge itself (not computed with DC_QUERY_COST)
+				_bridgedata.costs[j] = ret + (((int64)tot_bridgedata_len * _price.build_bridge * b->price) >> 8);
+				_bridgedata.indexes[j] = bridge_type;
+				j++;
+			}
+		}
+	}
+
+	_bridgedata.count = j;
+
+	if (j != 0) {
+		Window *w = AllocateWindowDesc((_bridgedata.type & 0x80) ? &_build_road_bridge_desc : &_build_bridge_desc);
+		w->vscroll.cap = 4;
+		w->vscroll.count = (byte)j;
+	} else {
+		ShowErrorMessage(errmsg, STR_5015_CAN_T_BUILD_BRIDGE_HERE, TileX(end) * TILE_SIZE, TileY(end) * TILE_SIZE);
+	}
+}

bridge_map.c

@@ -0,0 +1,37 @@
+/* $Id$ */
+
+#include "stdafx.h"
+#include "openttd.h"
+#include "bridge_map.h"
+
+
+TileIndex GetBridgeEnd(TileIndex tile, DiagDirection dir)
+{
+	TileIndexDiff delta = TileOffsByDiagDir(dir);
+
+	assert(DiagDirToAxis(dir) == GetBridgeAxis(tile));
+
+	do {
+		tile += delta;
+	} while (!IsBridgeRamp(tile));
+
+	return tile;
+}
+
+
+TileIndex GetSouthernBridgeEnd(TileIndex t)
+{
+	return GetBridgeEnd(t, AxisToDiagDir(GetBridgeAxis(t)));
+}
+
+
+TileIndex GetOtherBridgeEnd(TileIndex tile)
+{
+	TileIndexDiff delta = TileOffsByDiagDir(GetBridgeRampDirection(tile));
+
+	do {
+		tile += delta;
+	} while (!IsBridgeRamp(tile));
+
+	return tile;
+}

bridge_map.h

@@ -0,0 +1,235 @@
+/* $Id$ */
+
+#ifndef BRIDGE_MAP_H
+#define BRIDGE_MAP_H
+
+#include "direction.h"
+#include "macros.h"
+#include "map.h"
+#include "rail.h"
+#include "road_map.h"
+#include "tile.h"
+
+
+static inline bool IsBridge(TileIndex t)
+{
+	assert(IsTileType(t, MP_TUNNELBRIDGE));
+	return HASBIT(_m[t].m5, 7);
+}
+
+static inline bool IsBridgeTile(TileIndex t)
+{
+	return IsTileType(t, MP_TUNNELBRIDGE) && IsBridge(t);
+}
+
+
+static inline bool IsBridgeRamp(TileIndex t)
+{
+	assert(IsBridgeTile(t));
+	return !HASBIT(_m[t].m5, 6);
+}
+
+static inline bool IsBridgeMiddle(TileIndex t)
+{
+	assert(IsBridgeTile(t));
+	return HASBIT(_m[t].m5, 6);
+}
+
+
+/**
+ * Determines which piece of a bridge is contained in the current tile
+ * @param tile The tile to analyze
+ * @return the piece
+ */
+static inline uint GetBridgePiece(TileIndex t)
+{
+	assert(IsBridgeMiddle(t));
+	return GB(_m[t].m2, 0, 4);
+}
+
+
+/**
+ * Determines the type of bridge on a tile
+ * @param tile The tile to analyze
+ * @return The bridge type
+ */
+static inline uint GetBridgeType(TileIndex t)
+{
+	assert(IsBridgeTile(t));
+	return GB(_m[t].m2, 4, 4);
+}
+
+
+/**
+ * Get the direction pointing onto the bridge
+ */
+static inline DiagDirection GetBridgeRampDirection(TileIndex t)
+{
+	assert(IsBridgeRamp(t));
+	return ReverseDiagDir(XYNSToDiagDir((Axis)GB(_m[t].m5, 0, 1), GB(_m[t].m5, 5, 1)));
+}
+
+
+static inline Axis GetBridgeAxis(TileIndex t)
+{
+	assert(IsBridgeMiddle(t));
+	return (Axis)GB(_m[t].m5, 0, 1);
+}
+
+
+static inline TransportType GetBridgeTransportType(TileIndex t)
+{
+	assert(IsBridgeTile(t));
+	return (TransportType)GB(_m[t].m5, 1, 2);
+}
+
+
+static inline bool IsClearUnderBridge(TileIndex t)
+{
+	assert(IsBridgeMiddle(t));
+	return GB(_m[t].m5, 3, 3) == 0;
+}
+
+static inline bool IsWaterUnderBridge(TileIndex t)
+{
+	assert(IsBridgeMiddle(t));
+	return GB(_m[t].m5, 3, 3) == 1;
+}
+
+
+static inline bool IsTransportUnderBridge(TileIndex t)
+{
+	assert(IsBridgeMiddle(t));
+	return HASBIT(_m[t].m5, 5);
+}
+
+static inline TransportType GetTransportTypeUnderBridge(TileIndex t)
+{
+	assert(IsTransportUnderBridge(t));
+	return (TransportType)GB(_m[t].m5, 3, 2);
+}
+
+static inline RoadBits GetRoadBitsUnderBridge(TileIndex t)
+{
+	assert(GetTransportTypeUnderBridge(t) == TRANSPORT_ROAD);
+	return GetBridgeAxis(t) == AXIS_X ? ROAD_Y : ROAD_X;
+}
+
+static inline Track GetRailUnderBridge(TileIndex t)
+{
+	assert(GetTransportTypeUnderBridge(t) == TRANSPORT_RAIL);
+	return AxisToTrack(OtherAxis(GetBridgeAxis(t)));
+}
+
+static inline TrackBits GetRailBitsUnderBridge(TileIndex t)
+{
+	return TrackToTrackBits(GetRailUnderBridge(t));
+}
+
+
+/**
+ * Finds the end of a bridge in the specified direction starting at a middle tile
+ */
+TileIndex GetBridgeEnd(TileIndex, DiagDirection);
+
+/**
+ * Finds the southern end of a bridge starting at a middle tile
+ */
+TileIndex GetSouthernBridgeEnd(TileIndex t);
+
+
+/**
+ * Starting at one bridge end finds the other bridge end
+ */
+TileIndex GetOtherBridgeEnd(TileIndex);
+
+uint GetBridgeHeight(TileIndex t);
+
+static inline void SetClearUnderBridge(TileIndex t)
+{
+	assert(IsBridgeMiddle(t));
+	SetTileOwner(t, OWNER_NONE);
+	SB(_m[t].m5, 3, 3, 0 << 2 | 0);
+	SB(_m[t].m3, 0, 4, 0);
+}
+
+static inline void SetWaterUnderBridge(TileIndex t)
+{
+	assert(IsBridgeMiddle(t));
+	SetTileOwner(t, OWNER_WATER);
+	SB(_m[t].m5, 3, 3, 0 << 2 | 1);
+	SB(_m[t].m3, 0, 4, 0);
+}
+
+static inline void SetCanalUnderBridge(TileIndex t, Owner o)
+{
+	assert(IsBridgeMiddle(t));
+	SetTileOwner(t, o);
+	SB(_m[t].m5, 3, 3, 0 << 2 | 1);
+	SB(_m[t].m3, 0, 4, 0);
+}
+
+static inline void SetRailUnderBridge(TileIndex t, Owner o, RailType r)
+{
+	assert(IsBridgeMiddle(t));
+	SetTileOwner(t, o);
+	SB(_m[t].m5, 3, 3, 1 << 2 | TRANSPORT_RAIL);
+	SB(_m[t].m3, 0, 4, r);
+}
+
+static inline void SetRoadUnderBridge(TileIndex t, Owner o)
+{
+	assert(IsBridgeMiddle(t));
+	SetTileOwner(t, o);
+	SB(_m[t].m5, 3, 3, 1 << 2 | TRANSPORT_ROAD);
+	SB(_m[t].m3, 0, 4, 0);
+}
+
+
+static inline void MakeBridgeRamp(TileIndex t, Owner o, uint bridgetype, DiagDirection d, TransportType tt)
+{
+	uint northsouth = (d == DIAGDIR_NE || d == DIAGDIR_NW);
+
+	SetTileType(t, MP_TUNNELBRIDGE);
+	SetTileOwner(t, o);
+	_m[t].m2 = bridgetype << 4;
+	_m[t].m4 = 0;
+	_m[t].m5 = 1 << 7 | 0 << 6 | northsouth << 5 | tt << 1 | DiagDirToAxis(d);
+}
+
+static inline void MakeRoadBridgeRamp(TileIndex t, Owner o, uint bridgetype, DiagDirection d)
+{
+	MakeBridgeRamp(t, o, bridgetype, d, TRANSPORT_ROAD);
+	_m[t].m3 = 0;
+}
+
+static inline void MakeRailBridgeRamp(TileIndex t, Owner o, uint bridgetype, DiagDirection d, RailType r)
+{
+	MakeBridgeRamp(t, o, bridgetype, d, TRANSPORT_RAIL);
+	_m[t].m3 = r;
+}
+
+
+static inline void MakeBridgeMiddle(TileIndex t, uint bridgetype, uint piece, Axis a, TransportType tt)
+{
+	SetTileType(t, MP_TUNNELBRIDGE);
+	SetTileOwner(t, OWNER_NONE);
+	_m[t].m2 = bridgetype << 4 | piece;
+	_m[t].m3 = 0;
+	_m[t].m4 = 0;
+	_m[t].m5 = 1 << 7 | 1 << 6 | 0 << 5 | 0 << 3 | tt << 1 | a;
+}
+
+static inline void MakeRoadBridgeMiddle(TileIndex t, uint bridgetype, uint piece, Axis a)
+{
+	MakeBridgeMiddle(t, bridgetype, piece, a, TRANSPORT_ROAD);
+}
+
+static inline void MakeRailBridgeMiddle(TileIndex t, uint bridgetype, uint piece, Axis a, RailType r)
+{
+	MakeBridgeMiddle(t, bridgetype, piece, a, TRANSPORT_RAIL);
+	SB(_m[t].m3, 4, 4, r);
+}
+
+
+#endif /* BRIDGE_MAP_H */

build_vehicle_gui.c

@@ -0,0 +1,492 @@
+/* $Id$ */
+
+#include "stdafx.h"
+#include "openttd.h"
+#include "aircraft.h"
+#include "debug.h"
+#include "functions.h"
+#include "table/sprites.h"
+#include "table/strings.h"
+#include "window.h"
+#include "gui.h"
+#include "vehicle.h"
+#include "gfx.h"
+#include "station.h"
+#include "command.h"
+#include "engine.h"
+#include "player.h"
+#include "depot.h"
+#include "airport.h"
+#include "vehicle_gui.h"
+#include "newgrf_engine.h"
+#include "date.h"
+#include "strings.h"
+
+
+enum BuildVehicleWidgets {
+	BUILD_VEHICLE_WIDGET_CLOSEBOX = 0,
+	BUILD_VEHICLE_WIDGET_CAPTION,
+	BUILD_VEHICLE_WIDGET_SORT_ASSENDING_DESCENDING,
+	BUILD_VEHICLE_WIDGET_SORT_TEXT,
+	BUILD_VEHICLE_WIDGET_SORT_DROPDOWN,
+	BUILD_VEHICLE_WIDGET_LIST,
+	BUILD_VEHICLE_WIDGET_SCROLLBAR,
+	BUILD_VEHICLE_WIDGET_PANEL,
+	BUILD_VEHICLE_WIDGET_BUILD,
+	BUILD_VEHICLE_WIDGET_RENAME,
+	BUILD_VEHICLE_WIDGET_RESIZE,
+};
+
+static const Widget _build_vehicle_widgets[] = {
+	{   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                STR_018B_CLOSE_WINDOW },
+	{    WWT_CAPTION,   RESIZE_NONE,    14,    11,   239,     0,    13, STR_A005_NEW_AIRCRAFT,   STR_018C_WINDOW_TITLE_DRAG_THIS },
+	{ WWT_PUSHTXTBTN,   RESIZE_NONE,    14,     0,    80,    14,    25, STR_SORT_BY,             STR_SORT_ORDER_TIP},
+	{      WWT_PANEL,   RESIZE_NONE,    14,    81,   227,    14,    25, 0x0,                     STR_SORT_CRITERIA_TIP},
+	{    WWT_TEXTBTN,   RESIZE_NONE,    14,   228,   239,    14,    25, STR_0225,                STR_SORT_CRITERIA_TIP},
+	{     WWT_MATRIX, RESIZE_BOTTOM,    14,     0,   227,    26,   121, 0x401,                   STR_A025_AIRCRAFT_SELECTION_LIST },
+	{  WWT_SCROLLBAR, RESIZE_BOTTOM,    14,   228,   239,    26,   121, 0x0,                     STR_0190_SCROLL_BAR_SCROLLS_LIST },
+	{      WWT_PANEL,     RESIZE_TB,    14,     0,   239,   122,   213, 0x0,                     STR_NULL },
+
+	{ WWT_PUSHTXTBTN,     RESIZE_TB,    14,     0,   114,   214,   225, STR_A006_BUILD_AIRCRAFT, STR_A026_BUILD_THE_HIGHLIGHTED_AIRCRAFT },
+	{ WWT_PUSHTXTBTN,     RESIZE_TB,    14,   115,   227,   214,   225, STR_A037_RENAME,         STR_A038_RENAME_AIRCRAFT_TYPE },
+	{  WWT_RESIZEBOX,     RESIZE_TB,    14,   228,   239,   214,   225, 0x0,                     STR_RESIZE_BUTTON },
+	{   WIDGETS_END},
+};
+
+static bool _internal_sort_order; // descending/ascending
+static byte _last_sort_criteria = 0;
+static bool _last_sort_order = false;
+
+static int CDECL EngineNumberSorter(const void *a, const void *b)
+{
+	const EngineID va = *(const EngineID*)a;
+	const EngineID vb = *(const EngineID*)b;
+	int r = va - vb;
+
+	return _internal_sort_order ? -r : r;
+}
+
+static int CDECL EngineIntroDateSorter(const void *a, const void *b)
+{
+	const int va = GetEngine(*(const EngineID*)a)->intro_date;
+	const int vb = GetEngine(*(const EngineID*)b)->intro_date;
+	const int r = va - vb;
+
+	if (r == 0) {
+		/* Use EngineID to sort instead since we want consistent sorting */
+		return EngineNumberSorter(a, b);
+	}
+	return _internal_sort_order ? -r : r;
+}
+
+static int CDECL EngineNameSorter(const void *a, const void *b)
+{
+	static EngineID last_engine[2] = { INVALID_ENGINE, INVALID_ENGINE };
+	static char     last_name[2][64] = { "\0", "\0" };
+
+	const EngineID va = *(const EngineID*)a;
+	const EngineID vb = *(const EngineID*)b;
+	int r;
+
+	if (va != last_engine[0]) {
+		last_engine[0] = va;
+		GetString(last_name[0], GetCustomEngineName(va), lastof(last_name[0]));
+	}
+
+	if (vb != last_engine[1]) {
+		last_engine[1] = vb;
+		GetString(last_name[1], GetCustomEngineName(vb), lastof(last_name[1]));
+	}
+
+	r = strcmp(last_name[0], last_name[1]); // sort by name
+
+	if (r == 0) {
+		/* Use EngineID to sort instead since we want consistent sorting */
+		return EngineNumberSorter(a, b);
+	}
+	return _internal_sort_order ? -r : r;
+}
+
+static int CDECL EngineReliabilitySorter(const void *a, const void *b)
+{
+	const int va = GetEngine(*(const EngineID*)a)->reliability;
+	const int vb = GetEngine(*(const EngineID*)b)->reliability;
+	const int r = va - vb;
+
+	if (r == 0) {
+		/* Use EngineID to sort instead since we want consistent sorting */
+		return EngineNumberSorter(a, b);
+	}
+	return _internal_sort_order ? -r : r;
+}
+
+/* Aircraft sorting functions */
+
+static int CDECL AircraftEngineCostSorter(const void *a, const void *b)
+{
+	const int va = AircraftVehInfo(*(const EngineID*)a)->base_cost;
+	const int vb = AircraftVehInfo(*(const EngineID*)b)->base_cost;
+	int r = va - vb;
+
+	return _internal_sort_order ? -r : r;
+}
+
+static int CDECL AircraftEngineSpeedSorter(const void *a, const void *b)
+{
+	const int va = AircraftVehInfo(*(const EngineID*)a)->max_speed;
+	const int vb = AircraftVehInfo(*(const EngineID*)b)->max_speed;
+	const int r = va - vb;
+
+	if (r == 0) {
+		/* Use EngineID to sort instead since we want consistent sorting */
+		return EngineNumberSorter(a, b);
+	}
+	return _internal_sort_order ? -r : r;
+}
+
+static int CDECL AircraftEngineRunningCostSorter(const void *a, const void *b)
+{
+	const int va = AircraftVehInfo(*(const EngineID*)a)->running_cost;
+	const int vb = AircraftVehInfo(*(const EngineID*)b)->running_cost;
+	const int r = va - vb;
+
+	if (r == 0) {
+		/* Use EngineID to sort instead since we want consistent sorting */
+		return EngineNumberSorter(a, b);
+	}
+	return _internal_sort_order ? -r : r;
+}
+
+static int CDECL AircraftEngineCargoSorter(const void *a, const void *b)
+{
+	const int va = AircraftVehInfo(*(const EngineID*)a)->passenger_capacity;
+	const int vb = AircraftVehInfo(*(const EngineID*)b)->passenger_capacity;
+	const int r = va - vb;
+
+	if (r == 0) {
+		/* Use EngineID to sort instead since we want consistent sorting */
+		return EngineNumberSorter(a, b);
+	}
+	return _internal_sort_order ? -r : r;
+}
+
+static EngList_SortTypeFunction * const _aircraft_sorter[] = {
+	&EngineNumberSorter,
+	&AircraftEngineCostSorter,
+	&AircraftEngineSpeedSorter,
+	&EngineIntroDateSorter,
+	&EngineNameSorter,
+	&AircraftEngineRunningCostSorter,
+	&EngineReliabilitySorter,
+	&AircraftEngineCargoSorter,
+};
+
+static const StringID _aircraft_sort_listing[] = {
+	STR_ENGINE_SORT_ENGINE_ID,
+	STR_ENGINE_SORT_COST,
+	STR_SORT_BY_MAX_SPEED,
+	STR_ENGINE_SORT_INTRO_DATE,
+	STR_SORT_BY_DROPDOWN_NAME,
+	STR_ENGINE_SORT_RUNNING_COST,
+	STR_SORT_BY_RELIABILITY,
+	STR_ENGINE_SORT_CARGO_CAPACITY,
+	INVALID_STRING_ID
+};
+
+
+/**
+* Draw the purchase info details of an aircraft at a given location.
+ * @param x,y location where to draw the info
+ * @param engine_number the engine of which to draw the info of
+ */
+void DrawAircraftPurchaseInfo(int x, int y, uint w, EngineID engine_number)
+{
+	const AircraftVehicleInfo *avi = AircraftVehInfo(engine_number);
+	const Engine *e = GetEngine(engine_number);
+	CargoID cargo;
+	YearMonthDay ymd;
+	ConvertDateToYMD(e->intro_date, &ymd);
+
+	/* Purchase cost - Max speed */
+	SetDParam(0, avi->base_cost * (_price.aircraft_base>>3)>>5);
+	SetDParam(1, avi->max_speed * 128 / 10);
+	DrawString(x, y, STR_PURCHASE_INFO_COST_SPEED, 0);
+	y += 10;
+
+	/* Cargo capacity */
+	cargo = FindFirstRefittableCargo(engine_number);
+	if (cargo == CT_INVALID || cargo == CT_PASSENGERS) {
+		SetDParam(0, avi->passenger_capacity);
+		SetDParam(1, avi->mail_capacity);
+		DrawString(x, y, STR_PURCHASE_INFO_AIRCRAFT_CAPACITY, 0);
+	} else {
+		/* Note, if the default capacity is selected by the refit capacity
+		* callback, then the capacity shown is likely to be incorrect. */
+		SetDParam(0, cargo);
+		SetDParam(1, AircraftDefaultCargoCapacity(cargo, engine_number));
+		SetDParam(2, STR_9842_REFITTABLE);
+		DrawString(x, y, STR_PURCHASE_INFO_CAPACITY, 0);
+	}
+	y += 10;
+
+	/* Running cost */
+	SetDParam(0, avi->running_cost * _price.aircraft_running >> 8);
+	DrawString(x, y, STR_PURCHASE_INFO_RUNNINGCOST, 0);
+	y += 10;
+
+	/* Design date - Life length */
+	SetDParam(0, ymd.year);
+	SetDParam(1, e->lifelength);
+	DrawString(x, y, STR_PURCHASE_INFO_DESIGNED_LIFE, 0);
+	y += 10;
+
+	/* Reliability */
+	SetDParam(0, e->reliability * 100 >> 16);
+	DrawString(x, y, STR_PURCHASE_INFO_RELIABILITY, 0);
+	y += 10;
+
+	/* Additional text from NewGRF */
+	y += ShowAdditionalText(x, y, w, engine_number);
+	y += ShowRefitOptionsList(x, y, w, engine_number);
+}
+
+void DrawAircraftImage(const Vehicle *v, int x, int y, VehicleID selection)
+{
+	PalSpriteID pal = (v->vehstatus & VS_CRASHED) ? PALETTE_CRASH : GetVehiclePalette(v);
+	DrawSprite(GetAircraftImage(v, DIR_W) | pal, x + 25, y + 10);
+	if (v->subtype == 0) {
+		SpriteID rotor_sprite = GetCustomRotorSprite(v, true);
+		if (rotor_sprite == 0) rotor_sprite = SPR_ROTOR_STOPPED;
+		DrawSprite(rotor_sprite, x + 25, y + 5);
+	}
+	if (v->index == selection) {
+		DrawFrameRect(x - 1, y - 1, x + 58, y + 21, 0xF, FR_BORDERONLY);
+	}
+}
+
+void CcBuildAircraft(bool success, TileIndex tile, uint32 p1, uint32 p2)
+{
+	if (success) {
+		const Vehicle *v = GetVehicle(_new_vehicle_id);
+
+		if (v->tile == _backup_orders_tile) {
+			_backup_orders_tile = 0;
+			RestoreVehicleOrders(v, _backup_orders_data);
+		}
+		ShowAircraftViewWindow(v);
+	}
+}
+
+static void GenerateBuildAircraftList(Window *w)
+{
+	EngineID eid, sel_id;
+	buildvehicle_d *bv = &WP(w, buildvehicle_d);
+
+	EngList_RemoveAll(&bv->eng_list);
+
+	/* Make list of all available planes.
+	 * Also check to see if the previously selected plane is still available,
+	 * and if not, reset selection to INVALID_ENGINE. This could be the case
+	 * when planes become obsolete and are removed */
+	sel_id = INVALID_ENGINE;
+	for (eid = AIRCRAFT_ENGINES_INDEX; eid < AIRCRAFT_ENGINES_INDEX + NUM_AIRCRAFT_ENGINES; eid++) {
+		if (IsEngineBuildable(eid, VEH_Aircraft, _local_player)) {
+			const AircraftVehicleInfo *avi = AircraftVehInfo(eid);
+			switch (bv->filter.acc_planes) {
+				case HELICOPTERS_ONLY:
+					if (avi->subtype != 0) continue; // if not helicopter
+					break;
+
+				case AIRCRAFT_ONLY:
+					if (avi->subtype == 0) continue; // if helicopter
+					break;
+
+				case ALL: break;
+			}
+			EngList_Add(&bv->eng_list, eid);
+
+			if (eid == bv->sel_engine) sel_id = eid;
+		}
+	}
+
+	bv->sel_engine = sel_id;
+}
+
+static void GenerateBuildList(Window *w)
+{
+	buildvehicle_d *bv = &WP(w, buildvehicle_d);
+
+	switch (bv->vehicle_type) {
+		case VEH_Aircraft:
+			GenerateBuildAircraftList(w);
+			_internal_sort_order = bv->descending_sort_order;
+			EngList_Sort(&bv->eng_list, _aircraft_sorter[bv->sort_criteria]);
+			break;
+
+		default: NOT_REACHED();
+	}
+}
+
+static void DrawBuildAircraftWindow(Window *w)
+{
+	const buildvehicle_d *bv = &WP(w, buildvehicle_d);
+
+	SetWindowWidgetDisabledState(w, BUILD_VEHICLE_WIDGET_BUILD, w->window_number == 0);
+
+	SetVScrollCount(w, EngList_Count(&bv->eng_list));
+	DrawWindowWidgets(w);
+
+	{
+		int x = 2;
+		int y = 27;
+		EngineID selected_id = bv->sel_engine;
+		EngineID eid = w->vscroll.pos;
+		uint16 max = min(w->vscroll.pos + w->vscroll.cap, EngList_Count(&bv->eng_list));
+
+		for (; eid < max; eid++) {
+			const EngineID engine = bv->eng_list[eid];
+
+			DrawString(x + 62, y + 7, GetCustomEngineName(engine), engine == selected_id ? 0xC : 0x10);
+			DrawAircraftEngine(x + 29, y + 10, engine, GetEnginePalette(engine, _local_player));
+			y += 24;
+		}
+
+		if (selected_id != INVALID_ENGINE) {
+			const Widget *wi = &w->widget[BUILD_VEHICLE_WIDGET_PANEL];
+			DrawAircraftPurchaseInfo(x, wi->top + 1, wi->right - wi->left - 2, selected_id);
+		}
+	}
+	DrawString(85, 15, _aircraft_sort_listing[bv->sort_criteria], 0x10);
+	DoDrawString(bv->descending_sort_order ? DOWNARROW : UPARROW, 69, 15, 0x10);
+}
+
+static void BuildAircraftClickEvent(Window *w, WindowEvent *e)
+{
+	buildvehicle_d *bv = &WP(w, buildvehicle_d);
+
+	switch (e->we.click.widget) {
+		case BUILD_VEHICLE_WIDGET_SORT_ASSENDING_DESCENDING:
+			bv->descending_sort_order ^= true;
+			_last_sort_order = bv->descending_sort_order;
+			GenerateBuildList(w);
+			SetWindowDirty(w);
+			break;
+
+		case BUILD_VEHICLE_WIDGET_LIST: {
+			uint i = (e->we.click.pt.y - 26) / 24 + w->vscroll.pos;
+			uint num_items = EngList_Count(&bv->eng_list);
+			bv->sel_engine = (i < num_items) ? bv->eng_list[i] : INVALID_ENGINE;
+			SetWindowDirty(w);
+			break;
+		}
+
+		case BUILD_VEHICLE_WIDGET_SORT_TEXT: case BUILD_VEHICLE_WIDGET_SORT_DROPDOWN:/* Select sorting criteria dropdown menu */
+			ShowDropDownMenu(w, _aircraft_sort_listing, bv->sort_criteria, BUILD_VEHICLE_WIDGET_SORT_DROPDOWN, 0, 0);
+			return;
+
+		case BUILD_VEHICLE_WIDGET_BUILD: {
+			EngineID sel_eng = bv->sel_engine;
+			if (sel_eng != INVALID_ENGINE) {
+				DoCommandP(w->window_number, sel_eng, 0, CcBuildAircraft, CMD_BUILD_AIRCRAFT | CMD_MSG(STR_A008_CAN_T_BUILD_AIRCRAFT));
+			}
+			break;
+		}
+
+		case BUILD_VEHICLE_WIDGET_RENAME: {
+			EngineID sel_eng = bv->sel_engine;
+			if (sel_eng != INVALID_ENGINE) {
+				bv->rename_engine = sel_eng;
+				ShowQueryString(GetCustomEngineName(sel_eng), STR_A039_RENAME_AIRCRAFT_TYPE, 31, 160, w->window_class, w->window_number, CS_ALPHANUMERAL);
+			}
+			break;
+		}
+	}
+}
+
+static void NewAircraftWndProc(Window *w, WindowEvent *e)
+{
+	buildvehicle_d *bv = &WP(w, buildvehicle_d);
+
+	switch (e->event) {
+		case WE_INVALIDATE_DATA:
+			GenerateBuildList(w);
+			break;
+
+		case WE_DESTROY:
+			EngList_Destroy(&bv->eng_list);
+			break;
+
+		case WE_PAINT:
+			DrawBuildAircraftWindow(w);
+			break;
+
+		case WE_CLICK:
+			BuildAircraftClickEvent(w, e);
+			break;
+
+		case WE_ON_EDIT_TEXT: {
+			if (e->we.edittext.str[0] != '\0') {
+				_cmd_text = e->we.edittext.str;
+				DoCommandP(0, bv->rename_engine, 0, NULL, CMD_RENAME_ENGINE | CMD_MSG(STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE));
+			}
+			break;
+		}
+
+		case WE_DROPDOWN_SELECT: /* we have selected a dropdown item in the list */
+			if (bv->sort_criteria != e->we.dropdown.index) {
+				bv->sort_criteria = _last_sort_criteria = e->we.dropdown.index;
+				GenerateBuildList(w);
+			}
+			SetWindowDirty(w);
+			break;
+
+		case WE_RESIZE:
+			w->vscroll.cap += e->we.sizing.diff.y / 24;
+			w->widget[BUILD_VEHICLE_WIDGET_LIST].data = (w->vscroll.cap << 8) + 1;
+			break;
+	}
+}
+
+static const WindowDesc _build_vehicle_desc = {
+	WDP_AUTO, WDP_AUTO, 240, 226,
+	WC_BUILD_VEHICLE,0,
+	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE,
+	_build_vehicle_widgets,
+	NewAircraftWndProc
+};
+
+void ShowBuildVehicleWindow(TileIndex tile, byte type)
+{
+	buildvehicle_d *bv;
+	Window *w;
+
+	DeleteWindowById(WC_BUILD_VEHICLE, tile);
+	w = AllocateWindowDescFront(&_build_vehicle_desc, tile);
+	if (w == NULL) return;
+
+	w->caption_color = (tile != 0) ? GetTileOwner(tile) : _local_player;
+	w->resize.step_height = GetVehicleListHeight(type);
+	w->vscroll.cap = 4;
+	w->widget[BUILD_VEHICLE_WIDGET_LIST].data = (w->vscroll.cap << 8) + 1;
+
+	bv = &WP(w, buildvehicle_d);
+	EngList_Create(&bv->eng_list);
+	bv->sel_engine            = INVALID_ENGINE;
+	bv->sort_criteria         = _last_sort_criteria;
+	bv->descending_sort_order = _last_sort_order;
+
+	bv->vehicle_type = type;
+
+	switch (type) {
+		case VEH_Aircraft: {
+			byte acc_planes = (tile == 0) ? ALL : GetAirport(GetStationByTile(tile)->airport_type)->acc_planes;
+			bv->filter.acc_planes = acc_planes;
+			break;
+		}
+		default: NOT_REACHED();
+	}
+
+	GenerateBuildList(w);
+	/* Select the first plane in the list as default when opening the window */
+	if (EngList_Count(&bv->eng_list) > 0) bv->sel_engine = bv->eng_list[0];
+}

callback_table.c

@@ -1,58 +1,60 @@
 /* $Id$ */
 
-/** @file callback_table.cpp */
-
 #include "stdafx.h"
 #include "openttd.h"
 #include "callback_table.h"
+#include "functions.h"
 
-/* If you add a callback for DoCommandP, also add the callback in here
- *   see below for the full list!
- * If you don't do it, it won't work across the network!! */
+// If you add a callback for DoCommandP, also add the callback in here
+//   see below for the full list!
+// If you don't do it, it won't work across the network!!
 
-/* aircraft_gui.cpp */
+/* aircraft_gui.c */
 CommandCallback CcBuildAircraft;
+CommandCallback CcCloneAircraft;
 
-/* airport_gui.cpp */
+/* airport_gui.c */
 CommandCallback CcBuildAirport;
 
-/* bridge_gui.cpp */
+/* bridge_gui.c */
 CommandCallback CcBuildBridge;
 
-/* dock_gui.cpp */
+/* dock_gui.c */
 CommandCallback CcBuildDocks;
 CommandCallback CcBuildCanal;
 
-/* depot_gui.cpp */
+/* depot_gui.c */
 CommandCallback CcCloneVehicle;
 
-/* main_gui.cpp */
+/* main_gui.c */
 CommandCallback CcPlaySound10;
 CommandCallback CcPlaceSign;
 CommandCallback CcTerraform;
 CommandCallback CcBuildTown;
-CommandCallback CcGiveMoney;
 
-/* rail_gui.cpp */
+/* rail_gui.c */
 CommandCallback CcPlaySound1E;
 CommandCallback CcRailDepot;
 CommandCallback CcStation;
 CommandCallback CcBuildRailTunnel;
 
-/* road_gui.cpp */
+/* road_gui.c */
 CommandCallback CcPlaySound1D;
 CommandCallback CcBuildRoadTunnel;
 CommandCallback CcRoadDepot;
 
-/* roadveh_gui.cpp */
+/* roadveh_gui.c */
 CommandCallback CcBuildRoadVeh;
+CommandCallback CcCloneRoadVeh;
 
-/* ship_gui.cpp */
+/* ship_gui.c */
 CommandCallback CcBuildShip;
+CommandCallback CcCloneShip;
 
-/* train_gui.cpp */
+/* train_gui.c */
 CommandCallback CcBuildWagon;
 CommandCallback CcBuildLoco;
+CommandCallback CcCloneTrain;
 
 CommandCallback CcAI;
 
@@ -78,9 +80,12 @@ CommandCallback *_callback_table[] = {
 	/* 0x12 */ CcPlaySound1E,
 	/* 0x13 */ CcStation,
 	/* 0x14 */ CcTerraform,
-	/* 0x15 */ CcAI,
-	/* 0x16 */ CcCloneVehicle,
-	/* 0x17 */ CcGiveMoney,
+	/* 0x15 */ CcCloneAircraft,
+	/* 0x16 */ CcCloneRoadVeh,
+	/* 0x17 */ CcCloneShip,
+	/* 0x18 */ CcCloneTrain,
+	/* 0x19 */ CcAI,
+	/* 0x1A */ CcCloneVehicle
 };
 
 const int _callback_table_count = lengthof(_callback_table);

callback_table.h

@@ -1,11 +1,9 @@
 /* $Id$ */
 
-/** @file callback_table.h  */
-
 #ifndef CALLBACK_TABLE_H
 #define CALLBACK_TABLE_H
 
-#include "command_type.h"
+#include "command.h"
 
 extern CommandCallback *_callback_table[];
 extern const int _callback_table_count;

clear_cmd.c

@@ -0,0 +1,794 @@
+/* $Id$ */
+
+#include "stdafx.h"
+#include "openttd.h"
+#include "clear_map.h"
+#include "rail_map.h"
+#include "table/strings.h"
+#include "functions.h"
+#include "map.h"
+#include "player.h"
+#include "tile.h"
+#include "viewport.h"
+#include "command.h"
+#include "tunnel_map.h"
+#include "variables.h"
+#include "table/sprites.h"
+#include "unmovable_map.h"
+#include "genworld.h"
+#include "industry.h"
+
+typedef struct TerraformerHeightMod {
+	TileIndex tile;
+	byte height;
+} TerraformerHeightMod;
+
+typedef struct TerraformerState {
+	int height[4];
+	uint32 flags;
+
+	int direction;
+	int modheight_count;
+	int tile_table_count;
+
+	int32 cost;
+
+	TileIndex *tile_table;
+	TerraformerHeightMod *modheight;
+
+} TerraformerState;
+
+static int TerraformAllowTileProcess(TerraformerState *ts, TileIndex tile)
+{
+	TileIndex *t;
+	int count;
+
+	if (TileX(tile) == MapMaxX() || TileY(tile) == MapMaxY()) return -1;
+
+	t = ts->tile_table;
+	for (count = ts->tile_table_count; count != 0; count--, t++) {
+		if (*t == tile) return 0;
+	}
+
+	return 1;
+}
+
+static int TerraformGetHeightOfTile(TerraformerState *ts, TileIndex tile)
+{
+	TerraformerHeightMod *mod = ts->modheight;
+	int count;
+
+	for (count = ts->modheight_count; count != 0; count--, mod++) {
+		if (mod->tile == tile) return mod->height;
+	}
+
+	return TileHeight(tile);
+}
+
+static void TerraformAddDirtyTile(TerraformerState *ts, TileIndex tile)
+{
+	int count;
+	TileIndex *t;
+
+	count = ts->tile_table_count;
+
+	if (count >= 625) return;
+
+	for (t = ts->tile_table; count != 0; count--,t++) {
+		if (*t == tile) return;
+	}
+
+	ts->tile_table[ts->tile_table_count++] = tile;
+}
+
+static void TerraformAddDirtyTileAround(TerraformerState *ts, TileIndex tile)
+{
+	TerraformAddDirtyTile(ts, tile + TileDiffXY( 0, -1));
+	TerraformAddDirtyTile(ts, tile + TileDiffXY(-1, -1));
+	TerraformAddDirtyTile(ts, tile + TileDiffXY(-1,  0));
+	TerraformAddDirtyTile(ts, tile);
+}
+
+static int TerraformProc(TerraformerState *ts, TileIndex tile, int mode)
+{
+	int r;
+	int32 ret;
+
+	assert(tile < MapSize());
+
+	r = TerraformAllowTileProcess(ts, tile);
+	if (r <= 0) return r;
+
+	if (IsTileType(tile, MP_RAILWAY)) {
+		static const TrackBits safe_track[] = { TRACK_BIT_LOWER, TRACK_BIT_LEFT, TRACK_BIT_UPPER, TRACK_BIT_RIGHT };
+		static const Slope unsafe_slope[] = { SLOPE_S, SLOPE_W, SLOPE_N, SLOPE_E };
+
+		Slope tileh;
+		uint z;
+
+		// Nothing could be built at the steep slope - this avoids a bug
+		// when you have a single diagonal track in one corner on a
+		// basement and then you raise/lower the other corner.
+		tileh = GetTileSlope(tile, &z);
+		if (tileh == unsafe_slope[mode] ||
+				tileh == ComplementSlope(unsafe_slope[mode])) {
+			_terraform_err_tile = tile;
+			_error_message = STR_1008_MUST_REMOVE_RAILROAD_TRACK;
+			return -1;
+		}
+
+		// If we have a single diagonal track there, the other side of
+		// tile can be terraformed.
+		if (IsPlainRailTile(tile) && GetTrackBits(tile) == safe_track[mode]) {
+			/* If terraforming downwards prevent damaging a potential tunnel below.
+			 * This check is only necessary for flat tiles, because if the tile is
+			 * non-flat, then the corner opposing the rail is raised. Only this corner
+			 * can be lowered and this is a safe action
+			 */
+			if (tileh == SLOPE_FLAT &&
+					ts->direction == -1 &&
+					IsTunnelInWay(tile, z - TILE_HEIGHT)) {
+				_terraform_err_tile = tile;
+				_error_message = STR_1002_EXCAVATION_WOULD_DAMAGE;
+				return -1;
+			}
+			return 0;
+		}
+	}
+
+	ret = DoCommand(tile, 0,0, ts->flags & ~DC_EXEC, CMD_LANDSCAPE_CLEAR);
+
+	if (CmdFailed(ret)) {
+		_terraform_err_tile = tile;
+		return -1;
+	}
+
+	ts->cost += ret;
+
+	if (ts->tile_table_count >= 625) return -1;
+	ts->tile_table[ts->tile_table_count++] = tile;
+
+	return 0;
+}
+
+static bool TerraformTileHeight(TerraformerState *ts, TileIndex tile, int height)
+{
+	int nh;
+	TerraformerHeightMod *mod;
+	int count;
+
+	assert(tile < MapSize());
+
+	if (height < 0) {
+		_error_message = STR_1003_ALREADY_AT_SEA_LEVEL;
+		return false;
+	}
+
+	_error_message = STR_1004_TOO_HIGH;
+
+	if (height > 15) return false;
+
+	nh = TerraformGetHeightOfTile(ts, tile);
+	if (nh < 0 || height == nh) return false;
+
+	if (TerraformProc(ts, tile, 0) < 0) return false;
+	if (TerraformProc(ts, tile + TileDiffXY( 0, -1), 1) < 0) return false;
+	if (TerraformProc(ts, tile + TileDiffXY(-1, -1), 2) < 0) return false;
+	if (TerraformProc(ts, tile + TileDiffXY(-1,  0), 3) < 0) return false;
+
+	mod = ts->modheight;
+	count = ts->modheight_count;
+
+	for (;;) {
+		if (count == 0) {
+			if (ts->modheight_count >= 576) return false;
+			ts->modheight_count++;
+			break;
+		}
+		if (mod->tile == tile) break;
+		mod++;
+		count--;
+	}
+
+	mod->tile = tile;
+	mod->height = (byte)height;
+
+	ts->cost += _price.terraform;
+
+	{
+		int direction = ts->direction, r;
+		const TileIndexDiffC *ttm;
+
+		static const TileIndexDiffC _terraform_tilepos[] = {
+			{ 1,  0},
+			{-2,  0},
+			{ 1,  1},
+			{ 0, -2}
+		};
+
+		for (ttm = _terraform_tilepos; ttm != endof(_terraform_tilepos); ttm++) {
+			tile += ToTileIndexDiff(*ttm);
+
+			r = TerraformGetHeightOfTile(ts, tile);
+			if (r != height && r-direction != height && r+direction != height) {
+				if (!TerraformTileHeight(ts, tile, r+direction))
+					return false;
+			}
+		}
+	}
+
+	return true;
+}
+
+/** Terraform land
+ * @param tile tile to terraform
+ * @param p1 corners to terraform.
+ * @param p2 direction; eg up or down
+ */
+int32 CmdTerraformLand(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
+{
+	TerraformerState ts;
+	TileIndex t;
+	int direction;
+
+	TerraformerHeightMod modheight_data[576];
+	TileIndex tile_table_data[625];
+
+	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
+
+	_terraform_err_tile = 0;
+
+	ts.direction = direction = p2 ? 1 : -1;
+	ts.flags = flags;
+	ts.modheight_count = ts.tile_table_count = 0;
+	ts.cost = 0;
+	ts.modheight = modheight_data;
+	ts.tile_table = tile_table_data;
+
+	/* Make an extra check for map-bounds cause we add tiles to the originating tile */
+	if (tile + TileDiffXY(1, 1) >= MapSize()) return CMD_ERROR;
+
+	if (p1 & 1) {
+		t = tile + TileDiffXY(1, 0);
+		if (!TerraformTileHeight(&ts, t, TileHeight(t) + direction)) {
+			return CMD_ERROR;
+		}
+	}
+
+	if (p1 & 2) {
+		t = tile + TileDiffXY(1, 1);
+		if (!TerraformTileHeight(&ts, t, TileHeight(t) + direction)) {
+			return CMD_ERROR;
+		}
+	}
+
+	if (p1 & 4) {
+		t = tile + TileDiffXY(0, 1);
+		if (!TerraformTileHeight(&ts, t, TileHeight(t) + direction)) {
+			return CMD_ERROR;
+		}
+	}
+
+	if (p1 & 8) {
+		t = tile + TileDiffXY(0, 0);
+		if (!TerraformTileHeight(&ts, t, TileHeight(t) + direction)) {
+			return CMD_ERROR;
+		}
+	}
+
+	if (direction == -1) {
+		/* Check if tunnel would take damage */
+		int count;
+		TileIndex *ti = ts.tile_table;
+
+		for (count = ts.tile_table_count; count != 0; count--, ti++) {
+			uint z, t;
+			TileIndex tile = *ti;
+
+			z = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(0, 0));
+			t = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(1, 0));
+			if (t <= z) z = t;
+			t = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(1, 1));
+			if (t <= z) z = t;
+			t = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(0, 1));
+			if (t <= z) z = t;
+
+			if (IsTunnelInWay(tile, z * TILE_HEIGHT)) {
+				return_cmd_error(STR_1002_EXCAVATION_WOULD_DAMAGE);
+			}
+		}
+	}
+
+	if (flags & DC_EXEC) {
+		/* Clear the landscape at the tiles */
+		{
+			int count;
+			TileIndex *ti = ts.tile_table;
+			for (count = ts.tile_table_count; count != 0; count--, ti++) {
+				DoCommand(*ti, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
+			}
+		}
+
+		/* change the height */
+		{
+			int count;
+			TerraformerHeightMod *mod;
+
+			mod = ts.modheight;
+			for (count = ts.modheight_count; count != 0; count--, mod++) {
+				TileIndex til = mod->tile;
+
+				SetTileHeight(til, mod->height);
+				TerraformAddDirtyTileAround(&ts, til);
+			}
+		}
+
+		/* finally mark the dirty tiles dirty */
+		{
+			int count;
+			TileIndex *ti = ts.tile_table;
+			for (count = ts.tile_table_count; count != 0; count--, ti++) {
+				MarkTileDirtyByTile(*ti);
+			}
+		}
+	}
+	return ts.cost;
+}
+
+
+/** Levels a selected (rectangle) area of land
+ * @param tile end tile of area-drag
+ * @param p1 start tile of area drag
+ * @param p2 unused
+ */
+int32 CmdLevelLand(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
+{
+	int size_x, size_y;
+	int ex;
+	int ey;
+	int sx, sy;
+	uint h, curh;
+	int32 ret, cost, money;
+
+	if (p1 >= MapSize()) return CMD_ERROR;
+
+	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
+
+	// remember level height
+	h = TileHeight(p1);
+
+	// make sure sx,sy are smaller than ex,ey
+	ex = TileX(tile);
+	ey = TileY(tile);
+	sx = TileX(p1);
+	sy = TileY(p1);
+	if (ex < sx) intswap(ex, sx);
+	if (ey < sy) intswap(ey, sy);
+	tile = TileXY(sx, sy);
+
+	size_x = ex-sx+1;
+	size_y = ey-sy+1;
+
+	money = GetAvailableMoneyForCommand();
+	cost = 0;
+
+	BEGIN_TILE_LOOP(tile2, size_x, size_y, tile) {
+		curh = TileHeight(tile2);
+		while (curh != h) {
+			ret = DoCommand(tile2, 8, (curh > h) ? 0 : 1, flags & ~DC_EXEC, CMD_TERRAFORM_LAND);
+			if (CmdFailed(ret)) break;
+			cost += ret;
+
+			if (flags & DC_EXEC) {
+				if ((money -= ret) < 0) {
+					_additional_cash_required = ret;
+					return cost - ret;
+				}
+				DoCommand(tile2, 8, (curh > h) ? 0 : 1, flags, CMD_TERRAFORM_LAND);
+			}
+
+			curh += (curh > h) ? -1 : 1;
+		}
+	} END_TILE_LOOP(tile2, size_x, size_y, tile)
+
+	return (cost == 0) ? CMD_ERROR : cost;
+}
+
+/** Purchase a land area. Actually you only purchase one tile, so
+ * the name is a bit confusing ;p
+ * @param tile the tile the player is purchasing
+ * @param p1 unused
+ * @param p2 unused
+ */
+int32 CmdPurchaseLandArea(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
+{
+	int32 cost;
+
+	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
+
+	if (!EnsureNoVehicle(tile)) return CMD_ERROR;
+
+	if (IsOwnedLandTile(tile) && IsTileOwner(tile, _current_player)) {
+		return_cmd_error(STR_5807_YOU_ALREADY_OWN_IT);
+	}
+
+	cost = DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
+	if (CmdFailed(cost)) return CMD_ERROR;
+
+	if (flags & DC_EXEC) {
+		MakeOwnedLand(tile, _current_player);
+		MarkTileDirtyByTile(tile);
+	}
+
+	return cost + _price.purchase_land * 10;
+}
+
+
+static int32 ClearTile_Clear(TileIndex tile, byte flags)
+{
+	static const int32* clear_price_table[] = {
+		&_price.clear_1,
+		&_price.purchase_land,
+		&_price.clear_2,
+		&_price.clear_3,
+		&_price.purchase_land,
+		&_price.purchase_land,
+		&_price.clear_2, // XXX unused?
+	};
+	int32 price;
+
+	if (IsClearGround(tile, CLEAR_GRASS) && GetClearDensity(tile) == 0) {
+		price = 0;
+	} else {
+		price = *clear_price_table[GetClearGround(tile)];
+	}
+
+	if (flags & DC_EXEC) DoClearSquare(tile);
+
+	return price;
+}
+
+/** Sell a land area. Actually you only sell one tile, so
+ * the name is a bit confusing ;p
+ * @param tile the tile the player is selling
+ * @param p1 unused
+ * @param p2 unused
+ */
+int32 CmdSellLandArea(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
+{
+	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
+
+	if (!IsOwnedLandTile(tile)) return CMD_ERROR;
+	if (!CheckTileOwnership(tile) && _current_player != OWNER_WATER) return CMD_ERROR;
+
+
+	if (!EnsureNoVehicle(tile)) return CMD_ERROR;
+
+	if (flags & DC_EXEC) DoClearSquare(tile);
+
+	return - _price.purchase_land * 2;
+}
+
+
+#include "table/clear_land.h"
+
+
+void DrawClearLandTile(const TileInfo *ti, byte set)
+{
+	DrawGroundSprite(SPR_FLAT_BARE_LAND + _tileh_to_sprite[ti->tileh] + set * 19);
+}
+
+void DrawHillyLandTile(const TileInfo *ti)
+{
+	if (ti->tileh != SLOPE_FLAT) {
+		DrawGroundSprite(SPR_FLAT_ROUGH_LAND + _tileh_to_sprite[ti->tileh]);
+	} else {
+		DrawGroundSprite(_landscape_clear_sprites[GB(ti->x ^ ti->y, 4, 3)]);
+	}
+}
+
+void DrawClearLandFence(const TileInfo *ti)
+{
+	byte z = ti->z;
+
+	if (ti->tileh & SLOPE_S) {
+		z += TILE_HEIGHT;
+		if (ti->tileh == SLOPE_STEEP_S) z += TILE_HEIGHT;
+	}
+
+	if (GetFenceSW(ti->tile) != 0) {
+		DrawGroundSpriteAt(_clear_land_fence_sprites_1[GetFenceSW(ti->tile) - 1] + _fence_mod_by_tileh[ti->tileh], ti->x, ti->y, z);
+	}
+
+	if (GetFenceSE(ti->tile) != 0) {
+		DrawGroundSpriteAt(_clear_land_fence_sprites_1[GetFenceSE(ti->tile) - 1] + _fence_mod_by_tileh_2[ti->tileh], ti->x, ti->y, z);
+	}
+}
+
+static void DrawTile_Clear(TileInfo *ti)
+{
+	switch (GetClearGround(ti->tile)) {
+		case CLEAR_GRASS:
+			DrawClearLandTile(ti, GetClearDensity(ti->tile));
+			break;
+
+		case CLEAR_ROUGH:
+			DrawHillyLandTile(ti);
+			break;
+
+		case CLEAR_ROCKS:
+			DrawGroundSprite(SPR_FLAT_ROCKY_LAND_1 + _tileh_to_sprite[ti->tileh]);
+			break;
+
+		case CLEAR_FIELDS:
+			DrawGroundSprite(_clear_land_sprites_1[GetFieldType(ti->tile)] + _tileh_to_sprite[ti->tileh]);
+			break;
+
+		case CLEAR_SNOW:
+			DrawGroundSprite(_clear_land_sprites_2[GetClearDensity(ti->tile)] + _tileh_to_sprite[ti->tileh]);
+			break;
+
+		case CLEAR_DESERT:
+			DrawGroundSprite(_clear_land_sprites_3[GetClearDensity(ti->tile)] + _tileh_to_sprite[ti->tileh]);
+			break;
+	}
+
+	DrawClearLandFence(ti);
+}
+
+static uint GetSlopeZ_Clear(TileIndex tile, uint x, uint y)
+{
+	uint z;
+	uint tileh = GetTileSlope(tile, &z);
+
+	return z + GetPartialZ(x & 0xF, y & 0xF, tileh);
+}
+
+static Slope GetSlopeTileh_Clear(TileIndex tile, Slope tileh)
+{
+	return tileh;
+}
+
+static void GetAcceptedCargo_Clear(TileIndex tile, AcceptedCargo ac)
+{
+	/* unused */
+}
+
+static void AnimateTile_Clear(TileIndex tile)
+{
+	/* unused */
+}
+
+void TileLoopClearHelper(TileIndex tile)
+{
+	byte self;
+	byte neighbour;
+	TileIndex dirty = INVALID_TILE;
+
+	self = (IsTileType(tile, MP_CLEAR) && IsClearGround(tile, CLEAR_FIELDS));
+
+	neighbour = (IsTileType(TILE_ADDXY(tile, 1, 0), MP_CLEAR) && IsClearGround(TILE_ADDXY(tile, 1, 0), CLEAR_FIELDS));
+	if (GetFenceSW(tile) == 0) {
+		if (self != neighbour) {
+			SetFenceSW(tile, 3);
+			dirty = tile;
+		}
+	} else {
+		if (self == 0 && neighbour == 0) {
+			SetFenceSW(tile, 0);
+			dirty = tile;
+		}
+	}
+
+	neighbour = (IsTileType(TILE_ADDXY(tile, 0, 1), MP_CLEAR) && IsClearGround(TILE_ADDXY(tile, 0, 1), CLEAR_FIELDS));
+	if (GetFenceSE(tile) == 0) {
+		if (self != neighbour) {
+			SetFenceSE(tile, 3);
+			dirty = tile;
+		}
+	} else {
+		if (self == 0 && neighbour == 0) {
+			SetFenceSE(tile, 0);
+			dirty = tile;
+		}
+	}
+
+	if (dirty != INVALID_TILE) MarkTileDirtyByTile(dirty);
+}
+
+
+/* convert into snowy tiles */
+static void TileLoopClearAlps(TileIndex tile)
+{
+	int k = GetTileZ(tile) - _opt.snow_line + TILE_HEIGHT;
+
+	if (k < 0) { // well below the snow line
+		if (!IsClearGround(tile, CLEAR_SNOW)) return;
+		if (GetClearDensity(tile) == 0) SetClearGroundDensity(tile, CLEAR_GRASS, 3);
+	} else {
+		if (!IsClearGround(tile, CLEAR_SNOW)) {
+			SetClearGroundDensity(tile, CLEAR_SNOW, 0);
+		} else {
+			uint density = min((uint)k / TILE_HEIGHT, 3);
+
+			if (GetClearDensity(tile) < density) {
+				AddClearDensity(tile, 1);
+			} else if (GetClearDensity(tile) > density) {
+				AddClearDensity(tile, -1);
+			} else {
+				return;
+			}
+		}
+	}
+
+	MarkTileDirtyByTile(tile);
+}
+
+static void TileLoopClearDesert(TileIndex tile)
+{
+	if (IsClearGround(tile, CLEAR_DESERT)) return;
+
+	if (GetTropicZone(tile) == TROPICZONE_DESERT) {
+		SetClearGroundDensity(tile, CLEAR_DESERT, 3);
+	} else {
+		if (GetTropicZone(tile + TileDiffXY( 1,  0)) != TROPICZONE_DESERT &&
+				GetTropicZone(tile + TileDiffXY(-1,  0)) != TROPICZONE_DESERT &&
+				GetTropicZone(tile + TileDiffXY( 0,  1)) != TROPICZONE_DESERT &&
+				GetTropicZone(tile + TileDiffXY( 0, -1)) != TROPICZONE_DESERT)
+			return;
+		SetClearGroundDensity(tile, CLEAR_DESERT, 1);
+	}
+
+	MarkTileDirtyByTile(tile);
+}
+
+static void TileLoop_Clear(TileIndex tile)
+{
+	TileLoopClearHelper(tile);
+
+	switch (_opt.landscape) {
+		case LT_DESERT: TileLoopClearDesert(tile); break;
+		case LT_HILLY:  TileLoopClearAlps(tile);   break;
+	}
+
+	switch (GetClearGround(tile)) {
+		case CLEAR_GRASS:
+			if (GetClearDensity(tile) == 3) return;
+
+			if (_game_mode != GM_EDITOR) {
+				if (GetClearCounter(tile) < 7) {
+					AddClearCounter(tile, 1);
+					return;
+				} else {
+					SetClearCounter(tile, 0);
+					AddClearDensity(tile, 1);
+				}
+			} else {
+				SetClearGroundDensity(tile, GB(Random(), 0, 8) > 21 ? CLEAR_GRASS : CLEAR_ROUGH, 3);
+			}
+			break;
+
+		case CLEAR_FIELDS: {
+			uint field_type;
+
+			if (_game_mode == GM_EDITOR) return;
+
+			if (GetClearCounter(tile) < 7) {
+				AddClearCounter(tile, 1);
+				return;
+			} else {
+				SetClearCounter(tile, 0);
+			}
+
+			if (GetIndustryIndexOfField(tile) == INVALID_INDUSTRY && GetFieldType(tile) >= 7) {
+				/* This farmfield is no longer farmfield, so make it grass again */
+				MakeClear(tile, CLEAR_GRASS, 2);
+			} else {
+				field_type = GetFieldType(tile);
+				field_type = (field_type < 8) ? field_type + 1 : 0;
+				SetFieldType(tile, field_type);
+			}
+			break;
+		}
+
+		default:
+			return;
+	}
+
+	MarkTileDirtyByTile(tile);
+}
+
+void GenerateClearTile(void)
+{
+	uint i, gi;
+	TileIndex tile;
+
+	/* add rough tiles */
+	i = ScaleByMapSize(GB(Random(), 0, 10) + 0x400);
+	gi = ScaleByMapSize(GB(Random(), 0, 7) + 0x80);
+
+	SetGeneratingWorldProgress(GWP_ROUGH_ROCKY, gi + i);
+	do {
+		IncreaseGeneratingWorldProgress(GWP_ROUGH_ROCKY);
+		tile = RandomTile();
+		if (IsTileType(tile, MP_CLEAR) && !IsClearGround(tile, CLEAR_DESERT)) SetClearGroundDensity(tile, CLEAR_ROUGH, 3);
+	} while (--i);
+
+	/* add rocky tiles */
+	i = gi;
+	do {
+		uint32 r = Random();
+		tile = RandomTileSeed(r);
+
+		IncreaseGeneratingWorldProgress(GWP_ROUGH_ROCKY);
+		if (IsTileType(tile, MP_CLEAR) && !IsClearGround(tile, CLEAR_DESERT)) {
+			uint j = GB(r, 16, 4) + 5;
+			for (;;) {
+				TileIndex tile_new;
+
+				SetClearGroundDensity(tile, CLEAR_ROCKS, 3);
+				do {
+					if (--j == 0) goto get_out;
+					tile_new = tile + TileOffsByDiagDir(GB(Random(), 0, 2));
+				} while (!IsTileType(tile_new, MP_CLEAR) || IsClearGround(tile_new, CLEAR_DESERT));
+				tile = tile_new;
+			}
+get_out:;
+		}
+	} while (--i);
+}
+
+static void ClickTile_Clear(TileIndex tile)
+{
+	/* not used */
+}
+
+static uint32 GetTileTrackStatus_Clear(TileIndex tile, TransportType mode)
+{
+	return 0;
+}
+
+static const StringID _clear_land_str[] = {
+	STR_080D_GRASS,
+	STR_080B_ROUGH_LAND,
+	STR_080A_ROCKS,
+	STR_080E_FIELDS,
+	STR_080F_SNOW_COVERED_LAND,
+	STR_0810_DESERT
+};
+
+static void GetTileDesc_Clear(TileIndex tile, TileDesc *td)
+{
+	if (IsClearGround(tile, CLEAR_GRASS) && GetClearDensity(tile) == 0) {
+		td->str = STR_080C_BARE_LAND;
+	} else {
+		td->str = _clear_land_str[GetClearGround(tile)];
+	}
+	td->owner = GetTileOwner(tile);
+}
+
+static void ChangeTileOwner_Clear(TileIndex tile, PlayerID old_player, PlayerID new_player)
+{
+	return;
+}
+
+void InitializeClearLand(void)
+{
+	_opt.snow_line = _patches.snow_line_height * TILE_HEIGHT;
+}
+
+const TileTypeProcs _tile_type_clear_procs = {
+	DrawTile_Clear,           /* draw_tile_proc */
+	GetSlopeZ_Clear,          /* get_slope_z_proc */
+	ClearTile_Clear,          /* clear_tile_proc */
+	GetAcceptedCargo_Clear,   /* get_accepted_cargo_proc */
+	GetTileDesc_Clear,        /* get_tile_desc_proc */
+	GetTileTrackStatus_Clear, /* get_tile_track_status_proc */
+	ClickTile_Clear,          /* click_tile_proc */
+	AnimateTile_Clear,        /* animate_tile_proc */
+	TileLoop_Clear,           /* tile_loop_clear */
+	ChangeTileOwner_Clear,    /* change_tile_owner_clear */
+	NULL,                     /* get_produced_cargo_proc */
+	NULL,                     /* vehicle_enter_tile_proc */
+	GetSlopeTileh_Clear,      /* get_slope_tileh_proc */
+};

clear_map.h

@@ -0,0 +1,145 @@
+/* $Id$ */
+
+#ifndef CLEAR_MAP_H
+#define CLEAR_MAP_H
+
+#include "macros.h"
+#include "tile.h"
+
+/* ground type, m5 bits 2...4
+ * valid densities (bits 0...1) in comments after the enum
+ */
+typedef enum ClearGround {
+	CLEAR_GRASS  = 0, // 0-3
+	CLEAR_ROUGH  = 1, // 3
+	CLEAR_ROCKS  = 2, // 3
+	CLEAR_FIELDS = 3, // 3
+	CLEAR_SNOW   = 4, // 0-3
+	CLEAR_DESERT = 5  // 1,3
+} ClearGround;
+
+
+static inline ClearGround GetClearGround(TileIndex t)
+{
+	assert(IsTileType(t, MP_CLEAR));
+	return GB(_m[t].m5, 2, 3);
+}
+
+static inline bool IsClearGround(TileIndex t, ClearGround ct)
+{
+	return GetClearGround(t) == ct;
+}
+
+
+static inline uint GetClearDensity(TileIndex t)
+{
+	assert(IsTileType(t, MP_CLEAR));
+	return GB(_m[t].m5, 0, 2);
+}
+
+static inline void AddClearDensity(TileIndex t, int d)
+{
+	assert(IsTileType(t, MP_CLEAR)); // XXX incomplete
+	_m[t].m5 += d;
+}
+
+
+static inline uint GetClearCounter(TileIndex t)
+{
+	assert(IsTileType(t, MP_CLEAR));
+	return GB(_m[t].m5, 5, 3);
+}
+
+static inline void AddClearCounter(TileIndex t, int c)
+{
+	assert(IsTileType(t, MP_CLEAR)); // XXX incomplete
+	_m[t].m5 += c << 5;
+}
+
+static inline void SetClearCounter(TileIndex t, uint c)
+{
+	assert(IsTileType(t, MP_CLEAR)); // XXX incomplete
+	SB(_m[t].m5, 5, 3, c);
+}
+
+
+/* Sets type and density in one go, also sets the counter to 0 */
+static inline void SetClearGroundDensity(TileIndex t, ClearGround type, uint density)
+{
+	assert(IsTileType(t, MP_CLEAR)); // XXX incomplete
+	_m[t].m5 = 0 << 5 | type << 2 | density;
+}
+
+
+static inline uint GetFieldType(TileIndex t)
+{
+	assert(GetClearGround(t) == CLEAR_FIELDS);
+	return GB(_m[t].m3, 0, 4);
+}
+
+static inline void SetFieldType(TileIndex t, uint f)
+{
+	assert(GetClearGround(t) == CLEAR_FIELDS); // XXX incomplete
+	SB(_m[t].m3, 0, 4, f);
+}
+
+static inline uint16 GetIndustryIndexOfField(TileIndex t)
+{
+	assert(GetClearGround(t) == CLEAR_FIELDS);
+	return _m[t].m2;
+}
+
+static inline void SetIndustryIndexOfField(TileIndex t, uint16 i)
+{
+	assert(GetClearGround(t) == CLEAR_FIELDS);
+	_m[t].m2 = i;
+}
+
+/* Is used by tree tiles, too */
+static inline uint GetFenceSE(TileIndex t)
+{
+	assert(IsTileType(t, MP_CLEAR) || IsTileType(t, MP_TREES));
+	return GB(_m[t].m4, 2, 3);
+}
+
+static inline void SetFenceSE(TileIndex t, uint h)
+{
+	assert(IsTileType(t, MP_CLEAR) || IsTileType(t, MP_TREES)); // XXX incomplete
+	SB(_m[t].m4, 2, 3, h);
+}
+
+static inline uint GetFenceSW(TileIndex t)
+{
+	assert(IsTileType(t, MP_CLEAR) || IsTileType(t, MP_TREES));
+	return GB(_m[t].m4, 5, 3);
+}
+
+static inline void SetFenceSW(TileIndex t, uint h)
+{
+	assert(IsTileType(t, MP_CLEAR) || IsTileType(t, MP_TREES)); // XXX incomplete
+	SB(_m[t].m4, 5, 3, h);
+}
+
+
+static inline void MakeClear(TileIndex t, ClearGround g, uint density)
+{
+	SetTileType(t, MP_CLEAR);
+	SetTileOwner(t, OWNER_NONE);
+	_m[t].m2 = 0;
+	_m[t].m3 = 0;
+	_m[t].m4 = 0 << 5 | 0 << 2;
+	SetClearGroundDensity(t, g, density);
+}
+
+
+static inline void MakeField(TileIndex t, uint field_type, uint16 industry)
+{
+	SetTileType(t, MP_CLEAR);
+	SetTileOwner(t, OWNER_NONE);
+	_m[t].m2 = industry;
+	_m[t].m3 = field_type;
+	_m[t].m4 = 0 << 5 | 0 << 2;
+	SetClearGroundDensity(t, CLEAR_FIELDS, 3);
+}
+
+#endif /* CLEAR_MAP_H */

command.c

@@ -0,0 +1,562 @@
+/* $Id$ */
+
+#include "stdafx.h"
+#include "openttd.h"
+#include "table/strings.h"
+#include "functions.h"
+#include "map.h"
+#include "gui.h"
+#include "command.h"
+#include "player.h"
+#include "network.h"
+#include "variables.h"
+#include "genworld.h"
+
+const char* _cmd_text = NULL;
+
+#define DEF_COMMAND(yyyy) int32 yyyy(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
+
+DEF_COMMAND(CmdBuildRailroadTrack);
+DEF_COMMAND(CmdRemoveRailroadTrack);
+DEF_COMMAND(CmdBuildSingleRail);
+DEF_COMMAND(CmdRemoveSingleRail);
+
+DEF_COMMAND(CmdLandscapeClear);
+
+DEF_COMMAND(CmdBuildBridge);
+
+DEF_COMMAND(CmdBuildRailroadStation);
+DEF_COMMAND(CmdRemoveFromRailroadStation);
+DEF_COMMAND(CmdConvertRail);
+
+DEF_COMMAND(CmdBuildSingleSignal);
+DEF_COMMAND(CmdRemoveSingleSignal);
+
+DEF_COMMAND(CmdTerraformLand);
+
+DEF_COMMAND(CmdPurchaseLandArea);
+DEF_COMMAND(CmdSellLandArea);
+
+DEF_COMMAND(CmdBuildTunnel);
+
+DEF_COMMAND(CmdBuildTrainDepot);
+DEF_COMMAND(CmdBuildTrainWaypoint);
+DEF_COMMAND(CmdRenameWaypoint);
+DEF_COMMAND(CmdRemoveTrainWaypoint);
+
+DEF_COMMAND(CmdBuildRoadStop);
+
+DEF_COMMAND(CmdBuildLongRoad);
+DEF_COMMAND(CmdRemoveLongRoad);
+DEF_COMMAND(CmdBuildRoad);
+DEF_COMMAND(CmdRemoveRoad);
+
+DEF_COMMAND(CmdBuildRoadDepot);
+
+DEF_COMMAND(CmdBuildAirport);
+
+DEF_COMMAND(CmdBuildDock);
+
+DEF_COMMAND(CmdBuildShipDepot);
+
+DEF_COMMAND(CmdBuildBuoy);
+
+DEF_COMMAND(CmdPlantTree);
+
+DEF_COMMAND(CmdBuildRailVehicle);
+DEF_COMMAND(CmdMoveRailVehicle);
+
+DEF_COMMAND(CmdStartStopTrain);
+
+DEF_COMMAND(CmdSellRailWagon);
+
+DEF_COMMAND(CmdSendTrainToDepot);
+DEF_COMMAND(CmdForceTrainProceed);
+DEF_COMMAND(CmdReverseTrainDirection);
+
+DEF_COMMAND(CmdModifyOrder);
+DEF_COMMAND(CmdSkipOrder);
+DEF_COMMAND(CmdDeleteOrder);
+DEF_COMMAND(CmdInsertOrder);
+DEF_COMMAND(CmdChangeServiceInt);
+DEF_COMMAND(CmdRestoreOrderIndex);
+
+DEF_COMMAND(CmdBuildIndustry);
+
+DEF_COMMAND(CmdBuildCompanyHQ);
+DEF_COMMAND(CmdSetPlayerFace);
+DEF_COMMAND(CmdSetPlayerColor);
+
+DEF_COMMAND(CmdIncreaseLoan);
+DEF_COMMAND(CmdDecreaseLoan);
+
+DEF_COMMAND(CmdWantEnginePreview);
+
+DEF_COMMAND(CmdNameVehicle);
+DEF_COMMAND(CmdRenameEngine);
+
+DEF_COMMAND(CmdChangeCompanyName);
+DEF_COMMAND(CmdChangePresidentName);
+
+DEF_COMMAND(CmdRenameStation);
+
+DEF_COMMAND(CmdSellAircraft);
+DEF_COMMAND(CmdStartStopAircraft);
+DEF_COMMAND(CmdBuildAircraft);
+DEF_COMMAND(CmdSendAircraftToHangar);
+DEF_COMMAND(CmdRefitAircraft);
+
+DEF_COMMAND(CmdPlaceSign);
+DEF_COMMAND(CmdRenameSign);
+
+DEF_COMMAND(CmdBuildRoadVeh);
+DEF_COMMAND(CmdStartStopRoadVeh);
+DEF_COMMAND(CmdSellRoadVeh);
+DEF_COMMAND(CmdSendRoadVehToDepot);
+DEF_COMMAND(CmdTurnRoadVeh);
+DEF_COMMAND(CmdRefitRoadVeh);
+
+DEF_COMMAND(CmdPause);
+
+DEF_COMMAND(CmdBuyShareInCompany);
+DEF_COMMAND(CmdSellShareInCompany);
+DEF_COMMAND(CmdBuyCompany);
+
+DEF_COMMAND(CmdBuildTown);
+
+DEF_COMMAND(CmdRenameTown);
+DEF_COMMAND(CmdDoTownAction);
+
+DEF_COMMAND(CmdSetRoadDriveSide);
+
+DEF_COMMAND(CmdChangeDifficultyLevel);
+DEF_COMMAND(CmdChangePatchSetting);
+
+DEF_COMMAND(CmdStartStopShip);
+DEF_COMMAND(CmdSellShip);
+DEF_COMMAND(CmdBuildShip);
+DEF_COMMAND(CmdSendShipToDepot);
+DEF_COMMAND(CmdRefitShip);
+
+DEF_COMMAND(CmdOrderRefit);
+DEF_COMMAND(CmdCloneOrder);
+
+DEF_COMMAND(CmdClearArea);
+
+DEF_COMMAND(CmdGiveMoney);
+DEF_COMMAND(CmdMoneyCheat);
+DEF_COMMAND(CmdBuildCanal);
+DEF_COMMAND(CmdBuildLock);
+
+DEF_COMMAND(CmdPlayerCtrl);
+
+DEF_COMMAND(CmdLevelLand);
+
+DEF_COMMAND(CmdRefitRailVehicle);
+
+DEF_COMMAND(CmdBuildSignalTrack);
+DEF_COMMAND(CmdRemoveSignalTrack);
+
+DEF_COMMAND(CmdSetAutoReplace);
+
+DEF_COMMAND(CmdCloneVehicle);
+DEF_COMMAND(CmdMassStartStopVehicle);
+DEF_COMMAND(CmdDepotSellAllVehicles);
+DEF_COMMAND(CmdDepotMassAutoReplace);
+
+/* The master command table */
+static const Command _command_proc_table[] = {
+	{CmdBuildRailroadTrack,                  0}, /*   0 */
+	{CmdRemoveRailroadTrack,                 0}, /*   1 */
+	{CmdBuildSingleRail,                     0}, /*   2 */
+	{CmdRemoveSingleRail,                    0}, /*   3 */
+	{CmdLandscapeClear,                      0}, /*   4 */
+	{CmdBuildBridge,                         0}, /*   5 */
+	{CmdBuildRailroadStation,                0}, /*   6 */
+	{CmdBuildTrainDepot,                     0}, /*   7 */
+	{CmdBuildSingleSignal,                   0}, /*   8 */
+	{CmdRemoveSingleSignal,                  0}, /*   9 */
+	{CmdTerraformLand,                       0}, /*  10 */
+	{CmdPurchaseLandArea,                    0}, /*  11 */
+	{CmdSellLandArea,                        0}, /*  12 */
+	{CmdBuildTunnel,                         0}, /*  13 */
+	{CmdRemoveFromRailroadStation,           0}, /*  14 */
+	{CmdConvertRail,                         0}, /*  15 */
+	{CmdBuildTrainWaypoint,                  0}, /*  16 */
+	{CmdRenameWaypoint,                      0}, /*  17 */
+	{CmdRemoveTrainWaypoint,                 0}, /*  18 */
+	{NULL,                                   0}, /*  19 */
+	{NULL,                                   0}, /*  20 */
+	{CmdBuildRoadStop,                       0}, /*  21 */
+	{NULL,                                   0}, /*  22 */
+	{CmdBuildLongRoad,                       0}, /*  23 */
+	{CmdRemoveLongRoad,                      0}, /*  24 */
+	{CmdBuildRoad,                           0}, /*  25 */
+	{CmdRemoveRoad,                          0}, /*  26 */
+	{CmdBuildRoadDepot,                      0}, /*  27 */
+	{NULL,                                   0}, /*  28 */
+	{CmdBuildAirport,                        0}, /*  29 */
+	{CmdBuildDock,                           0}, /*  30 */
+	{CmdBuildShipDepot,                      0}, /*  31 */
+	{CmdBuildBuoy,                           0}, /*  32 */
+	{CmdPlantTree,                           0}, /*  33 */
+	{CmdBuildRailVehicle,                    0}, /*  34 */
+	{CmdMoveRailVehicle,                     0}, /*  35 */
+	{CmdStartStopTrain,                      0}, /*  36 */
+	{NULL,                                   0}, /*  37 */
+	{CmdSellRailWagon,                       0}, /*  38 */
+	{CmdSendTrainToDepot,                    0}, /*  39 */
+	{CmdForceTrainProceed,                   0}, /*  40 */
+	{CmdReverseTrainDirection,               0}, /*  41 */
+
+	{CmdModifyOrder,                         0}, /*  42 */
+	{CmdSkipOrder,                           0}, /*  43 */
+	{CmdDeleteOrder,                         0}, /*  44 */
+	{CmdInsertOrder,                         0}, /*  45 */
+
+	{CmdChangeServiceInt,                    0}, /*  46 */
+
+	{CmdBuildIndustry,                       0}, /*  47 */
+	{CmdBuildCompanyHQ,                      0}, /*  48 */
+	{CmdSetPlayerFace,                       0}, /*  49 */
+	{CmdSetPlayerColor,                      0}, /*  50 */
+
+	{CmdIncreaseLoan,                        0}, /*  51 */
+	{CmdDecreaseLoan,                        0}, /*  52 */
+
+	{CmdWantEnginePreview,                   0}, /*  53 */
+
+	{CmdNameVehicle,                         0}, /*  54 */
+	{CmdRenameEngine,                        0}, /*  55 */
+
+	{CmdChangeCompanyName,                   0}, /*  56 */
+	{CmdChangePresidentName,                 0}, /*  57 */
+
+	{CmdRenameStation,                       0}, /*  58 */
+
+	{CmdSellAircraft,                        0}, /*  59 */
+	{CmdStartStopAircraft,                   0}, /*  60 */
+
+	{CmdBuildAircraft,                       0}, /*  61 */
+	{CmdSendAircraftToHangar,                0}, /*  62 */
+	{NULL,                                   0}, /*  63 */
+	{CmdRefitAircraft,                       0}, /*  64 */
+
+	{CmdPlaceSign,                           0}, /*  65 */
+	{CmdRenameSign,                          0}, /*  66 */
+
+	{CmdBuildRoadVeh,                        0}, /*  67 */
+	{CmdStartStopRoadVeh,                    0}, /*  68 */
+	{CmdSellRoadVeh,                         0}, /*  69 */
+	{CmdSendRoadVehToDepot,                  0}, /*  70 */
+	{CmdTurnRoadVeh,                         0}, /*  71 */
+	{CmdRefitRoadVeh,                        0}, /*  72 */
+
+	{CmdPause,                      CMD_SERVER}, /*  73 */
+
+	{CmdBuyShareInCompany,                   0}, /*  74 */
+	{CmdSellShareInCompany,                  0}, /*  75 */
+	{CmdBuyCompany,                          0}, /*  76 */
+
+	{CmdBuildTown,                 CMD_OFFLINE}, /*  77 */
+	{NULL,                                   0}, /*  78 */
+	{NULL,                                   0}, /*  79 */
+	{CmdRenameTown,                 CMD_SERVER}, /*  80 */
+	{CmdDoTownAction,                        0}, /*  81 */
+
+	{CmdSetRoadDriveSide,           CMD_SERVER}, /*  82 */
+	{NULL,                                   0}, /*  83 */
+	{NULL,                                   0}, /*  84 */
+	{CmdChangeDifficultyLevel,      CMD_SERVER}, /*  85 */
+
+	{CmdStartStopShip,                       0}, /*  86 */
+	{CmdSellShip,                            0}, /*  87 */
+	{CmdBuildShip,                           0}, /*  88 */
+	{CmdSendShipToDepot,                     0}, /*  89 */
+	{NULL,                                   0}, /*  90 */
+	{CmdRefitShip,                           0}, /*  91 */
+
+	{NULL,                                   0}, /*  92 */
+	{NULL,                                   0}, /*  93 */
+	{NULL,                                   0}, /*  94 */
+	{NULL,                                   0}, /*  95 */
+	{NULL,                                   0}, /*  96 */
+	{NULL,                                   0}, /*  97 */
+
+	{CmdOrderRefit,                          0}, /*  98 */
+	{CmdCloneOrder,                          0}, /*  99 */
+
+	{CmdClearArea,                           0}, /* 100 */
+	{NULL,                                   0}, /* 101 */
+
+	{CmdMoneyCheat,                CMD_OFFLINE}, /* 102 */
+	{CmdBuildCanal,                          0}, /* 103 */
+	{CmdPlayerCtrl,                          0}, /* 104 */
+
+	{CmdLevelLand,                           0}, /* 105 */
+
+	{CmdRefitRailVehicle,                    0}, /* 106 */
+	{CmdRestoreOrderIndex,                   0}, /* 107 */
+	{CmdBuildLock,                           0}, /* 108 */
+	{NULL,                                   0}, /* 109 */
+	{CmdBuildSignalTrack,                    0}, /* 110 */
+	{CmdRemoveSignalTrack,                   0}, /* 111 */
+	{NULL,                                   0}, /* 112 */
+	{CmdGiveMoney,                           0}, /* 113 */
+	{CmdChangePatchSetting,         CMD_SERVER}, /* 114 */
+	{CmdSetAutoReplace,                      0}, /* 115 */
+	{CmdCloneVehicle,                        0}, /* 116 */
+	{CmdMassStartStopVehicle,                0}, /* 117 */
+	{CmdDepotSellAllVehicles,                0}, /* 118 */
+	{CmdDepotMassAutoReplace,                0}, /* 119 */
+};
+
+/* This function range-checks a cmd, and checks if the cmd is not NULL */
+bool IsValidCommand(uint cmd)
+{
+	cmd &= 0xFF;
+
+	return
+		cmd < lengthof(_command_proc_table) &&
+		_command_proc_table[cmd].proc != NULL;
+}
+
+byte GetCommandFlags(uint cmd)
+{
+	return _command_proc_table[cmd & 0xFF].flags;
+}
+
+
+static int _docommand_recursive;
+
+int32 DoCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc)
+{
+	int32 res;
+	CommandProc *proc;
+
+	/* Do not even think about executing out-of-bounds tile-commands */
+	if (tile >= MapSize()) {
+		_cmd_text = NULL;
+		return CMD_ERROR;
+	}
+
+	proc = _command_proc_table[procc].proc;
+
+	if (_docommand_recursive == 0) _error_message = INVALID_STRING_ID;
+
+	_docommand_recursive++;
+
+	// only execute the test call if it's toplevel, or we're not execing.
+	if (_docommand_recursive == 1 || !(flags & DC_EXEC) || (flags & DC_FORCETEST) ) {
+		res = proc(tile, flags & ~DC_EXEC, p1, p2);
+		if (CmdFailed(res)) {
+			if (res & 0xFFFF) _error_message = res & 0xFFFF;
+			goto error;
+		}
+
+		if (_docommand_recursive == 1 &&
+				!(flags & DC_QUERY_COST) &&
+				res != 0 &&
+				!CheckPlayerHasMoney(res)) {
+			goto error;
+		}
+
+		if (!(flags & DC_EXEC)) {
+			_docommand_recursive--;
+			_cmd_text = NULL;
+			return res;
+		}
+	}
+
+	/* Execute the command here. All cost-relevant functions set the expenses type
+	 * themselves with "SET_EXPENSES_TYPE(...);" at the beginning of the function */
+	res = proc(tile, flags, p1, p2);
+	if (CmdFailed(res)) {
+		if (res & 0xFFFF) _error_message = res & 0xFFFF;
+error:
+		_docommand_recursive--;
+		_cmd_text = NULL;
+		return CMD_ERROR;
+	}
+
+	// if toplevel, subtract the money.
+	if (--_docommand_recursive == 0) {
+		SubtractMoneyFromPlayer(res);
+		// XXX - Old AI hack which doesn't use DoCommandDP; update last build coord of player
+		if (tile != 0 && IsValidPlayer(_current_player)) {
+			GetPlayer(_current_player)->last_build_coordinate = tile;
+		}
+	}
+
+	_cmd_text = NULL;
+	return res;
+}
+
+int32 GetAvailableMoneyForCommand(void)
+{
+	PlayerID pid = _current_player;
+	if (!IsValidPlayer(pid)) return 0x7FFFFFFF; // max int
+	return GetPlayer(pid)->player_money;
+}
+
+// toplevel network safe docommand function for the current player. must not be called recursively.
+// the callback is called when the command succeeded or failed.
+bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback, uint32 cmd)
+{
+	int32 res = 0,res2;
+	CommandProc *proc;
+	uint32 flags;
+	bool notest;
+	StringID error_part1;
+
+	int x = TileX(tile) * TILE_SIZE;
+	int y = TileY(tile) * TILE_SIZE;
+
+	/* Do not even think about executing out-of-bounds tile-commands */
+	if (tile >= MapSize()) {
+		_cmd_text = NULL;
+		return false;
+	}
+
+	assert(_docommand_recursive == 0);
+
+	_error_message = INVALID_STRING_ID;
+	error_part1 = GB(cmd, 16, 16);
+	_additional_cash_required = 0;
+
+	/** Spectator has no rights except for the (dedicated) server which
+	 * is/can be a spectator but as the server it can do anything */
+	if (_current_player == PLAYER_SPECTATOR && !_network_server) {
+		ShowErrorMessage(_error_message, error_part1, x, y);
+		_cmd_text = NULL;
+		return false;
+	}
+
+	flags = 0;
+	if (cmd & CMD_AUTO) flags |= DC_AUTO;
+	if (cmd & CMD_NO_WATER) flags |= DC_NO_WATER;
+
+	// get pointer to command handler
+	assert((cmd & 0xFF) < lengthof(_command_proc_table));
+	proc = _command_proc_table[cmd & 0xFF].proc;
+	if (proc == NULL) {
+		_cmd_text = NULL;
+		return false;
+	}
+
+	// Some commands have a different output in dryrun than the realrun
+	//  e.g.: if you demolish a whole town, the dryrun would say okay.
+	//  but by really destroying, your rating drops and at a certain point
+	//  it will fail. so res and res2 are different
+	// CMD_REMOVE_ROAD: This command has special local authority
+	// restrictions which may cause the test run to fail (the previous
+	// road fragments still stay there and the town won't let you
+	// disconnect the road system), but the exec will succeed and this
+	// fact will trigger an assertion failure. --pasky
+	notest =
+		(cmd & 0xFF) == CMD_CLEAR_AREA ||
+		(cmd & 0xFF) == CMD_CONVERT_RAIL ||
+		(cmd & 0xFF) == CMD_LEVEL_LAND ||
+		(cmd & 0xFF) == CMD_REMOVE_ROAD ||
+		(cmd & 0xFF) == CMD_REMOVE_LONG_ROAD;
+
+	_docommand_recursive = 1;
+
+	// cost estimation only?
+	if (!IsGeneratingWorld() && _shift_pressed && IsLocalPlayer() && !(cmd & (CMD_NETWORK_COMMAND | CMD_SHOW_NO_ERROR))) {
+		// estimate the cost.
+		res = proc(tile, flags, p1, p2);
+		if (CmdFailed(res)) {
+			if (res & 0xFFFF) _error_message = res & 0xFFFF;
+			ShowErrorMessage(_error_message, error_part1, x, y);
+		} else {
+			ShowEstimatedCostOrIncome(res, x, y);
+		}
+
+		_docommand_recursive = 0;
+		_cmd_text = NULL;
+		return false;
+	}
+
+
+	if (!((cmd & CMD_NO_TEST_IF_IN_NETWORK) && _networking)) {
+		// first test if the command can be executed.
+		res = proc(tile, flags, p1, p2);
+		if (CmdFailed(res)) {
+			if (res & 0xFFFF) _error_message = res & 0xFFFF;
+			goto show_error;
+		}
+		// no money? Only check if notest is off
+		if (!notest && res != 0 && !CheckPlayerHasMoney(res)) goto show_error;
+	}
+
+#ifdef ENABLE_NETWORK
+	/** If we are in network, and the command is not from the network
+	 * send it to the command-queue and abort execution
+	 * If we are a dedicated server temporarily switch local player, otherwise
+	 * the other parties won't be able to execute our command and will desync.
+	 * We also need to do this if the server's company has gone bankrupt
+	 * @todo Rewrite (dedicated) server to something more than a dirty hack!
+	 */
+	if (_networking && !(cmd & CMD_NETWORK_COMMAND)) {
+		PlayerID pbck = _local_player;
+		if (_network_dedicated || (_network_server && pbck == PLAYER_SPECTATOR)) _local_player = 0;
+		NetworkSend_Command(tile, p1, p2, cmd, callback);
+		if (_network_dedicated || (_network_server && pbck == PLAYER_SPECTATOR)) _local_player = pbck;
+		_docommand_recursive = 0;
+		_cmd_text = NULL;
+		return true;
+	}
+#endif /* ENABLE_NETWORK */
+
+	// update last build coordinate of player.
+	if (tile != 0 && IsValidPlayer(_current_player)) {
+		GetPlayer(_current_player)->last_build_coordinate = tile;
+	}
+
+	/* Actually try and execute the command. If no cost-type is given
+	 * use the construction one */
+	_yearly_expenses_type = EXPENSES_CONSTRUCTION;
+	res2 = proc(tile, flags | DC_EXEC, p1, p2);
+
+	// If notest is on, it means the result of the test can be different than
+	//   the real command.. so ignore the test
+	if (!notest && !((cmd & CMD_NO_TEST_IF_IN_NETWORK) && _networking)) {
+		assert(res == res2); // sanity check
+	} else {
+		if (CmdFailed(res2)) {
+			if (res2 & 0xFFFF) _error_message = res2 & 0xFFFF;
+			goto show_error;
+		}
+	}
+
+	SubtractMoneyFromPlayer(res2);
+
+	if (IsLocalPlayer() && _game_mode != GM_EDITOR) {
+		if (res2 != 0) ShowCostOrIncomeAnimation(x, y, GetSlopeZ(x, y), res2);
+		if (_additional_cash_required) {
+			SetDParam(0, _additional_cash_required);
+			ShowErrorMessage(STR_0003_NOT_ENOUGH_CASH_REQUIRES, error_part1, x,y);
+			if (res2 == 0) goto callb_err;
+		}
+	}
+
+	_docommand_recursive = 0;
+
+	if (callback) callback(true, tile, p1, p2);
+	_cmd_text = NULL;
+	return true;
+
+show_error:
+	// show error message if the command fails?
+	if (IsLocalPlayer() && error_part1 != 0) {
+		ShowErrorMessage(_error_message, error_part1, x,y);
+	}
+
+callb_err:
+	_docommand_recursive = 0;
+
+	if (callback) callback(false, tile, p1, p2);
+	_cmd_text = NULL;
+	return false;
+}

command.h

@@ -0,0 +1,213 @@
+/* $Id$ */
+
+#ifndef COMMAND_H
+#define COMMAND_H
+
+enum {
+	CMD_BUILD_RAILROAD_TRACK         =   0,
+	CMD_REMOVE_RAILROAD_TRACK        =   1,
+	CMD_BUILD_SINGLE_RAIL            =   2,
+	CMD_REMOVE_SINGLE_RAIL           =   3,
+	CMD_LANDSCAPE_CLEAR              =   4,
+	CMD_BUILD_BRIDGE                 =   5,
+	CMD_BUILD_RAILROAD_STATION       =   6,
+	CMD_BUILD_TRAIN_DEPOT            =   7,
+	CMD_BUILD_SIGNALS                =   8,
+	CMD_REMOVE_SIGNALS               =   9,
+	CMD_TERRAFORM_LAND               =  10,
+	CMD_PURCHASE_LAND_AREA           =  11,
+	CMD_SELL_LAND_AREA               =  12,
+	CMD_BUILD_TUNNEL                 =  13,
+
+	CMD_REMOVE_FROM_RAILROAD_STATION =  14,
+	CMD_CONVERT_RAIL                 =  15,
+
+	CMD_BUILD_TRAIN_WAYPOINT         =  16,
+	CMD_RENAME_WAYPOINT              =  17,
+	CMD_REMOVE_TRAIN_WAYPOINT        =  18,
+
+	CMD_BUILD_ROAD_STOP              =  21,
+	CMD_BUILD_LONG_ROAD              =  23,
+	CMD_REMOVE_LONG_ROAD             =  24,
+	CMD_BUILD_ROAD                   =  25,
+	CMD_REMOVE_ROAD                  =  26,
+	CMD_BUILD_ROAD_DEPOT             =  27,
+
+	CMD_BUILD_AIRPORT                =  29,
+
+	CMD_BUILD_DOCK                   =  30,
+
+	CMD_BUILD_SHIP_DEPOT             =  31,
+	CMD_BUILD_BUOY                   =  32,
+
+	CMD_PLANT_TREE                   =  33,
+
+	CMD_BUILD_RAIL_VEHICLE           =  34,
+	CMD_MOVE_RAIL_VEHICLE            =  35,
+
+	CMD_START_STOP_TRAIN             =  36,
+
+	CMD_SELL_RAIL_WAGON              =  38,
+
+	CMD_SEND_TRAIN_TO_DEPOT          =  39,
+	CMD_FORCE_TRAIN_PROCEED          =  40,
+	CMD_REVERSE_TRAIN_DIRECTION      =  41,
+
+	CMD_MODIFY_ORDER                 =  42,
+	CMD_SKIP_ORDER                   =  43,
+	CMD_DELETE_ORDER                 =  44,
+	CMD_INSERT_ORDER                 =  45,
+
+	CMD_CHANGE_SERVICE_INT           =  46,
+
+	CMD_BUILD_INDUSTRY               =  47,
+
+	CMD_BUILD_COMPANY_HQ             =  48,
+	CMD_SET_PLAYER_FACE              =  49,
+	CMD_SET_PLAYER_COLOR             =  50,
+
+	CMD_INCREASE_LOAN                =  51,
+	CMD_DECREASE_LOAN                =  52,
+
+	CMD_WANT_ENGINE_PREVIEW          =  53,
+
+	CMD_NAME_VEHICLE                 =  54,
+	CMD_RENAME_ENGINE                =  55,
+	CMD_CHANGE_COMPANY_NAME          =  56,
+	CMD_CHANGE_PRESIDENT_NAME        =  57,
+	CMD_RENAME_STATION               =  58,
+
+	CMD_SELL_AIRCRAFT                =  59,
+	CMD_START_STOP_AIRCRAFT          =  60,
+	CMD_BUILD_AIRCRAFT               =  61,
+	CMD_SEND_AIRCRAFT_TO_HANGAR      =  62,
+	CMD_REFIT_AIRCRAFT               =  64,
+
+	CMD_PLACE_SIGN                   =  65,
+	CMD_RENAME_SIGN                  =  66,
+
+	CMD_BUILD_ROAD_VEH               =  67,
+	CMD_START_STOP_ROADVEH           =  68,
+	CMD_SELL_ROAD_VEH                =  69,
+	CMD_SEND_ROADVEH_TO_DEPOT        =  70,
+	CMD_TURN_ROADVEH                 =  71,
+	CMD_REFIT_ROAD_VEH               =  72,
+
+	CMD_PAUSE                        =  73,
+
+	CMD_BUY_SHARE_IN_COMPANY         =  74,
+	CMD_SELL_SHARE_IN_COMPANY        =  75,
+	CMD_BUY_COMPANY                  =  76,
+
+	CMD_BUILD_TOWN                   =  77,
+
+	CMD_RENAME_TOWN                  =  80,
+	CMD_DO_TOWN_ACTION               =  81,
+
+	CMD_SET_ROAD_DRIVE_SIDE          =  82,
+
+	CMD_CHANGE_DIFFICULTY_LEVEL      =  85,
+
+	CMD_START_STOP_SHIP              =  86,
+	CMD_SELL_SHIP                    =  87,
+	CMD_BUILD_SHIP                   =  88,
+	CMD_SEND_SHIP_TO_DEPOT           =  89,
+	CMD_REFIT_SHIP                   =  91,
+
+	CMD_ORDER_REFIT                  =  98,
+	CMD_CLONE_ORDER                  =  99,
+	CMD_CLEAR_AREA                   = 100,
+
+	CMD_MONEY_CHEAT                  = 102,
+	CMD_BUILD_CANAL                  = 103,
+
+	CMD_PLAYER_CTRL                  = 104, // used in multiplayer to create a new player etc.
+	CMD_LEVEL_LAND                   = 105, // level land
+
+	CMD_REFIT_RAIL_VEHICLE           = 106,
+	CMD_RESTORE_ORDER_INDEX          = 107,
+	CMD_BUILD_LOCK                   = 108,
+
+	CMD_BUILD_SIGNAL_TRACK           = 110,
+	CMD_REMOVE_SIGNAL_TRACK          = 111,
+
+	CMD_GIVE_MONEY                   = 113,
+	CMD_CHANGE_PATCH_SETTING         = 114,
+
+	CMD_SET_AUTOREPLACE              = 115,
+
+	CMD_CLONE_VEHICLE                = 116,
+	CMD_MASS_START_STOP              = 117,
+	CMD_DEPOT_SELL_ALL_VEHICLES      = 118,
+	CMD_DEPOT_MASS_AUTOREPLACE       = 119,
+};
+
+enum {
+	DC_EXEC            = 0x01,
+	DC_AUTO            = 0x02, // don't allow building on structures
+	DC_QUERY_COST      = 0x04, // query cost only,  don't build.
+	DC_NO_WATER        = 0x08, // don't allow building on water
+	DC_NO_RAIL_OVERLAP = 0x10, // don't allow overlap of rails (used in buildrail)
+	DC_AI_BUILDING     = 0x20, // special building rules for AI
+	DC_NO_TOWN_RATING  = 0x40, // town rating does not disallow you from building
+	DC_FORCETEST       = 0x80, // force test too.
+
+	CMD_ERROR = ((int32)0x80000000),
+};
+
+#define CMD_MSG(x) ((x)<<16)
+
+enum {
+	CMD_AUTO                  = 0x0200,
+	CMD_NO_WATER              = 0x0400,
+	CMD_NETWORK_COMMAND       = 0x0800, // execute the command without sending it on the network
+	CMD_NO_TEST_IF_IN_NETWORK = 0x1000, // When enabled, the command will bypass the no-DC_EXEC round if in network
+	CMD_SHOW_NO_ERROR         = 0x2000,
+};
+
+/** Command flags for the command table
+ * @see _command_proc_table
+ */
+enum {
+	CMD_SERVER  = 0x1, /// the command can only be initiated by the server
+	CMD_OFFLINE = 0x2, /// the command cannot be executed in a multiplayer game; single-player only
+};
+
+typedef int32 CommandProc(TileIndex tile, uint32 flags, uint32 p1, uint32 p2);
+
+typedef struct Command {
+	CommandProc *proc;
+	byte flags;
+} Command;
+
+//#define return_cmd_error(errcode) do { _error_message=(errcode); return CMD_ERROR; } while(0)
+#define return_cmd_error(errcode) do { return CMD_ERROR | (errcode); } while (0)
+
+/**
+ * Check the return value of a DoCommand*() function
+ * @param res the resulting value from the command to be checked
+ * @return Return true if the command failed, false otherwise
+ */
+static inline bool CmdFailed(int32 res)
+{
+	// lower 16bits are the StringID of the possible error
+	return res <= (CMD_ERROR | INVALID_STRING_ID);
+}
+
+/* command.c */
+typedef void CommandCallback(bool success, TileIndex tile, uint32 p1, uint32 p2);
+int32 DoCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc);
+bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback, uint32 cmd);
+
+#ifdef ENABLE_NETWORK
+
+void NetworkSend_Command(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd, CommandCallback *callback);
+#endif /* ENABLE_NETWORK */
+
+extern const char* _cmd_text; // Text, which gets sent with a command
+
+bool IsValidCommand(uint cmd);
+byte GetCommandFlags(uint cmd);
+int32 GetAvailableMoneyForCommand(void);
+
+#endif /* COMMAND_H */

configure

@@ -1,134 +1,323 @@
 #!/bin/sh
 
-CONFIGURE_EXECUTABLE="$_"
-# On *nix systems those two are equal when ./configure is done
-if [ "$0" != "$CONFIGURE_EXECUTABLE" ]; then
-	# On some systems, when ./configure is triggered from 'make'
-	#  the $_ is filled with 'make'. So if that is true, skip 'make'
-	#  and use $0 (and hope that is correct ;))
-	if [ -n "`echo $CONFIGURE_EXECUTABLE | grep make`" ]; then
-		CONFIGURE_EXECUTABLE="$0"
-	else
-		CONFIGURE_EXECUTABLE="$CONFIGURE_EXECUTABLE $0"
+# This 'configure' script is a very easy wrapper around 'make updateconf'
+#  It allows cross-compilers to do their job much more easy.
+
+function showhelp() {
+	echo "Configure for OpenTTD"
+	echo ""
+	echo "Usage:"
+	echo " $0 --your_options"
+	echo ""
+	echo "Params:"
+	echo " --debug             Create debug-release                [no]"
+	echo " --profile           Create profile-release              [no]"
+	echo " --dedicated         Make a dedicated build              [no]"
+	echo " --revision          Set the revision of the compilation [detected]"
+	echo " --target-cc         Sets the target-compiler            [\$CC]"
+	echo " --target-cxx        Sets the C++ target-compiler        []"
+	echo " --host-cc           Sets the host-compiler              [\$CC]"
+	echo " --host-cxx          Sets the C++ host-compiler          []"
+	echo " --os                Sets the OS. Listens to:            [detected]"
+	echo "                        UNIX, OSX, FREEBSD, MORPHOS"
+	echo "                        BEOS, SUNOS, CYGWIN, MINGW, OS2"
+	echo " --windres           Sets the windres (Windows)          [windres]"
+	echo " --force-le          Force LE platform                   [no]"
+	echo " --force-be          Force BE platform                   [no]"
+	echo ""
+	echo "Params that can be used with --with or --without"
+	echo "   (e.g.: --without-static disables static (default))"
+	echo " static              Do you want a static build?         [no]"
+	echo " directmusic         Do you want direct-music?           [no]"
+	echo " zlib                Do you want zlib-support?           [yes]"
+	echo " sdl                 Do you want SDL-support?            [yes]"
+	echo " png                 Do you want PNG-support?            [yes]"
+	echo " iconv               Do you want iconv-support?          [no]"
+	echo " network             Do you want network-support?        [yes]"
+	echo " cocoa               Do you want cocoa-support? (MacOSX) [no]"
+	echo " freetype            Do you want freetype-support?       [yes]"
+	echo " fontconfig          Do you want fontconfig-support?     [yes]"
+	echo ""
+	echo "Params used to configure external libs:"
+	echo " --static-zlib-path  Set the path to your static zlib    []"
+	echo " --sdl-config        Where is your sdl-config            [sdl-config]"
+	echo " --libpng-config     Where is your libpng-config         [libpng-config]"
+	echo " --freetype-config   Where is your freetype-config       [freetype-config]"
+	echo " --fontconfig-config Where is your fontconfig-config     [pkg-config fontconfig]"
+	echo " --with-iconv        Set the path to your iconv headers  []"
+	echo " "
+}
+
+function handle() {
+	PARAM="$PARAM \"$1=`awk 'BEGIN { FS="="; $0="'"$2"'"; print $2;}'`\""
+}
+
+# The things you can use inside this case:
+#  handle NAME VALUE - Sets the value to give the 'make upgradeconf'
+#                         Value is in form: tag=REAL_VALUE
+#  ITEM="NAME"       - Will set the value as above, only with the next param
+#  SITEM="NAME"      - Will set the var $NAME to the next param
+for n in "$@"
+do
+	case "$n" in
+		--help | -h)
+			showhelp
+			exit 0
+			;;
+
+		--debug)
+			DEBUG_SET=1
+			ITEM="DEBUG"
+			;;
+		--debug=*)
+			handle "DEBUG" "$n"
+			;;
+		--profile)
+			PARAM="$PARAM PROFILE=1"
+			;;
+		--dedicated)
+			PARAM="$PARAM DEDICATED=1"
+			;;
+		--revision=*)
+			RELEASE=`awk 'BEGIN { FS="="; $0="'"$n"'"; print $2;}'`
+			;;
+		--revision)
+			SITEM="RELEASE"
+			;;
+		--target-cc=*)
+			handle "CC_TARGET" "$n"
+			;;
+		--target-cc)
+			ITEM="CC_TARGET"
+			;;
+		--target-cxx=*)
+			handle "CXX_TARGET" "$n"
+			;;
+		--target-cxx)
+			SITEM="CXX_TARGET"
+			;;
+		--host-cc=*)
+			handle "CC_HOST" "$n"
+			;;
+		--host-cc)
+			ITEM="CC_HOST"
+			;;
+		--host-cxx=*)
+			handle "CXX_HOST" "$n"
+			;;
+		--host-cxx)
+			ITEM="CXX_HOST"
+			;;
+		--host-cflags=*)
+			handle CFLAGS_HOST "$n"
+			;;
+		--host-cflags)
+			ITEM="CFLAGS_HOST"
+			;;
+		--os=*)
+			TARGET_OS=`awk 'BEGIN { FS="="; $0="'"$n"'"; print $2;}'`
+			;;
+		--os)
+			SITEM="TARGET_OS"
+			;;
+		--windres=*)
+			handle WINDRES "$n"
+			;;
+		--windres)
+			ITEM="WINDRES"
+			;;
+		--force-le)
+			PARAM="$PARAM ENDIAN_FORCE=LE"
+			;;
+		--force-be)
+			PARAM="$PARAM ENDIAN_FORCE=BE"
+			;;
+
+		--with-static)
+			PARAM="$PARAM STATIC=1"
+			;;
+		--without-static)
+			PARAM="$PARAM STATIC="
+			;;
+		--with-directmusic)
+			PARAM="$PARAM WITH_DIRECTMUSIC=1"
+			;;
+		--without-directmusic)
+			PARAM="$PARAM WITH_DIRECTMUSIC="
+			;;
+		--with-zlib)
+			PARAM="$PARAM WITH_ZLIB=1"
+			;;
+		--without-zlib)
+			PARAM="$PARAM WITH_ZLIB="
+			;;
+		--with-sdl)
+			PARAM="$PARAM WITH_SDL=1"
+			;;
+		--without-sdl)
+			PARAM="$PARAM WITH_SDL="
+			;;
+		--with-png)
+			PARAM="$PARAM WITH_PNG=1"
+			;;
+		--without-png)
+			PARAM="$PARAM WITH_PNG="
+			;;
+		--with-iconv)
+			PARAM="$PARAM WITH_ICONV=1"
+			;;
+		--with-iconv=*)
+			PARAM="$PARAM WITH_ICONV=1"
+			handle WITH_ICONV_PATH "$n"
+			;;
+		--without-iconv)
+			PARAM="$PARAM WITH_ICONV="
+			;;
+		--with-cocoa)
+			PARAM="$PARAM WITH_COCOA=1"
+			;;
+		--with-network)
+			PARAM="$PARAM WITH_NETWORK=1"
+			;;
+		--without-network)
+			PARAM="$PARAM WITH_NETWORK="
+			;;
+		--without-cocoa)
+			PARAM="$PARAM WITH_COCOA="
+			;;
+		--with-freetype)
+			PARAM="$PARAM WITH_FREETYPE=1"
+			;;
+		--without-freetype)
+			PARAM="$PARAM WITH_FREETYPE="
+			;;
+		--with-fontconfig)
+			PARAM="$PARAM WITH_FONTCONFIG=1"
+			;;
+		--without-fontconfig)
+			PARAM="$PARAM WITH_FONTCONFIG="
+			;;
+		--static-zlib-path=*)
+			handle STATIC_ZLIB_PATH "$n"
+			;;
+		--static-zlib-path)
+			ITEM="STATIC_ZLIB_PATH"
+			;;
+		--sdl-config=*)
+			handle SDL_CONFIG "$n"
+			;;
+		--sdl-config)
+			ITEM="SDL_CONFIG"
+			;;
+		--libpng-config=*)
+			handle LIBPNG_CONFIG "$n"
+			;;
+		--libpng-config)
+			ITEM="LIBPNG_CONFIG"
+			;;
+		--freetype-config=*)
+			handle FREETYPE_CONFIG "$n"
+			;;
+		--freetype-config)
+			ITEM="FREETYPE_CONFIG"
+			;;
+		--fontconfig-config=*)
+			handle FONTCONFIG_CONFIG "$n"
+			;;
+		--fontconfig-config)
+			ITEM="FONTCONFIG_CONFIG"
+			;;
+
+		--*=*)
+			echo -n "Unknown switch "
+			echo `awk 'BEGIN { FS="="; $0="'"$n"'"; print $1;}'`
+			exit 1
+			;;
+		-*)
+			echo "Unknown switch $n"
+			exit 1
+			;;
+
+		*)
+			if ! test -z "$ITEM"
+			then
+				PARAM="$PARAM $ITEM=\"$n\""
+				ITEM="";
+			elif ! test -z "$SITEM"
+			then
+				export $SITEM="$n"
+				SITEM=""
+			else
+				echo "Unknown switch $n"
+				exit 1
+			fi
+			;;
+	esac
+done
+
+if ! test -z "$TARGET_OS"
+then
+	TARGET_OS=`echo $TARGET_OS | tr '[:lower:]' '[:upper:]'`
+	case "$TARGET_OS" in
+		WIN32)
+			PARAM="$PARAM WIN32=1"
+			;;
+		UNIX)
+			PARAM="$PARAM UNIX=1"
+			;;
+		OSX)
+			PARAM="$PARAM OSX=1 UNIX=1"
+			;;
+		FREEBSD)
+			PARAM="$PARAM FREEBSD=1"
+			;;
+		MORPHOS)
+			PARAM="$PARAM MORPHOS=1 UNIX=1"
+			;;
+		BEOS)
+			PARAM="$PARAM BEOS=1 UNIX=1"
+			;;
+		OS2)
+			PARAM="$PARAM OS2=1 UNIX=1"
+			;;
+		SUNOS)
+			PARAM="$PARAM SUNOS=1 UNIX=1"
+			;;
+		CYGWIN)
+			PARAM="$PARAM CYGWIN=1 WIN32=1"
+			;;
+		MINGW)
+			PARAM="$PARAM MINGW=1 WIN32=1"
+			;;
+		*)
+			echo "Unknown OS: $TARGET_OS"
+			exit 1
+			;;
+	esac
+	PARAM="$PARAM BYPASS_OS_DETECT=1"
+fi
+
+if ! test -z "$DEBUG_SET"
+then
+	if test -z "`echo $PARAM | grep "DEBUG="`"
+	then
+		# Someone did --debug, without assigning a value, assume 1
+		PARAM="$PARAM DEBUG=1"
 	fi
 fi
-# Find out where configure is (in what dir)
-ROOT_DIR="`dirname $0`"
-ROOT_DIR="`cd $ROOT_DIR && pwd`"
 
-PWD="`pwd`"
-PREFIX="$PWD/bin"
+# First remove the Makefile.config, else you can have double entries
+rm -f Makefile.config
 
-. $ROOT_DIR/config.lib
+echo "make upgradeconf $PARAM" > Makefile.run
+. Makefile.run
+rm -f Makefile.run
 
-# Set default dirs
-OBJS_DIR="$PWD/objs"
-BASE_SRC_OBJS_DIR="$OBJS_DIR"
-LANG_OBJS_DIR="$OBJS_DIR/lang"
-BIN_DIR="$PREFIX"
-SRC_DIR="$ROOT_DIR/src"
-LANG_DIR="$SRC_DIR/lang"
-MEDIA_DIR="$ROOT_DIR/media"
-SOURCE_LIST="$ROOT_DIR/source.list"
+# Makefile.config currently doesn't support custom RELEASE (revision), so, we add the line
+# yourself!
 
-if [ "$1" = "--reconfig" ] || [ "$1" = "--reconfigure" ]; then
-	if [ ! -f "config.cache" ]; then
-		echo "can't reconfigure, because never configured before"
-		exit 1
-	fi
-	# Make sure we don't lock config.cache
-	cat config.cache | sed 's/\\ /\\\\ /g' > cache.tmp
-	sh cache.tmp
-	rm -f cache.tmp
-	exit $?
+if ! test -z "$RELEASE"
+then
+	echo "RELEASE=$RELEASE" >> Makefile.config
 fi
 
-set_default
-detect_params "$@"
-check_params
-save_params
-make_cflags_and_ldflags
-
-EXE=""
-if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "OS2" ] || [ "$os" = "WINCE" ]; then
-	EXE=".exe"
-fi
-
-TTD="openttd$EXE"
-STRGEN="strgen$EXE"
-ENDIAN_CHECK="endian_check$EXE"
-
-if [ -z "$sort" ]; then
-	PIPE_SORT="sed s/a/a/"
-else
-	PIPE_SORT="$sort"
-fi
-
-if [ ! -f "$LANG_DIR/english.txt" ]; then
-	echo "Languages not found in $LANG_DIR. Can't continue without it."
-	echo "Please make sure the dir exists and contains at least english.txt"
-fi
-
-# Read the source.list and process it
-SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | $awk '
-	{  }
-	/^(	*)#end/  { if (deep == skip) { skip -= 1; } deep -= 1; next; }
-	/^(	*)#else/ { if (deep == skip) { skip -= 1; } else if (deep - 1 == skip) { skip += 1; } next; }
-	/^(	*)#if/   {
-		gsub("	", "", $0);
-		gsub("^#if ", "", $0);
-
-		if (deep != skip) { deep += 1; next; }
-
-		deep += 1;
-
-		if ($0 == "SDL"         && "'$sdl_config'" == "")          { next; }
-		if ($0 == "PNG"         && "'$png_config'" == "")          { next; }
-		if ($0 == "OSX"         && "'$os'" != "OSX")               { next; }
-		if ($0 == "OS2"         && "'$os'" != "OS2")               { next; }
-		if ($0 == "PSP"         && "'$os'" != "PSP")               { next; }
-		if ($0 == "DEDICATED"   && "'$enable_dedicated'" != "1")   { next; }
-		if ($0 == "COCOA"       && "'$with_cocoa'" == "0")         { next; }
-		if ($0 == "BEOS"        && "'$os'" != "BEOS")              { next; }
-		if ($0 == "WIN32"       && "'$os'" != "MINGW" &&
-		                "'$os'" != "CYGWIN" && "'$os'" != "MSVC" ) { next; }
-		if ($0 == "WINCE"       && "'$os'" != "WINCE")             { next; }
-		if ($0 == "MSVC"        && "'$os'" != "MSVC")              { next; }
-		if ($0 == "DIRECTMUSIC" && "'$with_direct_music'" == "0")  { next; }
-		if ($0 == "LIBTIMIDITY" && "'$libtimidity'" == "" )        { next; }
-		if ($0 == "NO_THREADS"  && "'$with_threads'" == "0")       { next; }
-
-		skip += 1;
-
-		next;
-	}
-	/^(	*)#/ { next }
-	/^$/ { next }
-	/\.h$/ { next }
-	/\.hpp$/ { next }
-	{
-		if (deep == skip) {
-			gsub("	", "", $0);
-			print $0;
-		}
-	}
-' | $PIPE_SORT`"
-
-OBJS_C="`  echo \"$SRCS\" | $awk ' { ORS = " " } /\.c$/   { gsub(".c$",   ".o", $0); print $0; }'`"
-OBJS_CPP="`echo \"$SRCS\" | $awk ' { ORS = " " } /\.cpp$/ { gsub(".cpp$", ".o", $0); print $0; }'`"
-OBJS_MM="` echo \"$SRCS\" | $awk ' { ORS = " " } /\.mm$/  { gsub(".mm$",  ".o", $0); print $0; }'`"
-OBJS_RC="` echo \"$SRCS\" | $awk ' { ORS = " " } /\.rc$/  { gsub(".rc$",  ".o", $0); print $0; }'`"
-SRCS="`    echo \"$SRCS\" | $awk ' { ORS = " " } { print $0; }'`"
-
-# In makefiles, we always use -u for sort
-if [ -z "$sort" ]; then
-	sort="sed s/a/a/"
-else
-	sort="$sort -u"
-fi
-
-CONFIGURE_FILES="$ROOT_DIR/configure $ROOT_DIR/config.lib $ROOT_DIR/Makefile.in $ROOT_DIR/Makefile.lang.in $ROOT_DIR/Makefile.src.in"
-
-generate_main
-generate_lang
-generate_src

console.c

@@ -1,25 +1,21 @@
 /* $Id$ */
 
-/** @file console.cpp */
-
 #include "stdafx.h"
 #include "openttd.h"
+#include "table/strings.h"
+#include "functions.h"
+#include "window.h"
 #include "gui.h"
-#include "textbuf_gui.h"
-#include "window_gui.h"
+#include "gfx.h"
+#include "player.h"
 #include "variables.h"
+#include "string.h"
 #include <stdarg.h>
 #include <string.h>
 #include "console.h"
-#include "network/network.h"
-#include "network/network_data.h"
-#include "network/network_server.h"
-#include "core/alloc_func.hpp"
-#include "window_func.h"
-#include "string_func.h"
-#include "gfx_func.h"
-
-#include "table/strings.h"
+#include "network.h"
+#include "network_data.h"
+#include "network_server.h"
 
 #define ICON_BUFFER 79
 #define ICON_HISTORY_SIZE 20
@@ -29,38 +25,25 @@
 #define ICON_MAX_ALIAS_LINES 40
 #define ICON_TOKEN_COUNT 20
 
-/* console parser */
-IConsoleCmd   *_iconsole_cmds;    ///< list of registred commands
-IConsoleVar   *_iconsole_vars;    ///< list of registred vars
-IConsoleAlias *_iconsole_aliases; ///< list of registred aliases
-
-/* console colors/modes */
-byte _icolour_def;
-byte _icolour_err;
-byte _icolour_warn;
-byte _icolour_dbg;
-byte _icolour_cmd;
-IConsoleModes _iconsole_mode;
-
-/* ** main console ** */
+// ** main console ** //
 static char *_iconsole_buffer[ICON_BUFFER + 1];
 static uint16 _iconsole_cbuffer[ICON_BUFFER + 1];
 static Textbuf _iconsole_cmdline;
 
-/* ** stdlib ** */
+// ** stdlib ** //
 byte _stdlib_developer = 1;
 bool _stdlib_con_developer = false;
 FILE *_iconsole_output_file;
 
-/* ** main console cmd buffer ** */
+// ** main console cmd buffer
 static char *_iconsole_history[ICON_HISTORY_SIZE];
 static byte _iconsole_historypos;
 
-/* *************** *
- *  end of header  *
- * *************** */
+/* *************** */
+/*  end of header  */
+/* *************** */
 
-static void IConsoleClearCommand()
+static void IConsoleClearCommand(void)
 {
 	memset(_iconsole_cmdline.buf, 0, ICON_CMDLN_SIZE);
 	_iconsole_cmdline.length = 0;
@@ -70,13 +53,13 @@ static void IConsoleClearCommand()
 	SetWindowDirty(FindWindowById(WC_CONSOLE, 0));
 }
 
-static inline void IConsoleResetHistoryPos() {_iconsole_historypos = ICON_HISTORY_SIZE - 1;}
+static inline void IConsoleResetHistoryPos(void) {_iconsole_historypos = ICON_HISTORY_SIZE - 1;}
 
 
 static void IConsoleHistoryAdd(const char *cmd);
 static void IConsoleHistoryNavigate(int direction);
 
-/* ** console window ** */
+// ** console window ** //
 static void IConsoleWndProc(Window *w, WindowEvent *e)
 {
 	static byte iconsole_scroll = ICON_BUFFER;
@@ -102,7 +85,7 @@ static void IConsoleWndProc(Window *w, WindowEvent *e)
 			DoDrawString(_iconsole_cmdline.buf, 10 + delta, w->height - ICON_LINE_HEIGHT, _icolour_cmd);
 
 			if (_iconsole_cmdline.caret)
-				DoDrawString("_", 10 + delta + _iconsole_cmdline.caretxoffs, w->height - ICON_LINE_HEIGHT, TC_WHITE);
+				DoDrawString("_", 10 + delta + _iconsole_cmdline.caretxoffs, w->height - ICON_LINE_HEIGHT, 12);
 			break;
 		}
 		case WE_MOUSELOOP:
@@ -214,14 +197,14 @@ static const Widget _iconsole_window_widgets[] = {
 };
 
 static const WindowDesc _iconsole_window_desc = {
-	0, 0, 2, 2, 2, 2,
-	WC_CONSOLE, WC_NONE,
+	0, 0, 2, 2,
+	WC_CONSOLE, 0,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
 	_iconsole_window_widgets,
 	IConsoleWndProc,
 };
 
-void IConsoleInit()
+void IConsoleInit(void)
 {
 	extern const char _openttd_revision[];
 	_iconsole_output_file = NULL;
@@ -229,7 +212,7 @@ void IConsoleInit()
 	_icolour_err  =  3;
 	_icolour_warn = 13;
 	_icolour_dbg  =  5;
-	_icolour_cmd  = TC_GOLD;
+	_icolour_cmd  =  2;
 	_iconsole_historypos = ICON_HISTORY_SIZE - 1;
 	_iconsole_mode = ICONSOLE_CLOSED;
 
@@ -240,7 +223,7 @@ void IConsoleInit()
 	memset(_iconsole_history, 0, sizeof(_iconsole_history));
 	memset(_iconsole_buffer, 0, sizeof(_iconsole_buffer));
 	memset(_iconsole_cbuffer, 0, sizeof(_iconsole_cbuffer));
-	_iconsole_cmdline.buf = CallocT<char>(ICON_CMDLN_SIZE); // create buffer and zero it
+	_iconsole_cmdline.buf = calloc(ICON_CMDLN_SIZE, sizeof(*_iconsole_cmdline.buf)); // create buffer and zero it
 	_iconsole_cmdline.maxlength = ICON_CMDLN_SIZE;
 
 	IConsolePrintF(13, "OpenTTD Game Console Revision 7 - %s", _openttd_revision);
@@ -252,7 +235,7 @@ void IConsoleInit()
 	IConsoleHistoryAdd("");
 }
 
-void IConsoleClearBuffer()
+void IConsoleClearBuffer(void)
 {
 	uint i;
 	for (i = 0; i <= ICON_BUFFER; i++) {
@@ -261,7 +244,7 @@ void IConsoleClearBuffer()
 	}
 }
 
-static void IConsoleClear()
+static void IConsoleClear(void)
 {
 	free(_iconsole_cmdline.buf);
 	IConsoleClearBuffer();
@@ -270,13 +253,13 @@ static void IConsoleClear()
 static void IConsoleWriteToLogFile(const char *string)
 {
 	if (_iconsole_output_file != NULL) {
-		/* if there is an console output file ... also print it there */
+		// if there is an console output file ... also print it there
 		fwrite(string, strlen(string), 1, _iconsole_output_file);
 		fwrite("\n", 1, 1, _iconsole_output_file);
 	}
 }
 
-bool CloseConsoleLogIfActive()
+bool CloseConsoleLogIfActive(void)
 {
 	if (_iconsole_output_file != NULL) {
 		IConsolePrintF(_icolour_def, "file output complete");
@@ -288,7 +271,7 @@ bool CloseConsoleLogIfActive()
 	return false;
 }
 
-void IConsoleFree()
+void IConsoleFree(void)
 {
 	IConsoleClear();
 	CloseConsoleLogIfActive();
@@ -311,7 +294,7 @@ void IConsoleResize(Window *w)
 	MarkWholeScreenDirty();
 }
 
-void IConsoleSwitch()
+void IConsoleSwitch(void)
 {
 	switch (_iconsole_mode) {
 		case ICONSOLE_CLOSED: {
@@ -319,20 +302,20 @@ void IConsoleSwitch()
 			w->height = _screen.height / 3;
 			w->width = _screen.width;
 			_iconsole_mode = ICONSOLE_OPENED;
-			SetBit(_no_scroll, SCROLL_CON); // override cursor arrows; the gamefield will not scroll
+			SETBIT(_no_scroll, SCROLL_CON); // override cursor arrows; the gamefield will not scroll
 		} break;
 		case ICONSOLE_OPENED: case ICONSOLE_FULL:
 			DeleteWindowById(WC_CONSOLE, 0);
 			_iconsole_mode = ICONSOLE_CLOSED;
-			ClrBit(_no_scroll, SCROLL_CON);
+			CLRBIT(_no_scroll, SCROLL_CON);
 			break;
 	}
 
 	MarkWholeScreenDirty();
 }
 
-void IConsoleClose() {if (_iconsole_mode == ICONSOLE_OPENED) IConsoleSwitch();}
-void IConsoleOpen()  {if (_iconsole_mode == ICONSOLE_CLOSED) IConsoleSwitch();}
+void IConsoleClose(void) {if (_iconsole_mode == ICONSOLE_OPENED) IConsoleSwitch();}
+void IConsoleOpen(void)  {if (_iconsole_mode == ICONSOLE_CLOSED) IConsoleSwitch();}
 
 /**
  * Add the entered line into the history so you can look it back
@@ -356,7 +339,7 @@ static void IConsoleHistoryNavigate(int direction)
 {
 	int i = _iconsole_historypos + direction;
 
-	/* watch out for overflows, just wrap around */
+	// watch out for overflows, just wrap around
 	if (i < 0) i = ICON_HISTORY_SIZE - 1;
 	if (i >= ICON_HISTORY_SIZE) i = 0;
 
@@ -369,8 +352,8 @@ static void IConsoleHistoryNavigate(int direction)
 
 	_iconsole_historypos = i;
 	IConsoleClearCommand();
-	/* copy history to 'command prompt / bash' */
-	assert(_iconsole_history[i] != NULL && IsInsideMM(i, 0, ICON_HISTORY_SIZE));
+	// copy history to 'command prompt / bash'
+	assert(_iconsole_history[i] != NULL && IS_INT_INSIDE(i, 0, ICON_HISTORY_SIZE));
 	ttd_strlcpy(_iconsole_cmdline.buf, _iconsole_history[i], _iconsole_cmdline.maxlength);
 	UpdateTextBufferSize(&_iconsole_cmdline);
 }
@@ -402,8 +385,7 @@ void IConsolePrint(uint16 color_code, const char *string)
 	str_validate(str);
 
 	if (_network_dedicated) {
-		fprintf(stdout, "%s\n", str);
-		fflush(stdout);
+		printf("%s\n", str);
 		IConsoleWriteToLogFile(str);
 		free(str); // free duplicated string since it's not used anymore
 		return;
@@ -426,7 +408,7 @@ void IConsolePrint(uint16 color_code, const char *string)
 /**
  * Handle the printing of text entered into the console or redirected there
  * by any other means. Uses printf() style format, for more information look
- * at IConsolePrint()
+ * at @IConsolePrint()
  */
 void CDECL IConsolePrintF(uint16 color_code, const char *s, ...)
 {
@@ -443,15 +425,13 @@ void CDECL IConsolePrintF(uint16 color_code, const char *s, ...)
 /**
  * It is possible to print debugging information to the console,
  * which is achieved by using this function. Can only be used by
- * debug() in debug.cpp. You need at least a level 2 (developer) for debugging
+ * @debug() in debug.c. You need at least a level 2 (developer) for debugging
  * messages to show up
- * @param dbg debugging category
- * @param string debugging message
  */
-void IConsoleDebug(const char *dbg, const char *string)
+void IConsoleDebug(const char *string)
 {
 	if (_stdlib_developer > 1)
-		IConsolePrintF(_icolour_dbg, "dbg: [%s] %s", dbg, string);
+		IConsolePrintF(_icolour_dbg, "dbg: %s", string);
 }
 
 /**
@@ -477,7 +457,7 @@ void IConsoleError(const char *string)
 /**
  * Change a string into its number representation. Supports
  * decimal and hexadecimal numbers as well as 'on'/'off' 'true'/'false'
- * @param *value the variable a successful conversion will be put in
+ * @param *value the variable a successfull conversion will be put in
  * @param *arg the string to be converted
  * @return Return true on success or false on failure
  */
@@ -498,13 +478,12 @@ bool GetArgumentInteger(uint32 *value, const char *arg)
 	return arg != endptr;
 }
 
-/*  * *************************
-    * hooking code            *
-    * *************************/
-
+// * ************************* * //
+// * hooking code              * //
+// * ************************* * //
 /**
  * General internal hooking code that is the same for both commands and variables
- * @param hooks IConsoleHooks structure that will be set according to
+ * @param hooks @IConsoleHooks structure that will be set according to
  * @param type type access trigger
  * @param proc function called when the hook criteria is met
  */
@@ -529,9 +508,9 @@ static void IConsoleHookAdd(IConsoleHooks *hooks, IConsoleHookTypes type, IConso
 /**
  * Handle any special hook triggers. If the hook type is met check if
  * there is a function associated with that and if so, execute it
- * @param hooks IConsoleHooks structure that will be checked
+ * @param hooks @IConsoleHooks structure that will be checked
  * @param type type of hook, trigger that needs to be activated
- * @return true on a successful execution of the hook command or if there
+ * @return true on a successfull execution of the hook command or if there
  * is no hook/trigger present at all. False otherwise
  */
 static bool IConsoleHookHandle(const IConsoleHooks *hooks, IConsoleHookTypes type)
@@ -631,7 +610,7 @@ void IConsoleVarHookAdd(const char *name, IConsoleHookTypes type, IConsoleHook *
 void IConsoleCmdRegister(const char *name, IConsoleCmdProc *proc)
 {
 	char *new_cmd = strdup(name);
-	IConsoleCmd *item_new = MallocT<IConsoleCmd>(1);
+	IConsoleCmd *item_new = malloc(sizeof(IConsoleCmd));
 
 	item_new->next = NULL;
 	item_new->proc = proc;
@@ -668,7 +647,7 @@ void IConsoleAliasRegister(const char *name, const char *cmd)
 {
 	char *new_alias = strdup(name);
 	char *cmd_aliased = strdup(cmd);
-	IConsoleAlias *item_new = MallocT<IConsoleAlias>(1);
+	IConsoleAlias *item_new = malloc(sizeof(IConsoleAlias));
 
 	item_new->next = NULL;
 	item_new->cmdline = cmd_aliased;
@@ -697,7 +676,7 @@ IConsoleAlias *IConsoleAliasGet(const char *name)
 static inline int IConsoleCopyInParams(char *dst, const char *src, uint bufpos)
 {
 	int len = min(ICON_MAX_STREAMSIZE - bufpos, (uint)strlen(src));
-	strecpy(dst, src, dst + len - 1);
+	strncpy(dst, src, len);
 
 	return len;
 }
@@ -727,18 +706,18 @@ static void IConsoleAliasExec(const IConsoleAlias *alias, byte tokencount, char
 		if (a_index >= lengthof(aliases) || astream_i >= lengthof(aliasstream)) break;
 
 		switch (*cmdptr) {
-		case '\'': // ' will double for ""
+		case '\'': /* ' will double for "" */
 			aliasstream[astream_i++] = '"';
 			break;
-		case ';': // Cmd seperator, start new command
+		case ';': /* Cmd seperator, start new command */
 			aliasstream[astream_i] = '\0';
 			aliases[++a_index] = &aliasstream[++astream_i];
 			cmdptr++;
 			break;
-		case '%': // Some or all parameters
+		case '%': /* Some or all parameters */
 			cmdptr++;
 			switch (*cmdptr) {
-			case '+': { // All parameters seperated: "[param 1]" "[param 2]"
+			case '+': { /* All parameters seperated: "[param 1]" "[param 2]" */
 				for (i = 0; i != tokencount; i++) {
 					aliasstream[astream_i++] = '"';
 					astream_i += IConsoleCopyInParams(&aliasstream[astream_i], tokens[i], astream_i);
@@ -746,7 +725,7 @@ static void IConsoleAliasExec(const IConsoleAlias *alias, byte tokencount, char
 					aliasstream[astream_i++] = ' ';
 				}
 			} break;
-			case '!': { // Merge the parameters to one: "[param 1] [param 2] [param 3...]"
+			case '!': { /* Merge the parameters to one: "[param 1] [param 2] [param 3...]" */
 				aliasstream[astream_i++] = '"';
 				for (i = 0; i != tokencount; i++) {
 					astream_i += IConsoleCopyInParams(&aliasstream[astream_i], tokens[i], astream_i);
@@ -755,7 +734,7 @@ static void IConsoleAliasExec(const IConsoleAlias *alias, byte tokencount, char
 				aliasstream[astream_i++] = '"';
 
 			} break;
-				default: { // One specific parameter: %A = [param 1] %B = [param 2] ...
+				default: { /* One specific parameter: %A = [param 1] %B = [param 2] ... */
 				int param = *cmdptr - 'A';
 
 				if (param < 0 || param >= tokencount) {
@@ -782,11 +761,8 @@ static void IConsoleAliasExec(const IConsoleAlias *alias, byte tokencount, char
 /**
  * Special function for adding string-type variables. They in addition
  * also need a 'size' value saying how long their string buffer is.
- * @param name name of the variable that will be used
- * @param addr memory location the variable will point to
  * @param size the length of the string buffer
- * @param help the help string shown for the variable
- * For more information see IConsoleVarRegister()
+ * For more information see @IConsoleVarRegister()
  */
 void IConsoleVarStringRegister(const char *name, void *addr, uint32 size, const char *help)
 {
@@ -806,7 +782,7 @@ void IConsoleVarStringRegister(const char *name, void *addr, uint32 size, const
 void IConsoleVarRegister(const char *name, void *addr, IConsoleVarTypes type, const char *help)
 {
 	char *new_cmd = strdup(name);
-	IConsoleVar *item_new = MallocT<IConsoleVar>(1);
+	IConsoleVar *item_new = malloc(sizeof(IConsoleVar));
 
 	item_new->help = (help != NULL) ? strdup(help) : NULL;
 
@@ -883,7 +859,7 @@ static void IConsoleVarSetStringvalue(const IConsoleVar *var, const char *value)
 	if (var->type != ICONSOLE_VAR_STRING || var->addr == NULL) return;
 
 	IConsoleHookHandle(&var->hook, ICONSOLE_HOOK_PRE_ACTION);
-	ttd_strlcpy((char*)var->addr, value, var->size);
+	ttd_strlcpy(var->addr, value, var->size);
 	IConsoleHookHandle(&var->hook, ICONSOLE_HOOK_POST_ACTION);
 	IConsoleVarPrintSetValue(var); // print out the new value, giving feedback
 	return;
@@ -1107,16 +1083,16 @@ void IConsoleCmdExec(const char *cmdstr)
 
 			tstream_i++;
 			break;
-		case '"': // Tokens enclosed in "" are one token
+		case '"': /* Tokens enclosed in "" are one token */
 			longtoken = !longtoken;
 			break;
-		case '\\': // Escape character for ""
+		case '\\': /* Escape character for "" */
 			if (cmdptr[1] == '"' && tstream_i + 1 < lengthof(tokenstream)) {
 				tokenstream[tstream_i++] = *++cmdptr;
 				break;
 			}
 			/* fallthrough */
-		default: // Normal character
+		default: /* Normal character */
 			tokenstream[tstream_i++] = *cmdptr;
 
 			if (!foundtoken) {

console.h

@@ -1,18 +1,14 @@
 /* $Id$ */
 
-/** @file console.h */
-
 #ifndef CONSOLE_H
 #define CONSOLE_H
 
-#include "window_type.h"
-
-/* maximum length of a typed in command */
+// maximum length of a typed in command
 #define ICON_CMDLN_SIZE 255
-/* maximum length of a totally expanded command */
+// maximum length of a totally expanded command
 #define ICON_MAX_STREAMSIZE 1024
 
-enum IConsoleVarTypes {
+typedef enum IConsoleVarTypes {
 	ICONSOLE_VAR_BOOLEAN,
 	ICONSOLE_VAR_BYTE,
 	ICONSOLE_VAR_UINT16,
@@ -20,31 +16,31 @@ enum IConsoleVarTypes {
 	ICONSOLE_VAR_INT16,
 	ICONSOLE_VAR_INT32,
 	ICONSOLE_VAR_STRING
-};
+} IConsoleVarTypes;
 
-enum IConsoleModes {
+typedef enum IConsoleModes {
 	ICONSOLE_FULL,
 	ICONSOLE_OPENED,
 	ICONSOLE_CLOSED
-};
+} IConsoleModes;
 
-enum IConsoleHookTypes {
+typedef enum IConsoleHookTypes {
 	ICONSOLE_HOOK_ACCESS,
 	ICONSOLE_HOOK_PRE_ACTION,
 	ICONSOLE_HOOK_POST_ACTION
-};
+} IConsoleHookTypes;
 
 /** --Hooks--
  * Hooks are certain triggers get get accessed/executed on either
  * access, before execution/change or after execution/change. This allows
  * for general flow of permissions or special action needed in some cases
  */
-typedef bool IConsoleHook();
-struct IConsoleHooks{
-	IConsoleHook *access; ///< trigger when accessing the variable/command
-	IConsoleHook *pre;    ///< trigger before the variable/command is changed/executed
-	IConsoleHook *post;   ///< trigger after the variable/command is changed/executed
-};
+typedef bool IConsoleHook(void);
+typedef struct IConsoleHooks{
+	IConsoleHook *access; // trigger when accessing the variable/command
+	IConsoleHook *pre;    // trigger before the variable/command is changed/executed
+	IConsoleHook *post;   // trigger after the variable/command is changed/executed
+} IConsoleHooks;
 
 /** --Commands--
  * Commands are commands, or functions. They get executed once and any
@@ -55,13 +51,14 @@ struct IConsoleHooks{
  */
 typedef bool (IConsoleCmdProc)(byte argc, char *argv[]);
 
-struct IConsoleCmd {
-	char *name;               ///< name of command
-	IConsoleCmd *next;        ///< next command in list
+struct IConsoleCmd;
+typedef struct IConsoleCmd {
+	char *name;               // name of command
+	struct IConsoleCmd *next; // next command in list
 
-	IConsoleCmdProc *proc;    ///< process executed when command is typed
-	IConsoleHooks hook;       ///< any special trigger action that needs executing
-};
+	IConsoleCmdProc *proc;    // process executed when command is typed
+	IConsoleHooks hook;       // any special trigger action that needs executing
+} IConsoleCmd;
 
 /** --Variables--
  * Variables are pointers to real ingame variables which allow for
@@ -72,17 +69,18 @@ struct IConsoleCmd {
  * - '++' to increase value by one
  * - '--' to decrease value by one
  */
-struct IConsoleVar {
-	char *name;               ///< name of the variable
-	IConsoleVar *next;        ///< next variable in list
+struct IConsoleVar;
+typedef struct IConsoleVar {
+	char *name;               // name of the variable
+	struct IConsoleVar *next; // next variable in list
 
-	void *addr;               ///< the address where the variable is pointing at
-	uint32 size;              ///< size of the variable, used for strings
-	char *help;               ///< the optional help string shown when requesting information
-	IConsoleVarTypes type;    ///< type of variable (for correct assignment/output)
-	IConsoleCmdProc *proc;    ///< some variables need really special handling, use a callback function for that
-	IConsoleHooks hook;       ///< any special trigger action that needs executing
-};
+	void *addr;               // the address where the variable is pointing at
+	uint32 size;              // size of the variable, used for strings
+	char *help;               // the optional help string shown when requesting information
+	IConsoleVarTypes type;    // type of variable (for correct assignment/output)
+	IConsoleCmdProc *proc;    // some variables need really special handling, use a callback function for that
+	IConsoleHooks hook;       // any special trigger action that needs executing
+} IConsoleVar;
 
 /** --Aliases--
  * Aliases are like shortcuts for complex functions, variable assignments,
@@ -95,39 +93,40 @@ struct IConsoleVar {
  * - "%!" also lists all parameters but presenting them to the aliased command as one argument
  * - ";" allows for combining commands (see example 'ng')
  */
-struct IConsoleAlias {
-	char *name;                 ///< name of the alias
-	IConsoleAlias *next;        ///< next alias in list
+struct IConsoleAlias;
+typedef struct IConsoleAlias {
+	char *name;                 // name of the alias
+	struct IConsoleAlias *next; // next alias in list
 
-	char *cmdline;              ///< command(s) that is/are being aliased
-};
+	char *cmdline;              // command(s) that is/are being aliased
+} IConsoleAlias;
 
 /* console parser */
-extern IConsoleCmd   *_iconsole_cmds;    ///< list of registred commands
-extern IConsoleVar   *_iconsole_vars;    ///< list of registred vars
-extern IConsoleAlias *_iconsole_aliases; ///< list of registred aliases
+VARDEF IConsoleCmd   *_iconsole_cmds;    // list of registred commands
+VARDEF IConsoleVar   *_iconsole_vars;    // list of registred vars
+VARDEF IConsoleAlias *_iconsole_aliases; // list of registred aliases
 
 /* console colors/modes */
-extern byte _icolour_def;
-extern byte _icolour_err;
-extern byte _icolour_warn;
-extern byte _icolour_dbg;
-extern byte _icolour_cmd;
-extern IConsoleModes _iconsole_mode;
+VARDEF byte _icolour_def;
+VARDEF byte _icolour_err;
+VARDEF byte _icolour_warn;
+VARDEF byte _icolour_dbg;
+VARDEF byte _icolour_cmd;
+VARDEF IConsoleModes _iconsole_mode;
 
 /* console functions */
-void IConsoleInit();
-void IConsoleFree();
-void IConsoleClearBuffer();
+void IConsoleInit(void);
+void IConsoleFree(void);
+void IConsoleClearBuffer(void);
 void IConsoleResize(Window *w);
-void IConsoleSwitch();
-void IConsoleClose();
-void IConsoleOpen();
+void IConsoleSwitch(void);
+void IConsoleClose(void);
+void IConsoleOpen(void);
 
 /* console output */
 void IConsolePrint(uint16 color_code, const char *string);
 void CDECL IConsolePrintF(uint16 color_code, const char *s, ...);
-void IConsoleDebug(const char *dbg, const char *string);
+void IConsoleDebug(const char *string);
 void IConsoleWarning(const char *string);
 void IConsoleError(const char *string);
 
@@ -149,7 +148,7 @@ void IConsoleCmdExec(const char *cmdstr);
 void IConsoleVarExec(const IConsoleVar *var, byte tokencount, char *token[]);
 
 /* console std lib (register ingame commands/aliases/variables) */
-void IConsoleStdLibRegister();
+void IConsoleStdLibRegister(void);
 
 /* Hooking code */
 void IConsoleCmdHookAdd(const char *name, IConsoleHookTypes type, IConsoleHook *proc);

console_cmds.c

@@ -1,42 +1,28 @@
 /* $Id$ */
 
-/** @file console_cmds.cpp */
-
 #include "stdafx.h"
 #include "openttd.h"
 #include "console.h"
 #include "debug.h"
 #include "engine.h"
-#include "landscape.h"
+#include "functions.h"
 #include "saveload.h"
+#include "string.h"
 #include "variables.h"
-#include "network/network_data.h"
-#include "network/network_client.h"
-#include "network/network_server.h"
-#include "network/network_udp.h"
-#include "command_func.h"
-#include "settings_func.h"
+#include "network_data.h"
+#include "network_client.h"
+#include "network_server.h"
+#include "network_udp.h"
+#include "command.h"
+#include "settings.h"
 #include "fios.h"
-#include "fileio.h"
+#include "vehicle.h"
 #include "station.h"
+#include "strings.h"
 #include "screenshot.h"
 #include "genworld.h"
-#include "network/network.h"
-#include "strings_func.h"
-#include "viewport_func.h"
-#include "window_func.h"
-#include "functions.h"
-#include "map_func.h"
-#include "date_func.h"
-#include "vehicle_func.h"
-#include "string_func.h"
-#include "player_func.h"
-#include "player_base.h"
-#include "settings_type.h"
-
-#ifdef ENABLE_NETWORK
-	#include "table/strings.h"
-#endif /* ENABLE_NETWORK */
+#include "date.h"
+#include "network.h"
 
 // ** scriptfile handling ** //
 static FILE *_script_file;
@@ -44,7 +30,7 @@ static bool _script_running;
 
 // ** console command / variable defines ** //
 #define DEF_CONSOLE_CMD(function) static bool function(byte argc, char *argv[])
-#define DEF_CONSOLE_HOOK(function) static bool function()
+#define DEF_CONSOLE_HOOK(function) static bool function(void)
 
 
 /* **************************** */
@@ -53,7 +39,7 @@ static bool _script_running;
 
 #ifdef ENABLE_NETWORK
 
-static inline bool NetworkAvailable()
+static inline bool NetworkAvailable(void)
 {
 	if (!_network_available) {
 		IConsoleError("You cannot use this command because there is no network available.");
@@ -144,12 +130,21 @@ DEF_CONSOLE_CMD(ConResetTile)
 
 DEF_CONSOLE_CMD(ConStopAllVehicles)
 {
+	Vehicle* v;
 	if (argc == 0) {
 		IConsoleHelp("Stops all vehicles in the game. For debugging only! Use at your own risk... Usage: 'stopall'");
 		return true;
 	}
 
-	StopAllVehicles();
+	FOR_ALL_VEHICLES(v) {
+		/* Code ripped from CmdStartStopTrain. Can't call it, because of
+		 * ownership problems, so we'll duplicate some code, for now */
+		if (v->type == VEH_Train)
+			v->u.rail.days_since_order_progr = 0;
+		v->vehstatus |= VS_STOPPED;
+		InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
+		InvalidateWindow(WC_VEHICLE_DEPOT, v->tile);
+	}
 	return true;
 }
 #endif /* _DEBUG */
@@ -177,7 +172,8 @@ DEF_CONSOLE_CMD(ConScrollToTile)
 	return false;
 }
 
-extern void BuildFileList();
+extern bool SafeSaveOrLoad(const char *filename, int mode, int newgm);
+extern void BuildFileList(void);
 extern void SetFiosType(const byte fiostype);
 
 /* Save the map to a file */
@@ -189,34 +185,22 @@ DEF_CONSOLE_CMD(ConSave)
 	}
 
 	if (argc == 2) {
-		char *filename = str_fmt("%s.sav", argv[1]);
+		char buf[200];
+
+		snprintf(buf, lengthof(buf), "%s%s%s.sav", _paths.save_dir, PATHSEP, argv[1]);
 		IConsolePrint(_icolour_def, "Saving map...");
 
-		if (SaveOrLoad(filename, SL_SAVE, SAVE_DIR) != SL_OK) {
-			IConsolePrint(_icolour_err, "Saving map failed");
+		if (SaveOrLoad(buf, SL_SAVE) != SL_OK) {
+			IConsolePrint(_icolour_err, "SaveMap failed");
 		} else {
-			IConsolePrintF(_icolour_def, "Map sucessfully saved to %s", filename);
+			IConsolePrintF(_icolour_def, "Map sucessfully saved to %s", buf);
 		}
-		free(filename);
 		return true;
 	}
 
 	return false;
 }
 
-/* Explicitly save the configuration */
-DEF_CONSOLE_CMD(ConSaveConfig)
-{
-	if (argc == 0) {
-		IConsoleHelp("Saves the current config, typically to 'openttd.cfg'.");
-		return true;
-	}
-
-	SaveToConfig();
-	IConsolePrint(_icolour_def, "Saved config.");
-	return true;
-}
-
 static const FiosItem* GetFiosItem(const char* file)
 {
 	int i;
@@ -229,14 +213,14 @@ static const FiosItem* GetFiosItem(const char* file)
 		if (strcmp(file, _fios_list[i].title) == 0) break;
 	}
 
-	if (i == _fios_num) { // If no name matches, try to parse it as number
+	if (i == _fios_num) { /* If no name matches, try to parse it as number */
 		char* endptr;
 
 		i = strtol(file, &endptr, 10);
 		if (file == endptr || *endptr != '\0') i = -1;
 	}
 
-	return IsInsideMM(i, 0, _fios_num) ? &_fios_list[i] : NULL;
+	return IS_INT_INSIDE(i, 0, _fios_num) ? &_fios_list[i] : NULL;
 }
 
 
@@ -426,9 +410,9 @@ DEF_CONSOLE_CMD(ConBan)
 	}
 
 	if (ci != NULL) {
-		IConsolePrint(_icolour_def, "Client banned");
 		banip = inet_ntoa(*(struct in_addr *)&ci->client_ip);
 		SEND_COMMAND(PACKET_SERVER_ERROR)(NetworkFindClientStateFromIndex(index), NETWORK_ERROR_KICKED);
+		IConsolePrint(_icolour_def, "Client banned");
 	} else {
 		IConsolePrint(_icolour_def, "Client not online, banned IP");
 	}
@@ -500,7 +484,7 @@ DEF_CONSOLE_CMD(ConPauseGame)
 		return true;
 	}
 
-	if (_pause_game == 0) {
+	if (_pause == 0) {
 		DoCommandP(0, 1, 0, NULL, CMD_PAUSE);
 		IConsolePrint(_icolour_def, "Game paused.");
 	} else {
@@ -517,7 +501,7 @@ DEF_CONSOLE_CMD(ConUnPauseGame)
 		return true;
 	}
 
-	if (_pause_game != 0) {
+	if (_pause != 0) {
 		DoCommandP(0, 0, 0, NULL, CMD_PAUSE);
 		IConsolePrint(_icolour_def, "Game unpaused.");
 	} else {
@@ -537,11 +521,7 @@ DEF_CONSOLE_CMD(ConRcon)
 
 	if (argc < 3) return false;
 
-	if (_network_server) {
-		IConsoleCmdExec(argv[2]);
-	} else {
-		SEND_COMMAND(PACKET_CLIENT_RCON)(argv[1], argv[2]);
-	}
+	SEND_COMMAND(PACKET_CLIENT_RCON)(argv[1], argv[2]);
 	return true;
 }
 
@@ -549,7 +529,6 @@ DEF_CONSOLE_CMD(ConStatus)
 {
 	static const char* const stat_str[] = {
 		"inactive",
-		"authorizing",
 		"authorized",
 		"waiting",
 		"loading map",
@@ -558,7 +537,7 @@ DEF_CONSOLE_CMD(ConStatus)
 		"active"
 	};
 
-	NetworkTCPSocketHandler *cs;
+	const NetworkClientState *cs;
 
 	if (argc == 0) {
 		IConsoleHelp("List the status of all clients connected to the server. Usage 'status'");
@@ -570,7 +549,7 @@ DEF_CONSOLE_CMD(ConStatus)
 		const NetworkClientInfo *ci = DEREF_CLIENT_INFO(cs);
 		const char* status;
 
-		status = (cs->status < (ptrdiff_t)lengthof(stat_str) ? stat_str[cs->status] : "unknown");
+		status = (cs->status < lengthof(stat_str) ? stat_str[cs->status] : "unknown");
 		IConsolePrintF(8, "Client #%1d  name: '%s'  status: '%s'  frame-lag: %3d  company: %1d  IP: %s  unique-id: '%s'",
 			cs->index, ci->client_name, status, lag,
 			ci->client_playas + (IsValidPlayer(ci->client_playas) ? 1 : 0),
@@ -600,8 +579,10 @@ DEF_CONSOLE_CMD(ConServerInfo)
 
 DEF_CONSOLE_HOOK(ConHookValidateMaxClientsCount)
 {
-	if (_network_game_info.clients_max > MAX_CLIENTS) {
-		_network_game_info.clients_max = MAX_CLIENTS;
+	/* XXX - hardcoded, string limiation -- TrueLight
+	 * XXX - also see network.c:NetworkStartup ~1356 */
+	if (_network_game_info.clients_max > 10) {
+		_network_game_info.clients_max = 10;
 		IConsoleError("Maximum clients out of bounds, truncating to limit.");
 	}
 
@@ -620,7 +601,7 @@ DEF_CONSOLE_HOOK(ConHookValidateMaxCompaniesCount)
 
 DEF_CONSOLE_HOOK(ConHookValidateMaxSpectatorsCount)
 {
-	/* XXX see ConHookValidateMaxClientsCount */
+	/* XXX @see ConHookValidateMaxClientsCount */
 	if (_network_game_info.spectators_max > 10) {
 		_network_game_info.spectators_max = 10;
 		IConsoleError("Maximum spectators out of bounds, truncating to limit.");
@@ -678,7 +659,7 @@ DEF_CONSOLE_CMD(ConKick)
 DEF_CONSOLE_CMD(ConResetCompany)
 {
 	const Player *p;
-	NetworkTCPSocketHandler *cs;
+	const NetworkClientState *cs;
 	const NetworkClientInfo *ci;
 	PlayerID index;
 
@@ -690,7 +671,7 @@ DEF_CONSOLE_CMD(ConResetCompany)
 
 	if (argc != 2) return false;
 
-	index = (PlayerID)(atoi(argv[1]) - 1);
+	index = atoi(argv[1]) - 1;
 
 	/* Check valid range */
 	if (!IsValidPlayer(index)) {
@@ -776,7 +757,7 @@ DEF_CONSOLE_CMD(ConNetworkConnect)
 
 	IConsolePrintF(_icolour_def, "Connecting to %s...", ip);
 	if (player != NULL) {
-		_network_playas = (PlayerID)atoi(player);
+		_network_playas = atoi(player);
 		IConsolePrintF(_icolour_def, "    player-no: %d", _network_playas);
 
 		/* From a user pov 0 is a new player, internally it's different and all
@@ -814,7 +795,7 @@ DEF_CONSOLE_CMD(ConExec)
 
 	if (argc < 2) return false;
 
-	_script_file = FioFOpenFile(argv[1], "r", BASE_DIR);
+	_script_file = fopen(argv[1], "r");
 
 	if (_script_file == NULL) {
 		if (argc == 2 || atoi(argv[2]) != 0) IConsoleError("script file not found");
@@ -838,7 +819,7 @@ DEF_CONSOLE_CMD(ConExec)
 		IConsoleError("Encountered errror while trying to read from script file");
 
 	_script_running = false;
-	FioFCloseFile(_script_file);
+	fclose(_script_file);
 	return true;
 }
 
@@ -856,7 +837,7 @@ DEF_CONSOLE_CMD(ConReturn)
 /* **************************** */
 /*   default console commands   */
 /* **************************** */
-extern bool CloseConsoleLogIfActive();
+extern bool CloseConsoleLogIfActive(void);
 
 DEF_CONSOLE_CMD(ConScript)
 {
@@ -945,20 +926,6 @@ DEF_CONSOLE_CMD(ConGetSeed)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConGetDate)
-{
-	if (argc == 0) {
-		IConsoleHelp("Returns the current date (day-month-year) of the game. Usage: 'getdate'");
-		return true;
-	}
-
-	YearMonthDay ymd;
-	ConvertDateToYMD(_date, &ymd);
-	IConsolePrintF(_icolour_def, "Date: %d-%d-%d", ymd.day, ymd.month + 1, ymd.year);
-	return true;
-}
-
-
 DEF_CONSOLE_CMD(ConAlias)
 {
 	IConsoleAlias *alias;
@@ -1084,8 +1051,6 @@ DEF_CONSOLE_CMD(ConExit)
 		return true;
 	}
 
-	if (_game_mode == GM_NORMAL && _patches.autosave_on_exit) DoExitSave();
-
 	_exit_game = true;
 	return true;
 }
@@ -1233,6 +1198,10 @@ DEF_CONSOLE_CMD(ConSay)
 	return true;
 }
 
+#ifdef ENABLE_NETWORK
+	#include "table/strings.h"
+#endif /* ENABLE_NETWORK */
+
 DEF_CONSOLE_CMD(ConPlayers)
 {
 	Player *p;
@@ -1248,16 +1217,13 @@ DEF_CONSOLE_CMD(ConPlayers)
 
 		if (!p->is_active) continue;
 
-		const NetworkPlayerInfo *npi = &_network_player_info[p->index];
-
 		GetString(buffer, STR_00D1_DARK_BLUE + _player_colors[p->index], lastof(buffer));
-		IConsolePrintF(8, "#:%d(%s) Company Name: '%s'  Year Founded: %d  Money: %" OTTD_PRINTF64 "d  Loan: %" OTTD_PRINTF64 "d  Value: %" OTTD_PRINTF64 "d  (T:%d, R:%d, P:%d, S:%d) %sprotected",
-			p->index + 1, buffer, npi->company_name, p->inaugurated_year, (int64)p->player_money, (int64)p->current_loan, (int64)CalculateCompanyValue(p),
-			/* trains      */ npi->num_vehicle[0],
-			/* lorry + bus */ npi->num_vehicle[1] + npi->num_vehicle[2],
-			/* planes      */ npi->num_vehicle[3],
-			/* ships       */ npi->num_vehicle[4],
-			/* protected   */ StrEmpty(npi->password) ? "un" : "");
+		IConsolePrintF(8, "#:%d(%s) Company Name: '%s'  Year Founded: %d  Money: %d  Loan: %d  Value: %" OTTD_PRINTF64 "d  (T:%d, R:%d, P:%d, S:%d)",
+			p->index + 1, buffer, _network_player_info[p->index].company_name, p->inaugurated_year, p->player_money, p->current_loan, CalculateCompanyValue(p),
+			/* trains      */ _network_player_info[p->index].num_vehicle[0],
+			/* lorry + bus */ _network_player_info[p->index].num_vehicle[1] + _network_player_info[p->index].num_vehicle[2],
+			/* planes      */ _network_player_info[p->index].num_vehicle[3],
+			/* ships       */ _network_player_info[p->index].num_vehicle[4]);
 	}
 
 	return true;
@@ -1329,8 +1295,6 @@ DEF_CONSOLE_HOOK(ConHookRconPW)
 	return true;
 }
 
-extern void HashCurrentCompanyPassword();
-
 /* Also use from within player_gui to change the password graphically */
 bool NetworkChangeCompanyPassword(byte argc, char *argv[])
 {
@@ -1351,11 +1315,8 @@ bool NetworkChangeCompanyPassword(byte argc, char *argv[])
 
 	ttd_strlcpy(_network_player_info[_local_player].password, argv[0], sizeof(_network_player_info[_local_player].password));
 
-	if (!_network_server) {
+	if (!_network_server)
 		SEND_COMMAND(PACKET_CLIENT_SET_PASSWORD)(_network_player_info[_local_player].password);
-	} else {
-		HashCurrentCompanyPassword();
-	}
 
 	IConsolePrintF(_icolour_warn, "'company_pw' changed to:  %s", _network_player_info[_local_player].password);
 
@@ -1368,7 +1329,7 @@ DEF_CONSOLE_HOOK(ConProcPlayerName)
 
 	if (ci == NULL) return false;
 
-	/* Don't change the name if it is the same as the old name */
+	// Don't change the name if it is the same as the old name
 	if (strcmp(ci->client_name, _network_player_name) != 0) {
 		if (!_network_server) {
 			SEND_COMMAND(PACKET_CLIENT_SET_NAME)(_network_player_name);
@@ -1431,11 +1392,7 @@ DEF_CONSOLE_CMD(ConPatch)
 
 		if (GetArgumentInteger(&val, argv[2])) {
 			if (!IConsoleSetPatchSetting(argv[1], val)) {
-				if (_network_server) {
-					IConsoleError("This command/variable is not available during network games.");
-				} else {
-					IConsoleError("This command/variable is only available to a network server.");
-				}
+				IConsoleError("This command/variable is only available to a network server.");
 			}
 		}
 	}
@@ -1443,19 +1400,6 @@ DEF_CONSOLE_CMD(ConPatch)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConListPatches)
-{
-	if (argc == 0) {
-		IConsoleHelp("List patch options. Usage: 'list_patches'");
-		return true;
-	}
-
-	if (argc != 1) return false;
-
-	IConsoleListPatches();
-	return true;
-}
-
 DEF_CONSOLE_CMD(ConListDumpVariables)
 {
 	const IConsoleVar *var;
@@ -1482,10 +1426,10 @@ DEF_CONSOLE_CMD(ConListDumpVariables)
 /*  debug commands and variables */
 /* ****************************************** */
 
-static void IConsoleDebugLibRegister()
+static void IConsoleDebugLibRegister(void)
 {
-	/* debugging variables and functions */
-	extern bool _stdlib_con_developer; // XXX extern in .cpp
+	// debugging variables and functions
+	extern bool _stdlib_con_developer; /* XXX extern in .c */
 
 	IConsoleVarRegister("con_developer",    &_stdlib_con_developer, ICONSOLE_VAR_BOOLEAN, "Enable/disable console debugging information (internal)");
 	IConsoleCmdRegister("resettile",        ConResetTile);
@@ -1499,12 +1443,12 @@ static void IConsoleDebugLibRegister()
 /*  console command and variable registration */
 /* ****************************************** */
 
-void IConsoleStdLibRegister()
+void IConsoleStdLibRegister(void)
 {
-	/* stdlib */
-	extern byte _stdlib_developer; // XXX extern in .cpp
+	// stdlib
+	extern byte _stdlib_developer; /* XXX extern in .c */
 
-	/* default variables and functions */
+	// default variables and functions
 	IConsoleCmdRegister("debug_level",  ConDebugLevel);
 	IConsoleCmdRegister("dump_vars",    ConListDumpVariables);
 	IConsoleCmdRegister("echo",         ConEcho);
@@ -1521,7 +1465,6 @@ void IConsoleStdLibRegister()
 	IConsoleCmdRegister("newgame",      ConNewGame);
 	IConsoleCmdRegister("restart",      ConRestart);
 	IConsoleCmdRegister("getseed",      ConGetSeed);
-	IConsoleCmdRegister("getdate",      ConGetDate);
 	IConsoleCmdRegister("quit",         ConExit);
 	IConsoleCmdRegister("resetengines", ConResetEngines);
 	IConsoleCmdRegister("return",       ConReturn);
@@ -1532,13 +1475,11 @@ void IConsoleStdLibRegister()
 	IConsoleCmdRegister("load",         ConLoad);
 	IConsoleCmdRegister("rm",           ConRemove);
 	IConsoleCmdRegister("save",         ConSave);
-	IConsoleCmdRegister("saveconfig",   ConSaveConfig);
 	IConsoleCmdRegister("ls",           ConListFiles);
 	IConsoleCmdRegister("cd",           ConChangeDirectory);
 	IConsoleCmdRegister("pwd",          ConPrintWorkingDirectory);
 	IConsoleCmdRegister("clear",        ConClearBuffer);
 	IConsoleCmdRegister("patch",        ConPatch);
-	IConsoleCmdRegister("list_patches", ConListPatches);
 
 	IConsoleAliasRegister("dir",      "ls");
 	IConsoleAliasRegister("del",      "rm %+");
@@ -1657,8 +1598,6 @@ void IConsoleStdLibRegister()
 	IConsoleVarRegister("min_players",           &_network_min_players, ICONSOLE_VAR_BYTE, "Automatically pause the game when the number of active players passes below the given amount");
 	IConsoleVarHookAdd("min_players",            ICONSOLE_HOOK_ACCESS, ConHookServerOnly);
 	IConsoleVarHookAdd("min_players",            ICONSOLE_HOOK_POST_ACTION, ConHookCheckMinPlayers);
-	IConsoleVarRegister("reload_cfg",            &_network_reload_cfg, ICONSOLE_VAR_BOOLEAN, "reload the entire config file between the end of this game, and starting the next new game - dedicated servers");
-	IConsoleVarHookAdd("reload_cfg",             ICONSOLE_HOOK_ACCESS, ConHookServerOnly);
 
 #endif /* ENABLE_NETWORK */
 

currency.c

@@ -1,49 +1,46 @@
 /* $Id$ */
 
-/** @file currency.cpp **/
-
 #include "stdafx.h"
 #include "openttd.h"
 #include "currency.h"
 #include "news.h"
-#include "settings_type.h"
-#include "date_func.h"
-
+#include "variables.h"
 #include "table/strings.h"
+#include "date.h"
 
 	//   exchange rate    prefix             symbol_pos
 	//   |  separator        |     postfix   |
 	//   |   |    Euro year  |       |       |    name
 	//   |   |    |          |       |       |    |
 static const CurrencySpec origin_currency_specs[NUM_CURRENCY] = {
-	{    1, ',', CF_NOEURO, "£",    "",      0,  STR_CURR_GBP    }, ///< british pounds
-	{    2, ',', CF_NOEURO, "$",    "",      0,  STR_CURR_USD    }, ///< us dollars
-	{    2, ',', CF_ISEURO, "€",    "",      0,  STR_CURR_EUR    }, ///< Euro
-	{  220, ',', CF_NOEURO, "¥",    "",      0,  STR_CURR_YEN    }, ///< yen
-	{   20, ',', 2002,      "",     " S.",   1,  STR_CURR_ATS    }, ///< austrian schilling
-	{   59, ',', 2002,      "BEF ", "",      0,  STR_CURR_BEF    }, ///< belgian franc
-	{    2, ',', CF_NOEURO, "CHF ", "",      0,  STR_CURR_CHF    }, ///< swiss franc
-	{   41, ',', CF_NOEURO, "",     " Kč",   1,  STR_CURR_CZK    }, ///< czech koruna
-	{    3, '.', 2002,      "DM ",  "",      0,  STR_CURR_DEM    }, ///< deutsche mark
-	{   11, '.', CF_NOEURO, "",     " kr",   1,  STR_CURR_DKK    }, ///< danish krone
-	{  245, '.', 2002,      "Pts ", "",      0,  STR_CURR_ESP    }, ///< spanish pesetas
-	{    9, ',', 2002,      "",     " mk",   1,  STR_CURR_FIM    }, ///< finnish markka
-	{   10, '.', 2002,      "FF ",  "",      0,  STR_CURR_FRF    }, ///< french francs
-	{  500, ',', 2002,      "",     "Dr.",   1,  STR_CURR_GRD    }, ///< greek drachma
-	{  378, ',', 2010,      "",     " Ft",   1,  STR_CURR_HUF    }, ///< hungarian forint
-	{  130, '.', CF_NOEURO, "",     " Kr",   1,  STR_CURR_ISK    }, ///< icelandic krona
-	{ 2850, ',', 2002,      "",     " L.",   1,  STR_CURR_ITL    }, ///< italian lira
-	{    3, ',', 2002,      "NLG ", "",      0,  STR_CURR_NLG    }, ///< dutch gulden
-	{   12, '.', CF_NOEURO, "",     " Kr",   1,  STR_CURR_NOK    }, ///< norwegian krone
-	{    6, ' ', CF_NOEURO, "",     " zl",   1,  STR_CURR_PLN    }, ///< polish zloty
-	{    5, '.', CF_NOEURO, "",     " Lei",  1,  STR_CURR_ROL    }, ///< romanian Lei
-	{   50, ' ', CF_NOEURO, "",     " p",    1,  STR_CURR_RUR    }, ///< russian rouble
-	{  352, '.', CF_NOEURO, "",     " SIT",  1,  STR_CURR_SIT    }, ///< slovenian tolar
-	{   13, '.', CF_NOEURO, "",     " Kr",   1,  STR_CURR_SEK    }, ///< swedish krona
-	{    3, '.', CF_NOEURO, "",     " YTL",  1,  STR_CURR_YTL    }, ///< turkish lira
-	{   52, ',', CF_NOEURO, "",     " Sk",   1,  STR_CURR_SKK    }, ///< slovak koruna
-	{    4, ',', CF_NOEURO, "R$ ",  "",      0,  STR_CURR_BRR    }, ///< brazil real
-	{    1, ' ', CF_NOEURO, "",     "",      2,  STR_CURR_CUSTOM }, ///< custom currency
+	{    1, ',', CF_NOEURO, "£",    "",      0,  STR_CURR_GBP    }, // british pounds
+	{    2, ',', CF_NOEURO, "$",    "",      0,  STR_CURR_USD    }, // us dollars
+	{    2, ',', CF_ISEURO, "€",    "",      0,  STR_CURR_EUR    }, // Euro
+	{  220, ',', CF_NOEURO, "¥",    "",      0,  STR_CURR_YEN    }, // yen
+	{   20, ',', 2002,      "",     " S.",   1,  STR_CURR_ATS    }, // austrian schilling
+	{   59, ',', 2002,      "BEF ", "",      0,  STR_CURR_BEF    }, // belgian franc
+	{    2, ',', CF_NOEURO, "CHF ", "",      0,  STR_CURR_CHF    }, // swiss franc
+	{   41, ',', CF_NOEURO, "",     " Kč",   1,  STR_CURR_CZK    }, // czech koruna
+	{    3, '.', 2002,      "DM ",  "",      0,  STR_CURR_DEM    }, // deutsche mark
+	{   11, '.', CF_NOEURO, "",     " kr",   1,  STR_CURR_DKK    }, // danish krone
+	{  245, '.', 2002,      "Pts ", "",      0,  STR_CURR_ESP    }, // spanish pesetas
+	{    9, ',', 2002,      "",     " mk",   1,  STR_CURR_FIM    }, // finnish markka
+	{   10, '.', 2002,      "FF ",  "",      0,  STR_CURR_FRF    }, // french francs
+	{  500, ',', 2002,      "",     "Dr.",   1,  STR_CURR_GRD    }, // greek drachma
+	{  378, ',', 2010,      "",     " Ft",   1,  STR_CURR_HUF    }, // hungarian forint
+	{  130, '.', CF_NOEURO, "",     " Kr",   1,  STR_CURR_ISK    }, // icelandic krona
+	{ 2850, ',', 2002,      "",     " L.",   1,  STR_CURR_ITL    }, // italian lira
+	{    3, ',', 2002,      "NLG ", "",      0,  STR_CURR_NLG    }, // dutch gulden
+	{   12, '.', CF_NOEURO, "",     " Kr",   1,  STR_CURR_NOK    }, // norwegian krone
+	{    6, ' ', CF_NOEURO, "",     " zl",   1,  STR_CURR_PLN    }, // polish zloty
+	{    5, '.', CF_NOEURO, "",     " Lei",  1,  STR_CURR_ROL    }, // romanian Lei
+	{   50, ' ', CF_NOEURO, "",     " p",    1,  STR_CURR_RUR    }, // russian rouble
+	{  352, '.', CF_NOEURO, "",     " SIT",  1,  STR_CURR_SIT    }, // slovenian tolar
+	{   13, '.', CF_NOEURO, "",     " Kr",   1,  STR_CURR_SEK    }, // swedish krona
+	{    3, '.', CF_NOEURO, "",     " YTL",  1,  STR_CURR_YTL    }, // turkish lira
+	{   52, ',', CF_NOEURO, "",     " Sk",   1,  STR_CURR_SKK    }, // slovak koruna
+	{    4, ',', CF_NOEURO, "R$ ",  "",      0,  STR_CURR_BRR    }, // brazil real
+	{    1, ' ', CF_NOEURO, "",     "",      2,  STR_CURR_CUSTOM }, // custom currency
 };
 
 /* Array of currencies used by the system */
@@ -125,11 +122,8 @@ byte GetNewgrfCurrencyIdConverted(byte grfcurr_id)
 	return (grfcurr_id >= lengthof(TTDPatch_To_OTTDIndex)) ? grfcurr_id : TTDPatch_To_OTTDIndex[grfcurr_id];
 }
 
-/**
- * get a mask of the allowed currencies depending on the year
- * @return mask of currencies
- */
-uint GetMaskOfAllowedCurrencies()
+/* get a mask of the allowed currencies depending on the year */
+uint GetMaskOfAllowedCurrencies(void)
 {
 	uint mask = 0;
 	uint i;
@@ -148,7 +142,7 @@ uint GetMaskOfAllowedCurrencies()
 /**
  * Verify if the currency chosen by the user is about to be converted to Euro
  **/
-void CheckSwitchToEuro()
+void CheckSwitchToEuro(void)
 {
 	if (_currency_specs[_opt.currency].to_euro != CF_NOEURO &&
 			_currency_specs[_opt.currency].to_euro != CF_ISEURO &&
@@ -159,27 +153,22 @@ void CheckSwitchToEuro()
 }
 
 /**
- * Will fill _currency_specs array with
+ * Called only from newgrf.c.  Will fill _currency_specs array with
  * default values from origin_currency_specs
- * Called only from newgrf.cpp and settings.cpp.
- * @param preserve_custom will not reset custom currency (the latest one on the list)
- *        if ever it is flagged to true. In which case, the total size of the memory to move
- *        will be one currency spec less, thus preserving the custom curreny from been
- *        overwritten.
  **/
-void ResetCurrencies(bool preserve_custom)
+void ResetCurrencies(void)
 {
-	memcpy(&_currency_specs, &origin_currency_specs, sizeof(origin_currency_specs) - (preserve_custom ? sizeof(_custom_currency) : 0));
+	memcpy(&_currency_specs, &origin_currency_specs, sizeof(origin_currency_specs));
 }
 
 /**
  * Build a list of currency names StringIDs to use in a dropdown list
  * @return Pointer to a (static) array of StringIDs
  */
-StringID* BuildCurrencyDropdown()
+StringID* BuildCurrencyDropdown(void)
 {
 	/* Allow room for all currencies, plus a terminator entry */
-	static StringID names[NUM_CURRENCY + 1];
+	static StringID names[CUSTOM_CURRENCY_ID];
 	uint i;
 
 	/* Add each name */

currency.h

@@ -1,13 +1,8 @@
 /* $Id$ */
 
-/** @file currency.h */
-
 #ifndef CURRENCY_H
 #define CURRENCY_H
 
-#include "date_type.h"
-#include "strings_type.h"
-
 enum {
 	CF_NOEURO = 0,
 	CF_ISEURO = 1,
@@ -15,7 +10,7 @@ enum {
 	CUSTOM_CURRENCY_ID = NUM_CURRENCY - 1
 };
 
-struct CurrencySpec {
+typedef struct {
 	uint16 rate;
 	char separator;
 	Year to_euro;
@@ -32,7 +27,7 @@ struct CurrencySpec {
 	 */
 	byte symbol_pos;
 	StringID name;
-};
+} CurrencySpec;
 
 
 extern CurrencySpec _currency_specs[NUM_CURRENCY];
@@ -41,10 +36,10 @@ extern CurrencySpec _currency_specs[NUM_CURRENCY];
 #define _custom_currency (_currency_specs[CUSTOM_CURRENCY_ID])
 #define _currency ((const CurrencySpec*)&_currency_specs[_opt_ptr->currency])
 
-uint GetMaskOfAllowedCurrencies();
-void CheckSwitchToEuro();
-void ResetCurrencies(bool preserve_custom = true);
-StringID* BuildCurrencyDropdown();
+uint GetMaskOfAllowedCurrencies(void);
+void CheckSwitchToEuro(void);
+void ResetCurrencies(void);
+StringID* BuildCurrencyDropdown(void);
 byte GetNewgrfCurrencyIdConverted(byte grfcurr_id);
 
 #endif /* CURRENCY_H */

date.c

@@ -1,23 +1,16 @@
 /* $Id$ */
 
-/** @file date.cpp */
-
 #include "stdafx.h"
 #include "openttd.h"
+#include "date.h"
 #include "variables.h"
-#include "settings_type.h"
-#include "network/network.h"
-#include "network/network_data.h"
-#include "network/network_server.h"
-#include "currency.h"
-#include "window_func.h"
+#include "macros.h"
+#include "vehicle.h"
+#include "network.h"
+#include "network_data.h"
+#include "network_server.h"
 #include "functions.h"
-#include "date_func.h"
-#include "vehicle_base.h"
-#include "debug.h"
-#ifdef DEBUG_DUMP_COMMANDS
-#include "saveload.h"
-#endif
+#include "currency.h"
 
 Year      _cur_year;
 Month     _cur_month;
@@ -99,22 +92,9 @@ void ConvertDateToYMD(Date date, YearMonthDay *ymd)
 	int rem = date % (365 * 400 + 97);
 	uint16 x;
 
-	if (rem >= 365 * 100 + 25) {
-		/* There are 25 leap years in the first 100 years after
-		 * every 400th year, as every 400th year is a leap year */
-		yr  += 100;
-		rem -= 365 * 100 + 25;
-
-		/* There are 24 leap years in the next couple of 100 years */
-		yr += 100 * (rem / (365 * 100 + 24));
-		rem = (rem % (365 * 100 + 24));
-	}
-
-	if (!IsLeapYear(yr) && rem >= 365 * 4) {
-		/* The first 4 year of the century are not always a leap year */
-		yr  += 4;
-		rem -= 365 * 4;
-	}
+	/* There are 24 leap years in 100 years */
+	yr += 100 * (rem / (365 * 100 + 24));
+	rem = rem % (365 * 100 + 24);
 
 	/* There is 1 leap year every 4 years */
 	yr += 4 * (rem / (365 * 4 + 1));
@@ -165,32 +145,50 @@ Date ConvertYMDToDate(Year year, Month month, Day day)
 
 /** Functions used by the IncreaseDate function */
 
-extern void WaypointsDailyLoop();
-extern void ChatMessageDailyLoop();
-extern void EnginesDailyLoop();
-extern void DisasterDailyLoop();
+extern void OnNewDay_Train(Vehicle *v);
+extern void OnNewDay_RoadVeh(Vehicle *v);
+extern void OnNewDay_Aircraft(Vehicle *v);
+extern void OnNewDay_Ship(Vehicle *v);
+static void OnNewDay_EffectVehicle(Vehicle *v) { /* empty */ }
+extern void OnNewDay_DisasterVehicle(Vehicle *v);
 
-extern void PlayersMonthlyLoop();
-extern void EnginesMonthlyLoop();
-extern void TownsMonthlyLoop();
-extern void IndustryMonthlyLoop();
-extern void StationMonthlyLoop();
+typedef void OnNewVehicleDayProc(Vehicle *v);
 
-extern void PlayersYearlyLoop();
-extern void TrainsYearlyLoop();
-extern void RoadVehiclesYearlyLoop();
-extern void AircraftYearlyLoop();
-extern void ShipsYearlyLoop();
+static OnNewVehicleDayProc * _on_new_vehicle_day_proc[] = {
+	OnNewDay_Train,
+	OnNewDay_RoadVeh,
+	OnNewDay_Ship,
+	OnNewDay_Aircraft,
+	OnNewDay_EffectVehicle,
+	OnNewDay_DisasterVehicle,
+};
 
-extern void ShowEndGameChart();
+extern void WaypointsDailyLoop(void);
+extern void TextMessageDailyLoop(void);
+extern void EnginesDailyLoop(void);
+extern void DisasterDailyLoop(void);
+
+extern void PlayersMonthlyLoop(void);
+extern void EnginesMonthlyLoop(void);
+extern void TownsMonthlyLoop(void);
+extern void IndustryMonthlyLoop(void);
+extern void StationMonthlyLoop(void);
+
+extern void PlayersYearlyLoop(void);
+extern void TrainsYearlyLoop(void);
+extern void RoadVehiclesYearlyLoop(void);
+extern void AircraftYearlyLoop(void);
+extern void ShipsYearlyLoop(void);
+
+extern void ShowEndGameChart(void);
 
 
 static const Month _autosave_months[] = {
-	 0, ///< never
-	 1, ///< every month
-	 3, ///< every 3 months
-	 6, ///< every 6 months
-	12, ///< every 12 months
+	 0, // never
+	 1, // every month
+	 3, // every 3 months
+	 6, // every 6 months
+	12, // every 12 months
 };
 
 /**
@@ -204,15 +202,11 @@ static void RunVehicleDayProc(uint daytick)
 	for (i = daytick; i < total; i += DAY_TICKS) {
 		Vehicle *v = GetVehicle(i);
 
-		if (v->IsValid()) {
-			/* Call the 32-day callback if needed */
-			CheckVehicle32Day(v);
-			v->OnNewDay();
-		}
+		if (IsValidVehicle(v)) _on_new_vehicle_day_proc[v->type - 0x10](v);
 	}
 }
 
-void IncreaseDate()
+void IncreaseDate(void)
 {
 	YearMonthDay ymd;
 
@@ -233,7 +227,7 @@ void IncreaseDate()
 	/* yeah, increase day counter and call various daily loops */
 	_date++;
 
-	ChatMessageDailyLoop();
+	TextMessageDailyLoop();
 
 	DisasterDailyLoop();
 	WaypointsDailyLoop();
@@ -250,18 +244,11 @@ void IncreaseDate()
 
 	/* yes, call various monthly loops */
 	if (_game_mode != GM_MENU) {
-#ifdef DEBUG_DUMP_COMMANDS
-		char name[MAX_PATH];
-		snprintf(name, lengthof(name), "dmp_cmds_%d.sav", _date);
-		SaveOrLoad(name, SL_SAVE, AUTOSAVE_DIR);
-		DebugDumpCommands("ddc:save:%s\n", name);
-#endif /* DUMP_COMMANDS */
 		if (_opt.autosave != 0 && (_cur_month % _autosave_months[_opt.autosave]) == 0) {
 			_do_autosave = true;
 			RedrawAutosave();
 		}
 
-		InvalidateWindowClasses(WC_CHEATS);
 		PlayersMonthlyLoop();
 		EnginesMonthlyLoop();
 		TownsMonthlyLoop();
@@ -297,7 +284,7 @@ void IncreaseDate()
 
 		/* Because the _date wraps here, and text-messages expire by game-days, we have to clean out
 		 *  all of them if the date is set back, else those messages will hang for ever */
-		InitChatMessage();
+		InitTextMessage();
 	}
 
 	if (_patches.auto_euro) CheckSwitchToEuro();

date.h

@@ -1,9 +1,7 @@
 /* $Id$ */
 
-/** @file date_type.h Types related to the dates in OpenTTD. */
-
-#ifndef DATE_TYPE_H
-#define DATE_TYPE_H
+#ifndef DATE_H
+#define DATE_H
 
 /**
  * 1 day is 74 ticks; _date_fract used to be uint16 and incremented by 885. On
@@ -37,20 +35,25 @@
  * be encoded in a single 32 bits date, about 2^31 / 366 years. */
 #define MAX_YEAR 5000000
 
-typedef int32  Date;
-typedef uint16 DateFract;
-
-typedef int32  Year;
+/* Year and Date are defined elsewhere */
 typedef uint8  Month;
 typedef uint8  Day;
+typedef uint16 DateFract;
 
-struct YearMonthDay {
+typedef struct YearMonthDay {
 	Year  year;
 	Month month;
 	Day   day;
-};
+} YearMonthDay;
 
-static const Year INVALID_YEAR = -1;
-static const Date INVALID_DATE = -1;
+extern Year      _cur_year;
+extern Month     _cur_month;
+extern Date      _date;
+extern DateFract _date_fract;
 
-#endif /* DATE_TYPE_H */
+
+void SetDate(Date date);
+void ConvertDateToYMD(Date date, YearMonthDay *ymd);
+Date ConvertYMDToDate(Year year, Month month, Day day);
+
+#endif /* DATE_H */

debug.c

@@ -1,19 +1,13 @@
 /* $Id$ */
 
-/** @file debug.cpp */
-
 #include "stdafx.h"
 #include <stdio.h>
 #include <stdarg.h>
 #include "openttd.h"
 #include "console.h"
 #include "debug.h"
-#include "string_func.h"
-#include "network/core/core.h"
-
-#if defined(ENABLE_NETWORK)
-SOCKET _debug_socket = INVALID_SOCKET;
-#endif /* ENABLE_NETWORK */
+#include "functions.h"
+#include "string.h"
 
 int _debug_ai_level;
 int _debug_driver_level;
@@ -22,20 +16,30 @@ int _debug_map_level;
 int _debug_misc_level;
 int _debug_ms_level;
 int _debug_net_level;
-int _debug_sprite_level;
+int _debug_spritecache_level;
 int _debug_oldloader_level;
 int _debug_ntp_level;
 int _debug_npf_level;
 int _debug_yapf_level;
 int _debug_freetype_level;
-int _debug_sl_level;
-int _debug_station_level;
 
 
-struct DebugLevel {
+void CDECL debug(const char *s, ...)
+{
+	va_list va;
+	char buf[1024];
+
+	va_start(va, s);
+	vsnprintf(buf, lengthof(buf), s, va);
+	va_end(va);
+	fprintf(stderr, "dbg: %s\n", buf);
+	IConsoleDebug(buf);
+}
+
+typedef struct DebugLevel {
 	const char *name;
 	int *level;
-};
+} DebugLevel;
 
 #define DEBUG_LEVEL(x) { #x, &_debug_##x##_level }
 	static const DebugLevel debug_level[] = {
@@ -46,58 +50,22 @@ struct DebugLevel {
 	DEBUG_LEVEL(misc),
 	DEBUG_LEVEL(ms),
 	DEBUG_LEVEL(net),
-	DEBUG_LEVEL(sprite),
+	DEBUG_LEVEL(spritecache),
 	DEBUG_LEVEL(oldloader),
 	DEBUG_LEVEL(ntp),
 	DEBUG_LEVEL(npf),
 	DEBUG_LEVEL(yapf),
-	DEBUG_LEVEL(freetype),
-	DEBUG_LEVEL(sl),
-	DEBUG_LEVEL(station),
+	DEBUG_LEVEL(freetype)
 	};
 #undef DEBUG_LEVEL
 
-#if !defined(NO_DEBUG_MESSAGES)
-
-void CDECL debug(const char *dbg, ...)
-{
-	va_list va;
-	va_start(va, dbg);
-	const char *s;
-	char buf[1024];
-
-	s = va_arg(va, const char*);
-	vsnprintf(buf, lengthof(buf), s, va);
-	va_end(va);
-#if defined(ENABLE_NETWORK)
-	if (_debug_socket != INVALID_SOCKET) {
-		char buf2[lengthof(buf) + 32];
-
-		snprintf(buf2, lengthof(buf2), "dbg: [%s] %s\n", dbg, buf);
-		send(_debug_socket, buf2, strlen(buf2), 0);
-	} else
-#endif /* ENABLE_NETWORK */
-	{
-#if defined(WINCE)
-		/* We need to do OTTD2FS twice, but as it uses a static buffer, we need to store one temporary */
-		TCHAR tbuf[512];
-		_sntprintf(tbuf, sizeof(tbuf), _T("%s"), OTTD2FS(dbg));
-		NKDbgPrintfW(_T("dbg: [%s] %s\n"), tbuf, OTTD2FS(buf));
-#else
-		fprintf(stderr, "dbg: [%s] %s\n", dbg, buf);
-#endif
-		IConsoleDebug(dbg, buf);
-	}
-}
-#endif /* NO_DEBUG_MESSAGES */
-
 void SetDebugString(const char *s)
 {
 	int v;
 	char *end;
 	const char *t;
 
-	/* global debugging level? */
+	// global debugging level?
 	if (*s >= '0' && *s <= '9') {
 		const DebugLevel *i;
 
@@ -107,19 +75,19 @@ void SetDebugString(const char *s)
 		for (i = debug_level; i != endof(debug_level); ++i) *i->level = v;
 	}
 
-	/* individual levels */
+	// individual levels
 	for (;;) {
 		const DebugLevel *i;
 		int *p;
 
-		/* skip delimiters */
+		// skip delimiters
 		while (*s == ' ' || *s == ',' || *s == '\t') s++;
 		if (*s == '\0') break;
 
 		t = s;
 		while (*s >= 'a' && *s <= 'z') s++;
 
-		/* check debugging levels */
+		// check debugging levels
 		p = NULL;
 		for (i = debug_level; i != endof(debug_level); ++i)
 			if (s == t + strlen(i->name) && strncmp(t, i->name, s - t) == 0) {
@@ -143,10 +111,10 @@ void SetDebugString(const char *s)
  * Just return a string with the values of all the debug categorites
  * @return string with debug-levels
  */
-const char *GetDebugString()
+const char *GetDebugString(void)
 {
 	const DebugLevel *i;
-	static char dbgstr[150];
+	static char dbgstr[100];
 	char dbgval[20];
 
 	memset(dbgstr, 0, sizeof(dbgstr));
@@ -160,20 +128,3 @@ const char *GetDebugString()
 
 	return dbgstr;
 }
-
-#ifdef DEBUG_DUMP_COMMANDS
-#include "fileio.h"
-
-void CDECL DebugDumpCommands(const char *s, ...)
-{
-	static FILE *f = FioFOpenFile("commands-out.log", "wb", AUTOSAVE_DIR);
-	if (f == NULL) return;
-
-	va_list va;
-	va_start(va, s);
-	vfprintf(f, s, va);
-	va_end(va);
-
-	fflush(f);
-}
-#endif /* DEBUG_DUMP_COMMANDS */

debug.h

@@ -0,0 +1,54 @@
+/* $Id$ */
+
+#ifndef DEBUG_H
+#define DEBUG_H
+
+#ifdef NO_DEBUG_MESSAGES
+	#define DEBUG(name, level)
+#else
+	#define DEBUG(name, level) if (level == 0 || _debug_ ## name ## _level >= level) debug
+
+	extern int _debug_ai_level;
+	extern int _debug_driver_level;
+	extern int _debug_grf_level;
+	extern int _debug_map_level;
+	extern int _debug_misc_level;
+	extern int _debug_ms_level;
+	extern int _debug_net_level;
+	extern int _debug_spritecache_level;
+	extern int _debug_oldloader_level;
+	extern int _debug_ntp_level;
+	extern int _debug_npf_level;
+	extern int _debug_yapf_level;
+	extern int _debug_freetype_level;
+#endif
+
+void CDECL debug(const char *s, ...);
+
+void SetDebugString(const char *s);
+const char *GetDebugString(void);
+
+/* MSVCRT of course has to have a different syntax for long long *sigh* */
+#if defined(_MSC_VER) || defined(__MINGW32__)
+# define OTTD_PRINTF64 "I64"
+#else
+# define OTTD_PRINTF64 "ll"
+#endif
+
+// Used for profiling
+#define TIC() {\
+	extern uint64 _rdtsc(void);\
+	uint64 _xxx_ = _rdtsc();\
+	static uint64 __sum__ = 0;\
+	static uint32 __i__ = 0;
+
+#define TOC(str, count)\
+	__sum__ += _rdtsc() - _xxx_;\
+	if (++__i__ == count) {\
+		printf("[%s]: %" OTTD_PRINTF64 "u [avg: %.1f]\n", str, __sum__, __sum__/(double)__i__);\
+		__i__ = 0;\
+		__sum__ = 0;\
+	}\
+}
+
+#endif /* DEBUG_H */

dedicated.c

@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/** @file dedicated.cpp */
-
 #include "stdafx.h"
 
 #ifdef ENABLE_NETWORK
@@ -14,15 +12,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#if defined(SUNOS) && !defined(_LP64) && !defined(_I32LPx)
-/* Solaris has, in certain situation, pid_t defined as long, while in other
- *  cases it has it defined as int... this handles all cases nicely. */
-# define PRINTF_PID_T "%ld"
-#else
-# define PRINTF_PID_T "%d"
-#endif
-
-void DedicatedFork()
+void DedicatedFork(void)
 {
 	/* Fork the program */
 	pid_t pid = fork();
@@ -53,9 +43,9 @@ void DedicatedFork()
 		}
 
 		default:
-			/* We're the parent */
+			// We're the parent
 			printf("Loading dedicated server...\n");
-			printf("  - Forked to background with pid " PRINTF_PID_T "\n", pid);
+			printf("  - Forked to background with pid %d\n", pid);
 			exit(0);
 	}
 }
@@ -63,7 +53,6 @@ void DedicatedFork()
 
 #else
 
-/** Empty helper function call for NOT(UNIX and not MORPHOS) systems */
-void DedicatedFork() {}
+void DedicatedFork(void) {}
 
 #endif /* ENABLE_NETWORK */

depot.c

@@ -0,0 +1,127 @@
+/* $Id$ */
+
+#include "stdafx.h"
+#include "openttd.h"
+#include "depot.h"
+#include "functions.h"
+#include "tile.h"
+#include "map.h"
+#include "table/strings.h"
+#include "saveload.h"
+#include "order.h"
+
+
+/**
+ * Called if a new block is added to the depot-pool
+ */
+static void DepotPoolNewBlock(uint start_item)
+{
+	Depot *d;
+
+	/* We don't use FOR_ALL here, because FOR_ALL skips invalid items.
+	 * TODO - This is just a temporary stage, this will be removed. */
+	for (d = GetDepot(start_item); d != NULL; d = (d->index + 1U < GetDepotPoolSize()) ? GetDepot(d->index + 1U) : NULL) d->index = start_item++;
+}
+
+DEFINE_OLD_POOL(Depot, Depot, DepotPoolNewBlock, NULL)
+
+
+/**
+ * Gets a depot from a tile
+ *
+ * @return Returns the depot if the tile had a depot, else it returns NULL
+ */
+Depot *GetDepotByTile(TileIndex tile)
+{
+	Depot *depot;
+
+	FOR_ALL_DEPOTS(depot) {
+		if (depot->xy == tile) return depot;
+	}
+
+	return NULL;
+}
+
+/**
+ * Allocate a new depot
+ */
+Depot *AllocateDepot(void)
+{
+	Depot *d;
+
+	/* We don't use FOR_ALL here, because FOR_ALL skips invalid items.
+	 * TODO - This is just a temporary stage, this will be removed. */
+	for (d = GetDepot(0); d != NULL; d = (d->index + 1U < GetDepotPoolSize()) ? GetDepot(d->index + 1U) : NULL) {
+		if (!IsValidDepot(d)) {
+			DepotID index = d->index;
+
+			memset(d, 0, sizeof(Depot));
+			d->index = index;
+
+			return d;
+		}
+	}
+
+	/* Check if we can add a block to the pool */
+	if (AddBlockToPool(&_Depot_pool)) return AllocateDepot();
+
+	return NULL;
+}
+
+/**
+ * Clean up a depot
+ */
+void DestroyDepot(Depot *depot)
+{
+	/* Clear the tile */
+	DoClearSquare(depot->xy);
+
+	/* Clear the depot from all order-lists */
+	RemoveOrderFromAllVehicles(OT_GOTO_DEPOT, depot->index);
+
+	/* Delete the depot-window */
+	DeleteWindowById(WC_VEHICLE_DEPOT, depot->xy);
+}
+
+void InitializeDepots(void)
+{
+	CleanPool(&_Depot_pool);
+	AddBlockToPool(&_Depot_pool);
+}
+
+
+static const SaveLoad _depot_desc[] = {
+	SLE_CONDVAR(Depot, xy,         SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
+	SLE_CONDVAR(Depot, xy,         SLE_UINT32,                 6, SL_MAX_VERSION),
+	    SLE_VAR(Depot, town_index, SLE_UINT16),
+	SLE_END()
+};
+
+static void Save_DEPT(void)
+{
+	Depot *depot;
+
+	FOR_ALL_DEPOTS(depot) {
+		SlSetArrayIndex(depot->index);
+		SlObject(depot, _depot_desc);
+	}
+}
+
+static void Load_DEPT(void)
+{
+	int index;
+
+	while ((index = SlIterateArray()) != -1) {
+		Depot *depot;
+
+		if (!AddBlockIfNeeded(&_Depot_pool, index))
+			error("Depots: failed loading savegame: too many depots");
+
+		depot = GetDepot(index);
+		SlObject(depot, _depot_desc);
+	}
+}
+
+const ChunkHandler _depot_chunk_handlers[] = {
+	{ 'DEPT', Save_DEPT, Load_DEPT, CH_ARRAY | CH_LAST},
+};

depot.h

@@ -1,40 +1,66 @@
 /* $Id$ */
 
-/** @file depot.h Header files for depots (not hangars) */
-
 #ifndef DEPOT_H
 #define DEPOT_H
 
-#include "direction_type.h"
+/** @file depot.h Header files for depots (not hangars)
+ *  @see depot.c */
+
+#include "direction.h"
 #include "oldpool.h"
-#include "road_map.h"
-#include "rail_map.h"
-#include "water_map.h"
-#include "station_map.h"
+#include "tile.h"
+#include "variables.h"
 
-struct Depot;
-DECLARE_OLD_POOL(Depot, Depot, 3, 8000)
-
-struct Depot : PoolItem<Depot, DepotID, &_Depot_pool> {
+struct Depot {
 	TileIndex xy;
 	TownID town_index;
-
-	Depot(TileIndex xy = 0) : xy(xy) {}
-	~Depot();
-
-	inline bool IsValid() const { return this->xy != 0; }
+	DepotID index;
 };
 
-static inline bool IsValidDepotID(DepotID index)
+DECLARE_OLD_POOL(Depot, Depot, 3, 8000)
+
+/**
+ * Check if a depot really exists.
+ */
+static inline bool IsValidDepot(const Depot *depot)
 {
-	return index < GetDepotPoolSize() && GetDepot(index)->IsValid();
+	return depot != NULL && depot->xy != 0;
 }
 
-void ShowDepotWindow(TileIndex tile, VehicleType type);
+static inline bool IsValidDepotID(uint index)
+{
+	return index < GetDepotPoolSize() && IsValidDepot(GetDepot(index));
+}
 
-#define FOR_ALL_DEPOTS_FROM(d, start) for (d = GetDepot(start); d != NULL; d = (d->index + 1U < GetDepotPoolSize()) ? GetDepot(d->index + 1U) : NULL) if (d->IsValid())
+void DestroyDepot(Depot *depot);
+
+static inline void DeleteDepot(Depot *depot)
+{
+	DestroyDepot(depot);
+	depot->xy = 0;
+}
+
+void ShowDepotWindow(TileIndex tile, byte type);
+
+#define FOR_ALL_DEPOTS_FROM(d, start) for (d = GetDepot(start); d != NULL; d = (d->index + 1U < GetDepotPoolSize()) ? GetDepot(d->index + 1U) : NULL) if (IsValidDepot(d))
 #define FOR_ALL_DEPOTS(d) FOR_ALL_DEPOTS_FROM(d, 0)
 
+#define MIN_SERVINT_PERCENT  5
+#define MAX_SERVINT_PERCENT 90
+#define MIN_SERVINT_DAYS    30
+#define MAX_SERVINT_DAYS   800
+
+/**
+ * Get the service interval domain.
+ * Get the new proposed service interval for the vehicle is indeed, clamped
+ * within the given bounds. @see MIN_SERVINT_PERCENT ,etc.
+ * @param index proposed service interval
+ */
+static inline Date GetServiceIntervalClamped(uint index)
+{
+	return (_patches.servint_ispercent) ? clamp(index, MIN_SERVINT_PERCENT, MAX_SERVINT_PERCENT) : clamp(index, MIN_SERVINT_DAYS, MAX_SERVINT_DAYS);
+}
+
 /**
  * Check if a tile is a depot of the given type.
  */
@@ -42,39 +68,24 @@ static inline bool IsTileDepotType(TileIndex tile, TransportType type)
 {
 	switch (type) {
 		case TRANSPORT_RAIL:
-			return IsTileType(tile, MP_RAILWAY) && GetRailTileType(tile)  == RAIL_TILE_DEPOT;
+			return IsTileType(tile, MP_RAILWAY) && (_m[tile].m5 & 0xFC) == 0xC0;
 
 		case TRANSPORT_ROAD:
-			return IsRoadDepotTile(tile);
+			return IsTileType(tile, MP_STREET) && (_m[tile].m5 & 0xF0) == 0x20;
 
 		case TRANSPORT_WATER:
-			return IsTileType(tile, MP_WATER)   && GetWaterTileType(tile) == WATER_TILE_DEPOT;
+			return IsTileType(tile, MP_WATER) && (_m[tile].m5 & ~3) == 0x80;
 
 		default:
-			NOT_REACHED();
+			assert(0);
 			return false;
 	}
 }
 
-/**
- * Is the given tile a tile with a depot on it?
- * @param tile the tile to check
- * @return true if and only if there is a depot on the tile.
- */
-static inline bool IsDepotTile(TileIndex tile)
-{
-	switch (GetTileType(tile)) {
-		case MP_ROAD:    return IsRoadDepot(tile);
-		case MP_WATER:   return GetWaterTileType(tile) == WATER_TILE_DEPOT;
-		case MP_RAILWAY: return GetRailTileType(tile)  == RAIL_TILE_DEPOT;
-		case MP_STATION: return IsHangar(tile);
-		default:         return false;
-	}
-}
 
 /**
  * Find out if the slope of the tile is suitable to build a depot of given direction
- * @param direction The direction in which the depot's exit points
+ * @param direction The direction in which the depot's exit points. Starts with 0 as NE and goes Clockwise
  * @param tileh The slope of the tile in question
  * @return true if the construction is possible
 
@@ -87,13 +98,14 @@ static inline bool IsDepotTile(TileIndex tile)
  * 03 (exit towards NW) we need either bit 0 or 4 set in tileh: 0x4C >> 3 = 1001<p>
  * So ((0x4C >> direction) & tileh) determines whether the depot can be built on the current tileh
  */
-static inline bool CanBuildDepotByTileh(DiagDirection direction, Slope tileh)
+static inline bool CanBuildDepotByTileh(uint32 direction, Slope tileh)
 {
 	return ((0x4C >> direction) & tileh) != 0;
 }
 
 Depot *GetDepotByTile(TileIndex tile);
-void InitializeDepots();
+void InitializeDepots(void);
+Depot *AllocateDepot(void);
 
 void DeleteDepotHighlightOfVehicle(const Vehicle *v);
 

direction.h

@@ -0,0 +1,147 @@
+/* $Id$ */
+
+#ifndef DIRECTION_H
+#define DIRECTION_H
+
+/* Direction as commonly used in v->direction, 8 way. */
+typedef enum Direction {
+	DIR_N   = 0,
+	DIR_NE  = 1,      /* Northeast, upper right on your monitor */
+	DIR_E   = 2,
+	DIR_SE  = 3,
+	DIR_S   = 4,
+	DIR_SW  = 5,
+	DIR_W   = 6,
+	DIR_NW  = 7,
+	DIR_END,
+	INVALID_DIR = 0xFF,
+} Direction;
+
+static inline Direction ReverseDir(Direction d)
+{
+	return (Direction)(4 ^ d);
+}
+
+
+typedef enum DirDiff {
+	DIRDIFF_SAME    = 0,
+	DIRDIFF_45RIGHT = 1,
+	DIRDIFF_90RIGHT = 2,
+	DIRDIFF_REVERSE = 4,
+	DIRDIFF_90LEFT  = 6,
+	DIRDIFF_45LEFT  = 7
+} DirDiff;
+
+static inline DirDiff DirDifference(Direction d0, Direction d1)
+{
+	return (DirDiff)((d0 + 8 - d1) % 8);
+}
+
+static inline DirDiff ChangeDirDiff(DirDiff d, DirDiff delta)
+{
+	return (DirDiff)((d + delta) % 8);
+}
+
+
+static inline Direction ChangeDir(Direction d, DirDiff delta)
+{
+	return (Direction)((d + delta) % 8);
+}
+
+
+/* Direction commonly used as the direction of entering and leaving tiles, 4-way */
+typedef enum DiagDirection {
+	DIAGDIR_NE  = 0,      /* Northeast, upper right on your monitor */
+	DIAGDIR_SE  = 1,
+	DIAGDIR_SW  = 2,
+	DIAGDIR_NW  = 3,
+	DIAGDIR_END,
+	INVALID_DIAGDIR = 0xFF,
+} DiagDirection;
+
+static inline DiagDirection ReverseDiagDir(DiagDirection d)
+{
+	return (DiagDirection)(2 ^ d);
+}
+
+
+typedef enum DiagDirDiff {
+	DIAGDIRDIFF_SAME    = 0,
+	DIAGDIRDIFF_90RIGHT = 1,
+	DIAGDIRDIFF_REVERSE = 2,
+	DIAGDIRDIFF_90LEFT  = 3
+} DiagDirDiff;
+
+static inline DiagDirection ChangeDiagDir(DiagDirection d, DiagDirDiff delta)
+{
+	return (DiagDirection)((d + delta) % 4);
+}
+
+
+static inline DiagDirection DirToDiagDir(Direction dir)
+{
+	return (DiagDirection)(dir >> 1);
+}
+
+
+static inline Direction DiagDirToDir(DiagDirection dir)
+{
+	return (Direction)(dir * 2 + 1);
+}
+
+
+/* the 2 axis */
+typedef enum Axis {
+	AXIS_X = 0,
+	AXIS_Y = 1,
+	AXIS_END
+} Axis;
+
+
+static inline Axis OtherAxis(Axis a)
+{
+	return (Axis)(a ^ 1);
+}
+
+
+static inline Axis DiagDirToAxis(DiagDirection d)
+{
+	return (Axis)(d & 1);
+}
+
+
+/*
+ * Converts an Axis to a DiagDirection
+ * Points always in the positive direction, i.e. S[EW]
+ */
+static inline DiagDirection AxisToDiagDir(Axis a)
+{
+	return (DiagDirection)(2 - a);
+}
+
+/**
+ * Convert an axis and a flag for north/south into a DiagDirection
+ * @param ns north -> 0, south -> 1
+ */
+static inline DiagDirection XYNSToDiagDir(Axis xy, uint ns)
+{
+	return (DiagDirection)(xy * 3 ^ ns * 2);
+}
+
+
+static inline bool IsValidDiagDirection(DiagDirection d)
+{
+	return d < DIAGDIR_END;
+}
+
+static inline bool IsValidDirection(Direction d)
+{
+	return d < DIR_END;
+}
+
+static inline bool IsValidAxis(Axis d)
+{
+	return d < AXIS_END;
+}
+
+#endif /* DIRECTION_H */

dock_gui.c

@@ -1,31 +1,22 @@
 /* $Id$ */
 
-/** @file dock_gui.cpp */
-
 #include "stdafx.h"
 #include "openttd.h"
-#include "tile_map.h"
-#include "station.h"
-#include "gui.h"
-#include "terraform_gui.h"
-#include "window_gui.h"
-#include "station_gui.h"
-#include "command_func.h"
-#include "settings_type.h"
-#include "water.h"
-#include "window_func.h"
-#include "vehicle_func.h"
-#include "sound_func.h"
-#include "viewport_func.h"
-#include "gfx_func.h"
-#include "player_func.h"
-#include "slope_func.h"
-
 #include "table/sprites.h"
 #include "table/strings.h"
+#include "functions.h"
+#include "map.h"
+#include "window.h"
+#include "station.h"
+#include "gui.h"
+#include "viewport.h"
+#include "gfx.h"
+#include "sound.h"
+#include "command.h"
+#include "variables.h"
 
-static void ShowBuildDockStationPicker();
-static void ShowBuildDocksDepotPicker();
+static void ShowBuildDockStationPicker(void);
+static void ShowBuildDocksDepotPicker(void);
 
 static Axis _ship_depot_direction;
 
@@ -45,32 +36,32 @@ void CcBuildCanal(bool success, TileIndex tile, uint32 p1, uint32 p2)
 
 static void PlaceDocks_Dock(TileIndex tile)
 {
-	DoCommandP(tile, _ctrl_pressed, 0, CcBuildDocks, CMD_BUILD_DOCK | CMD_MSG(STR_9802_CAN_T_BUILD_DOCK_HERE));
+	DoCommandP(tile, 0, 0, CcBuildDocks, CMD_BUILD_DOCK | CMD_AUTO | CMD_MSG(STR_9802_CAN_T_BUILD_DOCK_HERE));
 }
 
 static void PlaceDocks_Depot(TileIndex tile)
 {
-	DoCommandP(tile, _ship_depot_direction, 0, CcBuildDocks, CMD_BUILD_SHIP_DEPOT | CMD_MSG(STR_3802_CAN_T_BUILD_SHIP_DEPOT));
+	DoCommandP(tile, _ship_depot_direction, 0, CcBuildDocks, CMD_BUILD_SHIP_DEPOT | CMD_AUTO | CMD_MSG(STR_3802_CAN_T_BUILD_SHIP_DEPOT));
 }
 
 static void PlaceDocks_Buoy(TileIndex tile)
 {
-	DoCommandP(tile, 0, 0, CcBuildDocks, CMD_BUILD_BUOY | CMD_MSG(STR_9835_CAN_T_POSITION_BUOY_HERE));
+	DoCommandP(tile, 0, 0, CcBuildDocks, CMD_BUILD_BUOY | CMD_AUTO | CMD_MSG(STR_9835_CAN_T_POSITION_BUOY_HERE));
 }
 
 static void PlaceDocks_DemolishArea(TileIndex tile)
 {
-	VpStartPlaceSizing(tile, VPM_X_AND_Y, DDSP_DEMOLISH_AREA);
+	VpStartPlaceSizing(tile, VPM_X_AND_Y | GUI_PlaceProc_DemolishArea);
 }
 
 static void PlaceDocks_BuildCanal(TileIndex tile)
 {
-	VpStartPlaceSizing(tile, VPM_X_OR_Y, DDSP_CREATE_WATER);
+	VpStartPlaceSizing(tile, VPM_X_OR_Y);
 }
 
 static void PlaceDocks_BuildLock(TileIndex tile)
 {
-	DoCommandP(tile, 0, 0, CcBuildDocks, CMD_BUILD_LOCK | CMD_MSG(STR_CANT_BUILD_LOCKS));
+	DoCommandP(tile, 0, 0, CcBuildDocks, CMD_BUILD_LOCK | CMD_AUTO | CMD_MSG(STR_CANT_BUILD_LOCKS));
 }
 
 
@@ -86,37 +77,38 @@ enum {
 
 static void BuildDocksClick_Canal(Window *w)
 {
-	HandlePlacePushButton(w, DTW_CANAL, SPR_CURSOR_CANAL, VHM_RECT, PlaceDocks_BuildCanal);
+	HandlePlacePushButton(w, DTW_CANAL, SPR_CURSOR_CANAL, 1, PlaceDocks_BuildCanal);
 }
 
 static void BuildDocksClick_Lock(Window *w)
 {
-	HandlePlacePushButton(w, DTW_LOCK, SPR_CURSOR_LOCK, VHM_RECT, PlaceDocks_BuildLock);
+	HandlePlacePushButton(w, DTW_LOCK, SPR_CURSOR_LOCK, 1, PlaceDocks_BuildLock);
 }
 
 static void BuildDocksClick_Demolish(Window *w)
 {
-	HandlePlacePushButton(w, DTW_DEMOLISH, ANIMCURSOR_DEMOLISH, VHM_RECT, PlaceDocks_DemolishArea);
+	HandlePlacePushButton(w, DTW_DEMOLISH, ANIMCURSOR_DEMOLISH, 1, PlaceDocks_DemolishArea);
 }
 
 static void BuildDocksClick_Depot(Window *w)
 {
-	if (!CanBuildVehicleInfrastructure(VEH_SHIP)) return;
-	if (HandlePlacePushButton(w, DTW_DEPOT, SPR_CURSOR_SHIP_DEPOT, VHM_RECT, PlaceDocks_Depot)) ShowBuildDocksDepotPicker();
+	if (HandlePlacePushButton(w, DTW_DEPOT, SPR_CURSOR_SHIP_DEPOT, 1, PlaceDocks_Depot)) ShowBuildDocksDepotPicker();
 }
 
 static void BuildDocksClick_Dock(Window *w)
 {
-	if (!CanBuildVehicleInfrastructure(VEH_SHIP)) return;
-	if (HandlePlacePushButton(w, DTW_STATION, SPR_CURSOR_DOCK, VHM_SPECIAL, PlaceDocks_Dock)) ShowBuildDockStationPicker();
+	if (HandlePlacePushButton(w, DTW_STATION, SPR_CURSOR_DOCK, 3, PlaceDocks_Dock)) ShowBuildDockStationPicker();
 }
 
 static void BuildDocksClick_Buoy(Window *w)
 {
-	if (!CanBuildVehicleInfrastructure(VEH_SHIP)) return;
-	HandlePlacePushButton(w, DTW_BUOY, SPR_CURSOR_BOUY, VHM_RECT, PlaceDocks_Buoy);
+	HandlePlacePushButton(w, DTW_BUOY, SPR_CURSOR_BOUY, 1, PlaceDocks_Buoy);
 }
 
+static void BuildDocksClick_Landscaping(Window *w)
+{
+	ShowTerraformToolbar();
+}
 
 typedef void OnButtonClick(Window *w);
 static OnButtonClick * const _build_docks_button_proc[] = {
@@ -126,7 +118,8 @@ static OnButtonClick * const _build_docks_button_proc[] = {
 	BuildDocksClick_Demolish,
 	BuildDocksClick_Depot,
 	BuildDocksClick_Dock,
-	BuildDocksClick_Buoy
+	BuildDocksClick_Buoy,
+	BuildDocksClick_Landscaping,
 };
 
 static void BuildDocksToolbWndProc(Window *w, WindowEvent *e)
@@ -134,7 +127,6 @@ static void BuildDocksToolbWndProc(Window *w, WindowEvent *e)
 	switch (e->event) {
 	case WE_PAINT:
 		DrawWindowWidgets(w);
-		w->SetWidgetsDisabledState(!CanBuildVehicleInfrastructure(VEH_SHIP), 7, 8, 9, WIDGET_LIST_END);
 		break;
 
 	case WE_CLICK:
@@ -149,6 +141,7 @@ static void BuildDocksToolbWndProc(Window *w, WindowEvent *e)
 			case '4': BuildDocksClick_Depot(w); break;
 			case '5': BuildDocksClick_Dock(w); break;
 			case '6': BuildDocksClick_Buoy(w); break;
+			case 'l': BuildDocksClick_Landscaping(w); break;
 			default:  return;
 		}
 		break;
@@ -158,43 +151,42 @@ static void BuildDocksToolbWndProc(Window *w, WindowEvent *e)
 		break;
 
 	case WE_PLACE_DRAG: {
-		VpSelectTilesWithMethod(e->we.place.pt.x, e->we.place.pt.y, e->we.place.select_method);
+		VpSelectTilesWithMethod(e->we.place.pt.x, e->we.place.pt.y, e->we.place.userdata);
 		return;
 	}
 
 	case WE_PLACE_MOUSEUP:
 		if (e->we.place.pt.x != -1) {
-			switch (e->we.place.select_proc) {
-				case DDSP_DEMOLISH_AREA:
-					GUIPlaceProcDragXY(e);
-					break;
-				case DDSP_CREATE_WATER:
-					DoCommandP(e->we.place.tile, e->we.place.starttile, 0, CcBuildCanal, CMD_BUILD_CANAL | CMD_MSG(STR_CANT_BUILD_CANALS));
-					break;
-				default: break;
+			if ((e->we.place.userdata & 0xF) == VPM_X_AND_Y) { // dragged actions
+				GUIPlaceProcDragXY(e);
+			} else if (e->we.place.userdata == VPM_X_OR_Y) {
+				DoCommandP(e->we.place.tile, e->we.place.starttile, _ctrl_pressed, CcBuildCanal, CMD_BUILD_CANAL | CMD_AUTO | CMD_MSG(STR_CANT_BUILD_CANALS));
 			}
 		}
 		break;
 
 	case WE_ABORT_PLACE_OBJ:
-		w->RaiseButtons();
+		RaiseWindowButtons(w);
 
 		w = FindWindowById(WC_BUILD_STATION, 0);
-		if (w != NULL) WP(w, def_d).close = true;
+		if (w != NULL) WP(w,def_d).close = true;
 
 		w = FindWindowById(WC_BUILD_DEPOT, 0);
-		if (w != NULL) WP(w, def_d).close = true;
+		if (w != NULL) WP(w,def_d).close = true;
 		break;
 
 	case WE_PLACE_PRESIZE: {
 		TileIndex tile_from;
 		TileIndex tile_to;
 
-		tile_from = e->we.place.tile;
-
-		DiagDirection dir = GetInclinedSlopeDirection(GetTileSlope(tile_from, NULL));
-		tile_to = (dir != INVALID_DIAGDIR ? TileAddByDiagDir(tile_from, ReverseDiagDir(dir)) : tile_from);
-
+		tile_from = tile_to = e->we.place.tile;
+		switch (GetTileSlope(tile_from, NULL)) {
+			case SLOPE_SW: tile_to += TileDiffXY(-1,  0); break;
+			case SLOPE_SE: tile_to += TileDiffXY( 0, -1); break;
+			case SLOPE_NW: tile_to += TileDiffXY( 0,  1); break;
+			case SLOPE_NE: tile_to += TileDiffXY( 1,  0); break;
+			default: break;
+		}
 		VpSetPresizeRange(tile_from, tile_to);
 	} break;
 
@@ -206,8 +198,8 @@ static void BuildDocksToolbWndProc(Window *w, WindowEvent *e)
 
 static const Widget _build_docks_toolb_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,     7,     0,    10,     0,    13, STR_00C5,                   STR_018B_CLOSE_WINDOW},
-{    WWT_CAPTION,   RESIZE_NONE,     7,    11,   123,     0,    13, STR_9801_DOCK_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
-{  WWT_STICKYBOX,   RESIZE_NONE,     7,   124,   135,     0,    13, 0x0,                        STR_STICKY_BUTTON},
+{    WWT_CAPTION,   RESIZE_NONE,     7,    11,   145,     0,    13, STR_9801_DOCK_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
+{  WWT_STICKYBOX,   RESIZE_NONE,     7,   146,   157,     0,    13, 0x0,                        STR_STICKY_BUTTON},
 {     WWT_IMGBTN,   RESIZE_NONE,     7,     0,    21,    14,    35, SPR_IMG_BUILD_CANAL,        STR_BUILD_CANALS_TIP},
 {     WWT_IMGBTN,   RESIZE_NONE,     7,    22,    43,    14,    35, SPR_IMG_BUILD_LOCK,         STR_BUILD_LOCKS_TIP},
 
@@ -217,50 +209,43 @@ static const Widget _build_docks_toolb_widgets[] = {
 {     WWT_IMGBTN,   RESIZE_NONE,     7,    70,    91,    14,    35, SPR_IMG_SHIP_DEPOT,         STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING},
 {     WWT_IMGBTN,   RESIZE_NONE,     7,    92,   113,    14,    35, SPR_IMG_SHIP_DOCK,          STR_981D_BUILD_SHIP_DOCK},
 {     WWT_IMGBTN,   RESIZE_NONE,     7,   114,   135,    14,    35, SPR_IMG_BOUY,               STR_9834_POSITION_BUOY_WHICH_CAN},
+{     WWT_IMGBTN,   RESIZE_NONE,     7,   136,   157,    14,    35, SPR_IMG_LANDSCAPING,        STR_LANDSCAPING_TOOLBAR_TIP},
 {   WIDGETS_END},
 };
 
 static const WindowDesc _build_docks_toolbar_desc = {
-	WDP_ALIGN_TBR, 22, 136, 36, 136, 36,
-	WC_BUILD_TOOLBAR, WC_NONE,
+	WDP_ALIGN_TBR, 22, 158, 36,
+	WC_BUILD_TOOLBAR, 0,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
 	_build_docks_toolb_widgets,
 	BuildDocksToolbWndProc
 };
 
-void ShowBuildDocksToolbar()
+void ShowBuildDocksToolbar(void)
 {
 	if (!IsValidPlayer(_current_player)) return;
 
 	DeleteWindowById(WC_BUILD_TOOLBAR, 0);
-	Window *w = AllocateWindowDesc(&_build_docks_toolbar_desc);
-	if (_patches.link_terraform_toolbar) ShowTerraformToolbar(w);
+	AllocateWindowDesc(&_build_docks_toolbar_desc);
+	if (_patches.link_terraform_toolbar) ShowTerraformToolbar();
 }
 
 static void BuildDockStationWndProc(Window *w, WindowEvent *e)
 {
 	switch (e->event) {
-	case WE_CREATE: w->LowerWidget(_station_show_coverage + 3); break;
+	case WE_CREATE: LowerWindowWidget(w, _station_show_coverage + 3); break;
 
 	case WE_PAINT: {
-		int rad = (_patches.modified_catchment) ? CA_DOCK : CA_UNMODIFIED;
+		int rad;
 
-		if (WP(w, def_d).close) return;
+		if (WP(w,def_d).close) return;
 		DrawWindowWidgets(w);
 
-		if (_station_show_coverage) {
-			SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);
-		} else {
-			SetTileSelectSize(1, 1);
-		}
+		rad = (_patches.modified_catchment) ? CA_DOCK : 4;
 
-		int text_end = DrawStationCoverageAreaText(4, 50, SCT_ALL, rad) + 4;
-		if (text_end > w->widget[2].bottom) {
-			SetWindowDirty(w);
-			ResizeWindowForWidget(w, 2, 0, text_end - w->widget[2].bottom);
-			SetWindowDirty(w);
-		}
+		if (_station_show_coverage) SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);
 
+		DrawStationCoverageAreaText(4, 50, (uint)-1, rad);
 		break;
 	}
 
@@ -268,9 +253,9 @@ static void BuildDockStationWndProc(Window *w, WindowEvent *e)
 		switch (e->we.click.widget) {
 			case 3:
 			case 4:
-				w->RaiseWidget(_station_show_coverage + 3);
-				_station_show_coverage = (e->we.click.widget != 3);
-				w->LowerWidget(_station_show_coverage + 3);
+				RaiseWindowWidget(w, _station_show_coverage + 3);
+				_station_show_coverage = e->we.click.widget - 3;
+				LowerWindowWidget(w, _station_show_coverage + 3);
 				SndPlayFx(SND_15_BEEP);
 				SetWindowDirty(w);
 				break;
@@ -278,7 +263,7 @@ static void BuildDockStationWndProc(Window *w, WindowEvent *e)
 		break;
 
 	case WE_MOUSELOOP:
-		if (WP(w, def_d).close) {
+		if (WP(w,def_d).close) {
 			DeleteWindow(w);
 			return;
 		}
@@ -287,7 +272,7 @@ static void BuildDockStationWndProc(Window *w, WindowEvent *e)
 		break;
 
 	case WE_DESTROY:
-		if (!WP(w, def_d).close) ResetObjectToPlace();
+		if (!WP(w,def_d).close) ResetObjectToPlace();
 		break;
 	}
 }
@@ -303,19 +288,19 @@ static const Widget _build_dock_station_widgets[] = {
 };
 
 static const WindowDesc _build_dock_station_desc = {
-	WDP_AUTO, WDP_AUTO, 148, 75, 148, 75,
+	WDP_AUTO, WDP_AUTO, 148, 75,
 	WC_BUILD_STATION, WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_build_dock_station_widgets,
 	BuildDockStationWndProc
 };
 
-static void ShowBuildDockStationPicker()
+static void ShowBuildDockStationPicker(void)
 {
 	AllocateWindowDesc(&_build_dock_station_desc);
 }
 
-static void UpdateDocksDirection()
+static void UpdateDocksDirection(void)
 {
 	if (_ship_depot_direction != AXIS_X) {
 		SetTileSelectSize(1, 2);
@@ -327,7 +312,7 @@ static void UpdateDocksDirection()
 static void BuildDocksDepotWndProc(Window *w, WindowEvent *e)
 {
 	switch (e->event) {
-	case WE_CREATE: w->LowerWidget(_ship_depot_direction + 3); break;
+	case WE_CREATE: LowerWindowWidget(w, _ship_depot_direction + 3); break;
 
 	case WE_PAINT:
 		DrawWindowWidgets(w);
@@ -342,9 +327,9 @@ static void BuildDocksDepotWndProc(Window *w, WindowEvent *e)
 		switch (e->we.click.widget) {
 		case 3:
 		case 4:
-			w->RaiseWidget(_ship_depot_direction + 3);
-			_ship_depot_direction = (e->we.click.widget == 3 ? AXIS_X : AXIS_Y);
-			w->LowerWidget(_ship_depot_direction + 3);
+			RaiseWindowWidget(w, _ship_depot_direction + 3);
+			_ship_depot_direction = e->we.click.widget - 3;
+			LowerWindowWidget(w, _ship_depot_direction + 3);
 			SndPlayFx(SND_15_BEEP);
 			UpdateDocksDirection();
 			SetWindowDirty(w);
@@ -353,11 +338,11 @@ static void BuildDocksDepotWndProc(Window *w, WindowEvent *e)
 	} break;
 
 	case WE_MOUSELOOP:
-		if (WP(w, def_d).close) DeleteWindow(w);
+		if (WP(w,def_d).close) DeleteWindow(w);
 		break;
 
 	case WE_DESTROY:
-		if (!WP(w, def_d).close) ResetObjectToPlace();
+		if (!WP(w,def_d).close) ResetObjectToPlace();
 		break;
 	}
 }
@@ -372,7 +357,7 @@ static const Widget _build_docks_depot_widgets[] = {
 };
 
 static const WindowDesc _build_docks_depot_desc = {
-	WDP_AUTO, WDP_AUTO, 204, 86, 204, 86,
+	WDP_AUTO, WDP_AUTO, 204, 86,
 	WC_BUILD_DEPOT, WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_build_docks_depot_widgets,
@@ -380,14 +365,14 @@ static const WindowDesc _build_docks_depot_desc = {
 };
 
 
-static void ShowBuildDocksDepotPicker()
+static void ShowBuildDocksDepotPicker(void)
 {
 	AllocateWindowDesc(&_build_docks_depot_desc);
 	UpdateDocksDirection();
 }
 
 
-void InitializeDockGui()
+void InitializeDockGui(void)
 {
 	_ship_depot_direction = AXIS_X;
 }

docs/32bpp.txt

@@ -1,36 +0,0 @@
-32bpp and OpenTTD
-=================
-
-OpenTTD has 32bpp support. This means: OpenTTD still is 8bpp, but it has the
-posibility to override the graphics with 32bpp. This means that it isn't a
-replacement of grf or newgrf, but simply an addition. If you want to use 32bpp
-graphics of a newgrf, you do need the newgrf itself too (with 8bpp graphics).
-
-
-The Format
-----------
-
-32bpp images are stored in PNG. They should go in:
-  data/sprites/<grfname>/<SpriteID>.png
-
-For example, a grfname would be 'openttd' (without .grf, lowercase), and the
-SpriteID 3, to override the 3rd sprite in openttd.grf with a 32bpp version.
-
-The format of this PNG can be almost anything, but we advise to use RGBA
-format. Alpha-channel is fully supported.
-
-As the core of OpenTTD is 8bpp, and because you of course want company colours
-in your images, you will need to add a mask for every sprite that needs colour
-remapping. The name is simular as above, only you have to put a 'm' behind the
-SpriteID. This image should be a 8bpp palette image, where the palette is the
-OpenTTD palette. Upon load of the PNG, the mask is loaded too, and overrides
-the RGB (not the Alpha) of the original PNG image, and replacing it with a
-8bpp color remapped and converted to 32bpp.
-
-An other thing that OpenTTD needs in your png, is 2 tEXt chunks: x_offs and
-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.
-
-Your images should be the same as the grf, in size.
-

docs/HOWTO_compile_lang_files.txt

@@ -1,59 +0,0 @@
-STRGEN USAGE
-------------
-This guide is only interesting for people who want to alter something
-themselves without access to WT2 (translator2.openttd.org). Please note that
-your compiled language file will only be compatible with the OpenTTD version
-you have downloaded english.txt, the master language file, for. While this is
-not always true, namely when changes in the code have not touched language
-files, your safest bet is to assume this 'limitation'.
-As a first step you need to compile strgen. This is as easy as typing
-'make strgen'. You can also download a precompiled binary from a release,
-nightly, etc.
-strgen takes as argument a txt file and translates it to a lng file, allowing
-it to be used inside OpenTTD. strgen needs the master language file
-english.txt to work. Below are some examples of strgen usage.
-
-EXAMPLES
---------
-Example 1:
-if you are in the root of your working copy (svn code), you should type
-strgen/strgen -s lang lang/english.txt
-to compile englist.txt into english.lng. It will be placed in the lang dir
-
-Example 2:
-you only have the strgen executable (no working copy) and you want to compile
-a txt file in the same directory. You should type
-./strgen english.txt
-and you will get and english.lng in the same dir
-
-Example 3:
-you have strgen somewhere, english.txt in /usr/openttd/lang and you want the
-resulting language file to go to /tmp. Use
-./strgen -s /usr/openttd/lang -d /tmp english.txt
-
-You can interchange english.txt to whichever language you want to generate a
-.lng file for.
-
-STRGEN COMMAND SWITCHES
------------------------
--v | --version
-strgen will tell what svn revision it was last modified
-
--t | --todo
-strgen will add <TODO> to any untranslated/missing strings and use the english
-strings while compiling the language file
-
--w | --warning
-strgen will print any missing strings or wrongly translated (bad format)
-to standard error output(stderr)
-
--h | --help | -?
-Print out a summarized help message explaining these switches
-
--s | --source_dir
-strgen will search for the master file english.txt in the directory specified
-by this switch instead of the current directory
-
--d | --dest_dir
-strgen will put <language>.lng in the directory specified by this switch; if
-no dest_dir is given, output is the same as source_dir

docs/Howto_compile_lng_files_from_CLI.txt

@@ -0,0 +1,48 @@
+This is a guide to compile strgen on gcc
+
+All this is done in the makefile, so it's only interesting for people, who wants to alter something themselves (translators)
+
+HOWTO compile lng files:
+
+First you get strgen compiled (look below/download nightly build/run makefile)
+
+strgen takes the argument of a txt file and translates it to a lng file and places that lng file in the same dir as the txt file.
+
+Example 1:
+if you are in the root of your working copy (svn code), you should type
+strgen/strgen lang/english.txt
+to compile englist.lng. It will be placed in the lang dir
+
+Example 2:
+you have strgen but not the source and you want to compile a txt file in the same dir. YOu should type
+./strgen english.txt
+and you will get english.lng in the same dir
+
+You can change english to whatever language you want
+
+Commands used by strgen
+
+-v --version
+strgen will tell what svn revision it is based on
+
+-t
+strgen will add <TODO> to the missing strings and use the english strings while compiling
+this will need english.txt to be present
+
+-w
+strgen will print any missing strings to standard error output(stderr)
+this will need english.txt to be present
+
+here are a very useful tool for translators:
+http://openttd.rulez.org/
+
+
+HOWTO compile strgen:
+(this should be useless as you can just type make)
+Goto the main dir
+Compile by typing
+gcc strgen/strgen.c -o strgen/strgen -DUNIX
+or if you want it to tell the revision too
+gcc strgen/strgen.c rev.o -o strgen/strgen -DUNIX -DWITH_REV (this is the one the makefile uses)
+
+you now have a program called strgen in the strgen directory

docs/Manual.txt

@@ -13,11 +13,12 @@ Once you have obtained a recent copy of the source, you must build it. Windows b
 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.
+Use make or gmake to compile OpenTTD. You can adjust Makefile.config to compile with other options.
 
 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.
@@ -57,6 +58,7 @@ However, there is an even more noticable difference in rail station construction
 
 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.

docs/OSX_why_multiple_applications.txt

@@ -0,0 +1,10 @@
+There are currently two different downloads for OSX, one is named osx, while the other one is named osx-jaguar
+
+The reason for this is that Apple added more functionality to 10.3 and to make use of that, it will no longer run on OSX 10.2 (codenamed Jaguar). To make the game useable on Jaguar, then a special download is available, but it will miss the bugfixes/features, that relies on newer functionality.
+
+The general download is a universal binary and should work great on all macs using 10.3.9 or newer, no matter what processor it got. You should at all time avoid the Jaguar Build if possible.
+
+Technically the universal binary is a triple binary because it contains code for 3 CPUs and the CPUs in question are PPC (G3+G4), G5 and Intel. The Jaguar build is only optimised for PPC and other (newer) CPUs will not benefit so much from their advanced features. This is another reason to avoid the Jaguar build. It's generally slower on modern CPUs.
+
+Current list of missing features in the Jaguar build:
+-Can't save screenshots or savegames if certain chars are in the filename. This mainly applies to European chars and hits German hard as the month Mär (Mar) can't be saved

docs/Readme_Mandrake_Linux.txt

@@ -0,0 +1,62 @@
+Compiling and developing OpenTTD on MandrakeLinux 10.0 Official
+
+A quick guide to get started with OpenTTD development on Linux.
+---------------------------------------------------------------
+
+1.) RPMs:
+
+Most packages that are required for development (like gcc) should already be installed on your box. You will require those RPMs additionally:
+- libsdl1.2-devel-1.2.7-2mdk
+- subversion-1.0.1-1mdk (+ dependencies)
+- libsvn_ra_svn1_0-1.0.1-1mdk
+
+
+2.) Subversion:
+
+To obtain the source code from the subversion server type
+  $ svn co svn://svn.openttd.com/openttd/trunk openttd
+from command line to dump the code into the directory 'openttd'.
+
+To update your working copy to the latest revision use
+  $ svn update
+Don't worry, your version will be merged with the latest version.
+
+The command
+  $ svn diff > mypatch.diff
+creates a patch file (aka diff file) which you can submit to the developers to share your improvements.
+
+You can undo changes to a file with
+  $svn revert filename
+
+
+3.) Required data files:
+
+Copy the following files from Transport Tycoon Deluxe to openttd/data/
+  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.)
+
+
+4.) Compiling and running:
+
+Compile OpenTTD with
+  $ make
+and run it with
+  $ ./ttd
+
+
+5.) Playing the soundtrack:
+
+If you want the original TTD music you need to copy the whole /gm/ directory from Windows. Additionally the TiMidity driver is required:
+  TiMidity++-2.12.0-0.pre1.4mdk (+ dependencies)
+To run OpenTTD with music support type
+  $ ./ttd -m extmidi
+
+
+X.) Last Update: $Date: 2004-06-01 19:08:09 +0200 (Tue, 01 Jun 2004) $
+    Written for revision $Rev: 710 $

docs/Readme_OS2.txt

@@ -50,10 +50,6 @@ To enable music, start OpenTTD with the command line:
 If I hear enough responses that both music and sound work together (it might
 just be my system), I'll have the defaults changed.
 
-Please note also that the GCC version does not currently support the MCI MIDI
-system.
-
-
 A NOTE ABOUT DEDICATED MULTIPLAYER SERVERS
 ------------------------------------------
 
@@ -64,8 +60,6 @@ directly will result in the console not being displayed. You may
 still pass any other parameters ('-D' is already passed) to
 dedicated.cmd.
 
-You can find the dedicated.cmd file in the os/os2 directory.
-
 =========================
 BUILDING THE OS/2 VERSION
 =========================
@@ -73,33 +67,16 @@ BUILDING THE OS/2 VERSION
 Compiler
 --------
 
-Innotek GCC, an OS/2 port of the popular GCC compiler, was used to build OpenTTD.
-See www.innotek.de for more information. You WILL need a reasonably UNIX-like
-build environment in order to build OpenTTD successfully - the following link
-may help to set one up (although some of the links from that page are broken):
+Open Watcom 1.3 was used to build OpenTTD (earlier versions will
+NOT work). See http://www.openwatcom.org/ to download it. It may
+also be possible to build OpenTTD with GCC: I attempted this
+before using Open Watcom, but found the tools available for OS/2
+at the time to be a bit more tricky to get working.
 
-   http://www.mozilla.org/ports/os2/gccsetup.html
-
-Alternatively, Paul Smedley's ready-to-go GCC build environment has been known to
-successfully build the game:
-
-   http://www.smedley.info/os2ports/index.php?page=build-environment
-
-To build, you should, if your environment is set up well enough, be able to just
-type `./configure' (or `sh configure' if you're using the OS/2 shell) and `make'.
-
-You may have to manually specify `--os OS2' on the configure command line, as
-configure cannot always detect OS/2 correctly.
-
-A note on Open Watcom
----------------------
-
-Open Watcom C/C++ was previously used to build OpenTTD (version 0.4.x and earlier).
-However, due to advanced C++ features used in the YAPF portion of OpenTTD 0.5
-in particular, the compiler is no longer able to build the game at the moment.
-Hopefully one day Open Watcom will be able to catch up and we will be able to build
-the game once again (it's easier than getting an OS/2 UNIX-like environment set up
-in my opinion!), but until then, OpenTTD 0.5 and later can only be built with GCC.
+Due to complexities in my set-up, I actually used the Win32 version
+of Open Watcom to initially compile OpenTTD for OS/2. There should
+be no reason of course why the OS/2 version cannot be used, and I
+have subsequently built OpenTTD successfully this way.
 
 Libraries Required
 ------------------
@@ -110,23 +87,42 @@ to an IDE project file and built a library. Do not use the makefiles
 provided, they are not designed for Watcom (apart from SDL):
 
 - zlib
-  http://www.zlib.org/
+  http://www.zlib.org/ - contains a makefile for OS/2, but is out
+  of date and uses EMX, ignore this
 
 - libpng
-  http://www.libpng.org/
+  http://www.libpng.org/ - contains an EMX/gcc makefile, ignore this
 
 - SDL for OS/2
   ftp://ftp.netlabs.org/pub/sdl/sdl-1.2.7-src-20051222.zip used for
   0.4.7
 
-- Freetype
-  http://freetype.sourceforge.net/
-
-Currently, there are no pre-built libraries available for GCC. If you manage to get
-OpenTTD working on Watcom though (do let us know if this is the case!), pre-built
-versions can be downloaded from the Files section at
+If you do not wish to build the libraries yourself, pre-built versions
+can be downloaded from the Files section at
 http://sourceforge.net/projects/openttd/ - see "os2-useful-v1.1.zip".
 
+A Note About Subversion Revision Numbers
+----------------------------------------
+
+The project file uses a bit of a hack to find out the SVN revision number and
+create an appropriate rev.c file. You'll need the SVN tools in your path
+(specifically, "svnversion"). If "svnversion" can't be found, a generic rev.c
+with the revision set to "norev000" will be created. To specifically force a
+version number, set the environment variable "RELEASE" to the number (eg, "0.3.6")
+-before- starting the Open Watcom IDE (which must be launched from the same shell
+session). Also, beware, as you WILL cause incompatibilities if you try to
+play a multiplayer game with a different version.
+
+Compiling
+---------
+
+To compile, open the os/os2/openttd.wpj file in the IDE and first build
+the strgen.exe target. This will build the .lng file generator, and will
+also attempt to build all the language files (plus the table\strings.h
+file which is required for openttd.exe to be built). Once strgen.exe and
+the language files are built successfully, you can build the openttd.exe
+target.
+
 Contact Information
 -------------------
 
@@ -134,6 +130,4 @@ If you have any questions regarding OS/2 issues, please contact me
 (owen@owenrudge.net) and I'll try to help you out. For general OpenTTD
 issues, see the Contacting section of readme.txt.
 
-Thanks to Paul Smedley for his help with getting OpenTTD to compile under GCC on OS/2.
-
-- Owen Rudge, 24th June 2007
+- Owen Rudge

docs/Readme_Windows_MSVC.txt

@@ -1,115 +1,104 @@
-Compiling OpenTTD using Microsoft Visual C++
-January 2, 2007
---------------------------------------------
-PLEASE READ THE ENTIRE DOCUMENT BEFORE DOING ANY ACTUAL CHANGES!!
+Compiling OpenTTD using Microsoft Visual C++ 6.0
 
 
-SUPPORTED MSVC COMPILERS
-------------------------
-OpenTTD includes projects for MSVC 2005.NET and MSVC 2008.NET. Both will
-compile out of the box, providing you have the required libraries/headers;
-which ones, see below. There is no support for VS6 or MSVC 2002, or
-MSVC 2003.NET. You are therefore strongly encouraged to either upgrade to
-MSVC 2005 Express (free) or use GCC.
+Step 1: Ingredients
 
-
-1) REQUIRED FILES
------------------
-You might already have some of the files already installed, so check before
-downloading; mostly because the DirectX SDK and Platform SDK are about
-500MB each.
 Download the following files:
 
-	* openttd-useful.zip (http://sf.net/project/showfiles.php?group_id=103924&package_id=114307)
-	* DirectX 8.1 SDK (http://neuron.tuke.sk/~mizanin/eng/Dx81sdk-include-lib.rar) (or alternatively the latest DirectX SDK from Microsoft)
-	* MS Windows Platform SDK (http://www.microsoft.com/downloads/details.aspx?FamilyId=A55B6B43-E24F-4EA3-A93E-40C0EC4F68E5&displaylang=en)
-	* afxres.h (http://www-d0.fnal.gov/d0dist/dist/packages/d0ve/devel/windows/AFXRES.H)
+    * Openttd-useful.zip (http://sourceforge.net/project/showfiles.php?group_id=103924&package_id=114307&release_id=228633)
+    * DirectX 8.1 SDK (http://neuron.tuke.sk/~mizanin/eng/Dx81sdk-include-lib.rar) (or alternatively the latest DirectX SDK from Microsoft)
+    * The February 2003 Microsoft Platform SDK (http://www.microsoft.com/msdownload/platformsdk/sdkupdate/XPSP2FULLInstall.htm) (newer SDK's do not work with MSVC6)
+    * afxres.h (http://www-d0.fnal.gov/d0dist/dist/packages/d0ve/devel/windows/AFXRES.H) (maybe you not need this)
 
 ...and of course the newest source from svn://svn.openttd.org/trunk
 
-You need an SVN-client to download the source from subversion:
+You have to have a SVN-client to download the source:
 
-	* CLI Subversion (http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91)
-	* GUI TortoiseSVN (http://tortoisesvn.tigris.org/download.html)
+    * Command line version (Subversion 1.2.3 Win32 binaries) (http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91)
+    * GUI TortoiseSVN (http://tortoisesvn.tigris.org/download.html)
+
+Step 2: Includes and Libraries
+
+Put the newly downloaded files in the VC lib and include directories (Where "C:\Program Files\Microsoft Visual Studio\VC98" is your local location of VC)
 
 
-2) INCLUDES AND LIBRARIES
--------------------------
-Put the newly downloaded files in the VC lib\ and include\ directories; where
-"C:\Program Files\Microsoft Visual Studio 8\VC" is your location of Visual C.
-If you are compiling for an x64 system, use the include\ and lib\ directories
-from the win64/ folder.
+    * zconf.h [useful.zip]
+    * zlib.h [useful.zip]
+    * png.h [useful.zip]
+    * pngconf.h [useful.zip]
+    * afxres.h
 
-	* openttd-useful.zip\include\*
-	* afxresh.h
-	to >	C:\Program Files\Microsoft Visual Studio 8\VC\Include
+in
 
-	* openttd-useful.zip\lib\*
-	to >	C:\Program Files\Microsoft Visual Studio 8\VC\Lib
+ C:\Program Files\Microsoft Visual Studio\VC98\Include
 
-Custom directories might be recommended, check 2.2)
+and
+
+    * zlibstat.lib [useful.zip]
+    * libpng.lib [useful.zip]
+
+in
+
+ C:\Program Files\Microsoft Visual Studio\VC98\Lib
 
 
-2.1) INCLUDES AND LIBRARIES - DIRECTX/PLATFORM SDK
---------------------------------------------------
-Basically the same procedure as with the useful zip file, providing
-you are not using the Microsoft installer. Put the include files in the
-include\ directory and the library files to the Lib\ directory.
+Step 3: DirectX SDK
 
-It is recommended to use custom directories so you don't overwrite any
-default header or library files.
+(This should work with the latest DirectX SDK as well.)
+
+There are 2 folder in the compressed file: Include and Lib
+
+Copy all files from Include folder to
+
+C:\Program Files\Microsoft Visual Studio\VC98\Include
+
+and all files from Lib folder to
+
+C:\Program Files\Microsoft Visual Studio\VC98\Lib
 
 
-2.2) CUSTOM DIRECTORIES
------------------------
-If you have put the above include and/or library files into custom folders,
-MSVC will not find them by default. You need to add these paths to VC through:
 
-Tools > Options > Projects and Solutions > VC++ Directories > show directories for
+You can also make custom directories, which is recommended so you don't overwrite VS6 files, for libraries (.lib) and includes/header files (.h) and add it to the VC paths via:
 
-	* Include files: Add the DirectX/Platform SDK include dir you've created
-	* Library files: Add the path to the SDK custom lib dir
+Tools -> Options -> Directories -> show directories for:
 
-NOTE: make sure that the directory for the DirectX SDK is the first one in the
-list, above all others, otherwise compilation will most likely fail!!
+a) include files (the include dir: C:\Program Files\Microsoft Visual Studio\VC98\DirectX 8.1 SDK\include )
+
+b) library files (the lib dir, C:\Program Files\Microsoft Visual Studio\VC98\DirectX 8.1 SDK\lib )
+
+NOTE: make sure that the directory for the DirectX SDK is the first one in the list, above all others, otherwise compilation will most likely fail!!
+
+Step 4: TTD Graphics files
+
+Copy the following files from Transport Tycoon Deluxe to the data folder
+
+    * sample.cat
+    * trg1r.grf
+    * trgcr.grf
+    * trghr.grf
+    * trgir.grf
+    * trgtr.grf
 
 
-3) TTD GRAPHICS FILES
----------------------
-Copy the following files from Transport Tycoon Deluxe to the bin/data folder
+Step 5: Compiling
 
-	* sample.cat
-	* trg1r.grf
-	* trgcr.grf
-	* trghr.grf
-	* trgir.grf
-	* trgtr.grf
+Open trunk/openttd.dsw
 
+Build menu > Set active configuration > Select: "openttd - Win32 Release"
 
-4) COMPILING
-------------
-Open trunk/openttd_vs[89]0.sln
-Set the build mode to 'Release' in
-Build > Configuration manager > Active solution configuration > select "Release"
 Compile...
 
-If everything works well the binary should be in trunk/objs/Win[32|64]/Release/openttd.exe
 
+Now it should work, it worked for me :)
 
-5) EDITING, CHANGING SOURCE CODE
---------------------------------
-Set the build mode (back to) 'Debug'
-Change the startup project to openttd by right-clicking the 'openttd' project
-in the Solution Explorer and selecting 'Set as Startup Project'. The 'openttd'
-project should now show up bold instead of 'strgen'.
+From r1319 you can compile branch/map in Debug mode (by Bociusz)
 
+For compiling branch/cargo-packets you have to add cargo.c and .h to this tree's openttd.dsp
 
-6) PROBLEMS?
-------------
-If compilation fails, double-check that you are using the latest SVN (!)
-source. If it still doesn't work, check in on IRC (irc://irc.oftc.net/openttd),
-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.
+If it's not working, and you checked that you using the newest SVN (!) report to Bociusz on IRC (irc://irc.freenode.net/openttd)
 
-An up-to-date version of this README can be found on the wiki:
-http://wiki.openttd.org/index.php/MicrosoftVisualCExpress
+Go ahead and make that patch! Happy Hacking! :)
+
+Originally written by Dribbel
+
+Project file updating by Bociusz

docs/console.txt

@@ -0,0 +1,58 @@
+OPENTTD INGAME CONSOLE DOCUMENTATION
+====================================
+http://wiki.openttd.org/index.php/OpenTTDDevBlackBook
+for detailed information
+
+*** WARNING **
+ This document is out of date
+*** WARNING **
+
+HOTKEY: BACKQUOTE (aka tilde, the key left to "1")
+
+COMMANDS:
+---------
+
+echo [string]
+echoc [color-code] [string]
+exit
+debug_level [0-9]
+dump_vars [filter]
+help
+list_cmds [filter]
+list_vars [filter]
+printf [formatstring] [var] [var] [var]....
+printfc [color-code] [formatstring] [var] [var] [var]....
+quit
+random
+screenshot ["big"/"no_con"]
+
+VARIABLES:
+----------
+*con_developer
+-> true = console debugging info
+-> false = no output
+
+*developer
+-> 0 = no output
+-> 1 = console error output [like command not found]
+-> 2 = console error and debug output
+
+*cursor_rate
+-> 1-12 = defines the cursor blink interval
+
+
+VARIABLE HANDLING:
+------------------
+
+developer = 0
+developer ++
+
+temp_string = test
+temp_string = "my little"
+
+printf "%s world" temp_string
+
+
+---------------------------------------------------
+feel free to add more commands and use this in-game
+console for your debugging / enhancements

docs/directmusic.txt

@@ -0,0 +1,20 @@
+Notes about DirectMusic driver for Win32
+----------------------------------------
+
+If compiling under MinGW32, you require the DirectX 7.0 files for MinGW32, available from
+http://alleg.sourceforge.net/files/dx70_mgw.zip.
+
+If compiling under MSVC 6.0, you require the equivalent for MSVC, available from
+http://alleg.sourceforge.net/files/dx70_min.zip. MSVC 7.0/7.1 include header files that
+are recent enough.
+
+If you do not want to compile the DirectMusic driver, undefine WIN32_ENABLE_DIRECTMUSIC_SUPPORT
+in stdafx.h.
+
+Bugs, etc
+---------
+
+- The volume control doesn't work properly. I'll fix this soon.
+
+Owen Rudge
+14th March 2004

docs/landscape_externals.html

@@ -1,616 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
- <meta name="Author" content="Marcin Grzegorczyk">
- <meta name="Description" content="Structure of OpenTTD (OTTD) landscape arrays">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>OpenTTD Landscape externals</title>
-</head>
-
-<body>
- <h3><a name="Landscape">Landscape</a></h3>
- <p>
- These are the different house types available on standard game.<br>
- <small>Note: In the climate list, 'sub-arctic' means below the snow line, and 'snow' means above the snow line in the sub-arctic climate.</small>
- </p>
-
- <table>
-  <tr>
-   <th align=left>Type&nbsp;</th>
-   <th align=left>Size&nbsp;</th>
-   <th align=left>Climates&nbsp;</th>
-   <th align=left>Description</th>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>00</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate</td>
-   <td align=left>tall office block</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>01</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate</td>
-   <td align=left>office block</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>02</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate</td>
-   <td align=left>small block of flats</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>03</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate</td>
-   <td align=left>church</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>04</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate, sub-arctic, sub-tropical</td>
-   <td align=left>large office block</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>05</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>snow</td>
-   <td align=left>large office block</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>06</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate</td>
-   <td align=left>town houses</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>07</tt>..<tt>08</tt>&nbsp; </td>
-   <td>1&times;2</td>
-   <td>temperate</td>
-   <td align=left>hotel</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>09</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate, sub-arctic, sub-tropical&nbsp;&nbsp;</td>
-   <td align=left>statue</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>0A</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate, sub-arctic, sub-tropical</td>
-   <td align=left>fountain</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>0B</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate</td>
-   <td align=left>park (with a pond)</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>0C</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate</td>
-   <td align=left>park (with an alley)</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>0D</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate</td>
-   <td align=left>office block</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>0E</tt>..<tt>10</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate</td>
-   <td align=left>various types of shops and offices</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>11</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate, sub-arctic, sub-tropical</td>
-   <td align=left>modern office building</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>12</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate</td>
-   <td align=left>warehouse</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>13</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate</td>
-   <td align=left>office block (with spiral stairway on the side)</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>14</tt>..<tt>17</tt>&nbsp; </td>
-   <td>2&times;2</td>
-   <td>temperate</td>
-   <td align=left>stadium</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>18</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate</td>
-   <td align=left>old houses</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>19</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate</td>
-   <td align=left>cottages</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>1A</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate</td>
-   <td align=left>houses</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>1B</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate</td>
-   <td align=left>flats</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>1C</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate</td>
-   <td align=left>tall office block</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>1D</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate</td>
-   <td align=left>shops and offices</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>1E</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate, sub-tropical</td>
-   <td align=left>shops and offices</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>1F</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate</td>
-   <td align=left>theatre</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>20</tt>..<tt>23</tt>&nbsp; </td>
-   <td>2&times;2</td>
-   <td>temperate, sub-arctic, sub-tropical</td>
-   <td align=left>stadium (modern style)</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>24</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate, sub-arctic, sub-tropical</td>
-   <td align=left>offices (the modern 'vertical tube' style)</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>25</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-arctic</td>
-   <td align=left>houses</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>26</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>snow</td>
-   <td align=left>houses</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>27</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>temperate</td>
-   <td align=left>cinema</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>28</tt>..<tt>2B</tt>&nbsp; </td>
-   <td>2&times;2</td>
-   <td>temperate</td>
-   <td align=left>shopping mall</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>2C</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-arctic</td>
-   <td align=left>flats</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>2D</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>snow</td>
-   <td align=left>flats</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>2E</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-arctic</td>
-   <td align=left>houses</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>2F</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>snow</td>
-   <td align=left>houses</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>30</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-arctic</td>
-   <td align=left>houses</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>31</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>snow</td>
-   <td align=left>houses</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>32</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-arctic, sub-tropical</td>
-   <td align=left>tall office block</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>33</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>snow</td>
-   <td align=left>tall office block</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>34</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-arctic</td>
-   <td align=left>tall office block</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>35</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>snow</td>
-   <td align=left>tall office block</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>36</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-arctic, sub-tropical</td>
-   <td align=left>tall office block</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>37</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>snow</td>
-   <td align=left>tall office block</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>38</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-arctic</td>
-   <td align=left>houses</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>39</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>snow</td>
-   <td align=left>houses</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>3A</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-arctic</td>
-   <td align=left>shops and offices</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>3B</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>snow</td>
-   <td align=left>shops and offices</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>3C</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-arctic</td>
-   <td align=left>church</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>3D</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>snow</td>
-   <td align=left>church</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>3E</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-arctic</td>
-   <td align=left>houses</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>3F</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>snow</td>
-   <td align=left>houses</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>40</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-arctic</td>
-   <td align=left>shops and offices</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>41</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>snow</td>
-   <td align=left>shops and offices</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>42</tt>..<tt>43</tt>&nbsp; </td>
-   <td>1&times;2</td>
-   <td>sub-arctic</td>
-   <td align=left>hotel</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>44</tt>..<tt>45</tt>&nbsp; </td>
-   <td>1&times;2</td>
-   <td>snow</td>
-   <td align=left>hotel</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>46</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-arctic, sub-tropical</td>
-   <td align=left>shops and offices</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>47</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>snow</td>
-   <td align=left>shops and offices</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>48</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-arctic</td>
-   <td align=left>tall office block</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>49</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>snow</td>
-   <td align=left>tall office block</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>4A</tt>..<tt>4B</tt>&nbsp; </td>
-   <td>2&times;1</td>
-   <td>sub-arctic</td>
-   <td align=left>tall office block</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>4C</tt>..<tt>4D</tt>&nbsp; </td>
-   <td>2&times;1</td>
-   <td>snow</td>
-   <td align=left>tall office block</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>4E</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-tropical</td>
-   <td align=left>houses (with a tree in a corner)</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>4F</tt>, <tt>50</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-tropical</td>
-   <td align=left>houses</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>51</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-tropical</td>
-   <td align=left>houses (suburb-type)</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>52</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-tropical</td>
-   <td align=left>flats</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>53</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-tropical</td>
-   <td align=left>church</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>54</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-tropical</td>
-   <td align=left>houses (with two trees in front)</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>55</tt>, <tt>56</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-tropical</td>
-   <td align=left>flats</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>57</tt>..<tt>58</tt>&nbsp; </td>
-   <td>2&times;1</td>
-   <td>sub-tropical</td>
-   <td align=left>tall office block</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>59</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-tropical</td>
-   <td align=left>flats</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>5A</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>sub-tropical</td>
-   <td align=left>tall office block</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>5B</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>toyland</td>
-   <td align=left>church</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>5C</tt>..<tt>61</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>toyland</td>
-   <td align=left>various types of toyland houses</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>62</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>toyland</td>
-   <td align=left>tall office block</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>63</tt>..<tt>64</tt>&nbsp; </td>
-   <td>1&times;2</td>
-   <td>toyland</td>
-   <td align=left>houses ('shoe' style)</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>65</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>toyland</td>
-   <td align=left>tall office block</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>66</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>toyland</td>
-   <td align=left>igloo</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>67</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>toyland</td>
-   <td align=left>tepees</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>68</tt>, <tt>69</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>toyland</td>
-   <td align=left>shops and offices</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>6A</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>toyland</td>
-   <td align=left>tall office block</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>6B</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>toyland</td>
-   <td align=left>statue</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>6C</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>toyland</td>
-   <td align=left>teapot-house</td>
-  </tr>
-
-  <tr>
-   <td nowrap valign=top><tt>6D</tt>&nbsp; </td>
-   <td>1&times;1</td>
-   <td>toyland</td>
-   <td align=left>piggy-bank</td>
-  </tr>
- </table>
-</body>
-
-</html>

docs/landscape_grid.html

@@ -6,7 +6,6 @@
   <title>OpenTTD Landscape Internals - #2</title>
   <style type="text/css">
     span.abuse { font-family: "Courier New", Courier, mono; background-color: rgb(255, 58, 31); }
-    span.option{ font-family: "Courier New", Courier, mono; background-color: rgb(255,255, 30); }
     span.free  { font-family: "Courier New", Courier, mono; background-color: rgb(30, 178, 54); }
     span.used  { font-family: "Courier New", Courier, mono; }
     td.bits    { white-space: nowrap; text-align: center; font-family: "Courier New", Courier, mono; }
@@ -17,14 +16,13 @@
 </head>
 <body style="direction: ltr;">
 <h3 style="font-weight: bold;">Landscape</h3>
-<span style="font-weight: bold;"></span>Six attributes hold the information about a tile.
+<span style="font-weight: bold;"></span>Five attributes hold the information about a tile.
 This can be seen in the <a href="landscape.html">Landscape</a> document. This page tries to give an overview of used and free bits of
 the array so you can quickly see what is used and what is not.
 <ul>
   <li><span style="font-weight: bold;"><span class="free">O</span></span> - bit is free</li>
   <li><span style="font-weight: bold;"><span class="used">X</span></span> - bit is used</li>
-  <li><span style="font-weight: bold;"><span class="abuse">&nbsp;</span></span> - bit of attribute is abused for different purposes, i.e. other bits define the actual meaning.</li>
-  <li><span style="font-weight: bold;"><span class="option">~</span></span> - bit is accessed, but does not really have a meaning (e.g. owner of clear land is always OWNER_NONE)</li>
+  <li><span style="font-weight: bold;"><span class="abuse">&nbsp;</span></span> - bit of attribute is abused for different purposes</li>
 </ul>
 <p>
 <ul>
@@ -34,110 +32,81 @@ the array so you can quickly see what is used and what is not.
   <li><span style="font-weight: bold;">m3</span> - 8 bits in size, is used for general storage</li>
   <li><span style="font-weight: bold;">m4</span> - 8 bits in size, is used for general storage</li>
   <li><span style="font-weight: bold;">m5</span> - 8 bits in size, is used for general storage</li>
-  <li><span style="font-weight: bold;">m6</span> - 8 bits in size, special meaning : lower 2 bits only valid in tropic climate, upper 2 bits for bridges</li>
-  <li><span style="font-weight: bold;">m7</span> - 8 bits in size, is used for general storage</li>
 </ul>
 
 <table align=center border="1" cellpadding="2" cellspacing="2">
   <tbody>
     <tr>
       <th colspan=2>class</th>
-      <th>type_height (8)</th>
       <th>m1 (8)</th>
       <th>m2 (16)</th>
       <th>m3 (8)</th>
       <th>m4 (8)</th>
+      <th>type_height (8)</th>
       <th>m5 (8)</th>
-      <th>m6 (8)</th>
-      <th>m7 (8)</th>
     </tr>
     <tr>
       <td colspan=2 class="caption">bits</td>
       <td class="bits">7654 3210</td>
-      <td class="bits">7654 3210</td>
       <td class="bits">FEDC BA98 7654 3210</td>
       <td class="bits">7654 3210</td>
       <td class="bits">7654 3210</td>
       <td class="bits">7654 3210</td>
       <td class="bits">7654 3210</td>
-      <td class="bits">7654 3210</td>
     </tr>
     <tr>
       <td rowspan="2">0</td>
       <td class="caption">ground</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
       <td class="bits"><span class="free">OOOO OOOO OOOO 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>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XXXX XXXX</td>
     </tr>
     <tr>
       <td class="caption">farmland</td>
       <td class="bits">-inherit-</td>
-      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
       <td class="bits"><span class="free">OOOO</span> XXXX</td>
       <td class="bits">-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>
+      <td class="bits"><span class="free">OOO</span>X XXXX</td>
     </tr>
     <tr>
-      <td rowspan=4>1</td>
+      <td rowspan=3>1</td>
       <td class="caption">rail</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="option">~~~</span>X XXXX</td>
-      <td class="bits"><span class="free">OOOO 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"><span class="free">OOOO OOOO</span> XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO O</span>XXX</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-    </tr>
-    <tr>
-      <td class="caption">rail with signals</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO O</span>XXX <span class="free">O</span>XXX</td>
-      <td class="bits">XXXX <span class="option">~~</span>XX</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">-inherit-</td>
-      <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">depot</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO</span> <span class="option">~~</span>XX</td>
       <td class="bits"><span class="free">OOOO</span> XXXX</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOOO</span> XXXX</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">XX<span class="free">OO O</span>XXX</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">OO OOO</span>X</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOOO</span> XXXX</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">XX<span class="free">OO O</span>XXX</td>
     </tr>
     <tr>
       <td rowspan=3>2</td>
       <td class="caption">road</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="option">~~~</span>X XXXX</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
@@ -146,207 +115,152 @@ the array so you can quickly see what is used and what is not.
       <td class="caption">level crossing</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">XXXX <span class="option">~~</span>XX</td>
-      <td class="bits"><span class="free">O</span>XXX XXXX</td>
-      <td class="bits">XX<span class="free">OO</span> XXXX</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits">-inherit-</td>
+      <td class="bits">XXXX XX<span class="free">OO</span></td>
     </tr>
     <tr>
       <td class="caption">road depot</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits">X<span class="free">OOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits">XXX<span class="free">O OOOO</span></td>
+      <td class="bits">X<span class="free">OOO OOOO</span></td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">XXXX XXXX</td>
     </tr>
     <tr>
       <td>3</td>
-      <td class="caption">house</td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
+      <td class="caption">town</td>
+      <td class="bits"><span class="abuse">XXXX XXXX</span></td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits">XXX<span class="option">~ ~~</span>XX</td>
+      <td class="bits">XX<span class="free">OO OOOO</span></td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXX<span class="abuse">X XXXX</span></td>
-      <td class="bits"><span class="abuse">XXXX XX</span>XX</td>
-      <td class="bits">XXXX <span class="abuse">XXXX</span></td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits">X<span class="free">O</span>XX XXXX</td>
     </tr>
     <tr>
       <td>4</td>
       <td class="caption">trees</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span> XXXX XXXX</td>
-      <td class="bits"><span class="option">~~</span>XX XXXX</td>
+      <td class="bits">XXXX XXXX</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 O</span>XXX</td>
-      <td class="bits"><span class="free">OOOO OO</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
-      <td rowspan=6>5</td>
-      <td class="caption">rail station</td>
+      <td>5</td>
+      <td class="caption">station</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="option">~~~</span>X XXXX</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits">XXXX <span class="option">~~</span>XX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-    </tr>
-    <tr>
-      <td class="caption">road stop</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO O</span>XXX</td>
-      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
-      <td class="bits"><span class="option">~~~~ ~</span>XXX</td>
-      <td class="bits"><span class="free">OO</span>XX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-    </tr>
-    <tr>
-      <td class="caption">dock</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OO</span>XX</td>
-      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
-      <td class="bits"><span class="option">~~~~ ~</span>XXX</td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-    </tr>
-    <tr>
-      <td class="caption">airport</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-    </tr>
-    <tr>
-      <td class="caption">buoy</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OO</span>XX</td>
-      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
-      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-    </tr>
-    <tr>
-      <td class="caption">oilrig</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
-      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-    </tr>
-    <tr>
-      <td rowspan=3>6</td>
-      <td class="caption">sea, shore</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="option">~~~</span>X XXXX</td>
+    </tr>
+    <tr>
+      <td>6</td>
+      <td class="caption">water</td>
+      <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits">X<span class="option">~~</span>X XXXX</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-    </tr>
-    <tr>
-      <td class="caption">canal, river</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OO</span>XX</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XXXX XXXX</td>
     </tr>
     <tr>
-      <td class="caption">shipdepot</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OO</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-    </tr>
-    <tr>
-      <td>8</td>
+      <td rowspan=6>8</td>
       <td class="caption">industry</td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits">X<span class="free">OOO</span> <span class="abuse">
-        XXXX</span></td>
+      <td class="bits"><span class="abuse">X</span><span class="free">OO</span><span class="abuse">X XXXX</span></td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OO</span>XX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
     </tr>
     <tr>
-      <td rowspan=2>9</td>
-      <td class="caption">tunnel entrance</td>
+      <td>bubble/sugar/toffee</td>
+      <td class="bits"><span class="abuse">X</span><span class="free">OOO OOOO</span></td>
+      <td class="bits">-inherit-</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="option">~~~</span>X XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO</span> <span class="option">~</span><span class="abuse">XXX</span></td>
-      <td class="bits">X<span class="free">OOO OOOO</span></td>
-      <td class="bits">X<span class="free">OOO</span> <span class="option">~</span>XXX</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
+    </tr>
+    <tr>
+      <td>toy factory</td>
+      <td class="bits"><span class="abuse">X</span><span class="free">OOO OOOO</span></td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
+    </tr>
+    <tr>
+      <td>gold/copper/coal</td>
+      <td class="bits"><span class="abuse">XX</span><span class="free">OO OO</span><span class="abuse">XX</span></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>oil wells</td>
+      <td class="bits"><span class="abuse">X</span><span class="free">OOO OO</span><span class="abuse">XX</span></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>power station</td>
+      <td class="bits"><span class="abuse">X</span><span class="free">O</span><span class="abuse">XX XX</span><span class="free">OO</span></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 rowspan=3>9</td>
+      <td class="caption">tunnel</td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOOO</span> XXXX</td>
+      <td class="bits">X<span class="free">OOO OOOO</span></td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits">X<span class="free">OOO</span> XXXX</td>
     </tr>
     <tr>
       <td>bridge ramp</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO</span> XXXX <span class="free">OOOO</span></td>
-      <td class="bits"><span class="free">OOOO</span> <span class="option">~</span><span class="abuse">XXX</span></td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span> <span class="abuse">XXXX</span> <span class="free">OOOO</span></td>
+      <td class="bits"><span class="free">OOOO</span> XXXX</td>
       <td class="bits">X<span class="free">OOO OOOO</span></td>
-      <td class="bits">X<span class="free">OOO</span> <span class="option">~</span>XXX</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXX<span class="free">O O</span>XXX</td>
     </tr>
     <tr>
-      <td rowspan=2>A</td>
-      <td class="caption">unmovables</td>
+      <td>bridge middle part</td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span> <span class="abuse">XXXX XXXX</span></td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits">X<span class="free">OOO OOOO</span></td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
+    </tr>
+    <tr>
+      <td>A</td>
+      <td class="caption">various (HQ)</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="option">~~~</span>X XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits">X<span class="option">~~</span>X XXXX</td>
-      <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-    </tr>
-    <tr>
-      <td class="caption">company statue</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</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></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>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
     </tr>
   </tbody>
 </table>

docs/multiplayer.txt

@@ -9,7 +9,7 @@ Multiplayer Manual for OpenTTD (0.3.5)
  - Type in a game name
  - Select the type of game ('LAN/Internet' or 'Internet (advertise)'. With the last one
     other people are able to see you online. Else they need your IP and port to join)
- - Click "start game", "load game" or "load scenario"
+ - Click "start game" ,"load game" or "load scenario"
  - Start playing
 
 
@@ -46,7 +46,7 @@ Multiplayer Manual for OpenTTD (0.3.5)
 
  - Open the console and type in the following command:
 
-    connect <ip/host>:<port>#<player-no>
+    ]connect <ip/host>:<port>#<player-no>
 
 
 4. Playing Internet-Games
@@ -54,9 +54,7 @@ Multiplayer Manual for OpenTTD (0.3.5)
 
  - Since OpenTTD 0.3.5 the network protocol has been rewritten and is very stable, even over slow connections.
 
- - Servers with a red dot behind it have a different version then you have. You will not be able to join those servers.
-
- - Servers with a yellow dot behind it have NewGRFs that you do not have. You will not be able to join those servers.
+ - Server with a red dot behind it have a different version then you have. You will not be able to join those servers.
 
  - It can happen that a connection is that slow, or you have that many clients connected to your server, that your clients start to loose their connection. Some things you can do about it:
 
@@ -112,10 +110,3 @@ Multiplayer Manual for OpenTTD (0.3.5)
  - From 0.3.5, desyncs should not happen anymore
 
  - From 0.3.5, patch-settings are also synced. You can now play without deleting openttd.cfg, and with, for example, extra large trains enabled.
-
-7. Troubleshooting
-------------------
-
- - My advertised server does not show up in the 'advertised server list' (servers.openttd.org)
-     Run openttd with the '-d net=2' parameter, as this will show whether it receives replies from the master server.
-     If it does not receive replies it is most likely that you need to configure your router to forward the OpenTTD ports 3979 (both TCP and UDP) to the computer that is hosting the game.

docs/openttd.6

@@ -1,37 +1,28 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd Jul 20, 2008
+.Dd December 21, 2006
 .Dt OPENTTD 6
 .Sh NAME
 .Nm openttd
 .Nd An open source clone of the Microprose game "Transport Tycoon Deluxe"
 .Sh SYNOPSIS
 .Nm
-.Op Fl Defhix
+.Op Fl Defhi
 .Op Fl G Ar seed
-.Op Fl b Ar blitter
 .Op Fl d Ar [level | cat=lvl[, ...]]
-.Op Fl c Ar config_file
 .Op Fl g Ar [savegame]
-.Op Fl l Ar host[:port]
-.Op Fl n Ar host[:port][#player]
+.Op Fl n Ar [host[#player][:port]]
 .Op Fl r Ar widthxheight
 .Op Fl t Ar date
 .Op Fl m Ar driver
 .Op Fl s Ar driver
 .Op Fl v Ar driver
-.Op Fl b Ar blitter
 .Sh OPTIONS
-.Bl -tag -width ".Fl n Ar host[:port][#player]"
-.It Fl D Ar [host][:port]
+.Bl -tag -width ".Fl n Ar host[#player][:port]"
+.It Fl D
 Start a dedicated server
 .It Fl G Ar seed
 Seed the pseudo random number generator
-.It Fl b Ar blitter
-Set the blitter, see
-.Fl h
-.It Fl c Ar config_file
-Use 'config_file' instead of 'openttd.cfg'
 .It Fl d Ar [level]
 Set debug verbosity for all categories to
 .Ar level
@@ -51,13 +42,12 @@ at start or start a new game if omitted
 Display a summary of all options and available drivers
 .It Fl i
 Force to use the DOS palette (use this if you see a lot of magenta)
-.It Fl l Ar host[:port]
-Redirect DEBUG(), See
-.Fl D
 .It Fl m Ar driver
 Set the music driver, see
 .Fl h
-.It Fl n Ar host[:port][#player]
+.It Fl n
+Start a network server
+.It Fl n Ar host[#player][:port]
 Join a network game, optionally specify player to play as and port to connect to
 .It Fl r Ar widthxheight
 Set the resolution
@@ -69,8 +59,6 @@ Set the starting date
 .It Fl v Ar driver
 Set the video driver, see
 .Fl h
-.It Fl x
-Do not automatically save to config file on exit
 .El
 .Sh SEE ALSO
 http://wiki.openttd.org/, http://www.openttd.org

driver.c

@@ -0,0 +1,224 @@
+/* $Id$ */
+
+#include "stdafx.h"
+#include "openttd.h"
+#include "debug.h"
+#include "driver.h"
+#include "functions.h"
+#include "hal.h"
+#include "string.h"
+
+#include "music/bemidi.h"
+#include "music/dmusic.h"
+#include "music/extmidi.h"
+#include "music/null_m.h"
+#include "music/os2_m.h"
+#include "music/win32_m.h"
+#include "music/qtmidi.h"
+
+#include "sound/null_s.h"
+#include "sound/sdl_s.h"
+#include "sound/cocoa_s.h"
+#include "sound/win32_s.h"
+
+#include "video/dedicated_v.h"
+#include "video/null_v.h"
+#include "video/sdl_v.h"
+#include "video/cocoa_v.h"
+#include "video/win32_v.h"
+
+typedef struct DriverDesc {
+	const char* name;
+	const char* longname;
+	const HalCommonDriver* drv;
+} DriverDesc;
+
+typedef struct DriverClass {
+	const DriverDesc *descs;
+	const char *name;
+	const HalCommonDriver** drv;
+} DriverClass;
+
+
+#define M(x, y, z) { x, y, (const HalCommonDriver *)(void *)z }
+static const DriverDesc _music_driver_descs[] = {
+#ifdef __BEOS__
+	M("bemidi",  "BeOS MIDI Driver",        &_bemidi_music_driver),
+#endif
+#if defined(__OS2__) && !defined(__INNOTEK_LIBC__)
+	M("os2",     "OS/2 Music Driver",       &_os2_music_driver),
+#endif
+#ifdef WIN32_ENABLE_DIRECTMUSIC_SUPPORT
+	M("dmusic",  "DirectMusic MIDI Driver", &_dmusic_midi_driver),
+#endif
+#ifdef WIN32
+	M("win32",   "Win32 MIDI Driver",       &_win32_music_driver),
+#endif
+#if defined(__APPLE__) && !defined(DEDICATED)
+	M("qt",      "QuickTime MIDI Driver",   &_qtime_music_driver),
+#endif
+#ifdef UNIX
+#if !defined(__MORPHOS__) && !defined(__AMIGA__)
+	M("extmidi", "External MIDI Driver",    &_extmidi_music_driver),
+#endif
+#endif
+	M("null",    "Null Music Driver",       &_null_music_driver),
+	M(NULL, NULL, NULL)
+};
+
+static const DriverDesc _sound_driver_descs[] = {
+#ifdef WIN32
+	M("win32", "Win32 WaveOut Driver", &_win32_sound_driver),
+#endif
+#ifdef WITH_SDL
+	M("sdl",   "SDL Sound Driver",     &_sdl_sound_driver),
+#endif
+#ifdef WITH_COCOA
+	M("cocoa", "Cocoa Sound Driver",   &_cocoa_sound_driver),
+#endif
+	M("null",  "Null Sound Driver",    &_null_sound_driver),
+	M(NULL, NULL, NULL)
+};
+
+static const DriverDesc _video_driver_descs[] = {
+#ifdef WIN32
+	M("win32",      "Win32 GDI Video Driver", &_win32_video_driver),
+#endif
+#ifdef WITH_SDL
+	M("sdl",        "SDL Video Driver",       &_sdl_video_driver),
+#endif
+#ifdef WITH_COCOA
+	M("cocoa",      "Cocoa Video Driver",       &_cocoa_video_driver),
+#endif
+	M("null",       "Null Video Driver",      &_null_video_driver),
+#ifdef ENABLE_NETWORK
+	M("dedicated",  "Dedicated Video Driver", &_dedicated_video_driver),
+#endif
+	M(NULL, NULL, NULL)
+};
+#undef M
+
+
+#define M(x, y, z) { x, y, (const HalCommonDriver **)(void *)z }
+static const DriverClass _driver_classes[] = {
+	M(_video_driver_descs, "video", &_video_driver),
+	M(_sound_driver_descs, "sound", &_sound_driver),
+	M(_music_driver_descs, "music", &_music_driver)
+};
+#undef M
+
+static const DriverDesc* GetDriverByName(const DriverDesc* dd, const char* name)
+{
+	for (; dd->name != NULL; dd++) {
+		if (strcmp(dd->name, name) == 0) return dd;
+	}
+	return NULL;
+}
+
+void LoadDriver(int driver, const char *name)
+{
+	const DriverClass *dc = &_driver_classes[driver];
+	const DriverDesc *dd;
+	const char *err;
+
+	if (*name == '\0') {
+		for (dd = dc->descs; dd->name != NULL; dd++) {
+			err = dd->drv->start(NULL);
+			if (err == NULL) break;
+			DEBUG(driver, 1) ("Probing %s driver \"%s\" failed with error: %s",
+				dc->name, dd->name, err
+			);
+		}
+		if (dd->name == NULL) {
+			error("Couldn't find any suitable %s driver", dc->name);
+		}
+
+		DEBUG(driver, 1)
+			("Successfully probed %s driver \"%s\"", dc->name, dd->name);
+
+		*dc->drv = dd->drv;
+	} else {
+		char* parm;
+		char buffer[256];
+		const char* parms[32];
+
+		// Extract the driver name and put parameter list in parm
+		ttd_strlcpy(buffer, name, sizeof(buffer));
+		parm = strchr(buffer, ':');
+		parms[0] = NULL;
+		if (parm != NULL) {
+			uint np = 0;
+			// Tokenize the parm.
+			do {
+				*parm++ = '\0';
+				if (np < lengthof(parms) - 1)
+					parms[np++] = parm;
+				while (*parm != '\0' && *parm != ',')
+					parm++;
+			} while (*parm == ',');
+			parms[np] = NULL;
+		}
+		dd = GetDriverByName(dc->descs, buffer);
+		if (dd == NULL)
+			error("No such %s driver: %s\n", dc->name, buffer);
+
+		if (*dc->drv != NULL) (*dc->drv)->stop();
+		*dc->drv = NULL;
+
+		err = dd->drv->start(parms);
+		if (err != NULL) {
+			error("Unable to load driver %s(%s). The error was: %s\n",
+				dd->name, dd->longname, err
+			);
+		}
+		*dc->drv = dd->drv;
+	}
+}
+
+
+static const char* GetDriverParam(const char* const* parm, const char* name)
+{
+	size_t len;
+
+	if (parm == NULL) return NULL;
+
+	len = strlen(name);
+	for (; *parm != NULL; parm++) {
+		const char* p = *parm;
+
+		if (strncmp(p, name, len) == 0) {
+			if (p[len] == '=')  return p + len + 1;
+			if (p[len] == '\0') return p + len;
+		}
+	}
+	return NULL;
+}
+
+bool GetDriverParamBool(const char* const* parm, const char* name)
+{
+	return GetDriverParam(parm, name) != NULL;
+}
+
+int GetDriverParamInt(const char* const* parm, const char* name, int def)
+{
+	const char* p = GetDriverParam(parm, name);
+	return p != NULL ? atoi(p) : def;
+}
+
+
+char *GetDriverList(char* p, const char *last)
+{
+	const DriverClass* dc;
+
+	for (dc = _driver_classes; dc != endof(_driver_classes); dc++) {
+		const DriverDesc* dd;
+
+		p += snprintf(p, last - p, "List of %s drivers:\n", dc->name);
+		for (dd = dc->descs; dd->name != NULL; dd++) {
+			p += snprintf(p, last - p, "%10s: %s\n", dd->name, dd->longname);
+		}
+		p = strecpy(p, "\n", last);
+	}
+
+	return p;
+}

driver.h

@@ -0,0 +1,13 @@
+/* $Id$ */
+
+#ifndef DRIVER_H
+#define DRIVER_H
+
+void LoadDriver(int driver, const char *name);
+
+bool GetDriverParamBool(const char* const* parm, const char* name);
+int GetDriverParamInt(const char* const* parm, const char* name, int def);
+
+char *GetDriverList(char *p, const char *last);
+
+#endif /* DRIVER_H */

dummy_land.c

@@ -1,19 +1,16 @@
 /* $Id$ */
 
-/** @file dummy_land.cpp */
-
 #include "stdafx.h"
 #include "openttd.h"
-#include "tile_cmd.h"
-#include "command_func.h"
-#include "viewport_func.h"
-
 #include "table/strings.h"
+#include "functions.h"
+#include "viewport.h"
+#include "command.h"
 #include "table/sprites.h"
 
 static void DrawTile_Dummy(TileInfo *ti)
 {
-	DrawGroundSpriteAt(SPR_SHADOW_CELL, PAL_NONE, ti->x, ti->y, ti->z);
+	DrawGroundSpriteAt(SPR_SHADOW_CELL, ti->x, ti->y, ti->z);
 }
 
 
@@ -22,12 +19,12 @@ static uint GetSlopeZ_Dummy(TileIndex tile, uint x, uint y)
 	return 0;
 }
 
-static Foundation GetFoundation_Dummy(TileIndex tile, Slope tileh)
+static Slope GetSlopeTileh_Dummy(TileIndex tile, Slope tileh)
 {
-	return FOUNDATION_NONE;
+	return SLOPE_FLAT;
 }
 
-static CommandCost ClearTile_Dummy(TileIndex tile, byte flags)
+static int32 ClearTile_Dummy(TileIndex tile, byte flags)
 {
 	return_cmd_error(STR_0001_OFF_EDGE_OF_MAP);
 }
@@ -64,17 +61,12 @@ static void ChangeTileOwner_Dummy(TileIndex tile, PlayerID old_player, PlayerID
 	/* not used */
 }
 
-static TrackStatus GetTileTrackStatus_Dummy(TileIndex tile, TransportType mode, uint sub_mode, DiagDirection side)
+static uint32 GetTileTrackStatus_Dummy(TileIndex tile, TransportType mode)
 {
 	return 0;
 }
 
-static CommandCost TerraformTile_Dummy(TileIndex tile, uint32 flags, uint z_new, Slope tileh_new)
-{
-	return_cmd_error(STR_0001_OFF_EDGE_OF_MAP);
-}
-
-extern const TileTypeProcs _tile_type_dummy_procs = {
+const TileTypeProcs _tile_type_dummy_procs = {
 	DrawTile_Dummy,           /* draw_tile_proc */
 	GetSlopeZ_Dummy,          /* get_slope_z_proc */
 	ClearTile_Dummy,          /* clear_tile_proc */
@@ -87,6 +79,5 @@ extern const TileTypeProcs _tile_type_dummy_procs = {
 	ChangeTileOwner_Dummy,    /* change_tile_owner_clear */
 	NULL,                     /* get_produced_cargo_proc */
 	NULL,                     /* vehicle_enter_tile_proc */
-	GetFoundation_Dummy,      /* get_foundation_proc */
-	TerraformTile_Dummy,      /* terraform_tile_proc */
+	GetSlopeTileh_Dummy,      /* get_slope_tileh_proc */
 };

economy.h

@@ -0,0 +1,69 @@
+/* $Id$ */
+
+#ifndef ECONOMY_H
+#define ECONOMY_H
+
+void ResetPriceBaseMultipliers(void);
+void SetPriceBaseMultiplier(uint price, byte factor);
+
+typedef struct {
+	// Maximum possible loan
+	int32 max_loan;
+	int32 max_loan_unround;
+	// Economy fluctuation status
+	int fluct;
+	// Interest
+	byte interest_rate;
+	byte infl_amount;
+	byte infl_amount_pr;
+} Economy;
+
+VARDEF Economy _economy;
+
+typedef struct Subsidy {
+	CargoID cargo_type;
+	byte age;
+	/* from and to can either be TownID, StationID or IndustryID */
+	uint16 from;
+	uint16 to;
+} Subsidy;
+
+
+enum {
+	SCORE_VEHICLES   = 0,
+	SCORE_STATIONS   = 1,
+	SCORE_MIN_PROFIT = 2,
+	SCORE_MIN_INCOME = 3,
+	SCORE_MAX_INCOME = 4,
+	SCORE_DELIVERED  = 5,
+	SCORE_CARGO      = 6,
+	SCORE_MONEY      = 7,
+	SCORE_LOAN       = 8,
+	SCORE_TOTAL      = 9, // This must always be the last entry
+
+	NUM_SCORE = 10, // How many scores are there..
+
+	SCORE_MAX = 1000 // The max score that can be in the performance history
+	//  the scores together of score_info is allowed to be more!
+};
+
+typedef struct ScoreInfo {
+	byte id;    // Unique ID of the score
+	int needed; // How much you need to get the perfect score
+	int score;  // How much score it will give
+} ScoreInfo;
+
+extern const ScoreInfo _score_info[];
+extern int _score_part[MAX_PLAYERS][NUM_SCORE];
+
+int UpdateCompanyRatingAndValue(Player *p, bool update);
+
+VARDEF Subsidy _subsidies[MAX_PLAYERS];
+Pair SetupSubsidyDecodeParam(const Subsidy* s, bool mode);
+void DeleteSubsidyWithIndustry(uint16 index);
+void DeleteSubsidyWithStation(uint16 index);
+
+int32 GetTransportedGoodsIncome(uint num_pieces, uint dist, byte transit_days, CargoID cargo_type);
+uint MoveGoodsToStation(TileIndex tile, int w, int h, int type, uint amount);
+
+#endif /* ECONOMY_H */

elrail.c

@@ -0,0 +1,443 @@
+/* $Id$ */
+/** @file elrail.c
+ * This file deals with displaying wires and pylons for electric railways.
+ * <h2>Basics</h2>
+ *
+ * <h3>Tile Types</h3>
+ *
+ * We have two different types of tiles in the drawing code:
+ * Normal Railway Tiles (NRTs) which can have more than one track on it, and
+ * Special Railways tiles (SRTs) which have only one track (like crossings, depots
+ * stations, etc).
+ *
+ * <h3>Location Categories</h3>
+ *
+ * All tiles are categorized into three location groups (TLG):
+ * Group 0: Tiles with both an even X coordinate and an even Y coordinate
+ * Group 1: Tiles with an even X and an odd Y coordinate
+ * Group 2: Tiles with an odd X and an even Y coordinate
+ * Group 3: Tiles with both an odd X and Y coordnate.
+ *
+ * <h3>Pylon Points</h3>
+ * <h4>Control Points</h4>
+ * A Pylon Control Point (PCP) is a position where a wire (or rather two)
+ * is mounted onto a pylon.
+ * Each NRT does contain 4 PCPs which are bitmapped to a byte
+ * variable and are represented by the DiagDirection enum
+ *
+ * Each track ends on two PCPs and thus requires one pylon on each end. However,
+ * there is one exception: Straight-and-level tracks only have one pylon every
+ * other tile.
+ *
+ * Now on each edge there are two PCPs: One from each adjacent tile. Both PCPs
+ * are merged using an OR operation (i. e. if one tile needs a PCP at the postion
+ * in question, both tiles get it).
+ *
+ * <h4>Position Points</h4>
+ * A Pylon Position Point (PPP) is a position where a pylon is located on the
+ * ground.  Each PCP owns 8 in (45 degree steps) PPPs that are located around
+ * it. PPPs are represented using the Direction enum. Each track bit has PPPs
+ * that are impossible (because the pylon would be situated on the track) and
+ * some that are preferred (because the pylon would be rectangular to the track).
+ *
+ * <img src="../../elrail_tile.png">
+ * <img src="../../elrail_track.png">
+ *
+ */
+
+#include "stdafx.h"
+#include "openttd.h"
+#include "station_map.h"
+#include "tile.h"
+#include "viewport.h"
+#include "functions.h" /* We should REALLY get rid of this goddamn file, as it is butt-ugly */
+#include "variables.h" /* ... same here */
+#include "rail.h"
+#include "debug.h"
+#include "tunnel_map.h"
+#include "road_map.h"
+#include "bridge_map.h"
+#include "bridge.h"
+#include "rail_map.h"
+#include "table/sprites.h"
+#include "table/elrail_data.h"
+#include "vehicle.h"
+#include "train.h"
+#include "gui.h"
+
+static inline TLG GetTLG(TileIndex t)
+{
+	return (HASBIT(TileX(t), 0) << 1) + HASBIT(TileY(t), 0);
+}
+
+/** Finds which Rail Bits are present on a given tile. For bridge tiles,
+ * returns track bits under the bridge
+ */
+static TrackBits GetRailTrackBitsUniversal(TileIndex t, byte *override)
+{
+	switch (GetTileType(t)) {
+		case MP_RAILWAY:
+			if (GetRailType(t) != RAILTYPE_ELECTRIC) return 0;
+			switch (GetRailTileType(t)) {
+				case RAIL_TILE_NORMAL: case RAIL_TILE_SIGNALS:
+					return GetTrackBits(t);
+				case RAIL_TILE_DEPOT_WAYPOINT:
+					if (GetRailTileSubtype(t) == RAIL_SUBTYPE_WAYPOINT) return GetRailWaypointBits(t);
+				default:
+					return 0;
+			}
+			break;
+
+		case MP_TUNNELBRIDGE:
+			if (IsTunnel(t)) {
+				if (GetRailType(t) != RAILTYPE_ELECTRIC) return 0;
+				if (override != NULL) *override = 1 << GetTunnelDirection(t);
+				return AxisToTrackBits(DiagDirToAxis(GetTunnelDirection(t)));
+			} else {
+				if (GetRailType(t) != RAILTYPE_ELECTRIC) return 0;
+				if (IsBridgeMiddle(t)) {
+					if (IsTransportUnderBridge(t) &&
+						GetTransportTypeUnderBridge(t) == TRANSPORT_RAIL) {
+						return GetRailBitsUnderBridge(t);
+					} else {
+						return 0;
+					}
+				} else {
+					if (override != NULL && DistanceMax(t, GetOtherBridgeEnd(t)) > 1) *override = 1 << GetBridgeRampDirection(t);
+
+					return AxisToTrackBits(DiagDirToAxis(GetBridgeRampDirection(t)));
+				}
+			}
+
+		case MP_STREET:
+			if (GetRoadTileType(t) != ROAD_TILE_CROSSING) return 0;
+			if (GetRailTypeCrossing(t) != RAILTYPE_ELECTRIC) return 0;
+			return GetCrossingRailBits(t);
+
+		case MP_STATION:
+			if (!IsRailwayStation(t)) return 0;
+			if (GetRailType(t) != RAILTYPE_ELECTRIC) return 0;
+			if (!IsStationTileElectrifiable(t)) return 0;
+			return TrackToTrackBits(GetRailStationTrack(t));
+
+		default:
+			return 0;
+	}
+}
+
+/** Corrects the tileh for certain tile types. Returns an effective tileh for the track on the tile.
+ * @param tile The tile to analyse
+ * @param *tileh the tileh
+ */
+static void AdjustTileh(TileIndex tile, Slope *tileh)
+{
+	if (IsTileType(tile, MP_TUNNELBRIDGE)) {
+		if (IsTunnel(tile)) {
+			*tileh = SLOPE_FLAT;
+		} else {
+			if (IsBridgeRamp(tile)) {
+				if (*tileh != SLOPE_FLAT) {
+					*tileh = SLOPE_FLAT;
+				} else {
+					switch (GetBridgeRampDirection(tile)) {
+						case DIAGDIR_NE: *tileh = SLOPE_NE; break;
+						case DIAGDIR_SE: *tileh = SLOPE_SE; break;
+						case DIAGDIR_SW: *tileh = SLOPE_SW; break;
+						case DIAGDIR_NW: *tileh = SLOPE_NW; break;
+						default: break;
+					}
+				}
+			}
+		}
+	}
+}
+
+/** Draws wires and, if required, pylons on a given tile
+ * @param ti The Tileinfo to draw the tile for
+ */
+static void DrawCatenaryRailway(const TileInfo *ti)
+{
+	/* Pylons are placed on a tile edge, so we need to take into account
+	 * the track configuration of 2 adjacent tiles. trackconfig[0] stores the
+	 * current tile (home tile) while [1] holds the neighbour */
+	TrackBits trackconfig[TS_END];
+	bool isflat[TS_END];
+	/* Note that ti->tileh has already been adjusted for Foundations */
+	Slope tileh[TS_END] = { ti->tileh, SLOPE_FLAT };
+
+	TLG tlg = GetTLG(ti->tile);
+	byte PCPstatus = 0;
+	byte OverridePCP = 0;
+	byte PPPpreferred[DIAGDIR_END];
+	byte PPPallowed[DIAGDIR_END];
+	DiagDirection i;
+	Track t;
+
+	/* Find which rail bits are present, and select the override points.
+	 * We don't draw a pylon:
+	 * 1) INSIDE a tunnel (we wouldn't see it anyway)
+	 * 2) on the "far" end of a bridge head (the one that connects to bridge middle),
+	 *    because that one is drawn on the bridge. Exception is for length 0 bridges
+	 *    which have no middle tiles */
+	trackconfig[TS_HOME] = GetRailTrackBitsUniversal(ti->tile, &OverridePCP);
+	/* If a track bit is present that is not in the main direction, the track is level */
+	isflat[TS_HOME] = trackconfig[TS_HOME] & (TRACK_BIT_HORZ | TRACK_BIT_VERT);
+
+	AdjustTileh(ti->tile, &tileh[TS_HOME]);
+
+	for (i = DIAGDIR_NE; i < DIAGDIR_END; i++) {
+		TileIndex neighbour = ti->tile + TileOffsByDiagDir(i);
+		uint foundation = 0;
+		int k;
+
+		/* Here's one of the main headaches. GetTileSlope does not correct for possibly
+		 * existing foundataions, so we do have to do that manually later on.*/
+		tileh[TS_NEIGHBOUR] = GetTileSlope(neighbour, NULL);
+		trackconfig[TS_NEIGHBOUR] = GetRailTrackBitsUniversal(neighbour, NULL);
+		if (IsTunnelTile(neighbour) && i != GetTunnelDirection(neighbour)) trackconfig[TS_NEIGHBOUR] = 0;
+		isflat[TS_NEIGHBOUR] = trackconfig[TS_NEIGHBOUR] & (TRACK_BIT_HORZ | TRACK_BIT_VERT);
+
+		PPPpreferred[i] = 0xFF; /* We start with preferring everything (end-of-line in any direction) */
+		PPPallowed[i] = AllowedPPPonPCP[i];
+
+		/* We cycle through all the existing tracks at a PCP and see what
+		 * PPPs we want to have, or may not have at all */
+		for (k = 0; k < NUM_TRACKS_AT_PCP; k++) {
+			/* Next to us, we have a bridge head, don't worry about that one, if it shows away from us */
+			if (TrackSourceTile[i][k] == TS_NEIGHBOUR &&
+			    IsBridgeTile(neighbour) && IsBridgeRamp(neighbour) &&
+			    GetBridgeRampDirection(neighbour) == ReverseDiagDir(i)) {
+				continue;
+			}
+
+			/* We check whether the track in question (k) is present in the tile
+			 * (TrackSourceTile) */
+			if (HASBIT(trackconfig[TrackSourceTile[i][k]], TracksAtPCP[i][k])) {
+				/* track found, if track is in the neighbour tile, adjust the number
+				 * of the PCP for preferred/allowed determination*/
+				DiagDirection PCPpos = (TrackSourceTile[i][k] == TS_HOME) ? i : ReverseDiagDir(i);
+				SETBIT(PCPstatus, i); /* This PCP is in use */
+
+				PPPpreferred[i] &= PreferredPPPofTrackAtPCP[TracksAtPCP[i][k]][PCPpos];
+				PPPallowed[i] &= ~DisallowedPPPofTrackAtPCP[TracksAtPCP[i][k]][PCPpos];
+			}
+		}
+
+		/* Deactivate all PPPs if PCP is not used */
+		PPPpreferred[i] *= HASBIT(PCPstatus, i);
+		PPPallowed[i] *= HASBIT(PCPstatus, i);
+
+		/* A station is always "flat", so adjust the tileh accordingly */
+		if (IsTileType(neighbour, MP_STATION)) tileh[TS_NEIGHBOUR] = SLOPE_FLAT;
+
+		/* Read the foundataions if they are present, and adjust the tileh */
+		if (IsTileType(neighbour, MP_RAILWAY) && GetRailType(neighbour) == RAILTYPE_ELECTRIC) foundation = GetRailFoundation(tileh[TS_NEIGHBOUR], trackconfig[TS_NEIGHBOUR]);
+		if (IsBridgeTile(neighbour) && IsBridgeRamp(neighbour)) {
+			foundation = GetBridgeFoundation(tileh[TS_NEIGHBOUR], DiagDirToAxis(GetBridgeRampDirection(neighbour)));
+		}
+
+		if (foundation != 0) {
+			if (foundation < 15) {
+				tileh[TS_NEIGHBOUR] = SLOPE_FLAT;
+			} else {
+				tileh[TS_NEIGHBOUR] = _inclined_tileh[foundation - 15];
+			}
+		}
+
+		AdjustTileh(neighbour, &tileh[TS_NEIGHBOUR]);
+
+		/* If we have a straight (and level) track, we want a pylon only every 2 tiles
+		 * Delete the PCP if this is the case. */
+		/* Level means that the slope is the same, or the track is flat */
+		if (tileh[TS_HOME] == tileh[TS_NEIGHBOUR] || (isflat[TS_HOME] && isflat[TS_NEIGHBOUR])) {
+			for (k = 0; k < NUM_IGNORE_GROUPS; k++)
+				if (PPPpreferred[i] == IgnoredPCP[k][tlg][i]) CLRBIT(PCPstatus, i);
+		}
+
+		/* Now decide where we draw our pylons. First try the preferred PPPs, but they may not exist.
+		 * In that case, we try the any of the allowed ones. if they don't exist either, don't draw
+		 * anything. Note that the preferred PPPs still contain the end-of-line markers.
+		 * Remove those (simply by ANDing with allowed, since these markers are never allowed) */
+		if ((PPPallowed[i] & PPPpreferred[i]) != 0) PPPallowed[i] &= PPPpreferred[i];
+
+		if (PPPallowed[i] != 0 && HASBIT(PCPstatus, i) && !HASBIT(OverridePCP, i)) {
+			for (k = 0; k < DIR_END; k++) {
+				byte temp = PPPorder[i][GetTLG(ti->tile)][k];
+
+				if (HASBIT(PPPallowed[i], temp)) {
+					uint x  = ti->x + x_pcp_offsets[i] + x_ppp_offsets[temp];
+					uint y  = ti->y + y_pcp_offsets[i] + y_ppp_offsets[temp];
+
+					/* Don't build the pylon if it would be outside the tile */
+					if (!HASBIT(OwnedPPPonPCP[i], temp)) {
+						/* We have a neighour that will draw it, bail out */
+						if (trackconfig[TS_NEIGHBOUR] != 0) break;
+						continue; /* No neighbour, go looking for a better position */
+					}
+
+					AddSortableSpriteToDraw(pylons_normal[temp], x, y, 1, 1, 10,
+							GetSlopeZ(ti->x + x_pcp_offsets[i], ti->y + y_pcp_offsets[i]));
+					break; /* We already have drawn a pylon, bail out */
+				}
+			}
+		}
+	}
+
+	/* Don't draw a wire under a low bridge */
+	if (IsBridgeTile(ti->tile) &&
+			IsBridgeMiddle(ti->tile) &&
+			!(_display_opt & DO_TRANS_BUILDINGS) &&
+			GetBridgeHeight(ti->tile) <= TilePixelHeight(ti->tile) + TILE_HEIGHT) {
+		return;
+	}
+
+	/* Drawing of pylons is finished, now draw the wires */
+	for (t = 0; t < TRACK_END; t++) {
+		if (HASBIT(trackconfig[TS_HOME], t)) {
+
+			byte PCPconfig = HASBIT(PCPstatus, PCPpositions[t][0]) +
+				(HASBIT(PCPstatus, PCPpositions[t][1]) << 1);
+
+			const SortableSpriteStruct *sss;
+			int tileh_selector = !(tileh[TS_HOME] % 3) * tileh[TS_HOME] / 3; /* tileh for the slopes, 0 otherwise */
+
+			assert(PCPconfig != 0); /* We have a pylon on neither end of the wire, that doesn't work (since we have no sprites for that) */
+			assert(!IsSteepSlope(tileh[TS_HOME]));
+			sss = &CatenarySpriteData[Wires[tileh_selector][t][PCPconfig]];
+
+			AddSortableSpriteToDraw( sss->image, ti->x + sss->x_offset, ti->y + sss->y_offset,
+				sss->x_size, sss->y_size, sss->z_size, GetSlopeZ(ti->x + min(sss->x_offset, TILE_SIZE - 1), ti->y + min(sss->y_offset, TILE_SIZE - 1)) + sss->z_offset);
+		}
+	}
+}
+
+static void DrawCatenaryOnBridge(const TileInfo *ti)
+{
+	TileIndex end = GetSouthernBridgeEnd(ti->tile);
+	TileIndex start = GetOtherBridgeEnd(end);
+
+	uint length = GetBridgeLength(start, end);
+	uint num = DistanceMax(ti->tile, start);
+	uint height;
+
+	const SortableSpriteStruct *sss;
+	Axis axis = GetBridgeAxis(ti->tile);
+	TLG tlg = GetTLG(ti->tile);
+
+	CatenarySprite offset = axis == AXIS_X ? 0 : WIRE_Y_FLAT_BOTH - WIRE_X_FLAT_BOTH;
+
+	if ((length % 2) && num == length) {
+		/* Draw the "short" wire on the southern end of the bridge
+		 * only needed if the length of the bridge is odd */
+		sss = &CatenarySpriteData[WIRE_X_FLAT_BOTH + offset];
+	} else {
+		/* Draw "long" wires on all other tiles of the bridge (one pylon every two tiles) */
+		sss = &CatenarySpriteData[WIRE_X_FLAT_SW + (num % 2) + offset];
+	}
+
+	height = GetBridgeHeight(ti->tile);
+
+	AddSortableSpriteToDraw( sss->image, ti->x + sss->x_offset, ti->y + sss->y_offset,
+		sss->x_size, sss->y_size, sss->z_size, height + sss->z_offset
+	);
+
+	/* Finished with wires, draw pylons */
+	/* every other tile needs a pylon on the northern end */
+	if (num % 2) {
+		if (axis == AXIS_X) {
+			AddSortableSpriteToDraw(pylons_bridge[0 + HASBIT(tlg, 0)], ti->x, ti->y + 4 + 8 * HASBIT(tlg, 0), 1, 1, 10, height);
+		} else {
+			AddSortableSpriteToDraw(pylons_bridge[2 + HASBIT(tlg, 1)], ti->x + 4 + 8 * HASBIT(tlg, 1), ti->y, 1, 1, 10, height);
+		}
+	}
+
+	/* need a pylon on the southern end of the bridge */
+	if (DistanceMax(ti->tile, start) == length) {
+		if (axis == AXIS_X) {
+			AddSortableSpriteToDraw(pylons_bridge[0 + HASBIT(tlg, 0)], ti->x + 16, ti->y + 4 + 8 * HASBIT(tlg, 0), 1, 1, 10, height);
+		} else {
+			AddSortableSpriteToDraw(pylons_bridge[2 + HASBIT(tlg, 1)], ti->x + 4 + 8 * HASBIT(tlg, 1), ti->y + 16, 1, 1, 10, height);
+		}
+	}
+}
+
+void DrawCatenary(const TileInfo *ti)
+{
+	if (_patches.disable_elrails) return;
+
+	switch (GetTileType(ti->tile)) {
+		case MP_RAILWAY:
+			if (IsRailDepot(ti->tile)) {
+				const SortableSpriteStruct* sss = &CatenarySpriteData_Depot[GetRailDepotDirection(ti->tile)];
+
+				AddSortableSpriteToDraw(
+					sss->image, ti->x + sss->x_offset, ti->y + sss->y_offset,
+					sss->x_size, sss->y_size, sss->z_size,
+					GetTileMaxZ(ti->tile) + sss->z_offset
+				);
+				return;
+			}
+			break;
+
+		case MP_TUNNELBRIDGE:
+			if (IsBridge(ti->tile) && IsBridgeMiddle(ti->tile) && GetRailTypeOnBridge(ti->tile) == RAILTYPE_ELECTRIC) DrawCatenaryOnBridge(ti);
+			break;
+
+		case MP_STREET:  break;
+		case MP_STATION: break;
+
+		default: return;
+	}
+	DrawCatenaryRailway(ti);
+}
+
+int32 SettingsDisableElrail(int32 p1)
+{
+	EngineID e_id;
+	Vehicle* v;
+	Player *p;
+	bool disable = (p1 != 0);
+
+	/* we will now walk through all electric train engines and change their railtypes if it is the wrong one*/
+	const RailType old_railtype = disable ? RAILTYPE_ELECTRIC : RAILTYPE_RAIL;
+	const RailType new_railtype = disable ? RAILTYPE_RAIL : RAILTYPE_ELECTRIC;
+
+	/* walk through all train engines */
+	for (e_id = 0; e_id < NUM_TRAIN_ENGINES; e_id++) {
+		const RailVehicleInfo *rv_info = RailVehInfo(e_id);
+		Engine *e = GetEngine(e_id);
+		/* if it is an electric rail engine and its railtype is the wrong one */
+		if (rv_info->engclass == 2 && e->railtype == old_railtype) {
+			/* change it to the proper one */
+			e->railtype = new_railtype;
+		}
+	}
+
+	/* when disabling elrails, make sure that all existing trains can run on
+	*  normal rail too */
+	if (disable) {
+		FOR_ALL_VEHICLES(v) {
+			if (v->type == VEH_Train && v->u.rail.railtype == RAILTYPE_ELECTRIC) {
+				/* this railroad vehicle is now compatible only with elrail,
+				*  so add there also normal rail compatibility */
+				v->u.rail.compatible_railtypes |= (1 << RAILTYPE_RAIL);
+				v->u.rail.railtype = RAILTYPE_RAIL;
+				SETBIT(v->u.rail.flags, VRF_EL_ENGINE_ALLOWED_NORMAL_RAIL);
+			}
+		}
+	}
+
+	/* setup total power for trains */
+	FOR_ALL_VEHICLES(v) {
+		/* power is cached only for front engines */
+		if (v->type == VEH_Train && IsFrontEngine(v)) TrainPowerChanged(v);
+	}
+
+	FOR_ALL_PLAYERS(p) p->avail_railtypes = GetPlayerRailtypes(p->index);
+
+	/* This resets the _last_built_railtype, which will be invalid for electric
+	* rails. It may have unintended consequences if that function is ever
+	* extended, though. */
+	ReinitGuiAfterToggleElrail(disable);
+	return 0;
+}

endian_check.c

@@ -0,0 +1,52 @@
+/* $Id$ */
+
+#include <stdio.h>
+
+// This pretty simple file checks if the system is LITTLE_ENDIAN or BIG_ENDIAN
+//  it does that by putting a 1 and a 0 in an array, and read it out as one
+//  number. If it is 1, it is LITTLE_ENDIAN, if it is 256, it is BIG_ENDIAN
+//
+// After that it outputs the contents of an include files (endian.h)
+//  that says or TTD_LITTLE_ENDIAN, or TTD_BIG_ENDIAN. Makefile takes
+//  care of the real writing to the file.
+
+int main (int argc, char *argv[]) {
+	unsigned char EndianTest[2] = { 1, 0 };
+	int force_BE = 0, force_LE = 0, force_PREPROCESSOR = 0;
+
+	if (argc > 1 && strcmp(argv[1], "BE") == 0)
+		force_BE = 1;
+	if (argc > 1 && strcmp(argv[1], "LE") == 0)
+		force_LE = 1;
+	if (argc > 1 && strcmp(argv[1], "PREPROCESSOR") == 0)
+		force_PREPROCESSOR = 1;
+
+	printf("#ifndef ENDIAN_H\n#define ENDIAN_H\n");
+
+	if (force_LE == 1) {
+		printf("#define TTD_LITTLE_ENDIAN\n");
+	} else {
+		if (force_BE == 1) {
+			printf("#define TTD_BIG_ENDIAN\n");
+		} else {
+			if (force_PREPROCESSOR == 1) {
+				// adding support for universal binaries on OSX
+				// Universal binaries supports both PPC and x86
+				// If a compiler for OSX gets this setting, it will always pick the correct endian and no test is needed
+				printf("#ifdef __BIG_ENDIAN__\n");
+				printf("#define TTD_BIG_ENDIAN\n");
+				printf("#else\n");
+				printf("#define TTD_LITTLE_ENDIAN\n");
+				printf("#endif\n");
+			} else {
+				if ( *(short *) EndianTest == 1 )
+					printf("#define TTD_LITTLE_ENDIAN\n");
+				else
+					printf("#define TTD_BIG_ENDIAN\n");
+			}
+		}
+	}
+	printf("#endif\n");
+
+	return 0;
+}