(svn r1275) Tagged 0.3.5

BUGS

@@ -1,7 +0,0 @@
-/* $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,8 +1,8 @@
 		    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.
 
@@ -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,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -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
@@ -278,7 +278,7 @@ 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
 
   If you develop a new program, and you want it to be of the greatest
@@ -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

@@ -1,233 +0,0 @@
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-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" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-ALWAYS_DETAILED_SEC    = NO
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = ./
-STRIP_FROM_INC_PATH    =
-SHORT_NAMES            = NO
-JAVADOC_AUTOBRIEF      = YES
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
-INHERIT_DOCS           = YES
-DISTRIBUTE_GROUP_DOC   = NO
-TAB_SIZE               = 2
-ALIASES                =
-OPTIMIZE_OUTPUT_FOR_C  = YES
-OPTIMIZE_OUTPUT_JAVA   = NO
-SUBGROUPING            = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL            = NO
-EXTRACT_PRIVATE        = YES
-EXTRACT_STATIC         = YES
-EXTRACT_LOCAL_CLASSES  = YES
-EXTRACT_LOCAL_METHODS  = YES
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
-INTERNAL_DOCS          = NO
-CASE_SENSE_NAMES       = YES
-HIDE_SCOPE_NAMES       = NO
-SHOW_INCLUDE_FILES     = YES
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = YES
-SORT_BRIEF_DOCS        = NO
-SORT_BY_SCOPE_NAME     = NO
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       =
-MAX_INITIALIZER_LINES  = 30
-SHOW_USED_FILES        = YES
-SHOW_DIRECTORIES       = YES
-FILE_VERSION_FILTER    =
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
-WARN_NO_PARAMDOC       = NO
-WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           =
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = ./
-FILE_PATTERNS          = *.c \
-                         *.cc \
-                         *.cxx \
-                         *.cpp \
-                         *.c++ \
-                         *.h \
-                         table/*.h
-RECURSIVE              = YES
-EXCLUDE                =
-EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       =
-EXAMPLE_PATH           =
-EXAMPLE_PATTERNS       = *
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             =
-INPUT_FILTER           =
-FILTER_PATTERNS        =
-FILTER_SOURCE_FILES    = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER         = YES
-INLINE_SOURCES         = NO
-STRIP_CODE_COMMENTS    = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION    = YES
-VERBATIM_HEADERS       = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = NO
-COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          =
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML          = YES
-HTML_OUTPUT            = html
-HTML_FILE_EXTENSION    = .html
-HTML_HEADER            =
-HTML_FOOTER            =
-HTML_STYLESHEET        =
-HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = YES
-CHM_FILE               =
-HHC_LOCATION           =
-GENERATE_CHI           = NO
-BINARY_TOC             = NO
-TOC_EXPAND             = YES
-DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = YES
-TREEVIEW_WIDTH         = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = NO
-LATEX_OUTPUT           = latex
-LATEX_CMD_NAME         = latex
-MAKEINDEX_CMD_NAME     = makeindex
-COMPACT_LATEX          = NO
-PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         =
-LATEX_HEADER           =
-PDF_HYPERLINKS         = NO
-USE_PDFLATEX           = NO
-LATEX_BATCHMODE        = NO
-LATEX_HIDE_INDICES     = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = rtf
-COMPACT_RTF            = NO
-RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    =
-RTF_EXTENSIONS_FILE    =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = YES
-MAN_OUTPUT             = man
-MAN_EXTENSION          = .3
-MAN_LINKS              = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML           = NO
-XML_OUTPUT             = xml
-XML_SCHEMA             =
-XML_DTD                =
-XML_PROGRAMLISTING     = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF   = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD       = NO
-PERLMOD_LATEX          = NO
-PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX =
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           =
-INCLUDE_FILE_PATTERNS  =
-PREDEFINED             =
-EXPAND_AS_DEFINED      =
-SKIP_FUNCTION_MACROS   = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-TAGFILES               =
-GENERATE_TAGFILE       = openttd.tag
-ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = YES
-HIDE_UNDOC_RELATIONS   = YES
-HAVE_DOT               = NO
-CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = YES
-GROUP_GRAPHS           = YES
-UML_LOOK               = NO
-TEMPLATE_RELATIONS     = NO
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = YES
-CALL_GRAPH             = NO
-GRAPHICAL_HIERARCHY    = YES
-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
-GENERATE_LEGEND        = YES
-DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE           = NO

StdAfx.c

@@ -0,0 +1,8 @@
+// stdafx.cpp : source file that includes just the standard includes
+//	ttd.pch will be the pre-compiled header
+//	stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file

ai.h

@@ -1,10 +1,7 @@
-/* $Id$ */
+#ifndef AI_H
+#define AI_H
 
-#ifndef AI_TROLLY_H
-#define AI_TROLLY_H
-
-#include "../../aystar.h"
-#include "../../player.h"
+#include "aystar.h"
 
 /*
  * These defines can be altered to change the behavoir of the AI
@@ -40,8 +37,6 @@
 #define AI_PATHFINDER_PENALTY 150
 // The penalty given to a tile that is going up
 #define AI_PATHFINDER_TILE_GOES_UP_PENALTY 450
-// The penalty given to a tile which would have to use fundation
-#define AI_PATHFINDER_FOUNDATION_PENALTY 100
 // Changing direction is a penalty, to prevent curved ways (with that: slow ways)
 #define AI_PATHFINDER_DIRECTION_CHANGE_PENALTY 200
 // Same penalty, only for when road already exists
@@ -76,7 +71,7 @@
 #define AI_LOCATE_ROUTE_MAX_COUNTER 200
 
 // How many days must there be between building the first station and the second station
-//  within one city. This number is in days and should be more than 4 months.
+//  within one city. This number is in days and should be more then 4 months.
 #define AI_CHECKCITY_DATE_BETWEEN 180
 
 // How many cargo is needed for one station in a city?
@@ -135,7 +130,7 @@
 //  reuse the station instead of building a new one!
 #define AI_STATION_REUSE_MULTIPLER 2
 
-// No more than this amount of vehicles per station..
+// No more then this amount of vehicles per station..
 #define AI_CHECK_MAX_VEHICLE_PER_STATION 10
 
 // How many thick between building 2 vehicles
@@ -154,7 +149,7 @@
 //   while old vehicles stay longer, because we do get less in return.
 #define AI_MINIMUM_ROUTE_PROFIT 1000
 
-// A vehicle is considered lost when he his cargo is more than 180 days old
+// A vehicle is considered lost when he his cargo is more then 180 days old
 #define AI_VEHICLE_LOST_DAYS 180
 
 // How many times may the AI try to find a route before it gives up
@@ -173,6 +168,13 @@ static const byte _illegal_curves[6] = {
     3, // upright and downright are not valid
 };
 
+static const TileIndexDiff _tiles_around[4] = {
+    TILE_XY(-1,0),
+    TILE_XY(0,1),
+    TILE_XY(1,0),
+    TILE_XY(0,-1),
+};
+
 enum {
     AI_STATE_STARTUP = 0,
     AI_STATE_FIRST_TIME,
@@ -187,7 +189,6 @@ enum {
     AI_STATE_BUILD_PATH,
     AI_STATE_BUILD_DEPOT,
     AI_STATE_BUILD_VEHICLE,
-	AI_STATE_WAIT_FOR_BUILD,
     AI_STATE_GIVE_ORDERS,
     AI_STATE_START_VEHICLE,
     AI_STATE_REPAY_MONEY,
@@ -226,7 +227,7 @@ enum {
 
 #define AI_NO_CARGO 0xFF // Means that there is no cargo defined yet (used for industry)
 #define AI_NEED_CARGO 0xFE // Used when the AI needs to find out a cargo for the route
-#define AI_STATION_RANGE TileXY(MapMaxX(), MapMaxY())
+#define AI_STATION_RANGE TILE_XY(TILE_X_MAX, TILE_Y_MAX)
 
 #define AI_PATHFINDER_NO_DIRECTION (byte)-1
 
@@ -234,6 +235,13 @@ enum {
 #define AI_PATHFINDER_FLAG_BRIDGE 1
 #define AI_PATHFINDER_FLAG_TUNNEL 2
 
+// A macro for mp_street, where 0x20 is depot
+//   mp_tunnelbridge, where 0xf0 is a bridge, and 0x4/0x2 means: roadtunnel/bridge
+#define AI_PATHFINDER_IS_ROAD(tile) ((IS_TILETYPE(tile, MP_STREET) && !(_map5[tile] & 0x20)) || \
+(IS_TILETYPE(tile, MP_TUNNELBRIDGE) && \
+	(((_map5[tile] & 0x80) == 0 && (_map5[tile] & 0x4) == 0x4) || \
+	 ((_map5[tile] & 0x80) != 0 && (_map5[tile] & 0x2) == 0x2))))
+
 typedef void AiNew_StateFunction(Player *p);
 
 // ai_new.c
@@ -244,19 +252,20 @@ AyStar *new_AyStar_AiPathFinder(int max_tiles_around, Ai_PathFinderInfo *PathFin
 void clean_AyStar_AiPathFinder(AyStar *aystar, Ai_PathFinderInfo *PathFinderInfo);
 
 // ai_shared.c
-int AiNew_GetRailDirection(TileIndex tile_a, TileIndex tile_b, TileIndex tile_c);
-int AiNew_GetRoadDirection(TileIndex tile_a, TileIndex tile_b, TileIndex tile_c);
-DiagDirection AiNew_GetDirection(TileIndex tile_a, TileIndex tile_b);
+int AiNew_GetRailDirection(uint tile_a, uint tile_b, uint tile_c);
+int AiNew_GetRoadDirection(uint tile_a, uint tile_b, uint tile_c);
+int AiNew_GetDirection(uint tile_a, uint tile_b);
 bool AiNew_SetSpecialVehicleFlag(Player *p, Vehicle *v, uint flag);
 uint AiNew_GetSpecialVehicleFlag(Player *p, Vehicle *v);
 
 // ai_build.c
-bool AiNew_Build_CompanyHQ(Player *p, TileIndex tile);
-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);
+bool AiNew_Build_CompanyHQ(Player *p, uint tile);
+int AiNew_Build_Station(Player *p, byte type, uint tile, byte length, byte numtracks, byte direction, byte flag);
+int AiNew_Build_Bridge(Player *p, uint tile_a, uint tile_b, byte flag);
 int AiNew_Build_RoutePart(Player *p, Ai_PathFinderInfo *PathFinderInfo, byte flag);
-EngineID AiNew_PickVehicle(Player *p);
-int AiNew_Build_Vehicle(Player *p, TileIndex tile, byte flag);
-int AiNew_Build_Depot(Player* p, TileIndex tile, DiagDirection direction, byte flag);
+int AiNew_PickVehicle(Player *p);
+int AiNew_Build_Vehicle(Player *p, uint tile, byte flag);
+int AiNew_Build_Depot(Player *p, uint tile, byte direction, byte flag);
 
-#endif /* AI_TROLLY_H */
+
+#endif

ai/ai.c

@@ -1,246 +0,0 @@
-/* $Id$ */
-
-#include "../stdafx.h"
-#include "../openttd.h"
-#include "../variables.h"
-#include "../command.h"
-#include "../network.h"
-#include "ai.h"
-#include "default/default.h"
-
-/**
- * Dequeues commands put in the queue via AI_PutCommandInQueue.
- */
-static void AI_DequeueCommands(PlayerID player)
-{
-	AICommand *com, *entry_com;
-
-	entry_com = _ai_player[player].queue;
-
-	/* It happens that DoCommandP issues a new DoCommandAI which adds a new command
-	 *  to this very same queue (don't argue about this, if it currently doesn't
-	 *  happen I can tell you it will happen with AIScript -- TrueLight). If we
-	 *  do not make the queue NULL, that commands will be dequeued immediatly.
-	 *  Therefor we safe the entry-point to entry_com, and make the queue NULL, so
-	 *  the new queue can be safely built up. */
-	_ai_player[player].queue = NULL;
-	_ai_player[player].queue_tail = NULL;
-
-	/* Dequeue all commands */
-	while ((com = entry_com) != NULL) {
-		_current_player = player;
-
-		_cmd_text = com->text;
-		DoCommandP(com->tile, com->p1, com->p2, com->callback, com->procc);
-
-		/* Free item */
-		entry_com = com->next;
-		free(com->text);
-		free(com);
-	}
-}
-
-/**
- * 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, 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 = 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 = malloc(sizeof(AICommand));
-		_ai_player[player].queue_tail = _ai_player[player].queue_tail->next;
-	}
-
-	/* This is our new item */
-	com = _ai_player[player].queue_tail;
-
-	/* Assign the info */
-	com->tile  = tile;
-	com->p1    = p1;
-	com->p2    = p2;
-	com->procc = procc;
-	com->callback = callback;
-	com->next  = NULL;
-	com->text  = NULL;
-
-	/* Copy the cmd_text, if needed */
-	if (_cmd_text != NULL) {
-		com->text = strdup(_cmd_text);
-		_cmd_text = NULL;
-	}
-}
-
-/**
- * Executes a raw DoCommand for the AI.
- */
-int32 AI_DoCommandCc(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc, CommandCallback* callback)
-{
-	PlayerID old_lp;
-	int32 res = 0;
-	const char* tmp_cmdtext;
-
-	/* If you enable DC_EXEC with DC_QUERY_COST you are a really strange
-	 *   person.. should we check for those funny jokes?
-	 */
-
-	/* The test already resets _cmd_text, so backup the pointer */
-	tmp_cmdtext = _cmd_text;
-
-	/* First, do a test-run to see if we can do this */
-	res = DoCommand(tile, p1, p2, flags & ~DC_EXEC, procc);
-	/* The command failed, or you didn't want to execute, or you are quering, return */
-	if (CmdFailed(res) || !(flags & DC_EXEC) || (flags & DC_QUERY_COST)) {
-		return res;
-	}
-
-	/* 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_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;
-	_local_player = _current_player;
-
-#ifdef ENABLE_NETWORK
-	/* Send the command */
-	if (_networking) {
-		/* Network is easy, send it to his handler */
-		NetworkSend_Command(tile, p1, p2, procc, callback);
-	} else {
-#else
-	{
-#endif
-		/* If we execute BuildCommands directly in SP, we have a big problem with events
-		 *  so we need to delay is for 1 tick */
-		AI_PutCommandInQueue(_current_player, tile, p1, p2, procc, callback);
-	}
-
-	/* Set _local_player back */
-	_local_player = old_lp;
-
-	return res;
-}
-
-
-int32 AI_DoCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc)
-{
-	return AI_DoCommandCc(tile, p1, p2, flags, procc, NULL);
-}
-
-
-/**
- * Run 1 tick of the AI. Don't overdo it, keep it realistic.
- */
-static void AI_RunTick(PlayerID player)
-{
-	extern void AiNewDoGameLoop(Player *p);
-
-	Player *p = GetPlayer(player);
-	_current_player = player;
-
-	if (_patches.ainew_active) {
-		AiNewDoGameLoop(p);
-	} else {
-		/* Enable all kind of cheats the old AI needs in order to operate correctly... */
-		_is_old_ai_player = true;
-		AiDoGameLoop(p);
-		_is_old_ai_player = false;
-	}
-}
-
-
-/**
- * The gameloop for AIs.
- *  Handles one tick for all the AIs.
- */
-void AI_RunGameLoop(void)
-{
-	/* Don't do anything if ai is disabled */
-	if (!_ai.enabled) return;
-
-	/* Don't do anything if we are a network-client, or the AI has been disabled */
-	if (_networking && (!_network_server || !_patches.ai_in_multiplayer)) return;
-
-	/* New tick */
-	_ai.tick++;
-
-	/* Make sure the AI follows the difficulty rule.. */
-	assert(_opt.diff.competitor_speed <= 4);
-	if ((_ai.tick & ((1 << (4 - _opt.diff.competitor_speed)) - 1)) != 0) return;
-
-	/* Check for AI-client (so joining a network with an AI) */
-	if (!_networking || _network_server) {
-		/* Check if we want to run AIs (server or SP only) */
-		const Player* p;
-
-		FOR_ALL_PLAYERS(p) {
-			if (p->is_active && p->is_ai) {
-				/* This should always be true, else something went wrong... */
-				assert(_ai_player[p->index].active);
-
-				/* Run the script */
-				AI_DequeueCommands(p->index);
-				AI_RunTick(p->index);
-			}
-		}
-	}
-
-	_current_player = OWNER_NONE;
-}
-
-/**
- * A new AI sees the day of light. You can do here what ever you think is needed.
- */
-void AI_StartNewAI(PlayerID player)
-{
-	assert(IsValidPlayer(player));
-
-	/* Called if a new AI is booted */
-	_ai_player[player].active = true;
-}
-
-/**
- * This AI player died. Give it some chance to make a final puf.
- */
-void AI_PlayerDied(PlayerID player)
-{
-	/* Called if this AI died */
-	_ai_player[player].active = false;
-}
-
-/**
- * Initialize some AI-related stuff.
- */
-void AI_Initialize(void)
-{
-	/* First, make sure all AIs are DEAD! */
-	AI_Uninitialize();
-
-	memset(&_ai, 0, sizeof(_ai));
-	memset(&_ai_player, 0, sizeof(_ai_player));
-
-	_ai.enabled = true;
-}
-
-/**
- * Deinitializer for AI-related stuff.
- */
-void AI_Uninitialize(void)
-{
-	const Player* p;
-
-	FOR_ALL_PLAYERS(p) {
-		if (p->is_active && p->is_ai) AI_PlayerDied(p->index);
-	}
-}

ai/ai.h

@@ -1,111 +0,0 @@
-#ifndef AI_H
-#define AI_H
-
-#include "../functions.h"
-#include "../network.h"
-#include "../player.h"
-#include "../command.h"
-
-/* How DoCommands look like for an AI */
-typedef struct AICommand {
-	uint32 tile;
-	uint32 p1;
-	uint32 p2;
-	uint32 procc;
-	CommandCallback* callback;
-
-	char *text;
-	uint uid;
-
-	struct AICommand *next;
-} AICommand;
-
-/* The struct for an AIScript Player */
-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 */
-typedef struct AIStruct {
-	/* General */
-	bool enabled;           ///< Is AI enabled?
-	uint tick;              ///< The current tick (something like _frame_counter, only for AIs)
-} AIStruct;
-
-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);
-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(void)
-{
-	/* If disabled, no AI */
-	if (!_ai.enabled)
-		return false;
-
-	/* If in network, but no server, no AI */
-	if (_networking && !_network_server)
-		return false;
-
-	/* If in network, and server, possible AI */
-	if (_networking && _network_server) {
-		/* Do we want AIs in multiplayer? */
-		if (!_patches.ai_in_multiplayer)
-			return false;
-
-		/* Only the NewAI is allowed... sadly enough the old AI just doesn't support this
-		 *  system, because all commands are delayed by at least 1 tick, which causes
-		 *  a big problem, because it uses variables that are only set AFTER the command
-		 *  is really executed... */
-		if (!_patches.ainew_active)
-			return false;
-	}
-
-	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))
-
-/**
- * The random-function that should be used by ALL AIs.
- */
-static inline uint AI_RandomRange(uint max)
-{
-	/* 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.
-	 */
-	if (_networking)
-		return InteractiveRandomRange(max);
-	else
-		return RandomRange(max);
-}
-
-/**
- * The random-function that should be used by ALL AIs.
- */
-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.
-	 */
-	if (_networking)
-		return InteractiveRandom();
-	else
-		return Random();
-}
-
-#endif /* AI_H */

ai/default/default.h

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

ai/trolly/build.c

@@ -1,324 +0,0 @@
-/* $Id$ */
-
-#include "../../stdafx.h"
-#include "../../openttd.h"
-#include "../../debug.h"
-#include "../../functions.h"
-#include "../../map.h"
-#include "../../road_map.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 "../ai.h"
-
-// Build HQ
-//  Params:
-//    tile : tile where HQ is going to be build
-bool AiNew_Build_CompanyHQ(Player *p, TileIndex tile)
-{
-	if (CmdFailed(AI_DoCommand(tile, 0, 0, DC_AUTO | DC_NO_WATER, CMD_BUILD_COMPANY_HQ)))
-		return false;
-	AI_DoCommand(tile, 0, 0, DC_EXEC | DC_AUTO | DC_NO_WATER, CMD_BUILD_COMPANY_HQ);
-	return true;
-}
-
-
-// Build station
-//  Params:
-//    type : AI_TRAIN/AI_BUS/AI_TRUCK : indicates the type of station
-//    tile : tile where station is going to be build
-//    length : in case of AI_TRAIN: length of station
-//    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)
-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, RS_BUS, 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);
-}
-
-
-// Builds a brdige. The second best out of the ones available for this player
-//  Params:
-//   tile_a : starting point
-//   tile_b : end point
-//   flag : flag passed to DoCommand
-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 = 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)) {
-			type2 = type;
-			type = bridge_type;
-			// We found two bridges, exit
-			if (type2 != 0) break;
-		}
-	}
-	// There is only one bridge that can be built
-	if (type2 == 0 && type != 0) type2 = type;
-
-	// Now, simply, build the bridge!
-	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 << 8) + type2, flag | DC_AUTO, CMD_BUILD_BRIDGE);
-	}
-}
-
-
-// Build the route part by part
-// Basicly what this function do, is build that amount of parts of the route
-//  that go in the same direction. It sets 'part' to the last part of the route builded.
-//  The return value is the cost for the builded parts
-//
-//  Params:
-//   PathFinderInfo : Pointer to the PathFinderInfo used for AiPathFinder
-//   part : Which part we need to build
-//
-// TODO: skip already builded road-pieces (e.g.: cityroad)
-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;
-	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 0;
-	}
-
-
-	if (PathFinderInfo->rail_or_road) {
-		// Tunnel code
-		if ((AI_PATHFINDER_FLAG_TUNNEL & route_extra[part]) != 0) {
-			cost += AI_DoCommand(route[part], 0, 0, flag, CMD_BUILD_TUNNEL);
-			PathFinderInfo->position++;
-			// TODO: problems!
-			if (CmdFailed(cost)) {
-				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 += AiNew_Build_Bridge(p, route[part], route[part-1], flag);
-			PathFinderInfo->position++;
-			// TODO: problems!
-			if (CmdFailed(cost)) {
-				DEBUG(ai,0)("[AiNew - BuildPath] We have a serious problem: bridge could not be built!");
-				return 0;
-			}
-			return cost;
-		}
-
-		// Build normal rail
-		// Keep it doing till we go an other way
-		if (route_extra[part - 1] == 0 && route_extra[part] == 0) {
-			while (route_extra[part] == 0) {
-				// Get the current direction
-				dir = AiNew_GetRailDirection(route[part-1], route[part], route[part+1]);
-				// Is it the same as the last one?
-				if (old_dir != -1 && old_dir != dir) break;
-				old_dir = dir;
-				// Build the tile
-				res = AI_DoCommand(route[part], 0, dir, flag, CMD_BUILD_SINGLE_RAIL);
-				if (CmdFailed(res)) {
-					// Problem.. let's just abort it all!
-					p->ainew.state = AI_STATE_NOTHING;
-					return 0;
-				}
-				cost += res;
-				// Go to the next tile
-				part++;
-				// Check if it is still in range..
-				if (part >= PathFinderInfo->route_length - 1) break;
-			}
-			part--;
-		}
-		// We want to return the last position, so we go back one
-		PathFinderInfo->position = part;
-	} else {
-		// Tunnel code
-		if ((AI_PATHFINDER_FLAG_TUNNEL & route_extra[part]) != 0) {
-			cost += AI_DoCommand(route[part], 0x200, 0, flag, CMD_BUILD_TUNNEL);
-			PathFinderInfo->position++;
-			// TODO: problems!
-			if (CmdFailed(cost)) {
-				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 += AiNew_Build_Bridge(p, route[part], route[part+1], flag);
-			PathFinderInfo->position++;
-			// TODO: problems!
-			if (CmdFailed(cost)) {
-				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
-		// 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 || 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?
-				if (old_dir != -1 && old_dir != dir) break;
-				old_dir = dir;
-				// There is already some road, and it is a bridge.. don't build!!!
-				if (!IsTileType(route[part], MP_TUNNELBRIDGE)) {
-					// 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_STREET) && !EnsureNoVehicle(route[part])) {
-						// Problem.. let's just abort it all!
-						DEBUG(ai,0)("Darn, the route could not be built.. aborting!");
-						p->ainew.state = AI_STATE_NOTHING;
-						return 0;
-					}
-
-					if (!CmdFailed(res)) cost += res;
-				}
-				// Go to the next tile
-				part++;
-				// Check if it is still in range..
-				if (part >= PathFinderInfo->route_length - 1) break;
-			}
-			part--;
-			// We want to return the last position, so we go back one
-		}
-		if (!EnsureNoVehicle(route[part]) && flag == DC_EXEC) part--;
-		PathFinderInfo->position = part;
-	}
-
-	return cost;
-}
-
-
-// This functions tries to find the best vehicle for this type of cargo
-// It returns INVALID_ENGINE if not suitable engine is found
-EngineID AiNew_PickVehicle(Player *p)
-{
-	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 (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 != 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;
-
-			/* Rate and compare the engine by speed & capacity */
-			rating = rvi->max_speed * rvi->capacity;
-			if (rating <= best_veh_rating) continue;
-
-			// Can we build it?
-			ret = AI_DoCommand(0, i, 0, DC_QUERY_COST, CMD_BUILD_ROAD_VEH);
-			if (CmdFailed(ret)) continue;
-
-			best_veh_rating = rating;
-			best_veh_index = i;
-		}
-
-		return best_veh_index;
-	}
-}
-
-
-void CcAI(bool success, TileIndex tile, uint32 p1, uint32 p2)
-{
-	Player* p = GetPlayer(_current_player);
-
-	if (success) {
-		p->ainew.state = AI_STATE_GIVE_ORDERS;
-		p->ainew.veh_id = _new_vehicle_id;
-
-		if (GetVehicle(p->ainew.veh_id)->cargo_type != p->ainew.cargo) {
-			/* Cargo type doesn't match, so refit it */
-			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, 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 */
-		p->ainew.state = AI_STATE_NOTHING;
-	}
-}
-
-
-// Builds the best vehicle possible
-int AiNew_Build_Vehicle(Player *p, TileIndex tile, byte flag)
-{
-	EngineID i = AiNew_PickVehicle(p);
-
-	if (i == INVALID_ENGINE) 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);
-	} else {
-		return AI_DoCommand(tile, i, 0, flag, CMD_BUILD_ROAD_VEH);
-	}
-}
-
-int AiNew_Build_Depot(Player* p, TileIndex tile, DiagDirection direction, byte flag)
-{
-	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(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;
-		return ret + ret2;
-	}
-}

ai/trolly/pathfinder.c

@@ -1,510 +0,0 @@
-/* $Id$ */
-
-#include "../../stdafx.h"
-#include "../../openttd.h"
-#include "../../bridge_map.h"
-#include "../../debug.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 "../ai.h"
-
-#define TEST_STATION_NO_DIR 0xFF
-
-// Tests if a station can be build on the given spot
-// TODO: make it train compatible
-static bool TestCanBuildStationHere(TileIndex tile, byte dir)
-{
-	Player *p = GetPlayer(_current_player);
-
-	if (dir == TEST_STATION_NO_DIR) {
-		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, 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 !CmdFailed(AiNew_Build_Station(p, p->ainew.tbt, tile, 1, 1, dir, DC_QUERY_COST));
-}
-
-
-static bool IsRoad(TileIndex tile)
-{
-	return
-		// 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)
-		));
-}
-
-
-// Checks if a tile 'a' is between the tiles 'b' and 'c'
-#define TILES_BETWEEN(a, b, c) (TileX(a) >= TileX(b) && TileX(a) <= TileX(c) && TileY(a) >= TileY(b) && TileY(a) <= TileY(c))
-
-
-// Check if the current tile is in our end-area
-static int32 AyStar_AiPathFinder_EndNodeCheck(AyStar *aystar, OpenListNode *current)
-{
-	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;
-	if (TILES_BETWEEN(current->path.node.tile, PathFinderInfo->end_tile_tl, PathFinderInfo->end_tile_br))
-		if (IsTileType(current->path.node.tile, MP_CLEAR) || IsTileType(current->path.node.tile, MP_TREES))
-			if (current->path.parent == NULL || TestCanBuildStationHere(current->path.node.tile, AiNew_GetDirection(current->path.parent->node.tile, current->path.node.tile)))
-				return AYSTAR_FOUND_END_NODE;
-
-	return AYSTAR_DONE;
-}
-
-
-// Calculates the hash
-//   Currently it is a 10 bit hash, so the hash array has a max depth of 6 bits (so 64)
-static uint AiPathFinder_Hash(uint key1, uint key2)
-{
-	return (TileX(key1) & 0x1F) + ((TileY(key1) & 0x1F) << 5);
-}
-
-
-// Clear the memory of all the things
-static void AyStar_AiPathFinder_Free(AyStar *aystar)
-{
-	AyStarMain_Free(aystar);
-	free(aystar);
-}
-
-
-static int32 AyStar_AiPathFinder_CalculateG(AyStar *aystar, AyStarNode *current, OpenListNode *parent);
-static int32 AyStar_AiPathFinder_CalculateH(AyStar *aystar, AyStarNode *current, OpenListNode *parent);
-static void AyStar_AiPathFinder_FoundEndNode(AyStar *aystar, OpenListNode *current);
-static void AyStar_AiPathFinder_GetNeighbours(AyStar *aystar, OpenListNode *current);
-
-
-// This creates the AiPathFinder
-AyStar *new_AyStar_AiPathFinder(int max_tiles_around, Ai_PathFinderInfo *PathFinderInfo)
-{
-	PathNode start_node;
-	uint x;
-	uint y;
-	// Create AyStar
-	AyStar *result = malloc(sizeof(AyStar));
-	init_AyStar(result, AiPathFinder_Hash, 1 << 10);
-	// Set the function pointers
-	result->CalculateG = AyStar_AiPathFinder_CalculateG;
-	result->CalculateH = AyStar_AiPathFinder_CalculateH;
-	result->EndNodeCheck = AyStar_AiPathFinder_EndNodeCheck;
-	result->FoundEndNode = AyStar_AiPathFinder_FoundEndNode;
-	result->GetNeighbours = AyStar_AiPathFinder_GetNeighbours;
-
-	result->free = AyStar_AiPathFinder_Free;
-
-	// Set some information
-	result->loops_per_tick = AI_PATHFINDER_LOOPS_PER_TICK;
-	result->max_path_cost = 0;
-	result->max_search_nodes = AI_PATHFINDER_MAX_SEARCH_NODES;
-
-	// Set the user_data to the PathFinderInfo
-	result->user_target = PathFinderInfo;
-
-	// Set the start node
-	start_node.parent = NULL;
-	start_node.node.direction = 0;
-	start_node.node.user_data[0] = 0;
-
-	// Now we add all the starting tiles
-	for (x = TileX(PathFinderInfo->start_tile_tl); x <= TileX(PathFinderInfo->start_tile_br); x++) {
-		for (y = TileY(PathFinderInfo->start_tile_tl); y <= TileY(PathFinderInfo->start_tile_br); y++) {
-			start_node.node.tile = TileXY(x, y);
-			result->addstart(result, &start_node.node, 0);
-		}
-	}
-
-	return result;
-}
-
-
-// To reuse AyStar we sometimes have to clean all the memory
-void clean_AyStar_AiPathFinder(AyStar *aystar, Ai_PathFinderInfo *PathFinderInfo)
-{
-	PathNode start_node;
-	uint x;
-	uint y;
-
-	aystar->clear(aystar);
-
-	// Set the user_data to the PathFinderInfo
-	aystar->user_target = PathFinderInfo;
-
-	// Set the start node
-	start_node.parent = NULL;
-	start_node.node.direction = 0;
-	start_node.node.user_data[0] = 0;
-	start_node.node.tile = PathFinderInfo->start_tile_tl;
-
-	// Now we add all the starting tiles
-	for (x = TileX(PathFinderInfo->start_tile_tl); x <= TileX(PathFinderInfo->start_tile_br); x++) {
-		for (y = TileY(PathFinderInfo->start_tile_tl); y <= TileY(PathFinderInfo->start_tile_br); y++) {
-			TileIndex tile = TileXY(x, y);
-
-			if (!IsTileType(tile, MP_CLEAR) && !IsTileType(tile, MP_TREES)) continue;
-			if (!TestCanBuildStationHere(tile, TEST_STATION_NO_DIR)) continue;
-			start_node.node.tile = tile;
-			aystar->addstart(aystar, &start_node.node, 0);
-		}
-	}
-}
-
-
-// The h-value, simple calculation
-static int32 AyStar_AiPathFinder_CalculateH(AyStar *aystar, AyStarNode *current, OpenListNode *parent)
-{
-	const Ai_PathFinderInfo* PathFinderInfo = aystar->user_target;
-	int r, r2;
-
-	if (PathFinderInfo->end_direction != AI_PATHFINDER_NO_DIRECTION) {
-		// The station is pointing to a direction, add a tile towards that direction, so the H-value is more accurate
-		r = DistanceManhattan(current->tile, PathFinderInfo->end_tile_tl + TileOffsByDiagDir(PathFinderInfo->end_direction));
-		r2 = DistanceManhattan(current->tile, PathFinderInfo->end_tile_br + TileOffsByDiagDir(PathFinderInfo->end_direction));
-	} else {
-		// No direction, so just get the fastest route to the station
-		r = DistanceManhattan(current->tile, PathFinderInfo->end_tile_tl);
-		r2 = DistanceManhattan(current->tile, PathFinderInfo->end_tile_br);
-	}
-	// See if the bottomright is faster than the topleft..
-	if (r2 < r) r = r2;
-	return r * AI_PATHFINDER_H_MULTIPLER;
-}
-
-
-// We found the end.. let's get the route back and put it in an array
-static void AyStar_AiPathFinder_FoundEndNode(AyStar *aystar, OpenListNode *current)
-{
-	Ai_PathFinderInfo *PathFinderInfo = (Ai_PathFinderInfo*)aystar->user_target;
-	uint i = 0;
-	PathNode *parent = &current->path;
-
-	do {
-		PathFinderInfo->route_extra[i] = parent->node.user_data[0];
-		PathFinderInfo->route[i++] = parent->node.tile;
-		if (i > lengthof(PathFinderInfo->route)) {
-			// We ran out of space for the PathFinder
-			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)("[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)
-{
-	uint i;
-	int ret;
-	int dir;
-
-	Ai_PathFinderInfo *PathFinderInfo = (Ai_PathFinderInfo*)aystar->user_target;
-
-	aystar->num_neighbours = 0;
-
-	// Go through all surrounding tiles and check if they are within the limits
-	for (i = 0; i < 4; i++) {
-		TileIndex ctile = current->path.node.tile; // Current tile
-		TileIndex atile = ctile + TileOffsByDiagDir(i); // Adjacent tile
-
-		if (TileX(atile) > 1 && TileX(atile) < MapMaxX() - 1 &&
-				TileY(atile) > 1 && TileY(atile) < MapMaxY() - 1) {
-			// We also directly test if the current tile can connect to this tile..
-			//  We do this simply by just building the tile!
-
-			// 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 (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;
-				}
-			}
-
-			if ((AI_PATHFINDER_FLAG_BRIDGE & current->path.node.user_data[0]) != 0 ||
-					(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 (i != (current->path.node.user_data[0] >> 8)) continue;
-			}
-			dir = 0;
-
-			// First, check if we have a parent
-			if (current->path.parent == NULL && current->path.node.user_data[0] == 0) {
-				// If not, this means we are at the starting station
-				if (PathFinderInfo->start_direction != AI_PATHFINDER_NO_DIRECTION) {
-					// We do need a direction?
-					if (AiNew_GetDirection(ctile, atile) != PathFinderInfo->start_direction) {
-						// We are not pointing the right way, invalid tile
-						continue;
-					}
-				}
-			} else if (current->path.node.user_data[0] == 0) {
-				if (PathFinderInfo->rail_or_road) {
-					// Rail check
-					dir = AiNew_GetRailDirection(current->path.parent->node.tile, ctile, atile);
-					ret = AI_DoCommand(ctile, 0, dir, DC_AUTO | DC_NO_WATER, CMD_BUILD_SINGLE_RAIL);
-					if (CmdFailed(ret)) continue;
-#ifdef AI_PATHFINDER_NO_90DEGREES_TURN
-					if (current->path.parent->parent != NULL) {
-						// Check if we don't make a 90degree curve
-						int dir1 = AiNew_GetRailDirection(current->path.parent->parent->node.tile, current->path.parent->node.tile, ctile);
-						if (_illegal_curves[dir1] == dir || _illegal_curves[dir] == dir1) {
-							continue;
-						}
-					}
-#endif
-				} else {
-					// Road check
-					dir = AiNew_GetRoadDirection(current->path.parent->node.tile, ctile, atile);
-					if (IsRoad(ctile)) {
-						if (IsTileType(ctile, MP_TUNNELBRIDGE)) {
-							// We have a bridge, how nicely! We should mark it...
-							dir = 0;
-						} else {
-							// It already has road.. check if we miss any bits!
-							if ((_m[ctile].m5 & dir) != dir) {
-								// We do miss some pieces :(
-								dir &= ~_m[ctile].m5;
-							} else {
-								dir = 0;
-							}
-						}
-					}
-					// Only destruct things if it is MP_CLEAR of MP_TREES
-					if (dir != 0) {
-						ret = AI_DoCommand(ctile, dir, 0, DC_AUTO | DC_NO_WATER, CMD_BUILD_ROAD);
-						if (CmdFailed(ret)) continue;
-					}
-				}
-			}
-
-			// The tile can be connected
-			aystar->neighbours[aystar->num_neighbours].tile = atile;
-			aystar->neighbours[aystar->num_neighbours].user_data[0] = 0;
-			aystar->neighbours[aystar->num_neighbours++].direction = 0;
-		}
-	}
-
-	// Next step, check for bridges and tunnels
-	if (current->path.parent != NULL && current->path.node.user_data[0] == 0) {
-		// First we get the dir from this tile and his parent
-		DiagDirection dir = AiNew_GetDirection(current->path.parent->node.tile, current->path.node.tile);
-		// It means we can only walk with the track, so the bridge has to be in the same direction
-		TileIndex tile = current->path.node.tile;
-		TileIndex new_tile = tile;
-		Slope tileh = GetTileSlope(tile, NULL);
-
-		// 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_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, 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;
-
-				// Try building the bridge..
-				ret = AI_DoCommand(tile, new_tile, (0 << 8) + (MAX_BRIDGES / 2), DC_AUTO, CMD_BUILD_BRIDGE);
-				if (CmdFailed(ret)) continue;
-				// We can build a bridge here.. add him to the neighbours
-				aystar->neighbours[aystar->num_neighbours].tile = new_tile;
-				aystar->neighbours[aystar->num_neighbours].user_data[0] = AI_PATHFINDER_FLAG_BRIDGE + (dir << 8);
-				aystar->neighbours[aystar->num_neighbours++].direction = 0;
-				// We can only have 12 neighbours, and we need 1 left for tunnels
-				if (aystar->num_neighbours == 11) break;
-			}
-		}
-
-		// 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 ((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 (!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;
-			}
-		}
-	}
-}
-
-
-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 r, res = 0;
-	Slope tileh = GetTileSlope(current->tile, NULL);
-	Slope parent_tileh = GetTileSlope(parent->path.node.tile, NULL);
-
-	// Check if we hit the end-tile
-	if (TILES_BETWEEN(current->tile, PathFinderInfo->end_tile_tl, PathFinderInfo->end_tile_br)) {
-		// We are at the end-tile, check if we had a direction or something...
-		if (PathFinderInfo->end_direction != AI_PATHFINDER_NO_DIRECTION && AiNew_GetDirection(current->tile, parent->path.node.tile) != PathFinderInfo->end_direction) {
-			// We are not pointing the right way, invalid tile
-			return AYSTAR_INVALID_NODE;
-		}
-		// If it was valid, drop out.. we don't build on the endtile
-		return 0;
-	}
-
-	// Give everything a small penalty
-	res += AI_PATHFINDER_PENALTY;
-
-	if (!PathFinderInfo->rail_or_road) {
-		// Road has the lovely advantage it can use other road... check if
-		//  the current tile is road, and if so, give a good bonus
-		if (IsRoad(current->tile)) {
-			res -= AI_PATHFINDER_ROAD_ALREADY_EXISTS_BONUS;
-		}
-	}
-
-	// We should give a penalty when the tile is going up or down.. this is one way to do so!
-	//  Too bad we have to count it from the parent.. but that is not so bad.
-	// We also dislike long routes on slopes, since they do not look too realistic
-	//  when there is a flat land all around, they are more expensive to build, and
-	//  especially they essentially block the ability to connect or cross the road
-	//  from one side.
-	if (parent_tileh != SLOPE_FLAT && parent->path.parent != NULL) {
-		// 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) {
-				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)) {
-					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;
-					}
-				}
-			}
-		}
-	}
-
-	// Are we part of a tunnel?
-	if ((AI_PATHFINDER_FLAG_TUNNEL & current->user_data[0]) != 0) {
-		// Tunnels are very expensive when build on long routes..
-		// Ironicly, we are using BridgeCode here ;)
-		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 * 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 (!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 (!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
-	//    in speed, we have to give a good penalty to direction changing
-	//  This way, we get almost the fastest way in tiles, and a very good speed on the track
-	if (!PathFinderInfo->rail_or_road) {
-		if (parent->path.parent != NULL &&
-				AiNew_GetDirection(current->tile, parent->path.node.tile) != AiNew_GetDirection(parent->path.node.tile, parent->path.parent->node.tile)) {
-			// When road exists, we don't like turning, but its free, so don't be to piggy about it
-			if (IsRoad(parent->path.node.tile)) {
-				res += AI_PATHFINDER_DIRECTION_CHANGE_ON_EXISTING_ROAD_PENALTY;
-			} else {
-				res += AI_PATHFINDER_DIRECTION_CHANGE_PENALTY;
-			}
-		}
-	} else {
-		// For rail we have 1 exeption: diagonal rail..
-		// So we fetch 2 raildirection. That of the current one, and of the one before that
-		if (parent->path.parent != NULL && parent->path.parent->parent != NULL) {
-			int dir1 = AiNew_GetRailDirection(parent->path.parent->node.tile, parent->path.node.tile, current->tile);
-			int dir2 = AiNew_GetRailDirection(parent->path.parent->parent->node.tile, parent->path.parent->node.tile, parent->path.node.tile);
-			// First, see if we are on diagonal path, that is better than straight path
-			if (dir1 > 1) res -= AI_PATHFINDER_DIAGONAL_BONUS;
-
-			// First see if they are different
-			if (dir1 != dir2) {
-				// dir 2 and 3 are 1 diagonal track, and 4 and 5.
-				if (!(((dir1 == 2 || dir1 == 3) && (dir2 == 2 || dir2 == 3)) || ((dir1 == 4 || dir1 == 5) && (dir2 == 4 || dir2 == 5)))) {
-					// It is not, so we changed of direction
-					res += AI_PATHFINDER_DIRECTION_CHANGE_PENALTY;
-				}
-				if (parent->path.parent->parent->parent != NULL) {
-					int dir3 = AiNew_GetRailDirection(parent->path.parent->parent->parent->node.tile, parent->path.parent->parent->node.tile, parent->path.parent->node.tile);
-					// Check if we changed 3 tiles of direction in 3 tiles.. bad!!!
-					if ((dir1 == 0 || dir1 == 1) && dir2 > 1 && (dir3 == 0 || dir3 == 1)) {
-						res += AI_PATHFINDER_CURVE_PENALTY;
-					}
-				}
-			}
-		}
-	}
-
-	return (res < 0) ? 0 : res;
-}

ai/trolly/shared.c

@@ -1,118 +0,0 @@
-/* $Id$ */
-
-#include "../../stdafx.h"
-#include "../../openttd.h"
-#include "../../debug.h"
-#include "../../map.h"
-#include "trolly.h"
-#include "../../vehicle.h"
-
-int AiNew_GetRailDirection(TileIndex tile_a, TileIndex tile_b, TileIndex tile_c)
-{
-	// 0 = vert
-	// 1 = horz
-	// 2 = dig up-left
-	// 3 = dig down-right
-	// 4 = dig down-left
-	// 5 = dig up-right
-
-	uint x1 = TileX(tile_a);
-	uint x2 = TileX(tile_b);
-	uint x3 = TileX(tile_c);
-
-	uint y1 = TileY(tile_a);
-	uint y2 = TileY(tile_b);
-	uint y3 = TileY(tile_c);
-
-	if (y1 == y2 && y2 == y3) return 0;
-	if (x1 == x2 && x2 == x3) return 1;
-	if (y2 > y1) return x2 > x3 ? 2 : 4;
-	if (x2 > x1) return y2 > y3 ? 2 : 5;
-	if (y1 > y2) return x2 > x3 ? 5 : 3;
-	if (x1 > x2) return y2 > y3 ? 4 : 3;
-
-	return 0;
-}
-
-int AiNew_GetRoadDirection(TileIndex tile_a, TileIndex tile_b, TileIndex tile_c)
-{
-	int x1, x2, x3;
-	int y1, y2, y3;
-	int r;
-
-	x1 = TileX(tile_a);
-	x2 = TileX(tile_b);
-	x3 = TileX(tile_c);
-
-	y1 = TileY(tile_a);
-	y2 = TileY(tile_b);
-	y3 = TileY(tile_c);
-
-	r = 0;
-
-	if (x1 < x2) r += 8;
-	if (y1 < y2) r += 1;
-	if (x1 > x2) r += 2;
-	if (y1 > y2) r += 4;
-
-	if (x2 < x3) r += 2;
-	if (y2 < y3) r += 4;
-	if (x2 > x3) r += 8;
-	if (y2 > y3) r += 1;
-
-	return r;
-}
-
-// Get's the direction between 2 tiles seen from tile_a
-DiagDirection AiNew_GetDirection(TileIndex tile_a, TileIndex tile_b)
-{
-	if (TileY(tile_a) < TileY(tile_b)) return DIAGDIR_SE;
-	if (TileY(tile_a) > TileY(tile_b)) return DIAGDIR_NW;
-	if (TileX(tile_a) < TileX(tile_b)) return DIAGDIR_SW;
-	return DIAGDIR_NE;
-}
-
-
-// This functions looks up if this vehicle is special for this AI
-//  and returns his flag
-uint AiNew_GetSpecialVehicleFlag(Player* p, Vehicle* v)
-{
-	uint i;
-
-	for (i = 0; i < AI_MAX_SPECIAL_VEHICLES; i++) {
-		if (p->ainew.special_vehicles[i].veh_id == v->index) {
-			return p->ainew.special_vehicles[i].flag;
-		}
-	}
-
-	// Not found :(
-	return 0;
-}
-
-
-bool AiNew_SetSpecialVehicleFlag(Player* p, Vehicle* v, uint flag)
-{
-	int new_id = -1;
-	uint i;
-
-	for (i = 0; i < AI_MAX_SPECIAL_VEHICLES; i++) {
-		if (p->ainew.special_vehicles[i].veh_id == v->index) {
-			p->ainew.special_vehicles[i].flag |= flag;
-			return true;
-		}
-		if (new_id == -1 &&
-				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 :(");
-		return false;
-	}
-	p->ainew.special_vehicles[new_id].veh_id = v->index;
-	p->ainew.special_vehicles[new_id].flag = flag;
-	return true;
-}

ai_build.c

@@ -0,0 +1,258 @@
+#include "stdafx.h"
+#include "ttd.h"
+#include "map.h"
+#include "command.h"
+#include "ai.h"
+#include "engine.h"
+
+// Build HQ
+//  Params:
+//    tile : tile where HQ is going to be build
+bool AiNew_Build_CompanyHQ(Player *p, uint tile) {
+	if (DoCommandByTile(tile, 0, 0, DC_AUTO | DC_NO_WATER, CMD_BUILD_COMPANY_HQ) == CMD_ERROR)
+		return false;
+	DoCommandByTile(tile, 0, 0, DC_EXEC | DC_AUTO | DC_NO_WATER, CMD_BUILD_COMPANY_HQ);
+	return true;
+}
+
+// Build station
+//  Params:
+//    type : AI_TRAIN/AI_BUS/AI_TRUCK : indicates the type of station
+//    tile : tile where station is going to be build
+//    length : in case of AI_TRAIN: length of station
+//    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)
+int AiNew_Build_Station(Player *p, byte type, uint tile, byte length, byte numtracks, byte direction, byte flag) {
+	if (type == AI_TRAIN)
+		return DoCommandByTile(tile, direction + (numtracks << 8) + (length << 16), 0, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_RAILROAD_STATION);
+	else if (type == AI_BUS)
+		return DoCommandByTile(tile, direction, 0, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_BUS_STATION);
+	else
+		return DoCommandByTile(tile, direction, 0, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_TRUCK_STATION);
+}
+
+// Builds a brdige. The second best out of the ones available for this player
+//  Params:
+//   tile_a : starting point
+//   tile_b : end point
+//   flag : flag passed to DoCommand
+int AiNew_Build_Bridge(Player *p, uint tile_a, uint tile_b, byte flag) {
+	int bridge_type, bridge_len, type, type2;
+
+	// Find a good bridgetype (the best money can buy)
+	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)) {
+			type2 = type;
+			type = bridge_type;
+			// We found two bridges, exit
+			if (type2 != 0)
+				break;
+		}
+	}
+	// There is only one bridge that can be build..
+	if (type2 == 0 && type != 0) type2 = type;
+
+	// Now, simply, build the bridge!
+	if (p->ainew.tbt == AI_TRAIN)
+		return DoCommandByTile(tile_a, tile_b, (0<<8) + type2, flag | DC_AUTO, CMD_BUILD_BRIDGE);
+	else
+		return DoCommandByTile(tile_a, tile_b, (0x80 << 8) + type2, flag | DC_AUTO, CMD_BUILD_BRIDGE);
+}
+
+
+// Build the route part by part
+// Basicly what this function do, is build that amount of parts of the route
+//  that go in the same direction. It sets 'part' to the last part of the route builded.
+//  The return value is the cost for the builded parts
+//
+//  Params:
+//   PathFinderInfo : Pointer to the PathFinderInfo used for AiPathFinder
+//   part : Which part we need to build
+//
+// TODO: skip already builded road-pieces (e.g.: cityroad)
+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;
+	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 0; }
+
+
+	if (PathFinderInfo->rail_or_road) {
+		// Tunnel code
+     	if ((AI_PATHFINDER_FLAG_TUNNEL & route_extra[part]) != 0) {
+     		cost += DoCommandByTile(route[part], 0, 0, flag, CMD_BUILD_TUNNEL);
+     		PathFinderInfo->position++;
+     		// TODO: problems!
+     		if (cost == CMD_ERROR) {
+     			DEBUG(ai,0)("[AiNew - BuildPath] We have a serious problem: tunnel could not be build!");
+				return 0;
+     		}
+     		return cost;
+     	}
+     	// Bridge code
+     	if ((AI_PATHFINDER_FLAG_BRIDGE & route_extra[part]) != 0) {
+     		cost += AiNew_Build_Bridge(p, route[part], route[part-1], flag);
+     		PathFinderInfo->position++;
+     		// TODO: problems!
+     		if (cost == CMD_ERROR) {
+     			DEBUG(ai,0)("[AiNew - BuildPath] We have a serious problem: bridge could not be build!");
+				return 0;
+     		}
+     		return cost;
+     	}
+
+     	// Build normal rail
+     	// Keep it doing till we go an other way
+     	if (route_extra[part-1] == 0 && route_extra[part] == 0) {
+     		while (route_extra[part] == 0) {
+	     		// Get the current direction
+	     		dir = AiNew_GetRailDirection(route[part-1], route[part], route[part+1]);
+	     		// Is it the same as the last one?
+	     		if (old_dir != -1 && old_dir != dir) break;
+	     		old_dir = dir;
+	     		// Build the tile
+	     		res = DoCommandByTile(route[part], 0, dir, flag, CMD_BUILD_SINGLE_RAIL);
+	     		if (res == CMD_ERROR) {
+	     			// Problem.. let's just abort it all!
+	     			p->ainew.state = AI_STATE_NOTHING;
+	     			return 0;
+	     		}
+	     		cost += res;
+	     		// Go to the next tile
+	     		part++;
+	     		// Check if it is still in range..
+	     		if (part >= PathFinderInfo->route_length - 1) break;
+	     	}
+	     	part--;
+	    }
+     	// We want to return the last position, so we go back one
+     	PathFinderInfo->position = part;
+    } else {
+		// Tunnel code
+     	if ((AI_PATHFINDER_FLAG_TUNNEL & route_extra[part]) != 0) {
+     		cost += DoCommandByTile(route[part], 0x200, 0, flag, CMD_BUILD_TUNNEL);
+     		PathFinderInfo->position++;
+     		// TODO: problems!
+     		if (cost == CMD_ERROR) {
+     			DEBUG(ai,0)("[AiNew - BuildPath] We have a serious problem: tunnel could not be build!");
+				return 0;
+     		}
+     		return cost;
+     	}
+     	// Bridge code
+     	if ((AI_PATHFINDER_FLAG_BRIDGE & route_extra[part]) != 0) {
+     		cost += AiNew_Build_Bridge(p, route[part], route[part+1], flag);
+     		PathFinderInfo->position++;
+     		// TODO: problems!
+     		if (cost == CMD_ERROR) {
+     			DEBUG(ai,0)("[AiNew - BuildPath] We have a serious problem: bridge could not be build!");
+				return 0;
+     		}
+     		return cost;
+     	}
+
+     	// Build normal road
+     	// Keep it doing till we go an other 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 || 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?
+	     		if (old_dir != -1 && old_dir != dir) break;
+	     		old_dir = dir;
+	     		// There is already some road, and it is a bridge.. don't build!!!
+	     		if (!IS_TILETYPE(route[part], MP_TUNNELBRIDGE)) {
+	     			// Build the tile
+	     			res = DoCommandByTile(route[part], dir, 0, flag | DC_NO_WATER, CMD_BUILD_ROAD);
+	     			// Currently, we ignore CMD_ERRORs!
+	     			if (res == CMD_ERROR && flag == DC_EXEC && !IS_TILETYPE(route[part], MP_STREET) && !EnsureNoVehicle(route[part])) {
+     					// Problem.. let's just abort it all!
+     					DEBUG(ai,0)("Darn, the route could not be builded.. aborting!");
+    	     			p->ainew.state = AI_STATE_NOTHING;
+    	     			return 0;
+    	     		} else {
+    	     			if (res != CMD_ERROR)
+    	     				cost += res;
+    	     		}
+		     	}
+	     		// Go to the next tile
+	     		part++;
+	     		// Check if it is still in range..
+	     		if (part >= PathFinderInfo->route_length - 1) break;
+	     	}
+	     	part--;
+	     	// We want to return the last position, so we go back one
+	    }
+	    if (!EnsureNoVehicle(route[part]) && flag == DC_EXEC) part--;
+     	PathFinderInfo->position = part;
+    }
+
+    return cost;
+}
+
+// This functions tries to find the best vehicle for this type of cargo
+// It returns vehicle_id or -1 if not found
+int AiNew_PickVehicle(Player *p) {
+    if (p->ainew.tbt == AI_TRAIN) {
+        // Not supported yet
+        return -1;
+    } else {
+        int start, count, i, r = CMD_ERROR;
+        start = _cargoc.ai_roadveh_start[p->ainew.cargo];
+        count = _cargoc.ai_roadveh_count[p->ainew.cargo];
+
+        // Let's check it backwards.. we simply want to best engine available..
+        for (i=start+count-1;i>=start;i--) {
+        	// Is it availiable?
+        	// Also, check if the reliability of the vehicle is above the AI_VEHICLE_MIN_RELIABILTY
+        	if (!HASBIT(_engines[i].player_avail, _current_player) || _engines[i].reliability * 100 < AI_VEHICLE_MIN_RELIABILTY << 16) continue;
+        	// Can we build it?
+        	r = DoCommandByTile(0, i, 0, DC_QUERY_COST, CMD_BUILD_ROAD_VEH);
+        	if (r != CMD_ERROR) break;
+       	}
+       	// We did not find a vehicle :(
+       	if (r == CMD_ERROR) { return -1; }
+       	return i;
+    }
+}
+
+// Builds the best vehicle possible
+int AiNew_Build_Vehicle(Player *p, uint tile, byte flag) {
+	int i = AiNew_PickVehicle(p);
+	if (i == -1) return CMD_ERROR;
+
+	if (p->ainew.tbt == AI_TRAIN) {
+		return CMD_ERROR;
+	} else {
+		return DoCommandByTile(tile, i, 0, flag, CMD_BUILD_ROAD_VEH);
+	}
+}
+
+int AiNew_Build_Depot(Player *p, uint tile, byte direction, byte flag) {
+	static const byte _roadbits_by_dir[4] = {2,1,8,4};
+	int r, r2;
+    if (p->ainew.tbt == AI_TRAIN) {
+    	return DoCommandByTile(tile, 0, direction, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_TRAIN_DEPOT);
+    } else {
+    	r = DoCommandByTile(tile, direction, 0, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_ROAD_DEPOT);
+    	if (r == CMD_ERROR) return r;
+    	// Try to build the road from the depot
+    	r2 = DoCommandByTile(tile + _tileoffs_by_dir[direction], _roadbits_by_dir[direction], 0, flag | DC_AUTO | DC_NO_WATER, CMD_BUILD_ROAD);
+    	// If it fails, ignore it..
+    	if (r2 == CMD_ERROR) return r;
+    	return r + r2;
+    }
+}

ai_pathfinder.c

@@ -0,0 +1,458 @@
+#include "stdafx.h"
+#include "ttd.h"
+#include "map.h"
+#include "command.h"
+#include "ai.h"
+
+#define TEST_STATION_NO_DIR 0xFF
+
+// Tests if a station can be build on the given spot
+// TODO: make it train compatible
+bool TestCanBuildStationHere(uint tile, byte dir) {
+    Player *p = DEREF_PLAYER(_current_player);
+    if (dir == TEST_STATION_NO_DIR) {
+        // TODO: currently we only allow spots that can be access from al 4 directions...
+        //  should be fixed!!!
+        for (dir=0;dir<4;dir++) {
+        	int res = AiNew_Build_Station(p, p->ainew.tbt, tile, 1, 1, dir, DC_QUERY_COST);
+            if (res != CMD_ERROR)
+            	return true;
+        }
+        return false;
+    } else {
+       	int res = AiNew_Build_Station(p, p->ainew.tbt, tile, 1, 1, dir, DC_QUERY_COST);
+        if (res == CMD_ERROR)
+        	return false;
+    }
+    return true;
+}
+
+// Checks if a tile 'a' is between the tiles 'b' and 'c'
+#define TILES_BETWEEN(a,b,c) (GET_TILE_X(a) >= GET_TILE_X(b) && GET_TILE_X(a) <= GET_TILE_X(c) && GET_TILE_Y(a) >= GET_TILE_Y(b) && GET_TILE_Y(a) <= GET_TILE_Y(c))
+
+// Check if the current tile is in our end-area
+int32 AyStar_AiPathFinder_EndNodeCheck(AyStar *aystar, OpenListNode *current) {
+	Ai_PathFinderInfo *PathFinderInfo = (Ai_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;
+	if (TILES_BETWEEN(current->path.node.tile, PathFinderInfo->end_tile_tl, PathFinderInfo->end_tile_br))
+		if (IS_TILETYPE(current->path.node.tile, MP_CLEAR) || IS_TILETYPE(current->path.node.tile, MP_TREES))
+			if (current->path.parent == NULL || TestCanBuildStationHere(current->path.node.tile,AiNew_GetDirection(current->path.parent->node.tile, current->path.node.tile)))
+    			return AYSTAR_FOUND_END_NODE;
+
+	return AYSTAR_DONE;
+}
+
+// Calculates the hash
+//   Currently it is a 10 bit hash, so the hash array has a max depth of 6 bits (so 64)
+uint AiPathFinder_Hash(uint key1, uint key2) {
+	return (GET_TILE_X(key1) & 0x1F) + ((GET_TILE_Y(key1) & 0x1F) << 5);
+}
+
+// Clear the memory of all the things
+void AyStar_AiPathFinder_Free(AyStar *aystar) {
+	AyStarMain_Free(aystar);
+	free(aystar);
+}
+
+static int32 AyStar_AiPathFinder_CalculateG(AyStar *aystar, AyStarNode *current, OpenListNode *parent);
+static int32 AyStar_AiPathFinder_CalculateH(AyStar *aystar, AyStarNode *current, OpenListNode *parent);
+static void AyStar_AiPathFinder_FoundEndNode(AyStar *aystar, OpenListNode *current);
+static void AyStar_AiPathFinder_GetNeighbours(AyStar *aystar, OpenListNode *current);
+
+// This creates the AiPathFinder
+AyStar *new_AyStar_AiPathFinder(int max_tiles_around, Ai_PathFinderInfo *PathFinderInfo) {
+	PathNode start_node;
+	uint x,y;
+	// Create AyStar
+	AyStar *result = malloc(sizeof(AyStar));
+	init_AyStar(result, AiPathFinder_Hash, 1 << 10);
+	// Set the function pointers
+	result->CalculateG = AyStar_AiPathFinder_CalculateG;
+	result->CalculateH = AyStar_AiPathFinder_CalculateH;
+	result->EndNodeCheck = AyStar_AiPathFinder_EndNodeCheck;
+	result->FoundEndNode = AyStar_AiPathFinder_FoundEndNode;
+	result->GetNeighbours = AyStar_AiPathFinder_GetNeighbours;
+
+	result->free = AyStar_AiPathFinder_Free;
+
+	// Set some information
+	result->loops_per_tick = AI_PATHFINDER_LOOPS_PER_TICK;
+	result->max_path_cost = 0;
+	result->max_search_nodes = AI_PATHFINDER_MAX_SEARCH_NODES;
+
+	// Set the user_data to the PathFinderInfo
+	result->user_target = PathFinderInfo;
+
+	// Set the start node
+	start_node.parent = NULL;
+	start_node.node.direction = 0;
+	start_node.node.user_data[0] = 0;
+
+	// Now we add all the starting tiles
+	for (x=GET_TILE_X(PathFinderInfo->start_tile_tl);x<=GET_TILE_X(PathFinderInfo->start_tile_br);x++) {
+		for (y=GET_TILE_Y(PathFinderInfo->start_tile_tl);y<=GET_TILE_Y(PathFinderInfo->start_tile_br);y++) {
+			start_node.node.tile = TILE_XY(x,y);
+			result->addstart(result, &start_node.node);
+		}
+	}
+
+	return result;
+}
+
+// To reuse AyStar we sometimes have to clean all the memory
+void clean_AyStar_AiPathFinder(AyStar *aystar, Ai_PathFinderInfo *PathFinderInfo) {
+	PathNode start_node;
+	uint x,y;
+
+	aystar->clear(aystar);
+
+	// Set the user_data to the PathFinderInfo
+	aystar->user_target = PathFinderInfo;
+
+	// Set the start node
+	start_node.parent = NULL;
+	start_node.node.direction = 0;
+	start_node.node.user_data[0] = 0;
+	start_node.node.tile = PathFinderInfo->start_tile_tl;
+
+	// Now we add all the starting tiles
+	for (x=GET_TILE_X(PathFinderInfo->start_tile_tl);x<=GET_TILE_X(PathFinderInfo->start_tile_br);x++) {
+		for (y=GET_TILE_Y(PathFinderInfo->start_tile_tl);y<=GET_TILE_Y(PathFinderInfo->start_tile_br);y++) {
+			if (!(IS_TILETYPE(TILE_XY(x,y), MP_CLEAR) || IS_TILETYPE(TILE_XY(x,y), MP_TREES))) continue;
+			if (!TestCanBuildStationHere(TILE_XY(x,y),TEST_STATION_NO_DIR)) continue;
+			start_node.node.tile = TILE_XY(x,y);
+			aystar->addstart(aystar, &start_node.node);
+		}
+	}
+}
+
+// The h-value, simple calculation
+static int32 AyStar_AiPathFinder_CalculateH(AyStar *aystar, AyStarNode *current, OpenListNode *parent) {
+	Ai_PathFinderInfo *PathFinderInfo = (Ai_PathFinderInfo*)aystar->user_target;
+	int r, r2;
+	if (PathFinderInfo->end_direction != AI_PATHFINDER_NO_DIRECTION) {
+		// The station is pointing to a direction, add a tile towards that direction, so the H-value is more accurate
+		r = GetTileDist(current->tile, PathFinderInfo->end_tile_tl + _tiles_around[PathFinderInfo->end_direction]);
+		r2 = GetTileDist(current->tile, PathFinderInfo->end_tile_br + _tiles_around[PathFinderInfo->end_direction]);
+	} else {
+		// No direction, so just get the fastest route to the station
+		r = GetTileDist(current->tile, PathFinderInfo->end_tile_tl);
+		r2 = GetTileDist(current->tile, PathFinderInfo->end_tile_br);
+	}
+	// See if the bottomright is faster then the topleft..
+	if (r2 < r) r = r2;
+	return r * AI_PATHFINDER_H_MULTIPLER;
+}
+
+// We found the end.. let's get the route back and put it in an array
+static void AyStar_AiPathFinder_FoundEndNode(AyStar *aystar, OpenListNode *current) {
+	Ai_PathFinderInfo *PathFinderInfo = (Ai_PathFinderInfo*)aystar->user_target;
+	int i = 0;
+	PathNode *parent = &current->path;
+
+	do {
+     	PathFinderInfo->route_extra[i] = parent->node.user_data[0];
+		PathFinderInfo->route[i++] = parent->node.tile;
+		if (i > lengthof(PathFinderInfo->route)) {
+			// We ran out of space for the PathFinder
+			DEBUG(ai,0)("[AiPathFinder] Ran out of spacein 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)("[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) {
+    int i, r, dir;
+   	Ai_PathFinderInfo *PathFinderInfo = (Ai_PathFinderInfo*)aystar->user_target;
+
+    aystar->num_neighbours = 0;
+
+  	// Go through all surrounding tiles and check if they are within the limits
+   	for (i=0;i<4;i++) {
+   		if (GET_TILE_X(_tiles_around[i] + current->path.node.tile) > 1 && GET_TILE_X(_tiles_around[i] + current->path.node.tile) < TILE_X_MAX - 1 &&
+       		GET_TILE_Y(_tiles_around[i] + current->path.node.tile) > 1 && GET_TILE_Y(_tiles_around[i] + current->path.node.tile) < TILE_Y_MAX - 1) {
+       		// We also directly test if the current tile can connect to this tile..
+       		//  We do this simply by just building the tile!
+
+       		// If the next step is a bridge, we have to enter it the right way
+       		if (!PathFinderInfo->rail_or_road && AI_PATHFINDER_IS_ROAD(current->path.node.tile + _tiles_around[i])) {
+       			if (IS_TILETYPE(current->path.node.tile + _tiles_around[i], MP_TUNNELBRIDGE)) {
+       				// An existing bridge... let's test the direction ;)
+       				if ((_map5[current->path.node.tile + _tiles_around[i]] & 1) != (i & 1)) continue;
+   					// This problem only is valid for tunnels:
+       				// When the last tile was not yet a tunnel, check if we enter from the right side..
+       				if (!IS_TILETYPE(current->path.node.tile, MP_TUNNELBRIDGE) && (_map5[current->path.node.tile + _tiles_around[i]] & 0x80) == 0) {
+       					if (i != (_map5[current->path.node.tile + _tiles_around[i]] & 3)) continue;
+       				}
+       			}
+       		}
+       		// But also if we are on a bridge, we can only move a certain direction
+       		if (!PathFinderInfo->rail_or_road && AI_PATHFINDER_IS_ROAD(current->path.node.tile)) {
+       			if (IS_TILETYPE(current->path.node.tile, MP_TUNNELBRIDGE)) {
+       				// An existing bridge/tunnel... let's test the direction ;)
+       				if ((_map5[current->path.node.tile] & 1) != (i & 1)) continue;
+       			}
+       		}
+
+       		if ((AI_PATHFINDER_FLAG_BRIDGE & current->path.node.user_data[0]) != 0 ||
+       			(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 (i != (current->path.node.user_data[0] >> 8)) continue;
+       		}
+       		dir = 0;
+
+       		// First, check if we have a parent
+       		if (current->path.parent == NULL && current->path.node.user_data[0] == 0) {
+       			// If not, this means we are at the starting station
+       			if (PathFinderInfo->start_direction != AI_PATHFINDER_NO_DIRECTION) {
+		       		// We do need a direction?
+		       		if (AiNew_GetDirection(current->path.node.tile, current->path.node.tile + _tiles_around[i]) != PathFinderInfo->start_direction)
+		       			// We are not pointing the right way, invalid tile
+		       			continue;
+		       	}
+       		} else if (current->path.node.user_data[0] == 0) {
+       			if (PathFinderInfo->rail_or_road) {
+       				// Rail check
+       				dir = AiNew_GetRailDirection(current->path.parent->node.tile, current->path.node.tile, current->path.node.tile + _tiles_around[i]);
+       				r = DoCommandByTile(current->path.node.tile, 0, dir, DC_AUTO | DC_NO_WATER, CMD_BUILD_SINGLE_RAIL);
+       				if (r == CMD_ERROR) continue;
+#ifdef AI_PATHFINDER_NO_90DEGREES_TURN
+       				if (current->path.parent->parent != NULL) {
+       					// Check if we don't make a 90degree curve
+       					int dir1 = AiNew_GetRailDirection(current->path.parent->parent->node.tile, current->path.parent->node.tile, current->path.node.tile);
+       					if (_illegal_curves[dir1] == dir || _illegal_curves[dir] == dir1) {
+       						continue;
+       					}
+       				}
+#endif
+       			} else {
+       				// Road check
+       				dir = AiNew_GetRoadDirection(current->path.parent->node.tile, current->path.node.tile, current->path.node.tile + _tiles_around[i]);
+       				if (AI_PATHFINDER_IS_ROAD(current->path.node.tile)) {
+       					if (IS_TILETYPE(current->path.node.tile, MP_TUNNELBRIDGE)) {
+       						// We have a bridge, how nicely! We should mark it...
+       						dir = 0;
+       					} else {
+	       					// It already has road.. check if we miss any bits!
+	       					if ((_map5[current->path.node.tile] & dir) != dir) {
+	       						// We do miss some pieces :(
+	       						dir &= ~_map5[current->path.node.tile];
+	       					} else {
+	       						dir = 0;
+    	   					}
+    	   				}
+       				}
+       				// Only destruct things if it is MP_CLEAR of MP_TREES
+       				if (dir != 0) {
+       					r = DoCommandByTile(current->path.node.tile, dir, 0, DC_AUTO | DC_NO_WATER, CMD_BUILD_ROAD);
+       					if (r == CMD_ERROR) continue;
+       				}
+       			}
+
+       		}
+
+			// The tile can be connected
+   			aystar->neighbours[aystar->num_neighbours].tile = _tiles_around[i] + current->path.node.tile;
+   			aystar->neighbours[aystar->num_neighbours].user_data[0] = 0;
+   			aystar->neighbours[aystar->num_neighbours++].direction = 0;
+       	}
+    }
+
+    // Next step, check for bridges and tunnels
+    if (current->path.parent != NULL && current->path.node.user_data[0] == 0) {
+
+        TileInfo ti;
+        // First we get the dir from this tile and his parent
+    	int dir = AiNew_GetDirection(current->path.parent->node.tile, current->path.node.tile);
+    	// It means we can only walk with the track, so the bridge has to be in the same direction
+    	TileIndex tile = current->path.node.tile;
+    	TileIndex new_tile = tile;
+
+    	FindLandscapeHeightByTile(&ti, tile);
+
+   		// Bridges can only be build on land that is not flat
+   		//  And if there is a road or rail blocking
+   		if (ti.tileh != 0 ||
+     		(PathFinderInfo->rail_or_road && IS_TILETYPE(tile + _tiles_around[dir], MP_STREET)) ||
+       		(!PathFinderInfo->rail_or_road && IS_TILETYPE(tile + _tiles_around[dir], MP_RAILWAY))) {
+
+    		for (;;) {
+    			new_tile += _tiles_around[dir];
+
+    	    	// Precheck, is the length allowed?
+    	    	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;
+
+    	    	// Try building the bridge..
+    	    	r = DoCommandByTile(tile, new_tile, (0<<8) + (MAX_BRIDGES / 2), DC_AUTO, CMD_BUILD_BRIDGE);
+	    	   	if (r == CMD_ERROR) continue;
+    		   	// We can build a bridge here.. add him to the neighbours
+   				aystar->neighbours[aystar->num_neighbours].tile = new_tile;
+	   			aystar->neighbours[aystar->num_neighbours].user_data[0] = AI_PATHFINDER_FLAG_BRIDGE + (dir << 8);
+	   			aystar->neighbours[aystar->num_neighbours++].direction = 0;
+				// We can only have 12 neighbours, and we need 1 left for tunnels
+				if (aystar->num_neighbours == 11) break;
+			}
+    	}
+
+    	// Next, check for tunnels!
+    	// Tunnels can only be build with tileh of 3, 6, 9 or 12, depending on the direction
+    	//  For now, we check both sides for this tile.. terraforming gives fuzzy result
+    	if ((dir == 0 && ti.tileh == 12) ||
+    		(dir == 1 && ti.tileh == 6) ||
+    		(dir == 2 && ti.tileh == 3) ||
+    		(dir == 3 && ti.tileh == 9)) {
+    		// Now simply check if a tunnel can be build
+    		r = DoCommandByTile(tile, (PathFinderInfo->rail_or_road?0:0x200), 0, DC_AUTO, CMD_BUILD_TUNNEL);
+    		FindLandscapeHeightByTile(&ti, _build_tunnel_endtile);
+    		if (r != CMD_ERROR && (ti.tileh == 3 || ti.tileh == 6 || ti.tileh == 9 || ti.tileh == 12)) {
+    			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;
+    		}
+    	}
+  	}
+}
+
+extern uint GetRailFoundation(uint tileh, uint bits);
+extern uint GetRoadFoundation(uint tileh, uint bits);
+extern uint GetBridgeFoundation(uint tileh, byte direction);
+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 r, res = 0;
+	TileInfo ti, parent_ti;
+
+	// Gather some information about the tile..
+	FindLandscapeHeightByTile(&ti, current->tile);
+	FindLandscapeHeightByTile(&parent_ti, parent->path.node.tile);
+
+	// Check if we hit the end-tile
+	if (TILES_BETWEEN(current->tile,PathFinderInfo->end_tile_tl,PathFinderInfo->end_tile_br)) {
+		// We are at the end-tile, check if we had a direction or something...
+		if (PathFinderInfo->end_direction != AI_PATHFINDER_NO_DIRECTION && AiNew_GetDirection(current->tile, parent->path.node.tile) != PathFinderInfo->end_direction)
+			// We are not pointing the right way, invalid tile
+			return AYSTAR_INVALID_NODE;
+		// If it was valid, drop out.. we don't build on the endtile
+		return 0;
+	}
+
+	// Give everything a small penalty
+	res += AI_PATHFINDER_PENALTY;
+
+	if (!PathFinderInfo->rail_or_road) {
+		// Road has the lovely advantage it can use other road... check if
+		//  the current tile is road, and if so, give a good bonus
+		if (AI_PATHFINDER_IS_ROAD(current->tile)) {
+			res -= AI_PATHFINDER_ROAD_ALREADY_EXISTS_BONUS;
+		}
+	}
+
+	// We should give a penalty when the tile is going up or down.. this is one way to do so!
+	//  Too bad we have to count it from the parent.. but that is not so bad
+	if (parent_ti.tileh != 0 && parent->path.parent != NULL) {
+		// 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) {
+				r = GetRailFoundation(parent_ti.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 && (BRIDGE_NO_FOUNDATION & (1 << ti.tileh)))) {
+					res += AI_PATHFINDER_TILE_GOES_UP_PENALTY;
+				}
+			} else {
+				if (!(AI_PATHFINDER_IS_ROAD(parent->path.node.tile) && IS_TILETYPE(parent->path.node.tile, MP_TUNNELBRIDGE))) {
+					r = GetRoadFoundation(parent_ti.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;
+				}
+			}
+		}
+	}
+
+	// Are we part of a tunnel?
+	if ((AI_PATHFINDER_FLAG_TUNNEL & current->user_data[0]) != 0) {
+		// Tunnels are very expensive when build on long routes..
+		// Ironicly, we are using BridgeCode here ;)
+		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 * 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 (!(BRIDGE_NO_FOUNDATION & (1 << parent_ti.tileh))) {
+			if (GetBridgeFoundation(parent_ti.tileh, (current->user_data[0] >> 8) & 1) < 15)
+				res += AI_PATHFINDER_BRIDGE_GOES_UP_PENALTY;
+		}
+		// Second for the end point
+		if (!(BRIDGE_NO_FOUNDATION & (1 << ti.tileh))) {
+			if (GetBridgeFoundation(ti.tileh, (current->user_data[0] >> 8) & 1) < 15)
+				res += AI_PATHFINDER_BRIDGE_GOES_UP_PENALTY;
+		}
+		if (parent_ti.tileh == 0)
+			res += AI_PATHFINDER_BRIDGE_GOES_UP_PENALTY;
+		if (ti.tileh == 0)
+			res += AI_PATHFINDER_BRIDGE_GOES_UP_PENALTY;
+	}
+
+	//  To prevent the AI from taking the fastest way in tiles, but not the fastest way
+	//    in speed, we have to give a good penalty to direction changing
+	//  This way, we get almost the fastest way in tiles, and a very good speed on the track
+	if (!PathFinderInfo->rail_or_road) {
+		if (parent->path.parent != NULL &&
+			AiNew_GetDirection(current->tile, parent->path.node.tile) != AiNew_GetDirection(parent->path.node.tile, parent->path.parent->node.tile)) {
+			// When road exists, we don't like turning, but its free, so don't be to piggy about it
+			if (AI_PATHFINDER_IS_ROAD(parent->path.node.tile))
+				res += AI_PATHFINDER_DIRECTION_CHANGE_ON_EXISTING_ROAD_PENALTY;
+			else
+				res += AI_PATHFINDER_DIRECTION_CHANGE_PENALTY;
+		}
+	} else {
+		// For rail we have 1 exeption: diagonal rail..
+		// So we fetch 2 raildirection. That of the current one, and of the one before that
+		if (parent->path.parent != NULL && parent->path.parent->parent != NULL) {
+			int dir1 = AiNew_GetRailDirection(parent->path.parent->node.tile, parent->path.node.tile, current->tile);
+			int dir2 = AiNew_GetRailDirection(parent->path.parent->parent->node.tile, parent->path.parent->node.tile, parent->path.node.tile);
+			// First, see if we are on diagonal path, that is better then straight path
+			if (dir1 > 1) { res -= AI_PATHFINDER_DIAGONAL_BONUS; }
+
+			// First see if they are different
+			if (dir1 != dir2) {
+				// dir 2 and 3 are 1 diagonal track, and 4 and 5.
+				if (!(((dir1 == 2 || dir1 == 3) && (dir2 == 2 || dir2 == 3)) || ((dir1 == 4 || dir1 == 5) && (dir2 == 4 || dir2 == 5)))) {
+					// It is not, so we changed of direction
+					res += AI_PATHFINDER_DIRECTION_CHANGE_PENALTY;
+				}
+				if (parent->path.parent->parent->parent != NULL) {
+					int dir3 = AiNew_GetRailDirection(parent->path.parent->parent->parent->node.tile, parent->path.parent->parent->node.tile, parent->path.parent->node.tile);
+					// Check if we changed 3 tiles of direction in 3 tiles.. bad!!!
+					if ((dir1 == 0 || dir1 == 1) && dir2 > 1 && (dir3 == 0 || dir3 == 1)) {
+						res += AI_PATHFINDER_CURVE_PENALTY;
+					}
+				}
+			}
+		}
+	}
+
+	// Res should never be below zero.. if so, make it zero!
+	if (res < 0) { res = 0; }
+
+	// Return our value
+	return res;
+}

ai_shared.c

@@ -0,0 +1,118 @@
+#include "stdafx.h"
+#include "ttd.h"
+#include "map.h"
+#include "ai.h"
+#include "vehicle.h"
+
+int AiNew_GetRailDirection(uint tile_a, uint tile_b, uint tile_c) {
+	// 0 = vert
+	// 1 = horz
+	// 2 = dig up-left
+	// 3 = dig down-right
+	// 4 = dig down-left
+	// 5 = dig up-right
+
+	int x1, x2, x3;
+	int y1, y2, y3;
+
+	x1 = GET_TILE_X(tile_a);
+	x2 = GET_TILE_X(tile_b);
+	x3 = GET_TILE_X(tile_c);
+
+	y1 = GET_TILE_Y(tile_a);
+	y2 = GET_TILE_Y(tile_b);
+	y3 = GET_TILE_Y(tile_c);
+
+	if (y1 == y2 && y2 == y3) return 0;
+	if (x1 == x2 && x2 == x3) return 1;
+	if (y2 > y1) {
+		if (x2 > x3) return 2;
+		else return 4;
+	}
+	if (x2 > x1) {
+		if (y2 > y3) return 2;
+		else return 5;
+	}
+	if (y1 > y2) {
+		if (x2 > x3) return 5;
+		else return 3;
+	}
+	if (x1 > x2) {
+		if (y2 > y3) return 4;
+		else return 3;
+	}
+
+	return 0;
+}
+
+int AiNew_GetRoadDirection(uint tile_a, uint tile_b, uint tile_c) {
+	int x1, x2, x3;
+	int y1, y2, y3;
+	int r;
+
+	x1 = GET_TILE_X(tile_a);
+	x2 = GET_TILE_X(tile_b);
+	x3 = GET_TILE_X(tile_c);
+
+	y1 = GET_TILE_Y(tile_a);
+	y2 = GET_TILE_Y(tile_b);
+	y3 = GET_TILE_Y(tile_c);
+
+	r = 0;
+
+	if (x1 < x2) r += 8;
+	if (y1 < y2) r += 1;
+	if (x1 > x2) r += 2;
+	if (y1 > y2) r += 4;
+
+	if (x2 < x3) r += 2;
+	if (y2 < y3) r += 4;
+	if (x2 > x3) r += 8;
+	if (y2 > y3) r += 1;
+
+	return r;
+}
+
+// Get's the direction between 2 tiles seen from tile_a
+int AiNew_GetDirection(uint tile_a, uint tile_b) {
+	if (GET_TILE_Y(tile_a) < GET_TILE_Y(tile_b)) return 1;
+	if (GET_TILE_Y(tile_a) > GET_TILE_Y(tile_b)) return 3;
+	if (GET_TILE_X(tile_a) < GET_TILE_X(tile_b)) return 2;
+	return 0;
+}
+
+// This functions looks up if this vehicle is special for this AI
+//  and returns his flag
+uint AiNew_GetSpecialVehicleFlag(Player *p, Vehicle *v) {
+	int i;
+	for (i=0;i<AI_MAX_SPECIAL_VEHICLES;i++) {
+		if (p->ainew.special_vehicles[i].veh_id == v->index) {
+			return p->ainew.special_vehicles[i].flag;
+		}
+	}
+
+	// Not found :(
+	return 0;
+}
+
+bool AiNew_SetSpecialVehicleFlag(Player *p, Vehicle *v, uint flag) {
+	int i, new_id = -1;
+	for (i=0;i<AI_MAX_SPECIAL_VEHICLES;i++) {
+		if (p->ainew.special_vehicles[i].veh_id == v->index) {
+			p->ainew.special_vehicles[i].flag |= flag;
+			return true;
+		}
+		if (new_id == -1 && 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 :(");
+		return false;
+	}
+	p->ainew.special_vehicles[new_id].veh_id = v->index;
+	p->ainew.special_vehicles[new_id].flag = flag;
+	return true;
+}

aircraft.h

@@ -1,26 +0,0 @@
-/* $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 */

airport.c

@@ -1,393 +1,204 @@
-/* $Id$ */
-
 #include "stdafx.h"
-#include "openttd.h"
-#include "debug.h"
+#include "ttd.h"
 #include "map.h"
 #include "airport.h"
-#include "macros.h"
-#include "variables.h"
-#include "airport_movement.h"
-#include "date.h"
 
-/* Uncomment this to print out a full report of the airport-structure
- * You should either use
- * - true: full-report, print out every state and choice with string-names
- * OR
- * - false: give a summarized report which only shows current and next position */
-//#define DEBUG_AIRPORT false
+AirportFTAClass *CountryAirport;
+AirportFTAClass *CityAirport;
+AirportFTAClass *Heliport, *Oilrig;
+AirportFTAClass *MetropolitanAirport;
+AirportFTAClass *InternationalAirport;
 
-static AirportFTAClass *CountryAirport;
-static AirportFTAClass *CityAirport;
-static AirportFTAClass *Oilrig;
-static AirportFTAClass *Heliport;
-static AirportFTAClass *MetropolitanAirport;
-static AirportFTAClass *InternationalAirport;
-static AirportFTAClass *CommuterAirport;
-static AirportFTAClass *HeliDepot;
-static AirportFTAClass *IntercontinentalAirport;
-static AirportFTAClass *HeliStation;
-
-static void AirportFTAClass_Constructor(AirportFTAClass *apc,
-	const byte *terminals, const byte *helipads,
+static void AirportFTAClass_Constructor(AirportFTAClass *Airport,
+																				const byte nofterminals, const byte nofterminalgroups,
+																				const byte nofhelipads,  const byte nofhelipadgroups,
 																				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);
+																				const AirportFTAbuildup *FA,
+																				const TileIndex *depots, const byte nof_depots);
+static void AirportFTAClass_Destructor(AirportFTAClass *Airport);
 
-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);
+static uint16 AirportGetNofElements(const AirportFTAbuildup *FA);
+static void AirportBuildAutomata(AirportFTAClass *Airport, const AirportFTAbuildup *FA);
+static byte AirportTestFTA(const AirportFTAClass *Airport);
+/*static void AirportPrintOut(const AirportFTAClass *Airport, const bool full_report);
+static byte AirportBlockToString(uint32 block);*/
 
-#ifdef DEBUG_AIRPORT
-static void AirportPrintOut(const AirportFTAClass *apc, bool full_report);
-#endif /* DEBUG_AIRPORT */
-
-void InitializeAirports(void)
+void InitializeAirports()
 {
 	// country airport
-	CountryAirport = malloc(sizeof(AirportFTAClass));
-
-	AirportFTAClass_Constructor(
-		CountryAirport,
-		_airport_terminal_country,
-		NULL,
-		16,
-		ALL,
-		_airport_fta_country,
-		_airport_depots_country,
-		lengthof(_airport_depots_country),
-		4, 3
-	);
+	CountryAirport = (AirportFTAClass *)malloc(sizeof(AirportFTAClass));
+	AirportFTAClass_Constructor(CountryAirport, 2, 1, 0, 0, 16, ALL, _airport_fta_country, _airport_depots_country, lengthof(_airport_depots_country));
 
 	// city airport
-	CityAirport = malloc(sizeof(AirportFTAClass));
-
-	AirportFTAClass_Constructor(
-		CityAirport,
-		_airport_terminal_city,
-		NULL,
-		19,
-		ALL,
-		_airport_fta_city,
-		_airport_depots_city,
-		lengthof(_airport_depots_city),
-		6, 6
-	);
+	CityAirport = (AirportFTAClass *)malloc(sizeof(AirportFTAClass));
+	AirportFTAClass_Constructor(CityAirport, 3, 1, 0, 0, 19, ALL, _airport_fta_city, _airport_depots_city, lengthof(_airport_depots_city));
 
 	// metropolitan airport
-	MetropolitanAirport = malloc(sizeof(AirportFTAClass));
-
-	AirportFTAClass_Constructor(
-		MetropolitanAirport,
-		_airport_terminal_metropolitan,
-		NULL,
-		20,
-		ALL,
-		_airport_fta_metropolitan,
-		_airport_depots_metropolitan,
-		lengthof(_airport_depots_metropolitan),
-		6, 6
-	);
+	MetropolitanAirport = (AirportFTAClass *)malloc(sizeof(AirportFTAClass));
+	AirportFTAClass_Constructor(MetropolitanAirport, 3, 1, 0, 0, 20, ALL, _airport_fta_metropolitan, _airport_depots_metropolitan, lengthof(_airport_depots_metropolitan));
 
 	// international airport
 	InternationalAirport = (AirportFTAClass *)malloc(sizeof(AirportFTAClass));
-
-	AirportFTAClass_Constructor(
-		InternationalAirport,
-		_airport_terminal_international,
-		_airport_helipad_international,
-		37,
-		ALL,
-		_airport_fta_international,
-		_airport_depots_international,
-		lengthof(_airport_depots_international),
-		7, 7
-	);
-
-	// intercontintental airport
-	IntercontinentalAirport = (AirportFTAClass *)malloc(sizeof(AirportFTAClass));
-
-	AirportFTAClass_Constructor(
-		IntercontinentalAirport,
-		_airport_terminal_intercontinental,
-		_airport_helipad_intercontinental,
-		43,
-		ALL,
-		_airport_fta_intercontinental,
-		_airport_depots_intercontinental,
-		lengthof(_airport_depots_intercontinental),
-		9,11
-	);
+	AirportFTAClass_Constructor(InternationalAirport, 6, 2, 2, 1, 37, ALL, _airport_fta_international, _airport_depots_international, lengthof(_airport_depots_international));
 
 	// heliport, oilrig
 	Heliport = (AirportFTAClass *)malloc(sizeof(AirportFTAClass));
-
-	AirportFTAClass_Constructor(
-		Heliport,
-		NULL,
-		_airport_helipad_heliport_oilrig,
-		7,
-		HELICOPTERS_ONLY,
-		_airport_fta_heliport_oilrig,
-		NULL,
-		0,
-		1, 1
-	);
-
+	AirportFTAClass_Constructor(Heliport, 0, 0, 1, 1, 7, HELICOPTERS_ONLY, _airport_fta_heliport_oilrig, NULL, 0);
 	Oilrig = Heliport;  // exactly the same structure for heliport/oilrig, so share state machine
-
-	// commuter airport
-	CommuterAirport = malloc(sizeof(AirportFTAClass));
-
-	AirportFTAClass_Constructor(
-		CommuterAirport,
-		_airport_terminal_commuter,
-		_airport_helipad_commuter,
-		22,
-		ALL,
-		_airport_fta_commuter,
-		_airport_depots_commuter,
-		lengthof(_airport_depots_commuter),
-		5,4
-	);
-
-	// helidepot airport
-	HeliDepot = malloc(sizeof(AirportFTAClass));
-
-	AirportFTAClass_Constructor(
-		HeliDepot,
-		NULL,
-		_airport_helipad_helidepot,
-		4,
-		HELICOPTERS_ONLY,
-		_airport_fta_helidepot,
-		_airport_depots_helidepot,
-		lengthof(_airport_depots_helidepot),
-		2,2
-	);
-
-	// helistation airport
-	HeliStation = malloc(sizeof(AirportFTAClass));
-
-	AirportFTAClass_Constructor(
-		HeliStation,
-		NULL,
-		_airport_helipad_helistation,
-		25,
-		HELICOPTERS_ONLY,
-		_airport_fta_helistation,
-		_airport_depots_helistation,
-		lengthof(_airport_depots_helistation),
-		4,2
-	);
-
 }
 
-void UnInitializeAirports(void)
+void UnInitializeAirports()
 {
 	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 void AirportFTAClass_Constructor(AirportFTAClass *apc,
-	const byte *terminals, const byte *helipads,
+static void AirportFTAClass_Constructor(AirportFTAClass *Airport,
+																				const byte nofterminals, const byte nofterminalgroups,
+																				const byte nofhelipads, const byte nofhelipadgroups,
 																				const byte entry_point, const byte acc_planes,
-	const AirportFTAbuildup *apFA,
-	const TileIndexDiffC *depots, const byte nof_depots,
-	uint size_x, uint size_y
-)
+																				const AirportFTAbuildup *FA,
+																				const TileIndex *depots, const byte nof_depots)
 {
-	byte nofterminals, nofhelipads;
-	byte nofterminalgroups, nofhelipadgroups;
+	// if there are more terminals than 6, internal variables have to be changed, so don't allow that
+	// same goes for helipads
+	if (nofterminals > MAX_TERMINALS) { printf("Currently only maximum of %2d terminals are supported (you wanted %2d)\n", MAX_TERMINALS, nofterminals);}
+	if (nofhelipads > MAX_HELIPADS) { printf("Currently only maximum of %2d helipads are supported (you wanted %2d)\n", MAX_HELIPADS, nofhelipads);}
+	// terminals/helipads are divided into groups. Groups are computed by dividing the number
+	// of terminals by the number of groups. Half in half. If #terminals is uneven, first group
+	// will get the less # of terminals
+	if (nofterminalgroups > nofterminals) { printf("# of terminalgroups (%2d) must be less or equal to terminals (%2d)", nofterminals, nofterminalgroups);}
+	if (nofhelipadgroups > nofhelipads) { printf("# of helipadgroups (%2d) must be less or equal to helipads (%2d)", nofhelipads, 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 */
-	nofterminals = AirportGetTerminalCount(terminals, &nofterminalgroups);
-	if (nofterminals > MAX_TERMINALS) {
-		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;
-
-	nofhelipads = AirportGetTerminalCount(helipads, &nofhelipadgroups);
-	if (nofhelipads > MAX_HELIPADS) {
-		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;
+	assert(nofterminalgroups <= nofterminals);
+	assert(nofhelipadgroups <= nofhelipads);
 
-	/* 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 */
-	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);
+	Airport->nofelements = AirportGetNofElements(FA);
+	// check
+	if (entry_point >= Airport->nofelements) {printf("Entry point (%2d) must be within the airport positions (which is max %2d)\n", entry_point, Airport->nofelements);}
+	assert(entry_point < Airport->nofelements);
+
+	Airport->nofterminals = nofterminals;
+	Airport->nofterminalgroups = nofterminalgroups;
+	Airport->nofhelipads = nofhelipads;
+	Airport->nofhelipadgroups = nofhelipadgroups;
+	Airport->acc_planes = acc_planes;
+	Airport->entry_point = entry_point;
+	Airport->airport_depots = depots;
+	Airport->nof_depots = nof_depots;
+
+
+	// build the state machine
+	AirportBuildAutomata(Airport, FA);
+		DEBUG(misc, 1) ("#Elements %2d; #Terminals %2d in %d group(s); #Helipads %2d in %d group(s)", Airport->nofelements,
+				  Airport->nofterminals, Airport->nofterminalgroups, Airport->nofhelipads, Airport->nofhelipadgroups);
+
+
+	{
+		byte _retval = AirportTestFTA(Airport);
+		if (_retval != MAX_ELEMENTS) {printf("ERROR with element: %d\n", _retval-1);}
+		assert(_retval == MAX_ELEMENTS);
+	}
+	// print out full information
+	// true  -- full info including heading, block, etc
+	// false -- short info, only position and next position
+	//AirportPrintOut(Airport, false);
 }
 
-	apc->acc_planes     = acc_planes;
-	apc->entry_point    = entry_point;
-	apc->airport_depots = depots;
-	apc->nof_depots     = nof_depots;
-
-	/* Build the state machine itself */
-	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 */
-	{ 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(apc, DEBUG_AIRPORT);
-#endif
-}
-
-static void AirportFTAClass_Destructor(AirportFTAClass *apc)
+static void AirportFTAClass_Destructor(AirportFTAClass *Airport)
 {
 	int i;
 	AirportFTA *current, *next;
 
-	for (i = 0; i < apc->nofelements; i++) {
-		current = apc->layout[i].next;
+	for (i = 0; i < Airport->nofelements; i++) {
+		current = Airport->layout[i].next_in_chain;
 		while (current != NULL) {
-			next = current->next;
+			next = current->next_in_chain;
 			free(current);
 			current = next;
 		};
 	}
-	free(apc->layout);
-	free(apc);
+	free(Airport->layout);
+	free(Airport);
 }
 
-/** Get the number of elements of a source Airport state automata
- * Since it is actually just a big array of AirportFTA types, we only
- * know one element from the other by differing 'position' identifiers */
-static uint16 AirportGetNofElements(const AirportFTAbuildup *apFA)
+static uint16 AirportGetNofElements(const AirportFTAbuildup *FA)
 {
 	int i;
 	uint16 nofelements = 0;
-	int temp = apFA[0].position;
-
+	int temp = FA[0].position;
 	for (i = 0; i < MAX_ELEMENTS; i++) {
-		if (temp != apFA[i].position) {
+		if (temp != FA[i].position) {
 			nofelements++;
-			temp = apFA[i].position;
+			temp = FA[i].position;
 		}
-		if (apFA[i].position == MAX_ELEMENTS) break;
+		if (FA[i].position == MAX_ELEMENTS) {break;}
 	}
 	return nofelements;
 }
 
-/* We calculate the terminal/helipod count based on the data passed to us
- * This data (terminals) contains an index as a first element as to how many
- * 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) {
-		i = terminals[0];
-		*groups = i;
-		while (i-- > 0) {
-			terminals++;
-			assert(*terminals != 0); // no empty groups please
-			nof_terminals += *terminals;
-		}
-	}
-	return nof_terminals;
-}
-
-static void AirportBuildAutomata(AirportFTAClass *apc, const AirportFTAbuildup *apFA)
+static void AirportBuildAutomata(AirportFTAClass *Airport, const AirportFTAbuildup *FA)
 {
+	AirportFTA *FAutomata;
 	AirportFTA *current;
-	AirportFTA *FAutomata = malloc(sizeof(AirportFTA) * apc->nofelements);
-	uint16 internalcounter = 0;
-	uint16 i;
+	uint16 internalcounter, i;
+	FAutomata = (AirportFTA *)malloc(sizeof(AirportFTA) * Airport->nofelements);
+	Airport->layout = FAutomata;
+	internalcounter = 0;
 
-	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;
-		current->next_position = apFA[internalcounter].next;
+	for (i = 0; i < Airport->nofelements; i++) {
+		current = &Airport->layout[i];
+		current->position = FA[internalcounter].position;
+		current->heading  = FA[internalcounter].heading;
+		current->block    = FA[internalcounter].block;
+		current->next_position = FA[internalcounter].next_in_chain;
 
 		// outgoing nodes from the same position, create linked list
-		while (current->position == apFA[internalcounter + 1].position) {
-			AirportFTA *newNode = malloc(sizeof(AirportFTA));
-
-			newNode->position      = apFA[internalcounter + 1].position;
-			newNode->heading       = apFA[internalcounter + 1].heading;
-			newNode->block         = apFA[internalcounter + 1].block;
-			newNode->next_position = apFA[internalcounter + 1].next;
+		while (current->position == FA[internalcounter+1].position) {
+			AirportFTA *newNode = (AirportFTA *)malloc(sizeof(AirportFTA));
+			newNode->position = FA[internalcounter+1].position;
+			newNode->heading  = FA[internalcounter+1].heading;
+			newNode->block    = FA[internalcounter+1].block;
+			newNode->next_position = FA[internalcounter+1].next_in_chain;
 			// create link
-			current->next = newNode;
-			current = current->next;
+			current->next_in_chain = newNode;
+			current = current->next_in_chain;
 			internalcounter++;
 		} // while
-		current->next = NULL;
+		current->next_in_chain = NULL;
 		internalcounter++;
 	}
 }
 
-static byte AirportTestFTA(const AirportFTAClass *apc)
+static byte AirportTestFTA(const AirportFTAClass *Airport)
 {
-	byte position, i, next_position;
-	AirportFTA *current, *first;
-	next_position = 0;
+	byte position, i, next_element;
+	AirportFTA *temp;
+	next_element = 0;
 
-	for (i = 0; i < apc->nofelements; i++) {
-		position = apc->layout[i].position;
-		if (position != next_position) return i;
-		current = first = &apc->layout[i];
+	for (i = 0; i < Airport->nofelements; i++) {
+		position = Airport->layout[i].position;
+		if (position != next_element) {return i;}
+		temp = &Airport->layout[i];
 
-		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 > apc->terminals[0]) return i;
-			}
-
-			/* If there is only one choice, it must be at the end */
-			if (current->heading == 0 && current->next != NULL) return i;
-			/* 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 >= apc->nofelements) return i;
-		}
-		next_position++;
+		do {
+			if (temp->heading > MAX_HEADINGS && temp->heading != 255) {return i;}
+			if (temp->heading == 0 && temp->next_in_chain != 0) {return i;}
+			if (position != temp->position) {return i;}
+			if (temp->next_position >= Airport->nofelements) {return i;}
+			temp = temp->next_in_chain;
+		} while (temp != NULL);
+		next_element++;
 	}
 	return MAX_ELEMENTS;
 }
 
-#ifdef DEBUG_AIRPORT
-static const char* const _airport_heading_strings[] = {
+static const char* const _airport_heading_strings[MAX_HEADINGS+2] = {
 	"TO_ALL",
 	"HANGAR",
 	"TERM1",
@@ -407,83 +218,67 @@ static const char* const _airport_heading_strings[] = {
 	"ENDLANDING",
 	"HELILANDING",
 	"HELIENDLANDING",
-	"TERM7",
-	"TERM8",
-	"HELIPAD3",
-	"HELIPAD4",
 	"DUMMY"	// extra heading for 255
 };
 
-static uint AirportBlockToString(uint32 block)
+/*
+static void AirportPrintOut(const AirportFTAClass *Airport, const bool full_report)
 {
-	uint i = 0;
+	AirportFTA *temp;
+	uint16 i;
+	byte heading;
+
+	printf("(P = Current Position; NP = Next Position)\n");
+	for (i = 0; i < Airport->nofelements; i++) {
+		temp = &Airport->layout[i];
+		if (full_report) {
+			heading = (temp->heading == 255) ? MAX_HEADINGS+1 : temp->heading;
+			printf("Pos:%2d NPos:%2d Heading:%15s Block:%2d\n", temp->position, temp->next_position,
+						 _airport_heading_strings[heading], AirportBlockToString(temp->block));
+		}
+		else { printf("P:%2d NP:%2d", temp->position, temp->next_position);}
+		while (temp->next_in_chain != NULL) {
+			temp = temp->next_in_chain;
+			if (full_report) {
+				heading = (temp->heading == 255) ? MAX_HEADINGS+1 : temp->heading;
+				printf("Pos:%2d NPos:%2d Heading:%15s Block:%2d\n", temp->position, temp->next_position,
+							_airport_heading_strings[heading], AirportBlockToString(temp->block));
+			}
+			else { printf("P:%2d NP:%2d", temp->position, temp->next_position);}
+		}
+		printf("\n");
+	}
+}
+
+
+static byte AirportBlockToString(uint32 block)
+{
+	byte 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 (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],
-							AirportBlockToString(current->block));
-			} else {
-				printf("P:%2d NP:%2d", current->position, current->next_position);
-			}
-		}
-		printf("\n");
-	}
-}
-#endif
+}*/
 
 const AirportFTAClass* GetAirport(const byte airport_type)
 {
+	AirportFTAClass *Airport = NULL;
 	//FIXME -- AircraftNextAirportPos_and_Order -> Needs something nicer, don't like this code
 	// needs constant change if more airports are added
 	switch (airport_type) {
-		default:               NOT_REACHED();
-		case AT_SMALL:         return CountryAirport;
-		case AT_LARGE:         return CityAirport;
-		case AT_METROPOLITAN:  return MetropolitanAirport;
-		case AT_HELIPORT:      return Heliport;
-		case AT_OILRIG:        return Oilrig;
-		case AT_INTERNATIONAL: return InternationalAirport;
-		case AT_COMMUTER:      return CommuterAirport;
-		case AT_HELIDEPOT:     return HeliDepot;
-		case AT_INTERCON:      return IntercontinentalAirport;
-		case AT_HELISTATION:   return HeliStation;
+		case AT_SMALL: Airport = CountryAirport; break;
+		case AT_LARGE: Airport = CityAirport; break;
+		case AT_METROPOLITAN: Airport = MetropolitanAirport; break;
+		case AT_HELIPORT: Airport = Heliport; break;
+		case AT_OILRIG: Airport = Oilrig; break;
+		case AT_INTERNATIONAL: Airport = InternationalAirport; break;
+		default:
+			#ifdef DEBUG__
+				printf("Airport AircraftNextAirportPos_and_Order not yet implemented\n");
+			#endif
+			assert(airport_type <= AT_INTERNATIONAL);
 	}
-}
-
-const AirportMovingData *GetAirportMovingData(byte airport_type, byte position)
-{
-	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;
+	return Airport;
 }

airport.h

@@ -1,12 +1,10 @@
-/* $Id$ */
-
 #ifndef AIRPORT_H
 #define AIRPORT_H
 
-enum {MAX_TERMINALS =  10};
-enum {MAX_HELIPADS  =   4};
-enum {MAX_ELEMENTS  = 255};
-enum {MAX_HEADINGS  =  22};
+#include "airport_movement.h"
+
+enum {MAX_TERMINALS = 6};
+enum {MAX_HELIPADS  = 2};
 
 // Airport types
 enum {
@@ -15,128 +13,28 @@ enum {
 	AT_HELIPORT = 2,
 	AT_METROPOLITAN = 3,
 	AT_INTERNATIONAL = 4,
-	AT_COMMUTER      =  5,
-	AT_HELIDEPOT     =  6,
-	AT_INTERCON      =  7,
-	AT_HELISTATION   =  8,
-	AT_OILRIG        = 15
+	AT_OILRIG = 5
 };
 
 // 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,
+	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 nofterminals;						// number of terminals this airport has
+	byte nofterminalgroups;				// terminals belong to so many groups (MAX is the nofterminals)
+	byte nofhelipads;							// number of helipads this airport has
+	byte nofhelipadgroups;				// helipads belong to so many groups (MAX is the nofhelipads)
 	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
+	const TileIndex *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
@@ -145,19 +43,11 @@ typedef struct AirportFTA {
 	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
+	struct AirportFTA *next_in_chain;	// possible extra movement choices from this position
 } AirportFTA;
 
-void InitializeAirports(void);
-void UnInitializeAirports(void);
+void InitializeAirports();
+void UnInitializeAirports();
 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,10 +1,6 @@
-/* $Id$ */
-
 #include "stdafx.h"
-#include "openttd.h"
-#include "table/sprites.h"
+#include "ttd.h"
 #include "table/strings.h"
-#include "functions.h"
 #include "map.h"
 #include "window.h"
 #include "gui.h"
@@ -15,14 +11,13 @@
 #include "vehicle.h"
 #include "station.h"
 #include "airport.h"
-#include "depot.h"
 
 static byte _selected_airport_type;
 
-static void ShowBuildAirportPicker(void);
+static void ShowBuildAirportPicker();
 
 
-void CcBuildAirport(bool success, TileIndex tile, uint32 p1, uint32 p2)
+void CcBuildAirport(bool success, uint tile, uint32 p1, uint32 p2)
 {
 	if (success) {
 		SndPlayTileFx(SND_1F_SPLAT, tile);
@@ -30,31 +25,25 @@ void CcBuildAirport(bool success, TileIndex tile, uint32 p1, uint32 p2)
 	}
 }
 
-static void PlaceAirport(TileIndex tile)
+static void PlaceAirport(uint tile)
 {
-	DoCommandP(tile, _selected_airport_type, 0, 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)
+static void PlaceAir_DemolishArea(uint tile)
 {
 	VpStartPlaceSizing(tile, 4);
 }
 
 
-enum {
-	ATW_AIRPORT  = 3,
-	ATW_DEMOLISH = 4
-};
-
-
 static void BuildAirClick_Airport(Window *w)
 {
-	if (HandlePlacePushButton(w, ATW_AIRPORT, SPR_CURSOR_AIRPORT, 1, PlaceAirport)) ShowBuildAirportPicker();
+	if (HandlePlacePushButton(w, 3, 0xAA4, 1, PlaceAirport)) ShowBuildAirportPicker();
 }
 
 static void BuildAirClick_Demolish(Window *w)
 {
-	HandlePlacePushButton(w, ATW_DEMOLISH, ANIMCURSOR_DEMOLISH, 1, PlaceAir_DemolishArea);
+	HandlePlacePushButton(w, 4, ANIMCURSOR_DEMOLISH, 1, PlaceAir_DemolishArea);
 }
 
 static void BuildAirClick_Landscaping(Window *w)
@@ -77,123 +66,93 @@ static void BuildAirToolbWndProc(Window *w, WindowEvent *e)
 		break;
 
 	case WE_CLICK:
-		if (e->we.click.widget - 3 >= 0)
-			_build_air_button_proc[e->we.click.widget - 3](w);
+		if (e->click.widget - 3 >= 0)
+			_build_air_button_proc[e->click.widget - 3](w);
 		break;
 
-	case WE_KEYPRESS: {
-		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;
-
 	case WE_PLACE_OBJ:
-		_place_proc(e->we.place.tile);
+		_place_proc(e->place.tile);
 		break;
 
-	case WE_PLACE_DRAG:
-		VpSelectTilesWithMethod(e->we.place.pt.x, e->we.place.pt.y, e->we.place.userdata);
-		break;
+	case WE_PLACE_DRAG: {
+		VpSelectTilesWithMethod(e->place.pt.x, e->place.pt.y, e->place.userdata);
+		return;
+	}
 
 	case WE_PLACE_MOUSEUP:
-		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));
+		if (e->place.pt.x != -1) {
+			DoCommandP(e->place.tile, e->place.starttile, 0, CcPlaySound10, CMD_CLEAR_AREA | CMD_MSG(STR_00B5_CAN_T_CLEAR_THIS_AREA));
 		}
 		break;
 
 	case WE_ABORT_PLACE_OBJ:
-		RaiseWindowButtons(w);
-
+		UnclickWindowButtons(w);
+		SetWindowDirty(w);
 		w = FindWindowById(WC_BUILD_STATION, 0);
 		if (w != 0)
 			WP(w,def_d).close = true;
 		break;
-
-	case WE_DESTROY:
-		if (_patches.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0);
-		break;
 	}
 }
 
 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,    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 },
+{   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,							STR_018B_CLOSE_WINDOW},
+{    WWT_CAPTION,     7,    11,    73,     0,    13, STR_A000_AIRPORTS,			STR_018C_WINDOW_TITLE_DRAG_THIS},
+{  WWT_STICKYBOX,     7,    74,    85,     0,    13, 0x0,                   STR_STICKY_BUTTON},
+{      WWT_PANEL,     7,     0,    41,    14,    35, 0x2E8,									STR_A01E_BUILD_AIRPORT},
+{      WWT_PANEL,     7,    42,    63,    14,    35, 0x2BF,									STR_018D_DEMOLISH_BUILDINGS_ETC},
+{      WWT_PANEL,     7,    64,    85,    14,    35, SPR_IMG_LANDSCAPING,	STR_LANDSCAPING_TOOLBAR_TIP},
 {   WIDGETS_END},
 };
 
 
 static const WindowDesc _air_toolbar_desc = {
-	WDP_ALIGN_TBR, 22, 86, 36,
+	640-86, 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)
+void ShowBuildAirToolbar()
 {
-	if (!IsValidPlayer(_current_player)) return;
-
 	DeleteWindowById(WC_BUILD_TOOLBAR, 0);
 	AllocateWindowDescFront(&_air_toolbar_desc, 0);
-	if (_patches.link_terraform_toolbar) ShowTerraformToolbar();
 }
 
 static void BuildAirportPickerWndProc(Window *w, WindowEvent *e)
 {
 	switch(e->event) {
-	case WE_CREATE:
-		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 sel;
 		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;
+		w->disabled_state = 0;
 
-		avail_airports = GetValidAirports();
-
-		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.
-		 * There are 9 buildable airports
-		 * 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++) 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);
+		sel = _selected_airport_type;
+		// FIXME -- BuildAirportPickerWndProc - set availability of airports by year, instead of airplane
+		if (!(_avail_aircraft & 1)) { w->disabled_state |= (1<<3); if (sel == AT_SMALL) sel = AT_LARGE; }
+		if (!(_avail_aircraft & 2)) {	w->disabled_state |= (1<<4); if (sel == AT_LARGE) sel = AT_SMALL; }
+		if (!(_avail_aircraft & 4)) {	w->disabled_state |= (1<<5); }	// heliport
+		// 1980-1-1 is --> 21915
+		// 1990-1-1 is --> 25568
+		if (_date < 21915) {w->disabled_state |= (1<<6);}	// metropilitan airport 1980
+		if (_date < 25568) {w->disabled_state |= (1<<7);}	// international airport 1990
+		_selected_airport_type = sel;
+		// select default the coverage area to 'Off' (8)
+		w->click_state = ((1<<3) << sel) | ((1<<8) << _station_show_coverage);
+		SetTileSelectSize(_airport_size_x[sel],_airport_size_y[sel]);
 
      if (_patches.modified_catchment) {
-			switch (_selected_airport_type) {
+       switch (sel) {
          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;
        }
 		 }
 	
@@ -201,24 +160,24 @@ static void BuildAirportPickerWndProc(Window *w, WindowEvent *e)
 
 		DrawWindowWidgets(w);
     // strings such as 'Size' and 'Coverage Area'
-		// 'Coverage Area'
-		DrawStationCoverageAreaText(2, 206, (uint)-1, rad);
+		DrawStringCentered(74, 16, STR_305B_SIZE, 0);
+		DrawStringCentered(74, 78, STR_3066_COVERAGE_AREA_HIGHLIGHT, 0);
+		DrawStationCoverageAreaText(2, 104, (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:
-			RaiseWindowWidget(w, _selected_airport_type + 7);
-			_selected_airport_type = e->we.click.widget - 7;
-			LowerWindowWidget(w, _selected_airport_type + 7);
+		switch(e->click.widget) {
+		case 0:
+			ResetObjectToPlace();
+			break;
+		case 3: case 4: case 5: case 6: case 7:
+			_selected_airport_type = e->click.widget - 3;
 			SndPlayFx(SND_15_BEEP);
 			SetWindowDirty(w);
 			break;
-		case 16: case 17:
-			_station_show_coverage = e->we.click.widget - 16;
-			SetWindowWidgetLoweredState(w, 16, !_station_show_coverage);
-			SetWindowWidgetLoweredState(w, 17, _station_show_coverage);
+		case 8: case 9:
+			_station_show_coverage = e->click.widget - 8;
 			SndPlayFx(SND_15_BEEP);
 			SetWindowDirty(w);
 			break;
@@ -233,54 +192,38 @@ static void BuildAirportPickerWndProc(Window *w, WindowEvent *e)
 
 		CheckRedrawStationCoverage(w);
 	} break;
-
-	case WE_DESTROY:
-		if (!WP(w,def_d).close) ResetObjectToPlace();
-		break;
 	}
 }
 
 static const Widget _build_airport_picker_widgets[] = {
-{   WWT_CLOSEBOX,   RESIZE_NONE,     7,     0,    10,     0,    13, STR_00C5,                         STR_018B_CLOSE_WINDOW},
-{    WWT_CAPTION,   RESIZE_NONE,     7,    11,   147,     0,    13, STR_3001_AIRPORT_SELECTION,       STR_018C_WINDOW_TITLE_DRAG_THIS},
-{      WWT_PANEL,   RESIZE_NONE,     7,     0,   147,    14,    52, 0x0,                              STR_NULL},
-{      WWT_PANEL,   RESIZE_NONE,     7,     0,   147,    53,    89, 0x0,                              STR_NULL},
-{      WWT_PANEL,   RESIZE_NONE,     7,     0,   147,    90,   127, 0x0,                              STR_NULL},
-{      WWT_PANEL,   RESIZE_NONE,     7,     0,   147,   128,   177, 0x0,                              STR_NULL},
-{      WWT_PANEL,   RESIZE_NONE,     7,     0,   147,   178,   239, 0x0,                              STR_NULL},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   145,    27,    38, STR_SMALL_AIRPORT,                STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   145,    65,    76, STR_CITY_AIRPORT,                 STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   145,   141,   152, STR_HELIPORT,                     STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   145,    77,    88, STR_METRO_AIRPORT ,               STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   145,   103,   114, STR_INTERNATIONAL_AIRPORT,        STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   145,    39,    50, STR_COMMUTER_AIRPORT,             STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   145,   165,   176, STR_HELIDEPOT,                    STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   145,   115,   126, STR_INTERCONTINENTAL_AIRPORT,     STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   145,   153,   164, STR_HELISTATION,                  STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,    14,    73,   191,   202, STR_02DB_OFF,                     STR_3065_DON_T_HIGHLIGHT_COVERAGE},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,    74,   133,   191,   202, STR_02DA_ON,                      STR_3064_HIGHLIGHT_COVERAGE_AREA},
-{      WWT_LABEL,   RESIZE_NONE,     7,     0,   147,    14,    27, STR_SMALL_AIRPORTS,               STR_NULL},
-{      WWT_LABEL,   RESIZE_NONE,     7,     0,   147,    52,    65, STR_LARGE_AIRPORTS,               STR_NULL},
-{      WWT_LABEL,   RESIZE_NONE,     7,     0,   147,    90,   103, STR_HUB_AIRPORTS,                 STR_NULL},
-{      WWT_LABEL,   RESIZE_NONE,     7,     0,   147,   128,   141, STR_HELIPORTS,                    STR_NULL},
-{      WWT_LABEL,   RESIZE_NONE,     7,     0,   147,   178,   191, STR_3066_COVERAGE_AREA_HIGHLIGHT, STR_NULL},
+{   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,										STR_018B_CLOSE_WINDOW},
+{    WWT_CAPTION,     7,    11,   147,     0,    13, STR_3001_AIRPORT_SELECTION,	STR_018C_WINDOW_TITLE_DRAG_THIS},
+{      WWT_PANEL,     7,     0,   147,    14,   130, 0x0,													STR_NULL},
+{WWT_NODISTXTBTN,    14,     2,    73,    27,    38, STR_3059_SMALL,							STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT},
+{WWT_NODISTXTBTN,    14,    74,   145,    27,    38, STR_305A_LARGE,							STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT},
+{WWT_NODISTXTBTN,    14,     2,   145,    63,    74, STR_306B_HELIPORT,						STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT},
+{WWT_NODISTXTBTN,    14,     2,   145,    39,    50, STR_305AA_LARGE,	  					STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT},
+{WWT_NODISTXTBTN,    14,     2,   145,    51,    62, STR_305AB_LARGE,	  					STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT},
+{   WWT_CLOSEBOX,    14,    14,    73,    88,    98, STR_02DB_OFF,								STR_3065_DON_T_HIGHLIGHT_COVERAGE},
+{   WWT_CLOSEBOX,    14,    74,   133,    88,    98, STR_02DA_ON,									STR_3064_HIGHLIGHT_COVERAGE_AREA},
 {   WIDGETS_END},
 };
 
 static const WindowDesc _build_airport_desc = {
-	WDP_AUTO, WDP_AUTO, 148, 240,
+	-1, -1, 148, 131, // height, 130+1
 	WC_BUILD_STATION,WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_build_airport_picker_widgets,
 	BuildAirportPickerWndProc
 };
 
-static void ShowBuildAirportPicker(void)
+static void ShowBuildAirportPicker()
 {
 	AllocateWindowDesc(&_build_airport_desc);
 }
 
-void InitializeAirportGui(void)
+void InitializeAirportGui()
 {
 	_selected_airport_type = AT_SMALL;
+	_last_built_aircraft_depot_tile = 0;
 }

airport_movement.h

@@ -1,8 +1,14 @@
-/* $Id$ */
-
 #ifndef AIRPORT_MOVEMENT_H
 #define AIRPORT_MOVEMENT_H
 
+#include "stdafx.h"
+#include "macros.h"
+
+typedef struct AirportMovingData {
+	int x,y;
+	byte flag;
+	byte direction;
+} AirportMovingData;
 
 // state machine input struct (from external file, etc.)
 // Finite sTate mAchine --> FTA
@@ -10,9 +16,79 @@ 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
+	byte next_in_chain;					// next position from this position
 } AirportFTAbuildup;
 
+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,
+};
+
+enum {MAX_ELEMENTS = 255};
+enum {MAX_HEADINGS = 18};
+
+///////////////////////////////////////////////////////////////////////
+///////***********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
+};
+
+///////////////////////////////////////////////////////////////////////
+///////**********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,
+	NOTHING_block							= 1 << 30
+};
+
 ///////////////////////////////////////////////////////////////////////
 /////*********Movement Positions on Airports********************///////
 // Country Airfield (small) 4x3
@@ -38,49 +114,7 @@ static const AirportMovingData _airport_moving_data_country[22] = {
 	{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
+	{ 44, 40,AMED_HELI_LOWER,0}										// 21 Helicopter landing
 };
 
 // City Airport (large) 6x6
@@ -109,7 +143,7 @@ static const AirportMovingData _airport_moving_data_town[25] = {
 	{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
+	{ 28, 74,AMED_HELI_LOWER,0}										// 24 Helicopter landing
 };
 
 // Metropolitan Airport (metropolitan) - 2 runways
@@ -140,7 +174,7 @@ static const AirportMovingData _airport_moving_data_metropolitan[27] = {
 	{ 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
+	{ 15, 54,AMED_HELI_LOWER,0}										// 26 Helicopter landing
 };
 
 // International Airport (international) - 2 runways, 6 terminals, dedicated helipod
@@ -180,7 +214,7 @@ static const AirportMovingData _airport_moving_data_international[51] = {
 	{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, AMED_SLOWTURN,                   0 }, // 35 Just landed, turn around and taxi 1 square
+	{ 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)
@@ -199,89 +233,6 @@ static const AirportMovingData _airport_moving_data_international[51] = {
 	{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,                   1 }, // 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
@@ -295,65 +246,6 @@ static const AirportMovingData _airport_moving_data_heliport[9] = {
 	{ 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
@@ -369,10 +261,9 @@ static const AirportMovingData _airport_moving_data_oilrig[9] = {
 
 ///////////////////////////////////////////////////////////////////////
 /////**********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};
+// first element of depots 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 TileIndex _airport_depots_country[] = {TILE_XY(3,0)};
 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},
@@ -402,58 +293,7 @@ static const AirportFTAbuildup _airport_fta_country[] = {
 	{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 TileIndex _airport_depots_city[] = {TILE_XY(5,0)};
 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
@@ -487,8 +327,7 @@ static const AirportFTAbuildup _airport_fta_city[] = {
 	{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 TileIndex _airport_depots_metropolitan[] = {TILE_XY(5,0)};
 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
@@ -524,9 +363,7 @@ static const AirportFTAbuildup _airport_fta_metropolitan[] = {
 	{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 TileIndex _airport_depots_international[] = {TILE_XY(0,3), TILE_XY(6,1)};
 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},
@@ -588,102 +425,7 @@ static const AirportFTAbuildup _airport_fta_international[] = {
 	{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
@@ -698,96 +440,12 @@ static const AirportFTAbuildup _airport_fta_heliport_oilrig[] = {
 	{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[] = {
+static const AirportMovingData * const _airport_moving_datas[6] = {
 	_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
 };
 

aystar.c

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /*
  * This file has the core function for AyStar
  *  AyStar is a fast pathfinding routine and is used for things like
@@ -17,56 +15,46 @@
  */
 
 #include "stdafx.h"
-#include "openttd.h"
+#include "ttd.h"
 #include "aystar.h"
-
-int _aystar_stats_open_size;
-int _aystar_stats_closed_size;
-
 // This looks in the Hash if a node exists in ClosedList
 //  If so, it returns the PathNode, else NULL
-static PathNode* AyStarMain_ClosedList_IsInList(AyStar *aystar, const AyStarNode *node)
-{
+PathNode *AyStarMain_ClosedList_IsInList(AyStar *aystar, AyStarNode *node) {
 	return (PathNode*)Hash_Get(&aystar->ClosedListHash, node->tile, node->direction);
 }
 
 // This adds a node to the ClosedList
 //  It makes a copy of the data
-static void AyStarMain_ClosedList_Add(AyStar *aystar, const PathNode *node)
-{
+void AyStarMain_ClosedList_Add(AyStar *aystar, PathNode *node) {
 	// Add a node to the ClosedList
-	PathNode *new_node = malloc(sizeof(*new_node));
+	PathNode *new_node = malloc(sizeof(PathNode));
 	*new_node = *node;
 	Hash_Set(&aystar->ClosedListHash, node->node.tile, node->node.direction, new_node);
 }
 
 // Checks if a node is in the OpenList
 //   If so, it returns the OpenListNode, else NULL
-static OpenListNode *AyStarMain_OpenList_IsInList(AyStar *aystar, const AyStarNode *node)
-{
+OpenListNode *AyStarMain_OpenList_IsInList(AyStar *aystar, AyStarNode *node) {
 	return (OpenListNode*)Hash_Get(&aystar->OpenListHash, node->tile, node->direction);
 }
 
 // Gets the best node from OpenList
 //  returns the best node, or NULL of none is found
 // Also it deletes the node from the OpenList
-static OpenListNode *AyStarMain_OpenList_Pop(AyStar *aystar)
-{
+OpenListNode *AyStarMain_OpenList_Pop(AyStar *aystar) {
 	// Return the item the Queue returns.. the best next OpenList item.
 	OpenListNode* res = (OpenListNode*)aystar->OpenListQueue.pop(&aystar->OpenListQueue);
-	if (res != NULL) {
+	if (res != NULL)
 		Hash_Delete(&aystar->OpenListHash, res->path.node.tile, res->path.node.direction);
-	}
 
 	return res;
 }
 
 // Adds a node to the OpenList
 //  It makes a copy of node, and puts the pointer of parent in the struct
-static void AyStarMain_OpenList_Add(AyStar *aystar, PathNode *parent, const AyStarNode *node, int f, int g)
-{
+void AyStarMain_OpenList_Add(AyStar *aystar, PathNode *parent, AyStarNode *node, int f, int g, int userdata) {
 	// Add a new Node to the OpenList
-	OpenListNode *new_node = malloc(sizeof(*new_node));
+	OpenListNode* new_node = malloc(sizeof(OpenListNode));
 	new_node->g = g;
 	new_node->path.parent = parent;
 	new_node->path.node = *node;
@@ -81,8 +69,7 @@ static void AyStarMain_OpenList_Add(AyStar *aystar, PathNode *parent, const AySt
  *  return values:
  *	AYSTAR_DONE : indicates we are done
  */
-int AyStarMain_CheckTile(AyStar *aystar, AyStarNode *current, OpenListNode *parent)
-{
+int AyStarMain_CheckTile(AyStar *aystar, AyStarNode *current, OpenListNode *parent) {
 	int new_f, new_g, new_h;
 	PathNode *closedlist_parent;
 	OpenListNode *check;
@@ -113,9 +100,8 @@ int AyStarMain_CheckTile(AyStar *aystar, AyStarNode *current, OpenListNode *pare
 	closedlist_parent = AyStarMain_ClosedList_IsInList(aystar, &parent->path.node);
 
 	// Check if this item is already in the OpenList
-	check = AyStarMain_OpenList_IsInList(aystar, current);
-	if (check != NULL) {
-		uint i;
+	if ((check = AyStarMain_OpenList_IsInList(aystar, current)) != NULL) {
+		int i;
 		// Yes, check if this g value is lower..
 		if (new_g > check->g) return AYSTAR_DONE;
 		aystar->OpenListQueue.del(&aystar->OpenListQueue, check, 0);
@@ -123,14 +109,13 @@ int AyStarMain_CheckTile(AyStar *aystar, AyStarNode *current, OpenListNode *pare
 		check->g = new_g;
 		check->path.parent = closedlist_parent;
 		/* Copy user data, will probably have changed */
-		for (i = 0; i < lengthof(current->user_data); i++) {
+		for (i=0;i<lengthof(current->user_data);i++)
 			check->path.node.user_data[i] = current->user_data[i];
-		}
 		// Readd him in the OpenListQueue
 		aystar->OpenListQueue.push(&aystar->OpenListQueue, check, new_f);
 	} else {
 		// A new node, add him to the OpenList
-		AyStarMain_OpenList_Add(aystar, closedlist_parent, current, new_f, new_g);
+		AyStarMain_OpenList_Add(aystar, closedlist_parent, current, new_f, new_g, 0);
 	}
 
 	return AYSTAR_DONE;
@@ -147,8 +132,7 @@ int AyStarMain_CheckTile(AyStar *aystar, AyStarNode *current, OpenListNode *pare
  *	AYSTAR_FOUND_END_NODE : indicates we found the end. Path_found now is true, and in path is the path found.
  *	AYSTAR_STILL_BUSY : indicates we have done this tile, did not found the path yet, and have items left to try.
  */
-int AyStarMain_Loop(AyStar *aystar)
-{
+int AyStarMain_Loop(AyStar *aystar) {
 	int i, r;
 
 	// Get the best node from OpenList
@@ -179,20 +163,18 @@ int AyStarMain_Loop(AyStar *aystar)
 	// Free the node
 	free(current);
 
-	if (aystar->max_search_nodes != 0 && Hash_Size(&aystar->ClosedListHash) >= aystar->max_search_nodes) {
+	if (aystar->max_search_nodes != 0 && Hash_Size(&aystar->ClosedListHash) >= aystar->max_search_nodes)
 		/* We've expanded enough nodes */
 		return AYSTAR_LIMIT_REACHED;
-	} else {
+	else
 		// Return that we are still busy
 		return AYSTAR_STILL_BUSY;
 }
-}
 
 /*
  * This function frees the memory it allocated
  */
-void AyStarMain_Free(AyStar *aystar)
-{
+void AyStarMain_Free(AyStar *aystar) {
 	aystar->OpenListQueue.free(&aystar->OpenListQueue, false);
 	/* 2nd argument above is false, below is true, to free the values only
 	 * once */
@@ -207,8 +189,7 @@ void AyStarMain_Free(AyStar *aystar)
  * This function make the memory go back to zero
  *  This function should be called when you are using the same instance again.
  */
-void AyStarMain_Clear(AyStar *aystar)
-{
+void AyStarMain_Clear(AyStar *aystar) {
 	// Clean the Queue, but not the elements within. That will be done by
 	// the hash.
 	aystar->OpenListQueue.clear(&aystar->OpenListQueue, false);
@@ -234,29 +215,27 @@ void AyStarMain_Clear(AyStar *aystar)
 int AyStarMain_Main(AyStar *aystar) {
 	int r, i = 0;
 	// Loop through the OpenList
-	//  Quit if result is no AYSTAR_STILL_BUSY or is more than loops_per_tick
+	//  Quit if result is no AYSTAR_STILL_BUSY or is more then loops_per_tick
 	while ((r = aystar->loop(aystar)) == AYSTAR_STILL_BUSY && (aystar->loops_per_tick == 0 || ++i < aystar->loops_per_tick)) { }
 #ifdef AYSTAR_DEBUG
-	switch (r) {
-		case AYSTAR_FOUND_END_NODE: printf("[AyStar] Found path!\n"); break;
-		case AYSTAR_EMPTY_OPENLIST: printf("[AyStar] OpenList run dry, no path found\n"); break;
-		case AYSTAR_LIMIT_REACHED:  printf("[AyStar] Exceeded search_nodes, no path found\n"); break;
-		default: break;
-	}
+	if (r == AYSTAR_FOUND_END_NODE)
+		printf("[AyStar] Found path!\n");
+	else if (r == AYSTAR_EMPTY_OPENLIST)
+		printf("[AyStar] OpenList run dry, no path found\n");
+	else if (r == AYSTAR_LIMIT_REACHED)
+		printf("[AyStar] Exceeded search_nodes, no path found\n");
 #endif
-	if (r != AYSTAR_STILL_BUSY) {
+	if (r != AYSTAR_STILL_BUSY)
 		/* We're done, clean up */
-		_aystar_stats_open_size = aystar->OpenListHash.size;
-		_aystar_stats_closed_size = aystar->ClosedListHash.size;
 		aystar->clear(aystar);
-	}
 
-	switch (r) {
-		case AYSTAR_FOUND_END_NODE: return AYSTAR_FOUND_END_NODE;
-		case AYSTAR_EMPTY_OPENLIST:
-		case AYSTAR_LIMIT_REACHED:  return AYSTAR_NO_PATH;
-		default:                    return AYSTAR_STILL_BUSY;
-	}
+	// Check result-value
+	if (r == AYSTAR_FOUND_END_NODE) return AYSTAR_FOUND_END_NODE;
+	// Check if we have some left in the OpenList
+	if (r == AYSTAR_EMPTY_OPENLIST || r == AYSTAR_LIMIT_REACHED) return AYSTAR_NO_PATH;
+
+	// Return we are still busy
+	return AYSTAR_STILL_BUSY;
 }
 
 /*
@@ -264,19 +243,15 @@ int AyStarMain_Main(AyStar *aystar) {
  * if wanted. You should make sure that clear() is called before adding nodes
  * if the AyStar has been used before (though the normal main loop calls
  * clear() automatically when the algorithm finishes
- * g is the cost for starting with this node.
  */
-void AyStarMain_AddStartNode(AyStar *aystar, AyStarNode *start_node, uint g)
-{
+void AyStarMain_AddStartNode(AyStar *aystar, AyStarNode *start_node) {
 #ifdef AYSTAR_DEBUG
-	printf("[AyStar] Starting A* Algorithm from node (%d, %d, %d)\n",
-		TileX(start_node->tile), TileY(start_node->tile), start_node->direction);
+	printf("[AyStar] Starting A* Algorithm from node (%d, %d, %d)\n", GET_TILE_X(start_node->tile), GET_TILE_Y(start_node->tile), start_node->direction);
 #endif
-	AyStarMain_OpenList_Add(aystar, NULL, start_node, 0, g);
+	AyStarMain_OpenList_Add(aystar, NULL, start_node, 0, 0, 0);
 }
 
-void init_AyStar(AyStar *aystar, Hash_HashProc hash, uint num_buckets)
-{
+void init_AyStar(AyStar* aystar, Hash_HashProc hash, uint num_buckets) {
 	// Allocated the Hash for the OpenList and ClosedList
 	init_Hash(&aystar->OpenListHash, hash, num_buckets);
 	init_Hash(&aystar->ClosedListHash, hash, num_buckets);

aystar.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /*
  * This file has the header for AyStar
  *  AyStar is a fast pathfinding routine and is used for things like
@@ -29,7 +27,7 @@ enum{
 
 typedef struct AyStarNode AyStarNode;
 struct AyStarNode {
-	TileIndex tile;
+	uint tile;
 	uint direction;
 	uint user_data[2];
 };
@@ -58,14 +56,6 @@ typedef struct AyStar AyStar;
  *	AYSTAR_FOUND_END_NODE : indicates this is the end tile
  *	AYSTAR_DONE : indicates this is not the end tile (or direction was wrong)
  */
-/*
- * The 2nd parameter should be OpenListNode, and NOT AyStarNode. AyStarNode is
- * part of OpenListNode and so it could be accessed without any problems.
- * The good part about OpenListNode is, and how AIs use it, that you can
- * access the parent of the current node, and so check if you, for example
- * don't try to enter the file tile with a 90-degree curve. So please, leave
- * this an OpenListNode, it works just fine -- TrueLight
- */
 typedef int32 AyStar_EndNodeCheck(AyStar *aystar, OpenListNode *current);
 
 /*
@@ -99,7 +89,7 @@ typedef void AyStar_GetNeighbours(AyStar *aystar, OpenListNode *current);
 typedef void AyStar_FoundEndNode(AyStar *aystar, OpenListNode *current);
 
 // For internal use, see aystar.c
-typedef void AyStar_AddStartNode(AyStar *aystar, AyStarNode *start_node, uint g);
+typedef void AyStar_AddStartNode(AyStar *aystar, AyStarNode* start_node);
 typedef int AyStar_Main(AyStar *aystar);
 typedef int AyStar_Loop(AyStar *aystar);
 typedef int AyStar_CheckTile(AyStar *aystar, AyStarNode *current, OpenListNode *parent);
@@ -163,7 +153,7 @@ struct AyStar {
 };
 
 
-void AyStarMain_AddStartNode(AyStar *aystar, AyStarNode *start_node, uint g);
+void AyStarMain_AddStartNode(AyStar *aystar, AyStarNode *start_node);
 int AyStarMain_Main(AyStar *aystar);
 int AyStarMain_Loop(AyStar *aystar);
 int AyStarMain_CheckTile(AyStar *aystar, AyStarNode *current, OpenListNode *parent);
@@ -176,4 +166,4 @@ void AyStarMain_Clear(AyStar *aystar);
 void init_AyStar(AyStar* aystar, Hash_HashProc hash, uint num_buckets);
 
 
-#endif /* AYSTAR_H */
+#endif

bmp.c

@@ -1,378 +0,0 @@
-/* $Id$ */
-
-#include "stdafx.h"
-#include "openttd.h"
-#include "gfx.h"
-#include "bmp.h"
-#include "macros.h"
-
-void BmpInitializeBuffer(BmpBuffer *buffer, FILE *file) {
-	buffer->pos      = -1;
-	buffer->file     = file;
-	buffer->read     = 0;
-	buffer->real_pos = ftell(file);
-}
-
-static inline void AdvanceBuffer(BmpBuffer *buffer)
-{
-	buffer->read = (int)fread(buffer->data, 1, BMP_BUFFER_SIZE, buffer->file);
-	buffer->pos  = 0;
-}
-
-static inline bool EndOfBuffer(BmpBuffer *buffer)
-{
-	if (buffer->pos == buffer->read || buffer->pos < 0) AdvanceBuffer(buffer);
-	return buffer->pos == buffer->read;
-}
-
-static inline byte ReadByte(BmpBuffer *buffer)
-{
-	if (buffer->pos == buffer->read || buffer->pos < 0) AdvanceBuffer(buffer);
-	buffer->real_pos++;
-	return buffer->data[buffer->pos++];
-}
-
-static inline uint16 ReadWord(BmpBuffer *buffer)
-{
-	uint16 var = ReadByte(buffer);
-	return var | (ReadByte(buffer) << 8);
-}
-
-static inline uint32 ReadDword(BmpBuffer *buffer)
-{
-	uint32 var = ReadWord(buffer);
-	return var | (ReadWord(buffer) << 16);
-}
-
-static inline void SkipBytes(BmpBuffer *buffer, int bytes)
-{
-	int i;
-	for (i = 0; i < bytes; i++) ReadByte(buffer);
-}
-
-static inline void SetStreamOffset(BmpBuffer *buffer, int offset)
-{
-	fseek(buffer->file, offset, SEEK_SET);
-	buffer->pos = -1;
-	buffer->real_pos = offset;
-	AdvanceBuffer(buffer);
-}
-
-/**
- * Reads a 1 bpp uncompressed bitmap
- * The bitmap is converted to a 8 bpp bitmap
- */
-static inline bool BmpRead1(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
-{
-	uint x, y, i;
-	byte pad = GB(4 - info->width / 8, 0, 2);
-	byte *pixel_row;
-	byte b;
-	for (y = info->height; y > 0; y--) {
-		x = 0;
-		pixel_row = &data->bitmap[(y - 1) * info->width];
-		while (x < info->width) {
-			if (EndOfBuffer(buffer)) return false; // the file is shorter than expected
-			b = ReadByte(buffer);
-			for (i = 8; i > 0; i--) {
-				if (x < info->width) *pixel_row++ = GB(b, i - 1, 1);
-				x++;
-			}
-		}
-		/* Padding for 32 bit align */
-		SkipBytes(buffer, pad);
-	}
-	return true;
-}
-
-/**
- * Reads a 4 bpp uncompressed bitmap
- * The bitmap is converted to a 8 bpp bitmap
- */
-static inline bool BmpRead4(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
-{
-	uint x, y;
-	byte pad = GB(4 - info->width / 2, 0, 2);
-	byte *pixel_row;
-	byte b;
-	for (y = info->height; y > 0; y--) {
-		x = 0;
-		pixel_row = &data->bitmap[(y - 1) * info->width];
-		while (x < info->width) {
-			if (EndOfBuffer(buffer)) return false;  // the file is shorter than expected
-			b = ReadByte(buffer);
-			*pixel_row++ = GB(b, 4, 4);
-			x++;
-			if (x < info->width) {
-				*pixel_row++ = GB(b, 0, 4);
-				x++;
-			}
-		}
-		/* Padding for 32 bit align */
-		SkipBytes(buffer, pad);
-	}
-	return true;
-}
-
-/**
- * Reads a 4-bit RLE compressed bitmap
- * The bitmap is converted to a 8 bpp bitmap
- */
-static inline bool BmpRead4Rle(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
-{
-	uint i;
-	uint x = 0;
-	uint y = info->height - 1;
-	byte n, c, b;
-	byte *pixel = &data->bitmap[y * info->width];
-	while (y != 0 || x < info->width) {
-		if (EndOfBuffer(buffer)) return false; // the file is shorter than expected
-		n = ReadByte(buffer);
-		c = ReadByte(buffer);
-		if (n == 0) {
-			switch (c) {
-			case 0: // end of line
-				x = 0;
-				pixel = &data->bitmap[--y * info->width];
-				break;
-			case 1: // end of bitmap
-				x = info->width;
-				y = 0;
-				pixel = NULL;
-				break;
-			case 2: // delta
-				x += ReadByte(buffer);
-				i = ReadByte(buffer);
-				if (x >= info->width || (y == 0 && i > 0)) return false;
-				y -= i;
-				pixel = &data->bitmap[y * info->width + x];
-				break;
-			default: // uncompressed
-				i = 0;
-				while (i++ < c) {
-					if (EndOfBuffer(buffer) || x >= info->width) return false;
-					b = ReadByte(buffer);
-					*pixel++ = GB(b, 4, 4);
-					x++;
-					if (x < info->width && i++ < c) {
-						*pixel++ = GB(b, 0, 4);
-						x++;
-					}
-				}
-				/* Padding for 16 bit align */
-				SkipBytes(buffer, ((c + 1) / 2) % 2);
-				break;
-			}
-		} else {
-			i = 0;
-			while (i++ < n) {
-				if (EndOfBuffer(buffer) || x >= info->width) return false;
-				*pixel++ = GB(c, 4, 4);
-				x++;
-				if (x < info->width && i++ < n) {
-					*pixel++ = GB(c, 0, 4);
-					x++;
-				}
-			}
-		}
-	}
-	return true;
-}
-
-/**
- * Reads a 8 bpp bitmap
- */
-static inline bool BmpRead8(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
-{
-	uint i;
-	uint y;
-	byte pad = GB(4 - info->width, 0, 2);
-	byte *pixel;
-	for (y = info->height; y > 0; y--) {
-		if (EndOfBuffer(buffer)) return false; // the file is shorter than expected
-		pixel = &data->bitmap[(y - 1) * info->width];
-		for (i = 0; i < info->width; i++) *pixel++ = ReadByte(buffer);
-		/* Padding for 32 bit align */
-		SkipBytes(buffer, pad);
-	}
-	return true;
-}
-
-/**
- * Reads a 8-bit RLE compressed bpp bitmap
- */
-static inline bool BmpRead8Rle(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
-{
-	uint i;
-	uint x = 0;
-	uint y = info->height - 1;
-	byte n, c;
-	byte *pixel = &data->bitmap[y * info->width];
-	while (y != 0 || x < info->width) {
-		if (EndOfBuffer(buffer)) return false; // the file is shorter than expected
-		n = ReadByte(buffer);
-		c = ReadByte(buffer);
-		if (n == 0) {
-			switch (c) {
-			case 0: // end of line
-				x = 0;
-				pixel = &data->bitmap[--y * info->width];
-				break;
-			case 1: // end of bitmap
-				x = info->width;
-				y = 0;
-				pixel = NULL;
-				break;
-			case 2: // delta
-				x += ReadByte(buffer);
-				i = ReadByte(buffer);
-				if (x >= info->width || (y == 0 && i > 0)) return false;
-				y -= i;
-				pixel = &data->bitmap[y * info->width + x];
-				break;
-			default: // uncompressed
-				if ((x += c) > info->width) return false;
-				for (i = 0; i < c; i++) *pixel++ = ReadByte(buffer);
-				/* Padding for 16 bit align */
-				SkipBytes(buffer, c % 2);
-				break;
-			}
-		} else {
-			for (i = 0; i < n; i++) {
-				if (x >= info->width) return false;
-				*pixel++ = c;
-				x++;
-			}
-		}
-	}
-	return true;
-}
-
-/**
- * Reads a 24 bpp uncompressed bitmap
- */
-static inline bool BmpRead24(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
-{
-	uint x, y;
-	byte pad = GB(4 - info->width * 3, 0, 2);
-	byte *pixel_row;
-	for (y = info->height; y > 0; y--) {
-		pixel_row = &data->bitmap[(y - 1) * info->width * 3];
-		for (x = 0; x < info->width; x++) {
-			if (EndOfBuffer(buffer)) return false; // the file is shorter than expected
-			*(pixel_row + 2) = ReadByte(buffer); // green
-			*(pixel_row + 1) = ReadByte(buffer); // blue
-			*pixel_row       = ReadByte(buffer); // red
-			pixel_row += 3;
-		}
-		/* Padding for 32 bit align */
-		SkipBytes(buffer, pad);
-	}
-	return true;
-}
-
-/*
- * Reads bitmap headers, and palette (if any)
- */
-bool BmpReadHeader(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
-{
-	uint32 header_size;
-	assert(info != NULL);
-
-	/* Reading BMP header */
-	if (ReadWord(buffer) != 0x4D42) return false; // signature should be 'BM'
-	SkipBytes(buffer, 8); // skip file size and reserved
-	info->offset = ReadDword(buffer);
-
-	/* Reading info header */
-	header_size = ReadDword(buffer);
-	if (header_size < 12) return false; // info header should be at least 12 bytes long
-
-	info->os2_bmp = (header_size == 12); // OS/2 1.x or windows 2.x info header is 12 bytes long
-
-	if (info->os2_bmp) {
-		info->width = ReadWord(buffer);
-		info->height = ReadWord(buffer);
-		header_size -= 8;
-	} else {
-		info->width = ReadDword(buffer);
-		info->height = ReadDword(buffer);
-		header_size -= 12;
-	}
-
-	if (ReadWord(buffer) != 1) return false; // BMP can have only 1 plane
-
-	info->bpp = ReadWord(buffer);
-	if (info->bpp != 1 && info->bpp != 4 && info->bpp != 8 && info->bpp != 24) {
-		/* Only 1 bpp, 4 bpp, 8bpp and 24 bpp bitmaps are supported */
-		return false;
-	}
-
-	/* Reads compression method if available in info header*/
-	if ((header_size -= 4) >= 4) {
-		info->compression = ReadDword(buffer);
-		header_size -= 4;
-	}
-
-	/* Only 4-bit and 8-bit rle compression is supported */
-	if (info->compression > 2 || (info->compression > 0 && !(info->bpp == 4 || info->bpp == 8))) return false;
-
-	if (info->bpp <= 8) {
-		uint i;
-
-		/* Reads number of colors if available in info header */
-		if (header_size >= 16) {
-			SkipBytes(buffer, 12);                  // skip image size and resolution
-			info->palette_size = ReadDword(buffer); // number of colors in palette
-			SkipBytes(buffer, header_size - 16);    // skip the end of info header
-		}
-		if (info->palette_size == 0) info->palette_size = 1 << info->bpp;
-
-		data->palette = calloc(info->palette_size, sizeof(*(data->palette)));
-		if (data->palette == NULL) return false;
-
-		for (i = 0; i < info->palette_size; i++) {
-			data->palette[i].b = ReadByte(buffer);
-			data->palette[i].g = ReadByte(buffer);
-			data->palette[i].r = ReadByte(buffer);
-			if (!info->os2_bmp) SkipBytes(buffer, 1); // unused
-		}
-	}
-
-	return buffer->real_pos <= info->offset;
-}
-
-/*
- * Reads the bitmap
- * 1 bpp and 4 bpp bitmaps are converted to 8 bpp bitmaps
- */
-bool BmpReadBitmap(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
-{
-	assert(info != NULL && data != NULL);
-
-	data->bitmap = calloc(info->width * info->height, ((info->bpp == 24) ? 3 : 1) * sizeof(byte));
-	if (data->bitmap == NULL) return false;
-
-	/* Load image */
-	SetStreamOffset(buffer, info->offset);
-	switch (info->compression) {
-	case 0: // no compression
-		switch (info->bpp) {
-		case 1:  return BmpRead1(buffer, info, data);
-		case 4:  return BmpRead4(buffer, info, data);
-		case 8:  return BmpRead8(buffer, info, data);
-		case 24: return BmpRead24(buffer, info, data);
-		default: NOT_REACHED(); return false;
-		}
-	case 1:  return BmpRead8Rle(buffer, info, data); // 8-bit RLE compression
-	case 2:  return BmpRead4Rle(buffer, info, data); // 4-bit RLE compression
-	default: NOT_REACHED(); return false;
-	}
-}
-
-void BmpDestroyData(BmpData *data)
-{
-	assert(data != NULL);
-	free(data->palette);
-	free(data->bitmap);
-}

bmp.h

@@ -1,36 +0,0 @@
-/* $Id$ */
-
-#ifndef BMP_H
-#define BMP_H
-
-typedef struct {
-	uint32 offset;       ///< offset of bitmap data from .bmp file begining
-	uint32 width;        ///< bitmap width
-	uint32 height;       ///< bitmap height
-	bool os2_bmp;        ///< true if OS/2 1.x or windows 2.x bitmap
-	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;
-
-typedef struct {
-	Colour *palette;
-	byte   *bitmap;
-} BmpData;
-
-#define BMP_BUFFER_SIZE 1024
-
-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);
-bool BmpReadBitmap(BmpBuffer *buffer, BmpInfo *info, BmpData *data);
-void BmpDestroyData(BmpData *data);
-
-#endif /* BMP_H */

bridge.h

@@ -1,32 +0,0 @@
-/* $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);
-uint GetBridgeHeightRamp(TileIndex t);
-
-#endif /* BRIDGE_H */

bridge_gui.c

@@ -1,11 +1,6 @@
-/* $Id$ */
-
-/** @file bridge_gui.c Graphical user interface for bridge construction*/
-
 #include "stdafx.h"
-#include "openttd.h"
+#include "ttd.h"
 #include "table/strings.h"
-#include "functions.h"
 #include "map.h"
 #include "window.h"
 #include "gui.h"
@@ -13,19 +8,23 @@
 #include "gfx.h"
 #include "command.h"
 #include "sound.h"
-#include "variables.h"
-#include "bridge.h"
 
 static struct BridgeData {
-	uint count;
+	int count;
 	TileIndex start_tile;
 	TileIndex end_tile;
 	byte type;
 	byte indexes[MAX_BRIDGES];
 	int32 costs[MAX_BRIDGES];
-} _bridgedata;
+} _bridge;
 
-void CcBuildBridge(bool success, TileIndex tile, uint32 p1, uint32 p2)
+extern const uint16 _bridge_type_price_mod[MAX_BRIDGES];
+
+extern const PalSpriteID _bridge_sprites[MAX_BRIDGES];
+extern const uint16 _bridge_speeds[MAX_BRIDGES];
+extern const StringID _bridge_material[MAX_BRIDGES];
+
+void CcBuildBridge(bool success, uint tile, uint32 p1, uint32 p2)
 {
 	if (success) SndPlayTileFx(SND_27_BLACKSMITH_ANVIL, tile);
 }
@@ -33,35 +32,34 @@ void CcBuildBridge(bool success, TileIndex tile, uint32 p1, uint32 p2)
 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_MSG(STR_5015_CAN_T_BUILD_BRIDGE_HERE));
+	DoCommandP(_bridge.end_tile, _bridge.start_tile, _bridge.indexes[i] | (_bridge.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;
+		int 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]];
+		for(i=0; i < 4 && i + w->vscroll.pos < _bridge.count; i++) {
+			int ind = _bridge.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);
+			SetDParam(2, _bridge.costs[i + w->vscroll.pos]);
+			SetDParam(1, (_bridge_speeds[ind] >> 4) * 10);
+			SetDParam(0, _bridge_material[ind]);
+			DrawSprite(_bridge_sprites[ind], 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;
+		uint i = e->keypress.keycode - '1';
+		if (i < 9 && i < (uint)_bridge.count) {
+			e->keypress.cont = false;
 			BuildBridge(w, i);
 		}
 
@@ -69,9 +67,9 @@ static void BuildBridgeWndProc(Window *w, WindowEvent *e)
 	}
 
 	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)
+	 if (e->click.widget == 2) {
+			uint ind = ((int)e->click.pt.y - 14) / 22;
+			if (ind < 4 && (ind += w->vscroll.pos) < (uint)_bridge.count)
 				BuildBridge(w, ind);
 		}
 		break;
@@ -79,15 +77,15 @@ static void BuildBridgeWndProc(Window *w, WindowEvent *e)
 }
 
 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},
+{   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,										STR_018B_CLOSE_WINDOW},
+{    WWT_CAPTION,     7,    11,   199,     0,    13, STR_100D_SELECT_RAIL_BRIDGE,	STR_018C_WINDOW_TITLE_DRAG_THIS},
+{     WWT_MATRIX,     7,     0,   188,    14,   101, 0x401,												STR_101F_BRIDGE_SELECTION_CLICK},
+{  WWT_SCROLLBAR,     7,   189,   199,    14,   101, 0x0,													STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {   WIDGETS_END},
 };
 
 static const WindowDesc _build_bridge_desc = {
-	WDP_AUTO, WDP_AUTO, 200, 102,
+	-1, -1, 200, 102,
 	WC_BUILD_BRIDGE,WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_build_bridge_widgets,
@@ -96,15 +94,15 @@ static const WindowDesc _build_bridge_desc = {
 
 
 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},
+{   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,										STR_018B_CLOSE_WINDOW},
+{    WWT_CAPTION,     7,    11,   199,     0,    13, STR_1803_SELECT_ROAD_BRIDGE,	STR_018C_WINDOW_TITLE_DRAG_THIS},
+{     WWT_MATRIX,     7,     0,   188,    14,   101, 0x401,												STR_101F_BRIDGE_SELECTION_CLICK},
+{  WWT_SCROLLBAR,     7,   189,   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,
+	-1, -1, 200, 102,
 	WC_BUILD_BRIDGE,WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_build_road_bridge_widgets,
@@ -112,56 +110,57 @@ static const WindowDesc _build_road_bridge_desc = {
 };
 
 
-void ShowBuildBridgeWindow(TileIndex start, TileIndex end, byte bridge_type)
+void ShowBuildBridgeWindow(uint start, uint end, byte bridge_type)
 {
-	uint j = 0;
+	int j = 0;
 	int32 ret;
-	StringID errmsg;
+	uint16 errmsg;
 
 	DeleteWindowById(WC_BUILD_BRIDGE, 0);
 
-	_bridgedata.type = bridge_type;
-	_bridgedata.start_tile = start;
-	_bridgedata.end_tile = end;
+	_bridge.type = bridge_type;
+	_bridge.start_tile = start;
+	_bridge.end_tile = end;
 
-	errmsg = INVALID_STRING_ID;
+	errmsg = 0xFFFF;
 
 	// 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);
+	// returns CMD_ERROR on failure, and priCe on success
+	ret = DoCommandByTile(end, start, (bridge_type << 8), DC_AUTO | DC_QUERY_COST, CMD_BUILD_BRIDGE);
 
-	if (CmdFailed(ret)) {
+	if (ret == CMD_ERROR) {
 		errmsg = _error_message;
-	} else {
+	}
 	// check which bridges can be built
+	else {
 		int bridge_len;			// length of the middle parts of the bridge
-		int tot_bridgedata_len; // total length of bridge
+		int tot_bridge_len;	// total length of bridge
 
 		// get absolute bridge length
 		bridge_len = GetBridgeLength(start, end);
-		tot_bridgedata_len = bridge_len + 2;
+		tot_bridge_len = bridge_len + 2;
 
-		tot_bridgedata_len = CalcBridgeLenCostFactor(tot_bridgedata_len);
+		tot_bridge_len = CalcBridgeLenCostFactor(tot_bridge_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;
+				_bridge.costs[j] = ret + (((int64)tot_bridge_len * _price.build_bridge * _bridge_type_price_mod[bridge_type]) >> 8);
+				_bridge.indexes[j] = bridge_type;
 				j++;
 			}
 		}
 	}
 
-	_bridgedata.count = j;
+	_bridge.count = j;
 
 	if (j != 0) {
-		Window *w = AllocateWindowDesc((_bridgedata.type & 0x80) ? &_build_road_bridge_desc : &_build_bridge_desc);
+		Window *w = AllocateWindowDesc((_bridge.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);
+		ShowErrorMessage(errmsg, STR_5015_CAN_T_BUILD_BRIDGE_HERE, GET_TILE_X(end) * 16, GET_TILE_Y(end) * 16);
 	}
 }

bridge_map.c

@@ -1,37 +0,0 @@
-/* $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

@@ -1,235 +0,0 @@
-/* $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

@@ -1,492 +0,0 @@
-/* $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,8 +1,5 @@
-/* $Id$ */
-
 #include "stdafx.h"
-#include "openttd.h"
-#include "callback_table.h"
+#include "ttd.h"
 #include "functions.h"
 
 // If you add a callback for DoCommandP, also add the callback in here
@@ -11,7 +8,6 @@
 
 /* aircraft_gui.c */
 CommandCallback CcBuildAircraft;
-CommandCallback CcCloneAircraft;
 
 /* airport_gui.c */
 CommandCallback CcBuildAirport;
@@ -23,15 +19,12 @@ CommandCallback CcBuildBridge;
 CommandCallback CcBuildDocks;
 CommandCallback CcBuildCanal;
 
-/* depot_gui.c */
-CommandCallback CcCloneVehicle;
-
 /* main_gui.c */
 CommandCallback CcPlaySound10;
 CommandCallback CcPlaceSign;
 CommandCallback CcTerraform;
+//CommandCallback CcDemolish;
 CommandCallback CcBuildTown;
-CommandCallback CcGiveMoney;
 
 /* rail_gui.c */
 CommandCallback CcPlaySound1E;
@@ -46,18 +39,13 @@ CommandCallback CcRoadDepot;
 
 /* roadveh_gui.c */
 CommandCallback CcBuildRoadVeh;
-CommandCallback CcCloneRoadVeh;
 
 /* ship_gui.c */
 CommandCallback CcBuildShip;
-CommandCallback CcCloneShip;
 
 /* train_gui.c */
 CommandCallback CcBuildWagon;
 CommandCallback CcBuildLoco;
-CommandCallback CcCloneTrain;
-
-CommandCallback CcAI;
 
 CommandCallback *_callback_table[] = {
 	/* 0x00 */ NULL,
@@ -80,14 +68,7 @@ CommandCallback *_callback_table[] = {
 	/* 0x11 */ CcPlaySound1D,
 	/* 0x12 */ CcPlaySound1E,
 	/* 0x13 */ CcStation,
-	/* 0x14 */ CcTerraform,
-	/* 0x15 */ CcCloneAircraft,
-	/* 0x16 */ CcCloneRoadVeh,
-	/* 0x17 */ CcCloneShip,
-	/* 0x18 */ CcCloneTrain,
-	/* 0x19 */ CcAI,
-	/* 0x1A */ CcCloneVehicle,
-	/* 0x1B */ CcGiveMoney,
+	/* 0x14 */ CcTerraform
 };
 
-const int _callback_table_count = lengthof(_callback_table);
+const int _callback_table_count = sizeof (_callback_table) / sizeof (*_callback_table);

callback_table.h

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

clear_map.h

@@ -1,145 +0,0 @@
-/* $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

@@ -1,20 +1,13 @@
-/* $Id$ */
-
 #include "stdafx.h"
-#include "openttd.h"
+#include "ttd.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)
+#define DEF_COMMAND(yyyy) int32 yyyy(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 
 DEF_COMMAND(CmdBuildRailroadTrack);
 DEF_COMMAND(CmdRemoveRailroadTrack);
@@ -29,8 +22,8 @@ DEF_COMMAND(CmdBuildRailroadStation);
 DEF_COMMAND(CmdRemoveFromRailroadStation);
 DEF_COMMAND(CmdConvertRail);
 
-DEF_COMMAND(CmdBuildSingleSignal);
-DEF_COMMAND(CmdRemoveSingleSignal);
+DEF_COMMAND(CmdBuildSignals);
+DEF_COMMAND(CmdRemoveSignals);
 
 DEF_COMMAND(CmdTerraformLand);
 
@@ -44,7 +37,9 @@ DEF_COMMAND(CmdBuildTrainWaypoint);
 DEF_COMMAND(CmdRenameWaypoint);
 DEF_COMMAND(CmdRemoveTrainWaypoint);
 
-DEF_COMMAND(CmdBuildRoadStop);
+DEF_COMMAND(CmdBuildTruckStation);
+
+DEF_COMMAND(CmdBuildBusStation);
 
 DEF_COMMAND(CmdBuildLongRoad);
 DEF_COMMAND(CmdRemoveLongRoad);
@@ -70,7 +65,7 @@ DEF_COMMAND(CmdStartStopTrain);
 
 DEF_COMMAND(CmdSellRailWagon);
 
-DEF_COMMAND(CmdSendTrainToDepot);
+DEF_COMMAND(CmdTrainGotoDepot);
 DEF_COMMAND(CmdForceTrainProceed);
 DEF_COMMAND(CmdReverseTrainDirection);
 
@@ -78,12 +73,14 @@ DEF_COMMAND(CmdModifyOrder);
 DEF_COMMAND(CmdSkipOrder);
 DEF_COMMAND(CmdDeleteOrder);
 DEF_COMMAND(CmdInsertOrder);
-DEF_COMMAND(CmdChangeServiceInt);
+DEF_COMMAND(CmdChangeTrainServiceInt);
 DEF_COMMAND(CmdRestoreOrderIndex);
 
 DEF_COMMAND(CmdBuildIndustry);
+//DEF_COMMAND(CmdDestroyIndustry);
 
 DEF_COMMAND(CmdBuildCompanyHQ);
+DEF_COMMAND(CmdDestroyCompanyHQ);
 DEF_COMMAND(CmdSetPlayerFace);
 DEF_COMMAND(CmdSetPlayerColor);
 
@@ -104,6 +101,7 @@ DEF_COMMAND(CmdSellAircraft);
 DEF_COMMAND(CmdStartStopAircraft);
 DEF_COMMAND(CmdBuildAircraft);
 DEF_COMMAND(CmdSendAircraftToHangar);
+DEF_COMMAND(CmdChangeAircraftServiceInt);
 DEF_COMMAND(CmdRefitAircraft);
 
 DEF_COMMAND(CmdPlaceSign);
@@ -114,9 +112,10 @@ DEF_COMMAND(CmdStartStopRoadVeh);
 DEF_COMMAND(CmdSellRoadVeh);
 DEF_COMMAND(CmdSendRoadVehToDepot);
 DEF_COMMAND(CmdTurnRoadVeh);
-DEF_COMMAND(CmdRefitRoadVeh);
+DEF_COMMAND(CmdChangeRoadVehServiceInt);
 
 DEF_COMMAND(CmdPause);
+DEF_COMMAND(CmdResume);
 
 DEF_COMMAND(CmdBuyShareInCompany);
 DEF_COMMAND(CmdSellShareInCompany);
@@ -128,6 +127,7 @@ DEF_COMMAND(CmdRenameTown);
 DEF_COMMAND(CmdDoTownAction);
 
 DEF_COMMAND(CmdSetRoadDriveSide);
+DEF_COMMAND(CmdSetTownNameType);
 
 DEF_COMMAND(CmdChangeDifficultyLevel);
 DEF_COMMAND(CmdChangePatchSetting);
@@ -136,9 +136,18 @@ DEF_COMMAND(CmdStartStopShip);
 DEF_COMMAND(CmdSellShip);
 DEF_COMMAND(CmdBuildShip);
 DEF_COMMAND(CmdSendShipToDepot);
+DEF_COMMAND(CmdChangeShipServiceInt);
 DEF_COMMAND(CmdRefitShip);
 
-DEF_COMMAND(CmdOrderRefit);
+
+DEF_COMMAND(CmdStartNewGame);
+DEF_COMMAND(CmdLoadGame);
+DEF_COMMAND(CmdCreateScenario);
+DEF_COMMAND(CmdSetSinglePlayer);
+
+DEF_COMMAND(CmdSetNewLandscapeType);
+
+DEF_COMMAND(CmdGenRandomNewGame);
 DEF_COMMAND(CmdCloneOrder);
 
 DEF_COMMAND(CmdClearArea);
@@ -154,249 +163,219 @@ DEF_COMMAND(CmdLevelLand);
 
 DEF_COMMAND(CmdRefitRailVehicle);
 
-DEF_COMMAND(CmdBuildSignalTrack);
-DEF_COMMAND(CmdRemoveSignalTrack);
+DEF_COMMAND(CmdStartScenario);
 
-DEF_COMMAND(CmdSetAutoReplace);
-
-DEF_COMMAND(CmdCloneVehicle);
-DEF_COMMAND(CmdMassStartStopVehicle);
-DEF_COMMAND(CmdDepotSellAllVehicles);
-DEF_COMMAND(CmdDepotMassAutoReplace);
+DEF_COMMAND(CmdBuildManySignals);
 
 /* The master command table */
-static const Command _command_proc_table[] = {
-	{CmdBuildRailroadTrack,           CMD_AUTO}, /*   0 */
-	{CmdRemoveRailroadTrack,          CMD_AUTO}, /*   1 */
-	{CmdBuildSingleRail,              CMD_AUTO}, /*   2 */
-	{CmdRemoveSingleRail,             CMD_AUTO}, /*   3 */
-	{CmdLandscapeClear,                      0}, /*   4 */
-	{CmdBuildBridge,                  CMD_AUTO}, /*   5 */
-	{CmdBuildRailroadStation,         CMD_AUTO}, /*   6 */
-	{CmdBuildTrainDepot,              CMD_AUTO}, /*   7 */
-	{CmdBuildSingleSignal,            CMD_AUTO}, /*   8 */
-	{CmdRemoveSingleSignal,           CMD_AUTO}, /*   9 */
-	{CmdTerraformLand,                CMD_AUTO}, /*  10 */
-	{CmdPurchaseLandArea,             CMD_AUTO}, /*  11 */
-	{CmdSellLandArea,                        0}, /*  12 */
-	{CmdBuildTunnel,                  CMD_AUTO}, /*  13 */
-	{CmdRemoveFromRailroadStation,           0}, /*  14 */
-	{CmdConvertRail,                         0}, /*  15 */
-	{CmdBuildTrainWaypoint,                  0}, /*  16 */
-	{CmdRenameWaypoint,                      0}, /*  17 */
-	{CmdRemoveTrainWaypoint,                 0}, /*  18 */
-	{NULL,                                   0}, /*  19 */
-	{NULL,                                   0}, /*  20 */
-	{CmdBuildRoadStop,                CMD_AUTO}, /*  21 */
-	{NULL,                                   0}, /*  22 */
-	{CmdBuildLongRoad,                CMD_AUTO}, /*  23 */
-	{CmdRemoveLongRoad,               CMD_AUTO}, /*  24 */
-	{CmdBuildRoad,                           0}, /*  25 */
-	{CmdRemoveRoad,                          0}, /*  26 */
-	{CmdBuildRoadDepot,               CMD_AUTO}, /*  27 */
-	{NULL,                                   0}, /*  28 */
-	{CmdBuildAirport,                 CMD_AUTO}, /*  29 */
-	{CmdBuildDock,                    CMD_AUTO}, /*  30 */
-	{CmdBuildShipDepot,               CMD_AUTO}, /*  31 */
-	{CmdBuildBuoy,                    CMD_AUTO}, /*  32 */
-	{CmdPlantTree,                    CMD_AUTO}, /*  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 */
+static CommandProc * const _command_proc_table[] = {
+	CmdBuildRailroadTrack,				/* 0  */
+	CmdRemoveRailroadTrack,				/* 1  */
+	CmdBuildSingleRail,						/* 2  */
+	CmdRemoveSingleRail,					/* 3  */
+	CmdLandscapeClear,						/* 4  */
+	CmdBuildBridge,								/* 5  */
+	CmdBuildRailroadStation,			/* 6  */
+	CmdBuildTrainDepot,						/* 7  */
+	CmdBuildSignals,							/* 8  */
+	CmdRemoveSignals,							/* 9  */
+	CmdTerraformLand,							/* 10 */
+	CmdPurchaseLandArea,					/* 11 */
+	CmdSellLandArea,							/* 12 */
+	CmdBuildTunnel,								/* 13 */
+	CmdRemoveFromRailroadStation,	/* 14 */
+	CmdConvertRail,								/* 15 */
+	CmdBuildTrainWaypoint,				/* 16 */
+	CmdRenameWaypoint,						/* 17 */
+	CmdRemoveTrainWaypoint,				/* 18 */
+	CmdBuildTruckStation,					/* 19 */
+	NULL,													/* 20 */
+	CmdBuildBusStation,						/* 21 */
+	NULL,													/* 22 */
+	CmdBuildLongRoad,							/* 23 */
+	CmdRemoveLongRoad,						/* 24 */
+	CmdBuildRoad,									/* 25 */
+	CmdRemoveRoad,								/* 26 */
+	CmdBuildRoadDepot,						/* 27 */
+	NULL,													/* 28 */
+	CmdBuildAirport,							/* 29 */
+	CmdBuildDock,									/* 30 */
+	CmdBuildShipDepot,						/* 31 */
+	CmdBuildBuoy,									/* 32 */
+	CmdPlantTree,									/* 33 */
+	CmdBuildRailVehicle,					/* 34 */
+	CmdMoveRailVehicle,						/* 35 */
+	CmdStartStopTrain,						/* 36 */
+	NULL,													/* 37 */
+	CmdSellRailWagon,							/* 38 */
+	CmdTrainGotoDepot,						/* 39 */
+	CmdForceTrainProceed,					/* 40 */
+	CmdReverseTrainDirection,			/* 41 */
 
-	{CmdModifyOrder,                         0}, /*  42 */
-	{CmdSkipOrder,                           0}, /*  43 */
-	{CmdDeleteOrder,                         0}, /*  44 */
-	{CmdInsertOrder,                         0}, /*  45 */
+	CmdModifyOrder,								/* 42 */
+	CmdSkipOrder,									/* 43 */
+	CmdDeleteOrder,								/* 44 */
+	CmdInsertOrder,								/* 45 */
 
-	{CmdChangeServiceInt,                    0}, /*  46 */
+	CmdChangeTrainServiceInt,			/* 46 */
 
-	{CmdBuildIndustry,                       0}, /*  47 */
-	{CmdBuildCompanyHQ,               CMD_AUTO}, /*  48 */
-	{CmdSetPlayerFace,                       0}, /*  49 */
-	{CmdSetPlayerColor,                      0}, /*  50 */
+	CmdBuildIndustry,							/* 47 */
+	CmdBuildCompanyHQ,						/* 48 */
+	CmdSetPlayerFace,							/* 49 */
+	CmdSetPlayerColor,						/* 50 */
 
-	{CmdIncreaseLoan,                        0}, /*  51 */
-	{CmdDecreaseLoan,                        0}, /*  52 */
+	CmdIncreaseLoan,							/* 51 */
+	CmdDecreaseLoan,							/* 52 */
 
-	{CmdWantEnginePreview,                   0}, /*  53 */
+	CmdWantEnginePreview,					/* 53 */
 
-	{CmdNameVehicle,                         0}, /*  54 */
-	{CmdRenameEngine,                        0}, /*  55 */
+	CmdNameVehicle,								/* 54 */
+	CmdRenameEngine,							/* 55 */
 
-	{CmdChangeCompanyName,                   0}, /*  56 */
-	{CmdChangePresidentName,                 0}, /*  57 */
+	CmdChangeCompanyName,					/* 56 */
+	CmdChangePresidentName,				/* 57 */
 
-	{CmdRenameStation,                       0}, /*  58 */
+	CmdRenameStation,							/* 58 */
 
-	{CmdSellAircraft,                        0}, /*  59 */
-	{CmdStartStopAircraft,                   0}, /*  60 */
+	CmdSellAircraft,							/* 59 */
+	CmdStartStopAircraft,					/* 60 */
+	CmdBuildAircraft,							/* 61 */
+	CmdSendAircraftToHangar,			/* 62 */
+	CmdChangeAircraftServiceInt,	/* 63 */
+	CmdRefitAircraft,							/* 64 */
 
-	{CmdBuildAircraft,                       0}, /*  61 */
-	{CmdSendAircraftToHangar,                0}, /*  62 */
-	{NULL,                                   0}, /*  63 */
-	{CmdRefitAircraft,                       0}, /*  64 */
+	CmdPlaceSign,									/* 65 */
+	CmdRenameSign,								/* 66 */
 
-	{CmdPlaceSign,                           0}, /*  65 */
-	{CmdRenameSign,                          0}, /*  66 */
+	CmdBuildRoadVeh,							/* 67 */
+	CmdStartStopRoadVeh,					/* 68 */
+	CmdSellRoadVeh,								/* 69 */
+	CmdSendRoadVehToDepot,				/* 70 */
+	CmdTurnRoadVeh,								/* 71 */
+	CmdChangeRoadVehServiceInt,		/* 72 */
 
-	{CmdBuildRoadVeh,                        0}, /*  67 */
-	{CmdStartStopRoadVeh,                    0}, /*  68 */
-	{CmdSellRoadVeh,                         0}, /*  69 */
-	{CmdSendRoadVehToDepot,                  0}, /*  70 */
-	{CmdTurnRoadVeh,                         0}, /*  71 */
-	{CmdRefitRoadVeh,                        0}, /*  72 */
+	CmdPause,											/* 73 */
 
-	{CmdPause,                      CMD_SERVER}, /*  73 */
+	CmdBuyShareInCompany,					/* 74 */
+	CmdSellShareInCompany,				/* 75 */
+	CmdBuyCompany,								/* 76 */
 
-	{CmdBuyShareInCompany,                   0}, /*  74 */
-	{CmdSellShareInCompany,                  0}, /*  75 */
-	{CmdBuyCompany,                          0}, /*  76 */
+	CmdBuildTown,									/* 77 */
+	NULL,													/* 78 */
+	NULL,													/* 79 */
+	CmdRenameTown,								/* 80 */
+	CmdDoTownAction,							/* 81 */
 
-	{CmdBuildTown,                 CMD_OFFLINE}, /*  77 */
-	{NULL,                                   0}, /*  78 */
-	{NULL,                                   0}, /*  79 */
-	{CmdRenameTown,                 CMD_SERVER}, /*  80 */
-	{CmdDoTownAction,                        0}, /*  81 */
+	CmdSetRoadDriveSide,					/* 82 */
+	CmdSetTownNameType,						/* 83 */
+	NULL,													/* 84 */
+	CmdChangeDifficultyLevel,			/* 85 */
 
-	{CmdSetRoadDriveSide,           CMD_SERVER}, /*  82 */
-	{NULL,                                   0}, /*  83 */
-	{NULL,                                   0}, /*  84 */
-	{CmdChangeDifficultyLevel,      CMD_SERVER}, /*  85 */
+	CmdStartStopShip,							/* 86 */
+	CmdSellShip,									/* 87 */
+	CmdBuildShip,									/* 88 */
+	CmdSendShipToDepot,						/* 89 */
+	CmdChangeShipServiceInt,			/* 90 */
+	CmdRefitShip,									/* 91 */
 
-	{CmdStartStopShip,                       0}, /*  86 */
-	{CmdSellShip,                            0}, /*  87 */
-	{CmdBuildShip,                           0}, /*  88 */
-	{CmdSendShipToDepot,                     0}, /*  89 */
-	{NULL,                                   0}, /*  90 */
-	{CmdRefitShip,                           0}, /*  91 */
+	CmdStartNewGame,							/* 92 */
+	CmdLoadGame,									/* 93 */
+	CmdCreateScenario,						/* 94 */
+	CmdSetSinglePlayer,						/* 95 */
+	NULL,													/* 96 */
+	CmdSetNewLandscapeType,				/* 97 */
 
-	{NULL,                                   0}, /*  92 */
-	{NULL,                                   0}, /*  93 */
-	{NULL,                                   0}, /*  94 */
-	{NULL,                                   0}, /*  95 */
-	{NULL,                                   0}, /*  96 */
-	{NULL,                                   0}, /*  97 */
+	CmdGenRandomNewGame,					/* 98 */
 
-	{CmdOrderRefit,                          0}, /*  98 */
-	{CmdCloneOrder,                          0}, /*  99 */
+	CmdCloneOrder,								/* 99 */
 
-	{CmdClearArea,                           0}, /* 100 */
-	{NULL,                                   0}, /* 101 */
+	CmdClearArea,									/* 100 */
+	CmdResume,										/* 101 */
 
-	{CmdMoneyCheat,                CMD_OFFLINE}, /* 102 */
-	{CmdBuildCanal,                   CMD_AUTO}, /* 103 */
-	{CmdPlayerCtrl,                          0}, /* 104 */
+	CmdMoneyCheat,								/* 102 */
+	CmdBuildCanal,								/* 103 */
+	CmdPlayerCtrl,								/* 104 */
 
-	{CmdLevelLand,                    CMD_AUTO}, /* 105 */
+	CmdLevelLand,									/* 105 */
 
-	{CmdRefitRailVehicle,                    0}, /* 106 */
-	{CmdRestoreOrderIndex,                   0}, /* 107 */
-	{CmdBuildLock,                    CMD_AUTO}, /* 108 */
-	{NULL,                                   0}, /* 109 */
-	{CmdBuildSignalTrack,             CMD_AUTO}, /* 110 */
-	{CmdRemoveSignalTrack,            CMD_AUTO}, /* 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 */
+	CmdRefitRailVehicle,					/* 106 */
+	CmdRestoreOrderIndex,					/* 107 */
+	CmdBuildLock,									/* 108 */
+	CmdStartScenario,							/* 109 */
+	CmdBuildManySignals,					/* 110 */
+	//CmdDestroyIndustry,						/* 109 */
+	CmdDestroyCompanyHQ,					/* 111 */
+	CmdGiveMoney,									/* 112 */
+	CmdChangePatchSetting,				/* 113 */
 };
 
-/* This function range-checks a cmd, and checks if the cmd is not NULL */
-bool IsValidCommand(uint cmd)
+int32 DoCommandByTile(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc)
 {
-	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;
+	return DoCommand(GET_TILE_X(tile)*16, GET_TILE_Y(tile)*16, p1, p2, flags, procc);
 }
 
 
-static int _docommand_recursive;
+//extern void _stdcall Sleep(int s);
 
-int32 DoCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc)
+int32 DoCommand(int x, int y, 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() || IsTileType(tile, MP_VOID)) {
-		_cmd_text = NULL;
-		return CMD_ERROR;
+	proc = _command_proc_table[procc];
+
+	if (_docommand_recursive == 0) {
+		_error_message = INVALID_STRING_ID;
+		// update last build coord of player
+		if ( (x|y) != 0 && _current_player < MAX_PLAYERS) {
+			DEREF_PLAYER(_current_player)->last_build_coordinate = TILE_FROM_XY(x,y);
+		}
 	}
-
-	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)) {
+		res = proc(x, y, flags&~DC_EXEC, p1, p2);
+		if ((uint32)res >> 16 == 0x8000) {
 			if (res & 0xFFFF) _error_message = res & 0xFFFF;
 			goto error;
 		}
 
-		if (_docommand_recursive == 1 &&
-				!(flags & DC_QUERY_COST) &&
-				res != 0 &&
-				!CheckPlayerHasMoney(res)) {
+		if (_docommand_recursive == 1) {
+			if (!(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)) {
+	// execute the command here.
+	_yearly_expenses_type = 0;
+	res = proc(x, y, flags, p1, p2);
+	if ((uint32)res >> 16 == 0x8000) {
 		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)
+int32 GetAvailableMoneyForCommand()
 {
-	PlayerID pid = _current_player;
-	if (!IsValidPlayer(pid)) return 0x7FFFFFFF; // max int
-	return GetPlayer(pid)->player_money;
+	uint pid = _current_player;
+	if (pid >= MAX_PLAYERS) return 0x7FFFFFFF; // max int
+	return DEREF_PLAYER(pid)->player_money;
 }
 
 // toplevel network safe docommand function for the current player. must not be called recursively.
@@ -407,45 +386,31 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback,
 	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() || IsTileType(tile, MP_VOID)) {
-		_cmd_text = NULL;
-		return false;
-	}
+	int x = GET_TILE_X(tile)*16;
+	int y = GET_TILE_Y(tile)*16;
 
 	assert(_docommand_recursive == 0);
 
 	_error_message = INVALID_STRING_ID;
-	error_part1 = GB(cmd, 16, 16);
+	_error_message_2 = cmd >> 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;
+	// spectator has no rights.
+	if (_current_player == OWNER_SPECTATOR) {
+		ShowErrorMessage(_error_message, _error_message_2, x, y);
 		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;
-	}
+	proc = _command_proc_table[cmd & 0xFF];
 
-	if (GetCommandFlags(cmd) & CMD_AUTO) flags |= DC_AUTO;
-
-	// Some commands have a different output in dryrun than the realrun
+	// Some commands have a different output in dryrun then 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
@@ -458,36 +423,30 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback,
 		(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;
+		(cmd & 0xFF) == CMD_REMOVE_ROAD;
 
 	_docommand_recursive = 1;
 
 	// cost estimation only?
-	if (!IsGeneratingWorld() &&
-			_shift_pressed &&
-			IsLocalPlayer() &&
-			!(cmd & (CMD_NETWORK_COMMAND | CMD_SHOW_NO_ERROR)) &&
-			(cmd & 0xFF) != CMD_PAUSE) {
+	if (_shift_pressed && _current_player == _local_player && !(cmd & CMD_NETWORK_COMMAND)) {
 		// estimate the cost.
-		res = proc(tile, flags, p1, p2);
-		if (CmdFailed(res)) {
+		res = proc(x, y, flags, p1, p2);
+		if ((uint32)res >> 16 == 0x8000) {
 			if (res & 0xFFFF) _error_message = res & 0xFFFF;
-			ShowErrorMessage(_error_message, error_part1, x, y);
+			ShowErrorMessage(_error_message, _error_message_2, 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)) {
+		res = proc(x,y, flags, p1, p2);
+		if ((uint32)res >> 16 == 0x8000) {
 			if (res & 0xFFFF) _error_message = res & 0xFFFF;
 			goto show_error;
 		}
@@ -496,40 +455,28 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback,
 	}
 
 #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 we are in network, and the command is not from the network
+	//   send it to the command-queue and abort execution
 	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;
-	}
+	if ( tile != 0 && _current_player < MAX_PLAYERS) DEREF_PLAYER(_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);
+	// actually try and execute the command.
+	_yearly_expenses_type = 0;
+	res2 = proc(x,y, flags|DC_EXEC, p1, p2);
 
-	// If notest is on, it means the result of the test can be different than
+	// If notest is on, it means the result of the test can be different then
 	//   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 ((uint32)res2 >> 16 == 0x8000) {
 			if (res2 & 0xFFFF) _error_message = res2 & 0xFFFF;
 			goto show_error;
 		}
@@ -537,11 +484,12 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback,
 
 	SubtractMoneyFromPlayer(res2);
 
-	if (IsLocalPlayer() && _game_mode != GM_EDITOR) {
-		if (res2 != 0 && tile != 0) ShowCostOrIncomeAnimation(x, y, GetSlopeZ(x, y), res2);
+	if (_current_player == _local_player && _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);
+			ShowErrorMessage(STR_0003_NOT_ENOUGH_CASH_REQUIRES, _error_message_2, x,y);
 			if (res2 == 0) goto callb_err;
 		}
 	}
@@ -549,19 +497,16 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback,
 	_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);
-	}
+	if (_current_player == _local_player && _error_message_2 != 0)
+		ShowErrorMessage(_error_message, _error_message_2, x,y);
 
 callb_err:
 	_docommand_recursive = 0;
 
 	if (callback) callback(false, tile, p1, p2);
-	_cmd_text = NULL;
 	return false;
 }

command.h

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 #ifndef COMMAND_H
 #define COMMAND_H
 
@@ -26,7 +24,8 @@ enum {
 	CMD_RENAME_WAYPOINT = 17,
 	CMD_REMOVE_TRAIN_WAYPOINT = 18,
 
-	CMD_BUILD_ROAD_STOP              =  21,
+	CMD_BUILD_TRUCK_STATION = 19,
+	CMD_BUILD_BUS_STATION = 21,
 	CMD_BUILD_LONG_ROAD = 23,
 	CMD_REMOVE_LONG_ROAD = 24,
 	CMD_BUILD_ROAD = 25,
@@ -49,7 +48,7 @@ enum {
 
 	CMD_SELL_RAIL_WAGON = 38,
 
-	CMD_SEND_TRAIN_TO_DEPOT          =  39,
+	CMD_TRAIN_GOTO_DEPOT = 39,
 	CMD_FORCE_TRAIN_PROCEED = 40,
 	CMD_REVERSE_TRAIN_DIRECTION = 41,
 
@@ -58,7 +57,7 @@ enum {
 	CMD_DELETE_ORDER = 44,
 	CMD_INSERT_ORDER = 45,
 
-	CMD_CHANGE_SERVICE_INT           =  46,
+	CMD_CHANGE_TRAIN_SERVICE_INT = 46,
 
 	CMD_BUILD_INDUSTRY = 47,
 
@@ -81,6 +80,7 @@ enum {
 	CMD_START_STOP_AIRCRAFT = 60,
 	CMD_BUILD_AIRCRAFT = 61,
 	CMD_SEND_AIRCRAFT_TO_HANGAR = 62,
+	CMD_CHANGE_AIRCRAFT_SERVICE_INT = 63,
 	CMD_REFIT_AIRCRAFT = 64,
 
 	CMD_PLACE_SIGN = 65,
@@ -91,7 +91,7 @@ enum {
 	CMD_SELL_ROAD_VEH = 69,
 	CMD_SEND_ROADVEH_TO_DEPOT = 70,
 	CMD_TURN_ROADVEH = 71,
-	CMD_REFIT_ROAD_VEH               =  72,
+	CMD_CHANGE_ROADVEH_SERVICE_INT = 72,
 
 	CMD_PAUSE = 73,
 
@@ -105,6 +105,8 @@ enum {
 	CMD_DO_TOWN_ACTION = 81,
 
 	CMD_SET_ROAD_DRIVE_SIDE = 82,
+	CMD_SET_TOWN_NAME_TYPE = 83,
+
 
 	CMD_CHANGE_DIFFICULTY_LEVEL = 85,
 
@@ -112,12 +114,23 @@ enum {
 	CMD_SELL_SHIP = 87,
 	CMD_BUILD_SHIP = 88,
 	CMD_SEND_SHIP_TO_DEPOT = 89,
+	CMD_CHANGE_SHIP_SERVICE_INT = 90,
 	CMD_REFIT_SHIP = 91,
 
-	CMD_ORDER_REFIT                  =  98,
+	CMD_START_NEW_GAME = 92,
+	CMD_LOAD_GAME = 93,
+	CMD_CREATE_SCENARIO = 94,
+	CMD_SET_SINGLE_PLAYER = 95,
+
+	CMD_SET_NEW_LANDSCAPE_TYPE = 97,
+
+	CMD_GEN_RANDOM_NEW_GAME = 98,
+
 	CMD_CLONE_ORDER = 99,
 	CMD_CLEAR_AREA = 100,
 
+	CMD_RESUME = 101,
+
 	CMD_MONEY_CHEAT = 102,
 	CMD_BUILD_CANAL = 103,
 
@@ -128,25 +141,20 @@ enum {
 	CMD_RESTORE_ORDER_INDEX = 107,
 	CMD_BUILD_LOCK = 108,
 
-	CMD_BUILD_SIGNAL_TRACK           = 110,
-	CMD_REMOVE_SIGNAL_TRACK          = 111,
+	CMD_START_SCENARIO = 109,
+	CMD_BUILD_MANY_SIGNALS = 110,
 
-	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,
+	//CMD_DESTROY_INDUSTRY = 109,
+	CMD_DESTROY_COMPANY_HQ = 111,
+	CMD_GIVE_MONEY = 112,
+	CMD_CHANGE_PATCH_SETTING = 113,
 };
 
 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_EXEC = 1,
+	DC_AUTO = 2,								// don't allow building on structures
+	DC_QUERY_COST = 4,					// query cost only, don't build.
+	DC_NO_WATER = 8,						// 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
@@ -158,56 +166,19 @@ enum {
 #define CMD_MSG(x) ((x)<<16)
 
 enum {
-	CMD_NO_WATER              = 0x0400,
-	CMD_NETWORK_COMMAND       = 0x0800, // execute the command without sending it on the network
+	CMD_AUTO = 0x200,
+	CMD_NO_WATER = 0x400,
+	CMD_NETWORK_COMMAND = 0x800,		// 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
-	CMD_AUTO    = 0x4, ///< set the DC_AUTO flag on this command
-};
-
-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);
+int32 DoCommand(int x, int y, uint32 p1, uint32 p2, uint32 flags, uint procc);
+int32 DoCommandByTile(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc);
 
-#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);
+int32 GetAvailableMoneyForCommand();
 
 #endif /* COMMAND_H */

configure

@@ -1,323 +0,0 @@
-#!/bin/sh
-
-# This 'configure' script is a very easy wrapper around 'make updateconf'
-#  It allows cross-compilers to do their job much more easy.
-
-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 " "
-}
-
-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
-
-# First remove the Makefile.config, else you can have double entries
-rm -f Makefile.config
-
-echo "make upgradeconf $PARAM" > ./Makefile.run
-. ./Makefile.run
-rm -f ./Makefile.run
-
-# Makefile.config currently doesn't support custom RELEASE (revision), so, we add the line
-# yourself!
-
-if ! test -z "$RELEASE"
-then
-	echo "RELEASE=$RELEASE" >> Makefile.config
-fi
-

console.h

@@ -1,160 +1,159 @@
-/* $Id$ */
-
 #ifndef CONSOLE_H
 #define CONSOLE_H
 
-// maximum length of a typed in command
-#define ICON_CMDLN_SIZE 255
-// maximum length of a totally expanded command
-#define ICON_MAX_STREAMSIZE 1024
+// ** console parser ** //
 
-typedef enum IConsoleVarTypes {
+typedef enum _iconsole_var_types {
+	ICONSOLE_VAR_NONE,
 	ICONSOLE_VAR_BOOLEAN,
 	ICONSOLE_VAR_BYTE,
+	ICONSOLE_VAR_UINT8,
 	ICONSOLE_VAR_UINT16,
 	ICONSOLE_VAR_UINT32,
 	ICONSOLE_VAR_INT16,
 	ICONSOLE_VAR_INT32,
-	ICONSOLE_VAR_STRING
-} IConsoleVarTypes;
+	ICONSOLE_VAR_STRING,
+	ICONSOLE_VAR_POINTER,
+	ICONSOLE_VAR_REFERENCE,
+	ICONSOLE_VAR_UNKNOWN
+} _iconsole_var_types;
 
-typedef enum IConsoleModes {
+typedef enum {
 	ICONSOLE_FULL,
 	ICONSOLE_OPENED,
 	ICONSOLE_CLOSED
-} IConsoleModes;
+} _iconsole_modes;
 
-typedef enum IConsoleHookTypes {
+typedef enum _iconsole_hook_types {
 	ICONSOLE_HOOK_ACCESS,
-	ICONSOLE_HOOK_PRE_ACTION,
-	ICONSOLE_HOOK_POST_ACTION
-} IConsoleHookTypes;
+	ICONSOLE_HOOK_BEFORE_CHANGE,
+	ICONSOLE_HOOK_BEFORE_EXEC,
+	ICONSOLE_HOOK_AFTER_CHANGE,
+	ICONSOLE_HOOK_AFTER_EXEC
+} _iconsole_hook_types;
 
-/** --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(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;
+struct _iconsole_var;
+typedef bool (*iconsole_var_hook)(struct _iconsole_var* hook_var);
 
-/** --Commands--
- * Commands are commands, or functions. They get executed once and any
- * effect they produce are carried out. The arguments to the commands
- * are given to them, each input word seperated by a double-quote (") is an argument
- * If you want to handle multiple words as one, enclose them in double-quotes
- * eg. 'say "hello sexy boy"'
- */
-typedef bool (IConsoleCmdProc)(byte argc, char *argv[]);
+typedef struct _iconsole_var {
+	// --------------- //
+	union {
+		void*   addr;
+		bool*   bool_;
+		byte*   byte_;
+		uint16* uint16_;
+		uint32* uint32_;
+		int16*  int16_;
+		int32*  int32_;
+		char*   string_;
+		struct _iconsole_var* reference_;
+	} data;
+	char* name;
+	_iconsole_var_types type;
+	// -------------- //
+	iconsole_var_hook hook_access;
+	iconsole_var_hook hook_before_change;
+	iconsole_var_hook hook_after_change;
+	// -------------- //
+	struct _iconsole_var* _next;
+	bool _malloc;
+} _iconsole_var;
 
-struct IConsoleCmd;
-typedef struct IConsoleCmd {
-	char *name;               // name of command
-	struct IConsoleCmd *next; // next command in list
+struct _iconsole_cmd;
+typedef bool (*iconsole_cmd_hook)(struct _iconsole_cmd* hook_cmd);
 
-	IConsoleCmdProc *proc;    // process executed when command is typed
-	IConsoleHooks hook;       // any special trigger action that needs executing
-} IConsoleCmd;
+typedef _iconsole_var* (*_iconsole_cmd_addr)(byte argc, char* argv[], byte argt[]);
 
-/** --Variables--
- * Variables are pointers to real ingame variables which allow for
- * changing while ingame. After changing they keep their new value
- * and can be used for debugging, gameplay, etc. It accepts:
- * - no arguments; just print out current value
- * - '= <new value>' to assign a new value to the variable
- * - '++' to increase value by one
- * - '--' to decrease value by one
- */
-struct IConsoleVar;
-typedef struct IConsoleVar {
-	char *name;               // name of the variable
-	struct IConsoleVar *next; // next variable in list
+typedef struct _iconsole_cmd {
+	// -------------- //
+	_iconsole_cmd_addr addr;
+	char* name;
+	// -------------- //
+	iconsole_cmd_hook hook_access;
+	iconsole_cmd_hook hook_before_exec;
+	iconsole_cmd_hook hook_after_exec;
+	// -------------- //
+	void* _next;
+} _iconsole_cmd;
 
-	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;
+void IConsoleAliasRegister(const char* name, const char* cmdline);
 
-/** --Aliases--
- * Aliases are like shortcuts for complex functions, variable assignments,
- * etc. You can use a simple alias to rename a longer command (eg 'lv' for
- * 'list_vars' for example), or concatenate more commands into one
- * (eg. 'ng' for 'load %A; unpause; debug_level 5'). Aliases can parse the arguments
- * given to them in the command line.
- * - "%A - %Z" substitute arguments 1 t/m 26
- * - "%+" lists all parameters keeping them seperated
- * - "%!" also lists all parameters but presenting them to the aliased command as one argument
- * - ";" allows for combining commands (see example 'ng')
- */
-struct IConsoleAlias;
-typedef struct IConsoleAlias {
-	char *name;                 // name of the alias
-	struct IConsoleAlias *next; // next alias in list
+typedef struct _iconsole_alias {
+	// -------------- //
+	char * cmdline;
+	char* name;
+	void* _next;
+} _iconsole_alias;
 
-	char *cmdline;              // command(s) that is/are being aliased
-} IConsoleAlias;
+_iconsole_alias* IConsoleAliasGet(const char* name);
 
-/* console parser */
-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 parser ** //
 
-/* console colors/modes */
-VARDEF byte _icolour_def;
-VARDEF byte _icolour_err;
-VARDEF byte _icolour_warn;
-VARDEF byte _icolour_dbg;
-VARDEF byte _icolour_cmd;
-VARDEF IConsoleModes _iconsole_mode;
+_iconsole_cmd* _iconsole_cmds; // list of registred commands
+_iconsole_var* _iconsole_vars; // list of registred vars
+_iconsole_alias* _iconsole_aliases; // list of registred aliases
+
+// ** console colors ** //
+VARDEF byte _iconsole_color_default;
+VARDEF byte _iconsole_color_error;
+VARDEF byte _iconsole_color_warning;
+VARDEF byte _iconsole_color_debug;
+VARDEF byte _iconsole_color_commands;
+VARDEF _iconsole_modes _iconsole_mode;
+
+// ** ttd.c functions ** //
+
+void SetDebugString(const char* s);
+
+// ** console functions ** //
 
-/* console functions */
 void IConsoleInit(void);
+void IConsoleClear(void);
 void IConsoleFree(void);
-void IConsoleClearBuffer(void);
-void IConsoleResize(Window *w);
+void IConsoleResize(void);
 void IConsoleSwitch(void);
 void IConsoleClose(void);
 void IConsoleOpen(void);
 
-/* console output */
+// ** console cmd buffer ** //
+void IConsoleCmdBufferAdd(const char* cmd);
+void IConsoleCmdBufferNavigate(signed char direction);
+
+// ** console output ** //
 void IConsolePrint(uint16 color_code, const char* string);
 void CDECL IConsolePrintF(uint16 color_code, const char* s, ...);
 void IConsoleDebug(const char* string);
-void IConsoleWarning(const char *string);
 void IConsoleError(const char* string);
+void IConsoleWarning(const char* string);
 
-/* Commands */
-void IConsoleCmdRegister(const char *name, IConsoleCmdProc *proc);
-void IConsoleAliasRegister(const char *name, const char *cmd);
-IConsoleCmd *IConsoleCmdGet(const char *name);
-IConsoleAlias *IConsoleAliasGet(const char *name);
+// *** Commands *** //
 
-/* Variables */
-void IConsoleVarRegister(const char *name, void *addr, IConsoleVarTypes type, const char *help);
-void IConsoleVarStringRegister(const char *name, void *addr, uint32 size, const char *help);
-IConsoleVar* IConsoleVarGet(const char *name);
-void IConsoleVarPrintGetValue(const IConsoleVar *var);
-void IConsoleVarPrintSetValue(const IConsoleVar *var);
+void IConsoleCmdRegister(const char* name, _iconsole_cmd_addr addr);
+_iconsole_cmd* IConsoleCmdGet(const char* name);
+
+// *** Variables *** //
+
+void IConsoleVarRegister(const char* name, void* addr, _iconsole_var_types type);
+void IConsoleVarMemRegister(const char* name, _iconsole_var_types type);
+void IConsoleVarInsert(_iconsole_var* item_new, const char* name);
+_iconsole_var* IConsoleVarGet(const char* name);
+_iconsole_var* IConsoleVarAlloc(_iconsole_var_types type);
+void IConsoleVarFree(_iconsole_var* var);
+void IConsoleVarSetString(_iconsole_var* var, const char* string);
+void IConsoleVarSetValue(_iconsole_var* var, int value);
+void IConsoleVarDump(const _iconsole_var* var, const char* dump_desc);
+
+// *** Parser *** //
 
-/* Parser */
 void IConsoleCmdExec(const char* cmdstr);
-void IConsoleVarExec(const IConsoleVar *var, byte tokencount, char *token[]);
 
-/* console std lib (register ingame commands/aliases/variables) */
+// ** console std lib ** //
 void IConsoleStdLibRegister(void);
 
-/* Hooking code */
-void IConsoleCmdHookAdd(const char *name, IConsoleHookTypes type, IConsoleHook *proc);
-void IConsoleVarHookAdd(const char *name, IConsoleHookTypes type, IConsoleHook *proc);
-void IConsoleVarProcAdd(const char *name, IConsoleCmdProc *proc);
+// ** hook code ** //
+void IConsoleVarHook(const char* name, _iconsole_hook_types type, iconsole_var_hook proc);
+void IConsoleCmdHook(const char* name, _iconsole_hook_types type, iconsole_cmd_hook proc);
+bool IConsoleVarHookHandle(_iconsole_var* hook_var, _iconsole_hook_types type);
+bool IConsoleCmdHookHandle(_iconsole_cmd* hook_cmd, _iconsole_hook_types type);
 
-/* Supporting functions */
-bool GetArgumentInteger(uint32 *value, const char *arg);
 #endif /* CONSOLE_H */

currency.c

@@ -1,187 +0,0 @@
-/* $Id$ */
-
-#include "stdafx.h"
-#include "openttd.h"
-#include "currency.h"
-#include "news.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
-};
-
-/* Array of currencies used by the system */
-CurrencySpec _currency_specs[NUM_CURRENCY];
-
-/**
- * These enums are only declared in order to make sens
- * out of the TTDPatch_To_OTTDIndex array that will follow
- * Every currency used by Ottd is there, just in case TTDPatch will
- * add those missing in its code
- **/
-enum {
-	CURR_GBP,
-	CURR_USD,
-	CURR_EUR,
-	CURR_YEN,
-	CURR_ATS,
-	CURR_BEF,
-	CURR_CHF,
-	CURR_CZK,
-	CURR_DEM,
-	CURR_DKK,
-	CURR_ESP,
-	CURR_FIM,
-	CURR_FRF,
-	CURR_GRD,
-	CURR_HUF,
-	CURR_ISK,
-	CURR_ITL,
-	CURR_NLG,
-	CURR_NOK,
-	CURR_PLN,
-	CURR_ROL,
-	CURR_RUR,
-	CURR_SIT,
-	CURR_SEK,
-	CURR_YTL,
-};
-
-/**
- * This array represent the position of OpenTTD's currencies,
- * compared to TTDPatch's ones.
- * When a grf sends currencies, they are based on the order defined by TTDPatch.
- * So, we must reindex them to our own order.
- **/
-const byte TTDPatch_To_OTTDIndex[] =
-{
-	CURR_GBP,
-	CURR_USD,
-	CURR_FRF,
-	CURR_DEM,
-	CURR_YEN,
-	CURR_ESP,
-	CURR_HUF,
-	CURR_PLN,
-	CURR_ATS,
-	CURR_BEF,
-	CURR_DKK,
-	CURR_FIM,
-	CURR_GRD,
-	CURR_CHF,
-	CURR_NLG,
-	CURR_ITL,
-	CURR_SEK,
-	CURR_RUR,
-	CURR_EUR,
-};
-
-/**
- * Will return the ottd's index correspondance to
- * the ttdpatch's id.  If the id is bigger then the array,
- * it is  a grf written for ottd, thus returning the same id.
- * Only called from newgrf.c
- * @param grfcurr_id currency id coming from newgrf
- * @return the corrected index
- **/
-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 */
-uint GetMaskOfAllowedCurrencies(void)
-{
-	uint mask = 0;
-	uint i;
-
-	for (i = 0; i < NUM_CURRENCY; i++) {
-		Year to_euro = _currency_specs[i].to_euro;
-
-		if (to_euro != CF_NOEURO && to_euro != CF_ISEURO && _cur_year >= to_euro) continue;
-		if (to_euro == CF_ISEURO && _cur_year < 2000) continue;
-		mask |= (1 << i);
-	}
-	mask |= (1 << CUSTOM_CURRENCY_ID); // always allow custom currency
-	return mask;
-}
-
-/**
- * Verify if the currency chosen by the user is about to be converted to Euro
- **/
-void CheckSwitchToEuro(void)
-{
-	if (_currency_specs[_opt.currency].to_euro != CF_NOEURO &&
-			_currency_specs[_opt.currency].to_euro != CF_ISEURO &&
-			_cur_year >= _currency_specs[_opt.currency].to_euro) {
-		_opt.currency = 2; // this is the index of euro above.
-		AddNewsItem(STR_EURO_INTRODUCE, NEWS_FLAGS(NM_NORMAL, 0, NT_ECONOMY, 0), 0, 0);
-	}
-}
-
-/**
- * Will fill _currency_specs array with
- * default values from origin_currency_specs
- * Called only from newgrf.c and settings.c.
- * @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(bool preserve_custom)
-{
-	memcpy(&_currency_specs, &origin_currency_specs, sizeof(origin_currency_specs) - (preserve_custom ? sizeof(_custom_currency) : 0));
-}
-
-/**
- * Build a list of currency names StringIDs to use in a dropdown list
- * @return Pointer to a (static) array of StringIDs
- */
-StringID* BuildCurrencyDropdown(void)
-{
-	/* Allow room for all currencies, plus a terminator entry */
-	static StringID names[NUM_CURRENCY + 1];
-	uint i;
-
-	/* Add each name */
-	for (i = 0; i < NUM_CURRENCY; i++) {
-		names[i] = _currency_specs[i].name;
-	}
-	/* Terminate the list */
-	names[i] = INVALID_STRING_ID;
-
-	return names;
-}

currency.h

@@ -1,45 +0,0 @@
-/* $Id$ */
-
-#ifndef CURRENCY_H
-#define CURRENCY_H
-
-enum {
-	CF_NOEURO = 0,
-	CF_ISEURO = 1,
-	NUM_CURRENCY = 28,
-	CUSTOM_CURRENCY_ID = NUM_CURRENCY - 1
-};
-
-typedef struct {
-	uint16 rate;
-	char separator;
-	Year to_euro;
-	char prefix[16];
-	char suffix[16];
-	/**
-	 * The currency symbol is represented by two possible values, prefix and suffix
-	 * Usage of one or the other is determined by symbol_pos.
-	 * 0 = prefix
-	 * 1 = suffix
-	 * 2 = both : Special case only for custom currency.
-	 *            It is not a spec from Newgrf,
-	 *            rather a way to let users do what they want with custom curency
-	 */
-	byte symbol_pos;
-	StringID name;
-} CurrencySpec;
-
-
-extern CurrencySpec _currency_specs[NUM_CURRENCY];
-
-// XXX small hack, but makes the rest of the code a bit nicer to read
-#define _custom_currency (_currency_specs[CUSTOM_CURRENCY_ID])
-#define _currency ((const CurrencySpec*)&_currency_specs[_opt_ptr->currency])
-
-uint GetMaskOfAllowedCurrencies(void);
-void CheckSwitchToEuro(void);
-void ResetCurrencies(bool preserve_custom);
-StringID* BuildCurrencyDropdown(void);
-byte GetNewgrfCurrencyIdConverted(byte grfcurr_id);
-
-#endif /* CURRENCY_H */

date.c

@@ -1,304 +0,0 @@
-/* $Id$ */
-
-#include "stdafx.h"
-#include "openttd.h"
-#include "date.h"
-#include "variables.h"
-#include "macros.h"
-#include "vehicle.h"
-#include "network.h"
-#include "network_data.h"
-#include "network_server.h"
-#include "functions.h"
-#include "currency.h"
-
-Year      _cur_year;
-Month     _cur_month;
-Date      _date;
-DateFract _date_fract;
-
-
-void SetDate(Date date)
-{
-	YearMonthDay ymd;
-
-	_date = date;
-	ConvertDateToYMD(date, &ymd);
-	_cur_year = ymd.year;
-	_cur_month = ymd.month;
-#ifdef ENABLE_NETWORK
-	_network_last_advertise_frame = 0;
-	_network_need_advertise = true;
-#endif /* ENABLE_NETWORK */
-}
-
-#define M(a, b) ((a << 5) | b)
-static const uint16 _month_date_from_year_day[] = {
-	M( 0, 1), M( 0, 2), M( 0, 3), M( 0, 4), M( 0, 5), M( 0, 6), M( 0, 7), M( 0, 8), M( 0, 9), M( 0, 10), M( 0, 11), M( 0, 12), M( 0, 13), M( 0, 14), M( 0, 15), M( 0, 16), M( 0, 17), M( 0, 18), M( 0, 19), M( 0, 20), M( 0, 21), M( 0, 22), M( 0, 23), M( 0, 24), M( 0, 25), M( 0, 26), M( 0, 27), M( 0, 28), M( 0, 29), M( 0, 30), M( 0, 31),
-	M( 1, 1), M( 1, 2), M( 1, 3), M( 1, 4), M( 1, 5), M( 1, 6), M( 1, 7), M( 1, 8), M( 1, 9), M( 1, 10), M( 1, 11), M( 1, 12), M( 1, 13), M( 1, 14), M( 1, 15), M( 1, 16), M( 1, 17), M( 1, 18), M( 1, 19), M( 1, 20), M( 1, 21), M( 1, 22), M( 1, 23), M( 1, 24), M( 1, 25), M( 1, 26), M( 1, 27), M( 1, 28), M( 1, 29),
-	M( 2, 1), M( 2, 2), M( 2, 3), M( 2, 4), M( 2, 5), M( 2, 6), M( 2, 7), M( 2, 8), M( 2, 9), M( 2, 10), M( 2, 11), M( 2, 12), M( 2, 13), M( 2, 14), M( 2, 15), M( 2, 16), M( 2, 17), M( 2, 18), M( 2, 19), M( 2, 20), M( 2, 21), M( 2, 22), M( 2, 23), M( 2, 24), M( 2, 25), M( 2, 26), M( 2, 27), M( 2, 28), M( 2, 29), M( 2, 30), M( 2, 31),
-	M( 3, 1), M( 3, 2), M( 3, 3), M( 3, 4), M( 3, 5), M( 3, 6), M( 3, 7), M( 3, 8), M( 3, 9), M( 3, 10), M( 3, 11), M( 3, 12), M( 3, 13), M( 3, 14), M( 3, 15), M( 3, 16), M( 3, 17), M( 3, 18), M( 3, 19), M( 3, 20), M( 3, 21), M( 3, 22), M( 3, 23), M( 3, 24), M( 3, 25), M( 3, 26), M( 3, 27), M( 3, 28), M( 3, 29), M( 3, 30),
-	M( 4, 1), M( 4, 2), M( 4, 3), M( 4, 4), M( 4, 5), M( 4, 6), M( 4, 7), M( 4, 8), M( 4, 9), M( 4, 10), M( 4, 11), M( 4, 12), M( 4, 13), M( 4, 14), M( 4, 15), M( 4, 16), M( 4, 17), M( 4, 18), M( 4, 19), M( 4, 20), M( 4, 21), M( 4, 22), M( 4, 23), M( 4, 24), M( 4, 25), M( 4, 26), M( 4, 27), M( 4, 28), M( 4, 29), M( 4, 30), M( 4, 31),
-	M( 5, 1), M( 5, 2), M( 5, 3), M( 5, 4), M( 5, 5), M( 5, 6), M( 5, 7), M( 5, 8), M( 5, 9), M( 5, 10), M( 5, 11), M( 5, 12), M( 5, 13), M( 5, 14), M( 5, 15), M( 5, 16), M( 5, 17), M( 5, 18), M( 5, 19), M( 5, 20), M( 5, 21), M( 5, 22), M( 5, 23), M( 5, 24), M( 5, 25), M( 5, 26), M( 5, 27), M( 5, 28), M( 5, 29), M( 5, 30),
-	M( 6, 1), M( 6, 2), M( 6, 3), M( 6, 4), M( 6, 5), M( 6, 6), M( 6, 7), M( 6, 8), M( 6, 9), M( 6, 10), M( 6, 11), M( 6, 12), M( 6, 13), M( 6, 14), M( 6, 15), M( 6, 16), M( 6, 17), M( 6, 18), M( 6, 19), M( 6, 20), M( 6, 21), M( 6, 22), M( 6, 23), M( 6, 24), M( 6, 25), M( 6, 26), M( 6, 27), M( 6, 28), M( 6, 29), M( 6, 30), M( 6, 31),
-	M( 7, 1), M( 7, 2), M( 7, 3), M( 7, 4), M( 7, 5), M( 7, 6), M( 7, 7), M( 7, 8), M( 7, 9), M( 7, 10), M( 7, 11), M( 7, 12), M( 7, 13), M( 7, 14), M( 7, 15), M( 7, 16), M( 7, 17), M( 7, 18), M( 7, 19), M( 7, 20), M( 7, 21), M( 7, 22), M( 7, 23), M( 7, 24), M( 7, 25), M( 7, 26), M( 7, 27), M( 7, 28), M( 7, 29), M( 7, 30), M( 7, 31),
-	M( 8, 1), M( 8, 2), M( 8, 3), M( 8, 4), M( 8, 5), M( 8, 6), M( 8, 7), M( 8, 8), M( 8, 9), M( 8, 10), M( 8, 11), M( 8, 12), M( 8, 13), M( 8, 14), M( 8, 15), M( 8, 16), M( 8, 17), M( 8, 18), M( 8, 19), M( 8, 20), M( 8, 21), M( 8, 22), M( 8, 23), M( 8, 24), M( 8, 25), M( 8, 26), M( 8, 27), M( 8, 28), M( 8, 29), M( 8, 30),
-	M( 9, 1), M( 9, 2), M( 9, 3), M( 9, 4), M( 9, 5), M( 9, 6), M( 9, 7), M( 9, 8), M( 9, 9), M( 9, 10), M( 9, 11), M( 9, 12), M( 9, 13), M( 9, 14), M( 9, 15), M( 9, 16), M( 9, 17), M( 9, 18), M( 9, 19), M( 9, 20), M( 9, 21), M( 9, 22), M( 9, 23), M( 9, 24), M( 9, 25), M( 9, 26), M( 9, 27), M( 9, 28), M( 9, 29), M( 9, 30), M( 9, 31),
-	M(10, 1), M(10, 2), M(10, 3), M(10, 4), M(10, 5), M(10, 6), M(10, 7), M(10, 8), M(10, 9), M(10, 10), M(10, 11), M(10, 12), M(10, 13), M(10, 14), M(10, 15), M(10, 16), M(10, 17), M(10, 18), M(10, 19), M(10, 20), M(10, 21), M(10, 22), M(10, 23), M(10, 24), M(10, 25), M(10, 26), M(10, 27), M(10, 28), M(10, 29), M(10, 30),
-	M(11, 1), M(11, 2), M(11, 3), M(11, 4), M(11, 5), M(11, 6), M(11, 7), M(11, 8), M(11, 9), M(11, 10), M(11, 11), M(11, 12), M(11, 13), M(11, 14), M(11, 15), M(11, 16), M(11, 17), M(11, 18), M(11, 19), M(11, 20), M(11, 21), M(11, 22), M(11, 23), M(11, 24), M(11, 25), M(11, 26), M(11, 27), M(11, 28), M(11, 29), M(11, 30), M(11, 31),
-};
-#undef M
-
-enum {
-	ACCUM_JAN = 0,
-	ACCUM_FEB = ACCUM_JAN + 31,
-	ACCUM_MAR = ACCUM_FEB + 29,
-	ACCUM_APR = ACCUM_MAR + 31,
-	ACCUM_MAY = ACCUM_APR + 30,
-	ACCUM_JUN = ACCUM_MAY + 31,
-	ACCUM_JUL = ACCUM_JUN + 30,
-	ACCUM_AUG = ACCUM_JUL + 31,
-	ACCUM_SEP = ACCUM_AUG + 31,
-	ACCUM_OCT = ACCUM_SEP + 30,
-	ACCUM_NOV = ACCUM_OCT + 31,
-	ACCUM_DEC = ACCUM_NOV + 30,
-};
-
-static const uint16 _accum_days_for_month[] = {
-	ACCUM_JAN, ACCUM_FEB, ACCUM_MAR, ACCUM_APR,
-	ACCUM_MAY, ACCUM_JUN, ACCUM_JUL, ACCUM_AUG,
-	ACCUM_SEP, ACCUM_OCT, ACCUM_NOV, ACCUM_DEC,
-};
-
-static inline bool IsLeapYear(Year yr)
-{
-	return yr % 4 == 0 && (yr % 100 != 0 || yr % 400 == 0);
-}
-
-/**
- * Converts a Date to a Year, Month & Day.
- * @param date the date to convert from
- * @param ymd  the year, month and day to write to
- */
-void ConvertDateToYMD(Date date, YearMonthDay *ymd)
-{
-	/*
-	 * Year determination in multiple steps to account for leap
-	 * years. First do the large steps, then the smaller ones.
-	 */
-
-	/* There are 97 leap years in 400 years */
-	Year yr = 400 * (date / (365 * 400 + 97));
-	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 is 1 leap year every 4 years */
-	yr += 4 * (rem / (365 * 4 + 1));
-	rem = rem % (365 * 4 + 1);
-
-	/* The last (max 3) years to account for; the first one
-	 * can be, but is not necessarily a leap year */
-	while (rem >= (IsLeapYear(yr) ? 366 : 365)) {
-		rem -= IsLeapYear(yr) ? 366 : 365;
-		yr++;
-	}
-
-	/* Skip the 29th of February in non-leap years */
-	if (!IsLeapYear(yr) && rem >= ACCUM_MAR - 1) rem++;
-
-	ymd->year = yr;
-
-	x = _month_date_from_year_day[rem];
-	ymd->month = x >> 5;
-	ymd->day = x & 0x1F;
-}
-
-/**
- * Converts a tupe of Year, Month and Day to a Date.
- * @param year  is a number between 0..MAX_YEAR
- * @param month is a number between 0..11
- * @param day   is a number between 1..31
- */
-Date ConvertYMDToDate(Year year, Month month, Day day)
-{
-	/*
-	 * Each passed leap year adds one day to the 'day count'.
-	 *
-	 * A special case for the year 0 as no year has been passed,
-	 * but '(year - 1) / 4' does not yield '-1' to counteract the
-	 * '+1' at the end of the formula as divisions round to zero.
-	 */
-	int nr_of_leap_years = (year == 0) ? 0 : ((year - 1) / 4 - (year - 1) / 100 + (year - 1) / 400 + 1);
-
-	/* Day-offset in a leap year */
-	int days = _accum_days_for_month[month] + day - 1;
-
-	/* Account for the missing of the 29th of February in non-leap years */
-	if (!IsLeapYear(year) && days >= ACCUM_MAR) days--;
-
-	return year * 365 + nr_of_leap_years + days;
-}
-
-/** Functions used by the IncreaseDate function */
-
-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);
-
-typedef void OnNewVehicleDayProc(Vehicle *v);
-
-static OnNewVehicleDayProc * _on_new_vehicle_day_proc[] = {
-	OnNewDay_Train,
-	OnNewDay_RoadVeh,
-	OnNewDay_Ship,
-	OnNewDay_Aircraft,
-	OnNewDay_EffectVehicle,
-	OnNewDay_DisasterVehicle,
-};
-
-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
-};
-
-/**
- * Runs the day_proc for every DAY_TICKS vehicle starting at daytick.
- */
-static void RunVehicleDayProc(uint daytick)
-{
-	uint total = GetMaxVehicleIndex() + 1;
-	uint i;
-
-	for (i = daytick; i < total; i += DAY_TICKS) {
-		Vehicle *v = GetVehicle(i);
-
-		if (IsValidVehicle(v)) _on_new_vehicle_day_proc[v->type - 0x10](v);
-	}
-}
-
-void IncreaseDate(void)
-{
-	YearMonthDay ymd;
-
-	if (_game_mode == GM_MENU) {
-		_tick_counter++;
-		return;
-	}
-
-	RunVehicleDayProc(_date_fract);
-
-	/* increase day, and check if a new day is there? */
-	_tick_counter++;
-
-	_date_fract++;
-	if (_date_fract < DAY_TICKS) return;
-	_date_fract = 0;
-
-	/* yeah, increase day counter and call various daily loops */
-	_date++;
-
-	TextMessageDailyLoop();
-
-	DisasterDailyLoop();
-	WaypointsDailyLoop();
-
-	if (_game_mode != GM_MENU) {
-		InvalidateWindowWidget(WC_STATUS_BAR, 0, 0);
-		EnginesDailyLoop();
-	}
-
-	/* check if we entered a new month? */
-	ConvertDateToYMD(_date, &ymd);
-	if (ymd.month == _cur_month) return;
-	_cur_month = ymd.month;
-
-	/* yes, call various monthly loops */
-	if (_game_mode != GM_MENU) {
-		if (_opt.autosave != 0 && (_cur_month % _autosave_months[_opt.autosave]) == 0) {
-			_do_autosave = true;
-			RedrawAutosave();
-		}
-
-		PlayersMonthlyLoop();
-		EnginesMonthlyLoop();
-		TownsMonthlyLoop();
-		IndustryMonthlyLoop();
-		StationMonthlyLoop();
-		if (_network_server) NetworkServerMonthlyLoop();
-	}
-
-	/* check if we entered a new year? */
-	if (ymd.year == _cur_year) return;
-	_cur_year = ymd.year;
-
-	/* yes, call various yearly loops */
-	PlayersYearlyLoop();
-	TrainsYearlyLoop();
-	RoadVehiclesYearlyLoop();
-	AircraftYearlyLoop();
-	ShipsYearlyLoop();
-	if (_network_server) NetworkServerYearlyLoop();
-
-	/* check if we reached end of the game */
-	if (_cur_year == _patches.ending_year) {
-			ShowEndGameChart();
-	/* check if we reached the maximum year, decrement dates by a year */
-	} else if (_cur_year == MAX_YEAR + 1) {
-		Vehicle *v;
-		uint days_this_year;
-
-		_cur_year--;
-		days_this_year = IsLeapYear(_cur_year) ? 366 : 365;
-		_date -= days_this_year;
-		FOR_ALL_VEHICLES(v) v->date_of_last_service -= days_this_year;
-
-		/* 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 */
-		InitTextMessage();
-	}
-
-	if (_patches.auto_euro) CheckSwitchToEuro();
-}

date.h

@@ -1,59 +0,0 @@
-/* $Id$ */
-
-#ifndef DATE_H
-#define DATE_H
-
-/**
- * 1 day is 74 ticks; _date_fract used to be uint16 and incremented by 885. On
- *                    an overflow the new day begun and 65535 / 885 = 74.
- * 1 tick is approximately 30 ms.
- * 1 day is thus about 2 seconds (74 * 30 = 2220) on a machine that can run OpenTTD normally
- */
-#define DAY_TICKS 74
-
-/*
- * ORIGINAL_BASE_YEAR, ORIGINAL_MAX_YEAR and DAYS_TILL_ORIGINAL_BASE_YEAR are
- * primarily used for loading newgrf and savegame data and returning some
- * newgrf (callback) functions that were in the original (TTD) inherited
- * format, where '_date == 0' meant that it was 1920-01-01.
- */
-
-/** The minimum starting year/base year of the original TTD */
-#define ORIGINAL_BASE_YEAR 1920
-/** The maximum year of the original TTD */
-#define ORIGINAL_MAX_YEAR 2090
-
-/**
- * The offset in days from the '_date == 0' till
- * 'ConvertYMDToDate(ORIGINAL_BASE_YEAR, 0, 1)'
- */
-#define DAYS_TILL_ORIGINAL_BASE_YEAR (365 * ORIGINAL_BASE_YEAR + ORIGINAL_BASE_YEAR / 4 - ORIGINAL_BASE_YEAR / 100 + ORIGINAL_BASE_YEAR / 400)
-
-/* The absolute minimum & maximum years in OTTD */
-#define MIN_YEAR 0
-/* MAX_YEAR, nicely rounded value of the number of years that can
- * be encoded in a single 32 bits date, about 2^31 / 366 years. */
-#define MAX_YEAR 5000000
-
-/* Year and Date are defined elsewhere */
-typedef uint8  Month;
-typedef uint8  Day;
-typedef uint16 DateFract;
-
-typedef struct YearMonthDay {
-	Year  year;
-	Month month;
-	Day   day;
-} YearMonthDay;
-
-extern Year      _cur_year;
-extern Month     _cur_month;
-extern Date      _date;
-extern DateFract _date_fract;
-
-
-void SetDate(Date date);
-void ConvertDateToYMD(Date date, YearMonthDay *ymd);
-Date ConvertYMDToDate(Year year, Month month, Day day);
-
-#endif /* DATE_H */

debug.c

@@ -1,130 +0,0 @@
-/* $Id$ */
-
-#include "stdafx.h"
-#include <stdio.h>
-#include <stdarg.h>
-#include "openttd.h"
-#include "console.h"
-#include "debug.h"
-#include "functions.h"
-#include "string.h"
-
-int _debug_ai_level;
-int _debug_driver_level;
-int _debug_grf_level;
-int _debug_map_level;
-int _debug_misc_level;
-int _debug_ms_level;
-int _debug_net_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;
-
-
-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[] = {
-	DEBUG_LEVEL(ai),
-	DEBUG_LEVEL(driver),
-	DEBUG_LEVEL(grf),
-	DEBUG_LEVEL(map),
-	DEBUG_LEVEL(misc),
-	DEBUG_LEVEL(ms),
-	DEBUG_LEVEL(net),
-	DEBUG_LEVEL(spritecache),
-	DEBUG_LEVEL(oldloader),
-	DEBUG_LEVEL(ntp),
-	DEBUG_LEVEL(npf),
-	DEBUG_LEVEL(yapf),
-	DEBUG_LEVEL(freetype)
-	};
-#undef DEBUG_LEVEL
-
-void SetDebugString(const char *s)
-{
-	int v;
-	char *end;
-	const char *t;
-
-	// global debugging level?
-	if (*s >= '0' && *s <= '9') {
-		const DebugLevel *i;
-
-		v = strtoul(s, &end, 0);
-		s = end;
-
-		for (i = debug_level; i != endof(debug_level); ++i) *i->level = v;
-	}
-
-	// individual levels
-	for (;;) {
-		const DebugLevel *i;
-		int *p;
-
-		// skip delimiters
-		while (*s == ' ' || *s == ',' || *s == '\t') s++;
-		if (*s == '\0') break;
-
-		t = s;
-		while (*s >= 'a' && *s <= 'z') s++;
-
-		// 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) {
-				p = i->level;
-				break;
-			}
-
-		if (*s == '=') s++;
-		v = strtoul(s, &end, 0);
-		s = end;
-		if (p != NULL) {
-			*p = v;
-		} else {
-			ShowInfoF("Unknown debug level '%.*s'", s - t, t);
-			return;
-		}
-	}
-}
-
-/** Print out the current debug-level
- * Just return a string with the values of all the debug categorites
- * @return string with debug-levels
- */
-const char *GetDebugString(void)
-{
-	const DebugLevel *i;
-	static char dbgstr[100];
-	char dbgval[20];
-
-	memset(dbgstr, 0, sizeof(dbgstr));
-	i = debug_level;
-	snprintf(dbgstr, sizeof(dbgstr), "%s=%d", i->name, *i->level);
-
-	for (i++; i != endof(debug_level); i++) {
-		snprintf(dbgval, sizeof(dbgval), ", %s=%d", i->name, *i->level);
-		ttd_strlcat(dbgstr, dbgval, sizeof(dbgstr));
-	}
-
-	return dbgstr;
-}

debug.h

@@ -1,54 +0,0 @@
-/* $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,58 +1,268 @@
-/* $Id$ */
-
 #include "stdafx.h"
+#include "ttd.h"
+#include "network.h"
+#include "hal.h"
 
 #ifdef ENABLE_NETWORK
 
-#if defined(UNIX) && !defined(__MORPHOS__)
-
-#include "openttd.h"
-#include "variables.h"
+#include "gfx.h"
+#include "window.h"
+#include "command.h"
+#include "console.h"
+#ifdef WIN32
+#	include <windows.h> /* GetTickCount */
+#	include <conio.h>
+#endif
 
+#ifdef __OS2__
+#	include <sys/time.h> /* gettimeofday */
 #	include <sys/types.h>
 #	include <unistd.h>
+#	include <conio.h>
+#	define STDIN 0  /* file descriptor for standard input */
+#endif
 
+#ifdef UNIX
+#	include <sys/time.h> /* gettimeofday */
+#	include <sys/types.h>
+#	include <unistd.h>
+#	include <signal.h>
+#	define STDIN 0  /* file descriptor for standard input */
+#endif
+#ifdef __MORPHOS__
+/*  voids the fork, option will be disabled for morphos build anyway, because MorphOS 
+ *  doesn't support forking (could only implemented with lots of code changes here).
+ */
+int morphos_dummy_fork() { return -1; }
+#define fork morphos_dummy_fork
+#endif
+
+// This file handles all dedicated-server in- and outputs
+
+static void *_dedicated_video_mem;
+
+#ifdef UNIX
+/* We want to fork our dedicated server */
 void DedicatedFork(void)
 {
 	/* Fork the program */
-	pid_t pid = fork();
-	switch (pid) {
+	_dedicated_pid = fork();
+	switch (_dedicated_pid) {
 		case -1:
 			perror("Unable to fork");
 			exit(1);
-
-		case 0: { // We're the child
-			FILE* f;
+		case 0:
+			// We're the child
 
 			/* Open the log-file to log all stuff too */
-			f = fopen(_log_file, "a");
-			if (f == NULL) {
+			_log_file_fd = fopen(_log_file, "a");
+			if (!_log_file_fd) {
 				perror("Unable to open logfile");
 				exit(1);
 			}
 			/* Redirect stdout and stderr to log-file */
-			if (dup2(fileno(f), fileno(stdout)) == -1) {
-				perror("Rerouting stdout");
+			if (dup2(fileno(_log_file_fd), fileno(stdout)) == -1) {
+				perror("Re-routing stdout");
 				exit(1);
 			}
-			if (dup2(fileno(f), fileno(stderr)) == -1) {
-				perror("Rerouting stderr");
+			if (dup2(fileno(_log_file_fd), fileno(stderr)) == -1) {
+				perror("Re-routing stderr");
 				exit(1);
 			}
 			break;
-		}
-
 		default:
 			// We're the parent
 			printf("Loading dedicated server...\n");
-			printf("  - Forked to background with pid %d\n", pid);
+			printf("  - Forked to background with pid %d\n", _dedicated_pid);
 			exit(0);
 	}
 }
+
+/* Signal handlers */
+static void DedicatedSignalHandler(int sig)
+{
+	_exit_game = true;
+	signal(sig, DedicatedSignalHandler);
+}
 #endif
 
+static const char *DedicatedVideoStart(char **parm) {
+	_screen.width = _screen.pitch = _cur_resolution[0];
+	_screen.height = _cur_resolution[1];
+	_dedicated_video_mem = malloc(_cur_resolution[0]*_cur_resolution[1]);
+
+	_debug_net_level = 6;
+	_debug_misc_level = 0;
+
+#ifdef WIN32
+	// For win32 we need to allocate an console (debug mode does the same)
+	CreateConsole();
+	SetConsoleTitle("OpenTTD Dedicated Server");
+#endif
+
+	DEBUG(misc,0)("Loading dedicated server...");
+	return NULL;
+}
+static void DedicatedVideoStop() { free(_dedicated_video_mem); }
+static void DedicatedVideoMakeDirty(int left, int top, int width, int height) {}
+static bool DedicatedVideoChangeRes(int w, int h) { return false; }
+
+#ifdef UNIX
+
+static bool InputWaiting()
+{
+	struct timeval tv;
+	fd_set readfds;
+	byte ret;
+
+	tv.tv_sec = 0;
+	tv.tv_usec = 1;
+
+	FD_ZERO(&readfds);
+	FD_SET(STDIN, &readfds);
+
+	/* don't care about writefds and exceptfds: */
+	ret = select(STDIN + 1, &readfds, NULL, NULL, &tv);
+
+	if (ret > 0)
+		return true;
+	else
+		return false;
+}
+#else
+static bool InputWaiting()
+{
+	return kbhit();
+}
+#endif
+
+static void DedicatedHandleKeyInput()
+{
+#ifdef WIN32
+	char input;
+#endif
+	static char input_line[200] = "";
+
+#if defined(UNIX) || defined(__OS2__)
+	if (InputWaiting()) {
+		if (_exit_game)
+			return;
+
+		fgets(input_line, 200, stdin);
+		// Forget about the final \n (or \r)
+		strtok(input_line, "\r\n");
+		IConsoleCmdExec(input_line);
+	}
+#else
+	if (InputWaiting()) {
+		input = getch();
+		printf("%c", input);
+		if (input != '\r')
+			snprintf(input_line, 200, "%s%c", input_line, input);
+		else {
+			printf("\n");
+			IConsoleCmdExec(input_line);
+			input_line[0] = '\0';
+		}
+	}
+#endif
+}
+
+static int DedicatedVideoMainLoop()
+{
+#ifndef WIN32
+	struct timeval tim;
+#endif
+	uint32 next_tick;
+	uint32 cur_ticks;
+
+#ifdef WIN32
+	next_tick = GetTickCount() + 30;
+#else
+	gettimeofday(&tim, NULL);
+	next_tick = (tim.tv_usec / 1000) + 30 + (tim.tv_sec * 1000);
+#endif
+
+	/* Signal handlers */
+#ifdef UNIX
+	signal(SIGTERM, DedicatedSignalHandler);
+	signal(SIGINT, DedicatedSignalHandler);
+	signal(SIGQUIT, DedicatedSignalHandler);
+#endif
+
+	// Load the dedicated server stuff
+	_is_network_server = true;
+	_network_dedicated = true;
+	_switch_mode = SM_NONE;
+	_network_playas = OWNER_SPECTATOR;
+	_local_player = OWNER_SPECTATOR;
+	DoCommandP(0, Random(), InteractiveRandom(), NULL, CMD_GEN_RANDOM_NEW_GAME);
+	// Done loading, start game!
+
+	if (!_networking) {
+		DEBUG(net, 1)("Dedicated server could not be launced. Aborting..");
+		return ML_QUIT;
+	}
+
+	while (true) {
+		InteractiveRandom(); // randomness
+
+		if (_exit_game) return ML_QUIT;
+
+		if (!_dedicated_forks)
+			DedicatedHandleKeyInput();
+
+#ifdef WIN32
+		cur_ticks = GetTickCount();
+#else
+		gettimeofday(&tim, NULL);
+		cur_ticks = (tim.tv_usec / 1000) + (tim.tv_sec * 1000);
+#endif
+
+		if (cur_ticks >= next_tick) {
+			next_tick += 30;
+
+			GameLoop();
+			_screen.dst_ptr = _dedicated_video_mem;
+			UpdateWindows();
+		}
+		CSleep(1);
+	}
+
+	return ML_QUIT;
+}
+
+
+const HalVideoDriver _dedicated_video_driver = {
+	DedicatedVideoStart,
+	DedicatedVideoStop,
+	DedicatedVideoMakeDirty,
+	DedicatedVideoMainLoop,
+	DedicatedVideoChangeRes,
+};
+
 #else
 
+static void *_dedicated_video_mem;
+
+static const char *DedicatedVideoStart(char **parm) {
+	DEBUG(misc,0)("OpenTTD compiled without network-support, quiting...");
+
+	return NULL;
+}
+
 void DedicatedFork(void) {}
+static void DedicatedVideoStop() { free(_dedicated_video_mem); }
+static void DedicatedVideoMakeDirty(int left, int top, int width, int height) {}
+static bool DedicatedVideoChangeRes(int w, int h) { return false; }
+static int DedicatedVideoMainLoop() { return ML_QUIT; }
+
+const HalVideoDriver _dedicated_video_driver = {
+	DedicatedVideoStart,
+	DedicatedVideoStop,
+	DedicatedVideoMakeDirty,
+	DedicatedVideoMainLoop,
+	DedicatedVideoChangeRes,
+};
 
 #endif /* ENABLE_NETWORK */

depot.c

@@ -1,127 +0,0 @@
-/* $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,128 +0,0 @@
-/* $Id$ */
-
-#ifndef DEPOT_H
-#define DEPOT_H
-
-/** @file depot.h Header files for depots (not hangars)
- *  @see depot.c */
-
-#include "direction.h"
-#include "oldpool.h"
-#include "tile.h"
-#include "variables.h"
-#include "station_map.h"
-
-struct Depot {
-	TileIndex xy;
-	TownID town_index;
-	DepotID index;
-};
-
-DECLARE_OLD_POOL(Depot, Depot, 3, 8000)
-
-/**
- * Check if a depot really exists.
- */
-static inline bool IsValidDepot(const Depot *depot)
-{
-	return depot != NULL && depot->xy != 0;
-}
-
-static inline bool IsValidDepotID(uint index)
-{
-	return index < GetDepotPoolSize() && IsValidDepot(GetDepot(index));
-}
-
-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.
- */
-static inline bool IsTileDepotType(TileIndex tile, TransportType type)
-{
-	switch (type) {
-		case TRANSPORT_RAIL:
-			return IsTileType(tile, MP_RAILWAY) && (_m[tile].m5 & 0xFC) == 0xC0;
-
-		case TRANSPORT_ROAD:
-			return IsTileType(tile, MP_STREET) && (_m[tile].m5 & 0xF0) == 0x20;
-
-		case TRANSPORT_WATER:
-			return IsTileType(tile, MP_WATER) && (_m[tile].m5 & ~3) == 0x80;
-
-		default:
-			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_STREET:  return (_m[tile].m5 & 0xF0) == 0x20;
-		case MP_WATER:   return (_m[tile].m5 &   ~3) == 0x80;
-		case MP_RAILWAY: return (_m[tile].m5 & 0xFC) == 0xC0;
-		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. Starts with 0 as NE and goes Clockwise
- * @param tileh The slope of the tile in question
- * @return true if the construction is possible
-
- * This is checked by the ugly 0x4C >> direction magic, which does the following:
- * 0x4C is 0100 1100 and tileh has only bits 0..3 set (steep tiles are ruled out)
- * So: for direction (only the significant bits are shown)<p>
- * 00 (exit towards NE) we need either bit 2 or 3 set in tileh: 0x4C >> 0 = 1100<p>
- * 01 (exit towards SE) we need either bit 1 or 2 set in tileh: 0x4C >> 1 = 0110<p>
- * 02 (exit towards SW) we need either bit 0 or 1 set in tileh: 0x4C >> 2 = 0011<p>
- * 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(uint32 direction, Slope tileh)
-{
-	return ((0x4C >> direction) & tileh) != 0;
-}
-
-Depot *GetDepotByTile(TileIndex tile);
-void InitializeDepots(void);
-Depot *AllocateDepot(void);
-
-void DeleteDepotHighlightOfVehicle(const Vehicle *v);
-
-#endif /* DEPOT_H */

direction.h

@@ -1,147 +0,0 @@
-/* $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,10 +1,6 @@
-/* $Id$ */
-
 #include "stdafx.h"
-#include "openttd.h"
-#include "table/sprites.h"
+#include "ttd.h"
 #include "table/strings.h"
-#include "functions.h"
 #include "map.h"
 #include "window.h"
 #include "station.h"
@@ -13,14 +9,13 @@
 #include "gfx.h"
 #include "sound.h"
 #include "command.h"
-#include "variables.h"
 
-static void ShowBuildDockStationPicker(void);
-static void ShowBuildDocksDepotPicker(void);
+static void ShowBuildDockStationPicker();
+static void ShowBuildDocksDepotPicker();
 
-static Axis _ship_depot_direction;
+static byte _ship_depot_direction;
 
-void CcBuildDocks(bool success, TileIndex tile, uint32 p1, uint32 p2)
+void CcBuildDocks(bool success, uint tile, uint32 p1, uint32 p2)
 {
 	if (success) {
 		SndPlayTileFx(SND_02_SPLAT, tile);
@@ -28,81 +23,72 @@ void CcBuildDocks(bool success, TileIndex tile, uint32 p1, uint32 p2)
 	}
 }
 
-void CcBuildCanal(bool success, TileIndex tile, uint32 p1, uint32 p2)
+void CcBuildCanal(bool success, uint tile, uint32 p1, uint32 p2)
 {
 	if (success) SndPlayTileFx(SND_02_SPLAT, tile);
 }
 
 
-static void PlaceDocks_Dock(TileIndex tile)
+static void PlaceDocks_Dock(uint tile)
 {
-	DoCommandP(tile, 0, 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)
+static void PlaceDocks_Depot(uint 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)
+static void PlaceDocks_Buoy(uint 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)
+static void PlaceDocks_DemolishArea(uint tile)
 {
-	VpStartPlaceSizing(tile, VPM_X_AND_Y | GUI_PlaceProc_DemolishArea);
+	VpStartPlaceSizing(tile, VPM_X_AND_Y);
 }
 
-static void PlaceDocks_BuildCanal(TileIndex tile)
+static void PlaceDocks_BuildCanal(uint tile)
 {
 	VpStartPlaceSizing(tile, VPM_X_OR_Y);
 }
 
-static void PlaceDocks_BuildLock(TileIndex tile)
+static void PlaceDocks_BuildLock(uint 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));
 }
 
 
-enum {
-	DTW_CANAL    = 3,
-	DTW_LOCK     = 4,
-	DTW_DEMOLISH = 6,
-	DTW_DEPOT    = 7,
-	DTW_STATION  = 8,
-	DTW_BUOY     = 9
-};
-
-
 static void BuildDocksClick_Canal(Window *w)
 {
-	HandlePlacePushButton(w, DTW_CANAL, SPR_CURSOR_CANAL, 1, PlaceDocks_BuildCanal);
+	HandlePlacePushButton(w, 3, SPR_OPENTTD_BASE + 11, 1, PlaceDocks_BuildCanal);
 }
 
 static void BuildDocksClick_Lock(Window *w)
 {
-	HandlePlacePushButton(w, DTW_LOCK, SPR_CURSOR_LOCK, 1, PlaceDocks_BuildLock);
+	HandlePlacePushButton(w, 4, SPR_OPENTTD_BASE + 64, 1, PlaceDocks_BuildLock);
 }
 
 static void BuildDocksClick_Demolish(Window *w)
 {
-	HandlePlacePushButton(w, DTW_DEMOLISH, ANIMCURSOR_DEMOLISH, 1, PlaceDocks_DemolishArea);
+	HandlePlacePushButton(w, 6, ANIMCURSOR_DEMOLISH, 1, PlaceDocks_DemolishArea);
 }
 
 static void BuildDocksClick_Depot(Window *w)
 {
-	if (HandlePlacePushButton(w, DTW_DEPOT, SPR_CURSOR_SHIP_DEPOT, 1, PlaceDocks_Depot)) ShowBuildDocksDepotPicker();
+	if (HandlePlacePushButton(w, 7, 0x2D1, 1, PlaceDocks_Depot)) ShowBuildDocksDepotPicker();
 }
 
 static void BuildDocksClick_Dock(Window *w)
 {
-	if (HandlePlacePushButton(w, DTW_STATION, SPR_CURSOR_DOCK, 3, PlaceDocks_Dock)) ShowBuildDockStationPicker();
+
+	if (HandlePlacePushButton(w, 8, 0xE54, 3, PlaceDocks_Dock)) ShowBuildDockStationPicker();
 }
 
 static void BuildDocksClick_Buoy(Window *w)
 {
-	HandlePlacePushButton(w, DTW_BUOY, SPR_CURSOR_BOUY, 1, PlaceDocks_Buoy);
+	HandlePlacePushButton(w, 9, 0x2BE, 1, PlaceDocks_Buoy);
 }
 
 static void BuildDocksClick_Landscaping(Window *w)
@@ -114,7 +100,7 @@ typedef void OnButtonClick(Window *w);
 static OnButtonClick * const _build_docks_button_proc[] = {
 	BuildDocksClick_Canal,
 	BuildDocksClick_Lock,
-	NULL,
+	0,
 	BuildDocksClick_Demolish,
 	BuildDocksClick_Depot,
 	BuildDocksClick_Dock,
@@ -129,44 +115,31 @@ static void BuildDocksToolbWndProc(Window *w, WindowEvent *e)
 		DrawWindowWidgets(w);
 		break;
 
-	case WE_CLICK:
-		if (e->we.click.widget - 3 >= 0 && e->we.click.widget != 5) _build_docks_button_proc[e->we.click.widget - 3](w);
-		break;
-
-	case WE_KEYPRESS:
-		switch (e->we.keypress.keycode) {
-			case '1': BuildDocksClick_Canal(w); break;
-			case '2': BuildDocksClick_Lock(w); break;
-			case '3': BuildDocksClick_Demolish(w); break;
-			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;
+	case WE_CLICK: {
+		if (e->click.widget - 3 >= 0 && e->click.widget != 5) _build_docks_button_proc[e->click.widget - 3](w);
+	} break;
 
 	case WE_PLACE_OBJ:
-		_place_proc(e->we.place.tile);
+		_place_proc(e->place.tile);
 		break;
 
 	case WE_PLACE_DRAG: {
-		VpSelectTilesWithMethod(e->we.place.pt.x, e->we.place.pt.y, e->we.place.userdata);
+		VpSelectTilesWithMethod(e->place.pt.x, e->place.pt.y, e->place.userdata);
 		return;
 	}
 
 	case WE_PLACE_MOUSEUP:
-		if (e->we.place.pt.x != -1) {
-			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, 0, CcBuildCanal, CMD_BUILD_CANAL | CMD_MSG(STR_CANT_BUILD_CANALS));
-			}
+		if (e->click.pt.x != -1) {
+			if (e->place.userdata == VPM_X_AND_Y)
+				DoCommandP(e->place.tile, e->place.starttile, 0, CcPlaySound10, CMD_CLEAR_AREA | CMD_MSG(STR_00B5_CAN_T_CLEAR_THIS_AREA));
+			else if(e->place.userdata == VPM_X_OR_Y)
+				DoCommandP(e->place.tile, e->place.starttile, 0, CcBuildCanal, CMD_BUILD_CANAL | CMD_AUTO | CMD_MSG(STR_CANT_BUILD_CANALS));
 		}
 		break;
 
 	case WE_ABORT_PLACE_OBJ:
-		RaiseWindowButtons(w);
+		UnclickWindowButtons(w);
+		SetWindowDirty(w);
 
 		w = FindWindowById(WC_BUILD_STATION, 0);
 		if (w != NULL) WP(w,def_d).close=true;
@@ -176,95 +149,88 @@ static void BuildDocksToolbWndProc(Window *w, WindowEvent *e)
 		break;
 
 	case WE_PLACE_PRESIZE: {
-		TileIndex tile_from;
-		TileIndex tile_to;
+		uint tile_from, tile_to;
 
-		tile_from = tile_to = e->we.place.tile;
+		tile_from = tile_to = e->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;
+		case 3: tile_to += TILE_XY(-1,0); break;
+		case 6:	tile_to += TILE_XY(0,-1);	break;
+		case 9:	tile_to += TILE_XY(0,1);	break;
+		case 12:tile_to += TILE_XY(1,0);	break;
 		}
 		VpSetPresizeRange(tile_from, tile_to);
 	} break;
-
-	case WE_DESTROY:
-		if (_patches.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0);
-		break;
 	}
 }
 
 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,   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},
+{   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,										STR_018B_CLOSE_WINDOW},
+{    WWT_CAPTION,     7,    11,   145,     0,    13, STR_9801_DOCK_CONSTRUCTION,	STR_018C_WINDOW_TITLE_DRAG_THIS},
+{  WWT_STICKYBOX,     7,   146,   157,     0,    13, 0x0,                         STR_STICKY_BUTTON},
+{      WWT_PANEL,     7,     0,    21,    14,    35, SPR_OPENTTD_BASE+65,					STR_BUILD_CANALS_TIP},
+{      WWT_PANEL,     7,    22,    43,    14,    35, SPR_CANALS_BASE+69,					STR_BUILD_LOCKS_TIP},
 
-{      WWT_PANEL,   RESIZE_NONE,     7,    44,    47,    14,    35, 0x0,                        STR_NULL},
+{      WWT_PANEL,     7,    44,    47,    14,    35, 0x0,													STR_NULL},
 
-{     WWT_IMGBTN,   RESIZE_NONE,     7,    48,    69,    14,    35, SPR_IMG_DYNAMITE,           STR_018D_DEMOLISH_BUILDINGS_ETC},
-{     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},
+{      WWT_PANEL,     7,    48,    69,    14,    35, 703,													STR_018D_DEMOLISH_BUILDINGS_ETC},
+{      WWT_PANEL,     7,    70,    91,    14,    35, 748,													STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING},
+{      WWT_PANEL,     7,    92,   113,    14,    35, 746,													STR_981D_BUILD_SHIP_DOCK},
+{      WWT_PANEL,     7,   114,   135,    14,    35, 693,													STR_9834_POSITION_BUOY_WHICH_CAN},
+{      WWT_PANEL,     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, 158, 36,
+	640-158, 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)
+void ShowBuildDocksToolbar()
 {
-	if (!IsValidPlayer(_current_player)) return;
-
 	DeleteWindowById(WC_BUILD_TOOLBAR, 0);
 	AllocateWindowDesc(&_build_docks_toolbar_desc);
-	if (_patches.link_terraform_toolbar) ShowTerraformToolbar();
 }
 
 static void BuildDockStationWndProc(Window *w, WindowEvent *e)
 {
+	int rad;
+
 	switch(e->event) {
-	case WE_CREATE: LowerWindowWidget(w, _station_show_coverage + 3); break;
-
 	case WE_PAINT: {
-		int rad = (_patches.modified_catchment) ? CA_DOCK : 4;
-
-		if (WP(w,def_d).close) return;
+		if (WP(w,def_d).close)
+			return;
+		w->click_state = (1<<3) << _station_show_coverage;
 		DrawWindowWidgets(w);
-
-		if (_station_show_coverage) {
-			SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);
+		if (_patches.modified_catchment) {
+			rad = CA_DOCK;
 		} else {
-			SetTileSelectSize(1, 1);
+			rad = 4;
 		}
 
+		if (_station_show_coverage)	SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);
+		else SetTileSelectBigSize(0, 0, 0, 0);
+
+		DrawStringCentered(74, 17, STR_3066_COVERAGE_AREA_HIGHLIGHT, 0);
 		DrawStationCoverageAreaText(4, 50, (uint)-1, rad);
-		break;
-	}
+	} break;
 
-	case WE_CLICK:
-		switch (e->we.click.widget) {
-			case 3:
-			case 4:
-				RaiseWindowWidget(w, _station_show_coverage + 3);
-				_station_show_coverage = e->we.click.widget - 3;
-				LowerWindowWidget(w, _station_show_coverage + 3);
+	case WE_CLICK: {
+		switch(e->click.widget) {
+		case 0:
+			ResetObjectToPlace();
+			break;
+		case 3: case 4:
+			_station_show_coverage = e->click.widget - 3;
 			SndPlayFx(SND_15_BEEP);
 			SetWindowDirty(w);
 			break;
 		}
-		break;
+	} break;
 
-	case WE_MOUSELOOP:
+	case WE_MOUSELOOP: {
 		if (WP(w,def_d).close) {
 			DeleteWindow(w);
 			return;
@@ -272,39 +238,35 @@ static void BuildDockStationWndProc(Window *w, WindowEvent *e)
 
 		CheckRedrawStationCoverage(w);
 		break;
-
-	case WE_DESTROY:
-		if (!WP(w,def_d).close) ResetObjectToPlace();
-		break;
+	}
 	}
 }
 
 static const Widget _build_dock_station_widgets[] = {
-{   WWT_CLOSEBOX,   RESIZE_NONE,     7,     0,    10,     0,    13, STR_00C5,                         STR_018B_CLOSE_WINDOW},
-{    WWT_CAPTION,   RESIZE_NONE,     7,    11,   147,     0,    13, STR_3068_DOCK,                    STR_018C_WINDOW_TITLE_DRAG_THIS},
-{      WWT_PANEL,   RESIZE_NONE,     7,     0,   147,    14,    74, 0x0,                              STR_NULL},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,    14,    73,    30,    40, STR_02DB_OFF,                     STR_3065_DON_T_HIGHLIGHT_COVERAGE},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,    74,   133,    30,    40, STR_02DA_ON,                      STR_3064_HIGHLIGHT_COVERAGE_AREA},
-{      WWT_LABEL,   RESIZE_NONE,     7,     0,   147,    17,    30, STR_3066_COVERAGE_AREA_HIGHLIGHT, STR_NULL},
+{   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,			STR_018B_CLOSE_WINDOW},
+{    WWT_CAPTION,     7,    11,   147,     0,    13, STR_3068_DOCK,	STR_018C_WINDOW_TITLE_DRAG_THIS},
+{      WWT_PANEL,     7,     0,   147,    14,    74, 0x0,						STR_NULL},
+{   WWT_CLOSEBOX,    14,    14,    73,    30,    40, STR_02DB_OFF,	STR_3065_DON_T_HIGHLIGHT_COVERAGE},
+{   WWT_CLOSEBOX,    14,    74,   133,    30,    40, STR_02DA_ON,		STR_3064_HIGHLIGHT_COVERAGE_AREA},
 {   WIDGETS_END},
 };
 
 static const WindowDesc _build_dock_station_desc = {
-	WDP_AUTO, WDP_AUTO, 148, 75,
+	-1, -1, 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(void)
+static void ShowBuildDockStationPicker()
 {
 	AllocateWindowDesc(&_build_dock_station_desc);
 }
 
-static void UpdateDocksDirection(void)
+static void UpdateDocksDirection()
 {
-	if (_ship_depot_direction != AXIS_X) {
+	if (_ship_depot_direction != 0) {
 		SetTileSelectSize(1, 2);
 	} else {
 		SetTileSelectSize(2, 1);
@@ -314,9 +276,8 @@ static void UpdateDocksDirection(void)
 static void BuildDocksDepotWndProc(Window *w, WindowEvent *e)
 {
 	switch(e->event) {
-	case WE_CREATE: LowerWindowWidget(w, _ship_depot_direction + 3); break;
-
 	case WE_PAINT:
+		w->click_state = (1<<3) << _ship_depot_direction;
 		DrawWindowWidgets(w);
 
 		DrawShipDepotSprite(67, 35, 0);
@@ -326,12 +287,13 @@ static void BuildDocksDepotWndProc(Window *w, WindowEvent *e)
 		return;
 
 	case WE_CLICK: {
-		switch (e->we.click.widget) {
+		switch(e->click.widget) {
+		case 0:
+			ResetObjectToPlace();
+			break;
 		case 3:
 		case 4:
-			RaiseWindowWidget(w, _ship_depot_direction + 3);
-			_ship_depot_direction = e->we.click.widget - 3;
-			LowerWindowWidget(w, _ship_depot_direction + 3);
+			_ship_depot_direction = e->click.widget - 3;
 			SndPlayFx(SND_15_BEEP);
 			UpdateDocksDirection();
 			SetWindowDirty(w);
@@ -340,26 +302,23 @@ static void BuildDocksDepotWndProc(Window *w, WindowEvent *e)
 	} break;
 
 	case WE_MOUSELOOP:
-		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)
+			DeleteWindow(w);
 		break;
 	}
 }
 
 static const Widget _build_docks_depot_widgets[] = {
-{   WWT_CLOSEBOX,   RESIZE_NONE,     7,     0,    10,     0,    13, STR_00C5,                        STR_018B_CLOSE_WINDOW},
-{    WWT_CAPTION,   RESIZE_NONE,     7,    11,   203,     0,    13, STR_3800_SHIP_DEPOT_ORIENTATION, STR_018C_WINDOW_TITLE_DRAG_THIS},
-{      WWT_PANEL,   RESIZE_NONE,     7,     0,   203,    14,    85, 0x0,                             STR_NULL},
-{      WWT_PANEL,   RESIZE_NONE,    14,     3,   100,    17,    82, 0x0,                             STR_3803_SELECT_SHIP_DEPOT_ORIENTATION},
-{      WWT_PANEL,   RESIZE_NONE,    14,   103,   200,    17,    82, 0x0,                             STR_3803_SELECT_SHIP_DEPOT_ORIENTATION},
+{   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,												STR_018B_CLOSE_WINDOW},
+{    WWT_CAPTION,     7,    11,   203,     0,    13, STR_3800_SHIP_DEPOT_ORIENTATION,	STR_018C_WINDOW_TITLE_DRAG_THIS},
+{      WWT_PANEL,     7,     0,   203,    14,    85, 0x0,															STR_NULL},
+{      WWT_PANEL,    14,     3,   100,    17,    82, 0x0,															STR_3803_SELECT_SHIP_DEPOT_ORIENTATION},
+{      WWT_PANEL,    14,   103,   200,    17,    82, 0x0,															STR_3803_SELECT_SHIP_DEPOT_ORIENTATION},
 {   WIDGETS_END},
 };
 
 static const WindowDesc _build_docks_depot_desc = {
-	WDP_AUTO, WDP_AUTO, 204, 86,
+	-1, -1, 204, 86,
 	WC_BUILD_DEPOT,WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_build_docks_depot_widgets,
@@ -367,14 +326,14 @@ static const WindowDesc _build_docks_depot_desc = {
 };
 
 
-static void ShowBuildDocksDepotPicker(void)
+static void ShowBuildDocksDepotPicker()
 {
 	AllocateWindowDesc(&_build_docks_depot_desc);
 	UpdateDocksDirection();
 }
 
 
-void InitializeDockGui(void)
+void InitializeDockGui()
 {
-	_ship_depot_direction = AXIS_X;
+	_ship_depot_direction = 0;
 }

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

@@ -32,3 +32,18 @@ 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

@@ -18,12 +18,13 @@ Use make or gmake to compile OpenTTD. You can adjust Makefile.config to compile
 BeOS:
 On BeOS, run ./configure and then use jam. There are a variaty of options you can pass to your build tool, these are reported by ./configure.
 
+
 1.2 Installing OpenTTD.
 
 On Windows, insert your "Transport Tycoon Deluxe for Windows 95" disk. You can use a DOS version, but your graphics will be purple. NB: Even if your version of Transport Tycoon Deluxe ran on Windows 95, it may still be the DOS version. Then run the OpenTTD installer. 
 
 On UNIX platforms; decompress your OpenTTD archive, or otherwise run the installer. You should be left with an OpenTTD directory on your system. In this directory, make a subdirectory called 'data', and into this place the sample.cat file and all the .grf files from the install CD of 'Transport Tycoon Deluxe for Windows 95". 
-(Alternatively you can use the TTD GRF files from the DOS version: TRG1.GRF, TRGC.GRF, TRGH.GRF, TRGI.GRF, TRGT.GRF. A few minor graphical glitches with the DOS graphics remain. E.g. the autorail button in the rail toolbar doesn't look as nice as with the Windows graphics.)
+(Alternatively you can use the TTD GRF files from the DOS version: TRG1.GRF, TRGC.GRF, TRGH.GRF, TRGI.GRF, TRGT.GRF. Those filenames have to be uppercase to be detected correctly. A few minor graphical glitches with the DOS graphics remain. E.g. the autorail button in the rail toolbar doesn't look as nice as with the Windows graphics.)
 
 If you want MIDI music, copy the 'gm' folder from the original game directory/CD to the OpenTTD folder.
 
@@ -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_install_instructions.txt

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

docs/OSX_where_did_the_package_go.txt

@@ -0,0 +1,24 @@
+It's gone
+
+The main goal with the package system was to make it as simple as possible to update. The problem was that some files inside the data folder should be updated and not others. Now the data files have been moved inside OpenTTD itself and to make it even easier, the same goes for the lang dir. There will no longer be an issue where people have different versions of grf files, language files and OpenTTD.
+
+To install simply copy OpenTTD into the folder you want
+If it is your current folder with outdated grf files, you should remove
+canalsw.grf
+openttd.grf
+opntitle.dat
+signalsw.grf
+trkfoundw.grf
+
+THE TTD GRF FILES ARE STILL NEEDED!
+They need to be inside a folder called "data" in the same folder as OpenTTD. Create it if you have none. It should contain:
+sample.cat
+trg1r.grf
+trgcr.grf
+trghr.grf
+trgir.grf
+trgtr.grf
+
+(Alternatively you can use the TTD GRF files from the DOS version: TRG1.GRF, TRGC.GRF, TRGH.GRF, TRGI.GRF, TRGT.GRF. Those filenames have to be uppercase to be detected correctly. A few minor graphical glitches with the DOS graphics remain. E.g. the autorail button in the rail toolbar doesn't look as nice as with the Windows graphics.)
+
+You should also use the data folder to add any custom grf files if you like

docs/README_if_game_crashed_on_OSX.txt

@@ -0,0 +1,36 @@
+Since you are reading this, OpenTTD have crashed. This file tells you how 
+to fix the most common problems or make to make a bug report, that the 
+developers can use to track down the problem
+
+If it is an assert, OpenTTD will open the console for you, if it is truly a crash, you have to do it yourself. The Console is located at /Applications/Utilities/Console.
+The problem is near the button of the page
+
+The problems are as follows:
+NOTE: build from source means to download the source and compile 
+yourself. If you get one of the build from source error with the version 
+that is downloaded on a dmg file, you should make a bug report
+
+--Didn't find a needed file:
+	you just give it the file it asks for. It even tells you what 
+folder it wants it in
+	most common version of this problem is "Error: Cannot open file 
+'data/sample.cat'"
+	if you get that one, that means that you haven't got all the 
+needed files from the WINDOWS version of TTD
+	or if you build from source, 
+
+--Error: No available language packs
+	you need at least one .lng file in your lang folder. This applies 
+only to people who build from source
+
+--spritecache.c:237: failed assertion `b'
+	you got an outdated grf file. Update from the data folder in the 
+source. This applies only to people, who build from 	source
+
+--assertion error that are not triggered by one of the errors listed in 
+this file:
+	you most likely found a bug. Write down the assertion and try to 
+see if you can reproduce it. If you can, make a
+	savegame from just before it happens (autosaves are useful here) 
+and post a bugreport with it on sourceforge
+	Write what you did to trigger the bug and what assertion it made

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. Those filenames have to be uppercase to be detected correctly. 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

@@ -1,136 +1,48 @@
-OpenTTD: OS/2 version
+OpenTTD: OS/2 version  ** CURRENTLY INCOMPLETE **
 =====================
 
-OpenTTD has been ported to work on OS/2 4.x or later (including
-eComStation). The game should work as well as it does on Windows
-or other platforms: the main issues you may encounter are graphics
-card problems, but that is really the fault of SDL.
-
-=========================
-USING OPENTTD FOR OS/2
-=========================
-
-LIBRARIES REQUIRED FOR END USERS
---------------------------------
-
-SDL.DLL (SDL 1.2.7) and FSLib.dll are required to use this program:
-these can be downloaded from the Files section at
-http://sourceforge.net/projects/openttd/ - see "os2-useful-v1.1.zip".
-Version 20051222 of SDL or later is required. This can be found at
-http://sdl.netlabs.org/.
-
-Please note that earlier SDL releases will probably NOT work with
-OpenTTD. If you experience problems with OpenTTD, please check
-your SDL and FSLib.dll versions (both must match).
-
-Note that to actually play the game, I have found in my own
-experience that a version of the Scitech Display Drivers or its later
-incarnation (see www.scitech.com) are necessary for it to work. If
-you have trouble with your native drivers, try the Scitech drivers
-and see if they help the problem.
-
-KNOWN ISSUES
-------------
-
-- If an error occurs during loading, the OS/2 error message window
-  is not always displayed.
-
-A NOTE ABOUT MUSIC
-------------------
-
-OpenTTD includes a music driver which uses the MCI MIDI system. Unfortunately,
-due to the lack of proper MIDI hardware myself, I have been unable to test it,
-but during testing, I found that when MIDI was enabled, I got no sound
-effects. I therefore decided to DISABLE music by default.
-
-To enable music, start OpenTTD with the command line:
-
-   openttd -m os2
-
-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
-------------------------------------------
-
-To start a dedicated multiplayer server, you should run the dedicated.cmd
-file. This enables OpenTTD to open up a VIO console window to display
-its output and gather any necessary input. Running "openttd -D"
-directly will result in the console not being displayed. You may
-still pass any other parameters ('-D' is already passed) to
-dedicated.cmd.
-
-=========================
-BUILDING THE OS/2 VERSION
-=========================
+OpenTTD has been ported to work on OS/2 4.x or later (including eComStation). At the moment, it does not work properly, but it
+can compile and work to an extent.
 
 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 under OS/2: 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 currently detect OS/2 manually.
-
-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.
 
 Libraries Required
 ------------------
 
-The following libraries are required. To build zlib and libpng, I
-simply added the required files (watch out for sample programs, etc)
-to an IDE project file and built a library. Do not use the makefiles
-provided, they are not designed for Watcom (apart from SDL):
+The following libraries are required. To build zlib and libpng, I simply added the required files (watch out for sample
+programs, etc) to an IDE project file and built a library:
 
 - zlib
-  http://www.zlib.org/
+  http://www.zlib.org/ - contains a makefile for OS/2, but is out of date and uses EMX
 
 - libpng
-  http://www.libpng.org/
+  http://www.libpng.org/ - contains an EMX/gcc makefile
 
 - SDL for OS/2
-  ftp://ftp.netlabs.org/pub/sdl/sdl-1.2.7-src-20051222.zip used for
-  0.4.7
+  I used ftp://ftp.netlabs.org/pub/sdl/SDL-1.2.7-src-20040908a.zip - take SDL.dll and SDL.lib from the src/ directory.
 
-- Freetype
-  http://freetype.sourceforge.net/
+Note that to use the compiled program, you also need FSLib.dll (from src/ in the SDL zip) and a version of the Scitech
+Display Drivers or its later incarnation (see www.scitech.com).
 
-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
-http://sourceforge.net/projects/openttd/ - see "os2-useful-v1.1.zip".
+Compiling
+---------
 
-Contact Information
--------------------
+To compile, open the os/os2/openttd.wpj file in the IDE and build the openttd.exe target.
 
-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.
+TODO: compilation of language files properly
 
-Thanks to Paul Smedley for his help with getting OpenTTD to compile under GCC on OS/2.
 
-- Owen Rudge, 24th June 2007
+** THESE DOCS ARE INCOMPLETE FOR THE MOMENT, WILL BE COMPLETED SOON **
+
+If you have any questions, please contact me (owen@owenrudge.net) and I'll try to help you out
+
+- Owen Rudge, 18th December 2004
+

docs/Readme_Windows_MSVC.txt

@@ -1,108 +0,0 @@
-Compiling OpenTTD using Microsoft Visual C++
-December 28, 2006
---------------------------------------------
-PLEASE READ THE ENTIRE DOCUMENT BEFORE DOING ANY ACTUAL CHANGES!!
-
-SUPPORTED MSVC COMPILERS
-------------------------
-OpenTTD includes projects for MSVC 2003.NET and MSVC 2005.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, you are therefore
-strongly encouraged to either upgrade to MSVC 2005 Express (free) or use GCC.
-MSVC 2002 probably works as well, but it has not been tested.
-
-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)
-
-...and of course the newest source from svn://svn.openttd.org/trunk
-
-You need an SVN-client to download the source from subversion:
-
-	* CLI Subversion (http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91)
-	* GUI TortoiseSVN (http://tortoisesvn.tigris.org/download.html)
-
-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.
-
-	* openttd-useful.zip\include\*
-	* afxresh.h
-	to >	C:\Program Files\Microsoft Visual Studio 8\VC\Include
-
-	* openttd-useful.zip\lib\*
-	to >	C:\Program Files\Microsoft Visual Studio 8\VC\Lib
-
-Custom directories might be recommended, check 2.2)
-
-
-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.
-
-It is recommended to use custom directories so you don't overwrite any
-default header or library files.
-
-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
-
-	* Include files: Add the DirectX/Platform SDK include dir you've created
-	* Library files: Add the path to the SDK custom lib dir
-
-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!!
-
-3) 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
-
-
-4) COMPILING
-------------
-Open trunk/openttd[_vs80].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/Release/openttd.exe
-
-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'.
-
-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.
-
-An up-to-date version of this README can be found on the wiki:
-http://wiki.openttd.org/index.php/MicrosoftVisualCExpress

docs/Readme_Windows_MSVC6.0.txt

@@ -0,0 +1,89 @@
+Compilung OpenTTD using MS VC6.0
+
+
+Step 1
+------------------
+Downloaded:
+Useful.zip	http://sourceforge.net/project/showfiles.php?group_id=103924&package_id=114307&release_id=228633
+SDL.zip		http://www.libsdl.org/release/SDL-1.2.7-win32.zip
+DirectX7.0 SDK	http://www.tt-forums.net/download.php?id=15989
+		(or alternatively the latest DirectX SDK from Microsoft)
+afxres.h	http://www-d0.fnal.gov/d0dist/dist/packages/d0ve/devel/windows/AFXRES.H
+
+
+Step 2
+------------------
+Put the newly downloaded files in the VC lib and include directories
+(Where D:\program files\ is your local location of VC)
+
+
+* zconf.h		[useful.zip]
+* zlib.h		[useful.zip]
+* afxres.h	
+in
+  D:\Program Files\Microsoft Visual Studio\VC98\Include
+
+* zlibstat.lib		[usefull.zip]
+* SDL.lib		[SDL.zip
+* libpng.lib		[usefull.zip]
+in
+  D:\Program Files\Microsoft Visual Studio\VC98\Lib
+
+You can also make custum directories, for libraries (.lib) and includes/header files (.h) and
+add it to the VC paths via: 
+Tools -> Options -> Directories -> show directories for:
+a) include files (the include dir: D:\Program Files\Microsoft Visual Studio\VC98\DirectX 7 SDK\include )
+b) library files (the lib dir, D:\Program Files\Microsoft Visual Studio\VC98\DirectX 7 SDK\lib )
+
+
+Step 3: DirextX SDK
+------------------
+(This should work with the latest DirectX SDK as well.)
+The installation with DirectX 7 was odd, so you'd better use the version available via the forum, see also
+the download link on top.
+
+Copy the DirectX 7 SDK files, leaving the directory stucture intact, to the directory:
+  D:\Program Files\Microsoft Visual Studio\VC98\
+thus resulting in
+  D:\Program Files\Microsoft Visual Studio\VC98\DirectX 7 SDK\include and
+  D:\Program Files\Microsoft Visual Studio\VC98\DirectX 7 SDK\lib
+
+Step 3.1
+
+Add these two folders to the search path of VC.
+In VC6.0: Tools -> Options -> Directories -> show directories for:
+a) include files (the include dir: D:\Program Files\Microsoft Visual Studio\VC98\DirectX 7 SDK\include )
+b) libraru files (the lib dir, D:\Program Files\Microsoft Visual Studio\VC98\DirectX 7 SDK\lib )
+
+
+Step 4
+-----------------
+Copy the following files from Transport Tycoon Deluxe to the data folder
+  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. Those filenames have to be uppercase to be detected correctly. 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.)
+
+Step 5
+-----------------
+Compile ...
+
+
+Step 6
+-----------------
+
+Now it should work, it worked for me :)
+
+Go ahead and make that patch!
+
+Happy Hacking!
+
+
+
+------------------
+written by Dribbel
+

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

@@ -2,29 +2,22 @@
 <html>
 <head>
 <meta name="Author" content="Marcin Grzegorczyk">
-<meta name="Description" content="Structure of OpenTTD (OTTD) landscape arrays">
+<meta name="Description" content="Structure of Transport Tycoon Deluxe (TTD) savegame files">
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>OpenTTD Landscape Internals</title>
+<title>Transport Tycoon Deluxe savegame internals</title>
 
 </head>
 <body>
 
 <h3><a name="Landscape">Landscape</a></h3>
 <p>
-Five attributes hold the information about a tile.
-These attributes are referred to as
-  "<span style="font-weight: bold;">type_height</span>",
-  "<span style="font-weight: bold;">m1</span>",
-  "<span style="font-weight: bold;">m2</span>",
-  "<span style="font-weight: bold;">m3</span>",
-  "<span style="font-weight: bold;">m4</span>" and
-  "<span style="font-weight: bold;">m5</span>".
-The most important value is the class of a tile, stored in the upper 4 bits of the type_height array.
-The lower 4 bits are used to encode the height and slope data.
-For a graphical represenation of the tile-layout have a look at <a href="landscape_grid.html">Landscape grid</a> page.
+Five arrays are used to encode the information of the contents of each tile. These arrays are referred to as <a href="#_landscape1">map_owner</a>, <a href="#_landscape2">map2</a>, <a href="#_landscape3">map3_lo</a>, <a href="#_landscape4">type_and_height</a> and <a href="#_landscape5">map5</a>. The known encodings are listed in the table below. The most important value is the class of a tile, stored in the upper 4 bits of the type_and_height array.
 </p>
 <p>
-OTTD's class-specific periodic tile processing routine is called once every +256 ticks for each tile.
+<a name="OwnershipInfo">Owner values</a> <tt>00</tt> through <tt>07</tt> are companies (they're indices into the <a href="#_CompanyArray">array of companies</a>), <tt>10</tt> is no owner, <tt>11</tt> appears to be reserved for water, <tt>80</tt> and above are towns (in this case the low 7 bits contain an index into the <a href="#_TownArray">town array</a>).
+</p>
+<p>
+TTD's class-specific periodic tile processing routine is called once every +256 ticks for each tile.
 </p>
 
 <table border=1 cellpadding=3>
@@ -32,7 +25,7 @@ OTTD's class-specific periodic tile processing routine is called once every +256
 
 <tr><td valign=top nowrap><a name="Class0"><tt> 0 </tt></a></td><td>
 <ul>
-<li>m5 bits 4..0: tile type:
+<li>map5 bits 4..0: tile type:
 <table>
 <tr><td nowrap valign=top><tt>00</tt>&nbsp; </td><td align=left>bare land</td></tr>
 <tr><td nowrap valign=top><tt>01</tt>&nbsp; </td><td align=left>1/3 grass</td></tr>
@@ -40,9 +33,7 @@ OTTD's class-specific periodic tile processing routine is called once every +256
 <tr><td nowrap valign=top><tt>03</tt>&nbsp; </td><td align=left>full grass</td></tr>
 <tr><td nowrap valign=top><tt>07</tt>&nbsp; </td><td align=left>rough land</td></tr>
 <tr><td nowrap valign=top><tt>0B</tt>&nbsp; </td><td align=left>rocks</td></tr>
-<tr><td nowrap valign=top><tt>0F</tt>&nbsp; </td><td align=left>fields; type of fields in m3 bits 3..0 (legal values: 0 through 9)<br>
-  m2: Index into the array of industries (farms), INVALID_INDUSTRY (0xFFFF) if farm has been removed </td>
-</tr>
+<tr><td nowrap valign=top><tt>0F</tt>&nbsp; </td><td align=left>fields; type of fields in map3_lo bits 3..0 (legal values: 0 through 9)</td></tr>
 <tr><td nowrap valign=top><tt>10</tt>&nbsp; </td><td align=left>1/4 snow</td></tr>
 <tr><td nowrap valign=top><tt>11</tt>&nbsp; </td><td align=left>2/4 snow</td></tr>
 <tr><td nowrap valign=top><tt>12</tt>&nbsp; </td><td align=left>3/4 snow</td></tr>
@@ -51,20 +42,20 @@ OTTD's class-specific periodic tile processing routine is called once every +256
 <tr><td nowrap valign=top><tt>17</tt>&nbsp; </td><td align=left>full desert</td></tr>
 </table>
 </li>
-<li>m5 bits 7..5: update counter, incremented on every periodic processing for tile types other than <tt>03</tt>, <tt>07</tt>, <tt>0B</tt> and <tt>10</tt> and above, on wraparound the tile is updated (for fields, the type of fields in m3 is increased, for other types the tile type in m5 is increased)
+<li>map5 bits 7..6: update counter, incremented on every periodic processing for tile types other than <tt>03</tt>, <tt>07</tt>, <tt>0B</tt> and <tt>10</tt> and above, on wraparound the tile is updated (for fields, the type of fields in map3_lo is increased, for other types the tile type in map5 is increased)
 <br>(for snow and desert, these bits are not used, tile is updated on every periodic processing)
 </li>
-<li>m1: <a href="#OwnershipInfo">owner</a> of the tile (normally <tt>10</tt>)
+<li>map_owner: <a href="#OwnershipInfo">owner</a> of the tile (normally <tt>10</tt>)
 </li>
-<li>m4 bits 7..5: type of hedge on the SW border of the tile (1 through 6, or 0=none); bits 4..2: same for the SE border
+<li>map3_hi bits 7..5: type of hedge on the SW border of the tile (1 through 6, or 0=none); bits 4..2: same for the SE border
 </li>
 </ul>
 </td></tr>
 
 <tr><td valign=top nowrap><a name="Class1"><tt> 1 </tt></a></td><td>
-m5 bit 7 clear: railway track
+map5 bit 7 clear: railway track
 <ul>
-<li>m5 bits 0..5: track layout: bit set = track present:
+<li>map5 bits 0..5: track layout: bit set = track present:
 <table>
 <tr><td nowrap valign=top>bit 0: </td><td align=left>in the X direction</td></tr>
 <tr><td nowrap valign=top>bit 1: </td><td align=left>in the Y direction</td></tr>
@@ -73,9 +64,9 @@ m5 bit 7 clear: railway track
 <tr><td nowrap valign=top>bit 4: </td><td align=left>in the west corner (direction N-S)</td></tr>
 <tr><td nowrap valign=top>bit 5: </td><td align=left>in the east corner (direction N-S)</td></tr>
 </table></li>
-<li>m5 bit 6 set = with signals:
+<li>map5 bit 6 set = with signals:
 <ul>
-<li>m3 bits 7..4: bit set = signal present:
+<li>map3_lo bits 7..4: bit set = signal present:
 <ul>
 <li>For track in the X direction:
 <table>
@@ -102,8 +93,8 @@ m5 bit 7 clear: railway track
 <tr><td nowrap valign=top>bit 7: </td><td align=left>signal in the N direction on the track in the W corner</td></tr>
 </table></li>
 </ul></li>
-<li>m2 bits 7..4: bit clear = signal shows red; same bits as in m3</li>
-<li>OpenTTD bits in m4:
+<li>map2 bits 7..4: bit clear = signal shows red; same bits as in map3_lo</li>
+<li>OpenTTD bits in map3_hi:
 <table>
 <tr><td nowrap valign=top>bits 1..0: </td><td align=left>type of signal:</td></tr>
 <tr><td nowrap valign=top><tt>00</tt>: </td><td align=left>normal signals</td></tr>
@@ -113,9 +104,9 @@ m5 bit 7 clear: railway track
 <tr><td nowrap valign=top>bit 2: </td><td align=left>set = semaphore signals, clear = light signals</td></tr>
 </table></li>
 </ul></li>
-<li>m1: <a href="#OwnershipInfo">owner</a> of the track
+<li>map_owner: <a href="#OwnershipInfo">owner</a> of the track
 </li>
-<li>m2 bits 0..3:
+<li>map2 bits 0..3:
 <table>
 <tr><td nowrap valign=top><tt>0</tt>&nbsp; </td><td align=left>on bare land</td></tr>
 <tr><td nowrap valign=top><tt>1</tt>&nbsp; </td><td align=left>on grass, no fences</td></tr>
@@ -131,63 +122,60 @@ m5 bit 7 clear: railway track
 <tr><td nowrap valign=top><tt>B</tt>&nbsp; </td><td align=left>fence on the N side (track in the S corner)</td></tr>
 <tr><td nowrap valign=top><tt>C</tt>&nbsp; </td><td align=left>on snow or desert</td></tr>
 </table></li>
-<li>m3 bits 0..3 = <a name="TrackType">track type</a>: <tt>0</tt> - conventional railway, <tt>1</tt> - electrified railway, <tt>2</tt> - monorail, <tt>3</tt> - maglev
+<li>map3_lo bits 0..3 = <a name="TrackType">track type</a>: <tt>0</tt> - conventional railway, <tt>1</tt> - monorail, <tt>2</tt> - maglev
+</li>
 </ul>
-m5 bits 7 and 6 set: railway depot / checkpoints
+map5 bits 7 and 6 set: railway depot / checkpoints
 <ul>
-<li>m5 value C0..C3: railway depot
-<br>m5 bits 1..0 - direction: exit towards: <tt>00</tt> = NE, <tt>01</tt> = SE, <tt>02</tt> = SW, <tt>03</tt> = NW</li>
-<li>m5 value C4..C5: checkpoint
+<li>map5 value C0..C3: railway depot
+<br>map5 bits 1..0 - direction: exit towards: <tt>00</tt> = NE, <tt>01</tt> = SE, <tt>02</tt> = SW, <tt>03</tt> = NW</li>
+<li>map5 value C4..C5: checkpoint
 <br>bit 0: clear = in X direction, set = in Y direction
 <br>
 <br>
-<li>m1: <a href="#OwnershipInfo">owner</a> of the depot / checkpoint</li>
-<li>m2: For waypoints, index into the array of waypoints.</li>
-<li>m3 bits 0..3 = <a href="#TrackType">track type</a></li>
-<li>m4 bits 0..3 = ground type, as per m2 bits 0..3 for railway tiles.</li>
+<li>map_owner: <a href="#OwnershipInfo">owner</a> of the depot / checkpoint</li>
+<li>map3_lo bits 0..3 = <a href="#TrackType">track type</a></li>
+<li>map3_lo bit 4 = use custom sprite (valid only for the checkpoint)</li>
+<li>map3_hi = custom station id</li>
 </ul>
 </td></tr>
 
 <tr><td valign=top nowrap><a name="Class2"><tt> 2 </tt></a></td><td>
-m5 bits 7..4 clear: road
+map5 bits 7..4 clear: road
 <ul>
-<li>m5 bits 3..0: road layout: bit set = road piece present:
+<li>map5 bits 3..0: road layout: bit set = road piece present:
 <table>
 <tr><td nowrap valign=top>bit 0: </td><td align=left>NW piece</td></tr>
 <tr><td nowrap valign=top>bit 1: </td><td align=left>SW piece</td></tr>
 <tr><td nowrap valign=top>bit 2: </td><td align=left>SE piece</td></tr>
 <tr><td nowrap valign=top>bit 3: </td><td align=left>NE piece</td></tr>
 </table></li>
-<li>m1: <a href="#OwnershipInfo">owner</a> of the road</li>
-<li>m2: Index into the array of towns, 0 for non-town roads</li>
-<li>m4 bits 0..3: counter for the roadworks</li>
-<li>m4 bits 4..6: <tt>0</tt> - on bare land, <tt>1</tt> - on grass, <tt>2</tt> - paved, <tt>3</tt> - with streetlights, <tt>5</tt> - tree-lined, <tt>6</tt> - on grass with road works, <tt>7</tt> - paved with road works</li>
-<li>m4 bit 7 set = on snow or desert</li>
+<li>map_owner: <a href="#OwnershipInfo">owner</a> of the road</li>
+<li>map2 bits 0..2: <tt>0</tt> - on bare land, <tt>1</tt> - on grass, <tt>2</tt> - paved, <tt>3</tt> - with streetlights, <tt>5</tt> - tree-lined, <tt>6</tt> - on grass with road works, <tt>7</tt> - paved with road works</li>
+<li>map3_hi bit 7 set = on snow or desert</li>
 </ul>
-m5 bit 4 set, bits 7..5 clear: level crossing
+map5 bit 4 set, bits 7..5 clear: level crossing
 <ul>
-<li>m5 bit 3: clear - road in the X direction, set - road in the Y direction (railway track always perpendicular)</li>
-<li>m5 bit 2: set if crossing lights are on</li>
-<li>m1: <a href="#OwnershipInfo">owner</a> of the railway track</li>
-<li>m2: Index into the array of towns, 0 for non-town roads</li>
-<li>m3 bits 0..7: <a href="#OwnershipInfo">owner</a> of the road</li>
-<li>m4 bits 3..0: <a href="#TrackType">track type</a></li>
-<li>m4 bits 4..6: <tt>0</tt> - on bare land, <tt>1</tt> - on grass, <tt>2</tt> or higher - paved</li>
-<li>m4 bit 7 set = on snow or desert</li>
+<li>map5 bit 3: clear - road in the X direction, set - road in the Y direction (railway track always perpendicular)</li>
+<li>map5 bit 2: set if crossing lights are on</li>
+<li>map_owner: <a href="#OwnershipInfo">owner</a> of the railway track</li>
+<li>map2 bits 0..2: <tt>0</tt> - on bare land, <tt>1</tt> - on grass, <tt>2</tt> or higher - paved</li>
+<li>map3_lo bits 0..7: <a href="#OwnershipInfo">owner</a> of the road</li>
+<li>map3_hi bits 3..0: <a href="#TrackType">track type</a></li>
+<li>map3_hi bit 7 set = on snow or desert</li>
 </ul>
-m5 bit 5 set: road depot
+map5 bit 5 set: road depot
 <ul>
-<li>m5 bits 3..0 - direction: exit towards: <tt>0</tt> = NE, <tt>1</tt> = SE, <tt>2</tt> = SW, <tt>3</tt> = NW</li>
-<li>m1: <a href="#OwnershipInfo">owner</a> of the depot</li>
-<li>m4 bit 7 set = on snow or desert (not displayed, but set internally)</li>
+<li>map5 bits 3..0 - direction: exit towards: <tt>0</tt> = NE, <tt>1</tt> = SE, <tt>2</tt> = SW, <tt>3</tt> = NW</li>
+<li>map_owner: <a href="#OwnershipInfo">owner</a> of the depot</li>
+<li>map3_hi bit 7 set = on snow or desert (not displayed, but set internally)</li>
 </ul>
 </td></tr>
 
 <tr><td valign=top nowrap><a name="Class3"><tt> 3 </tt></a></td><td>
 Town building
 <ul>
-<li>m2: Index into the array of towns</li>
-<li>m4: <a name="HouseTypes">town building type</a>:
+<li>map2: <a name="HouseTypes">town building type</a>:
 <p><small>Note: In the climate list, 'sub-arctic' means below the <a href="#_snowline">snow line</a>, 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>
@@ -277,13 +265,13 @@ Town building
 <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>
 <tr><td colspan=2></td></tr> <!-- spacer -- -- (and I don't mean a walk) -->
 </table></li>
-<li>m3 bits 7..6: stage of construction (<tt>3</tt> = completed)</li>
-<li>m5 bits 2..0: construction counter, for buildings under construction incremented on every periodic tile processing, on wraparound the stage of construction in m3 is increased</li>
+<li>map3_lo bits 7..6: stage of construction (<tt>3</tt> = completed)</li>
+<li>map5 bits 2..0: construction counter, for buildings under construction incremented on every periodic tile processing, on wraparound the stage of construction in map3_lo is increased</li>
 <li>for large office blocks (types <tt>04</tt> and <tt>05</tt>):
 <ul>
-<li>m1 bits 6..0: position of the lift</li>
-<li>m1 bit 7: if set the lift is moving</li>
-<li>m5 bit 7: if set then m5 bits 5..0 hold the destination floor of the lift, which could be 0..6, except 1, so the building has 6 effective floors. This due to the fact that the first floor is 2 'normal' floors high. One 'normal' floor has a height of 6 lift positions.</li>
+<li>map_owner bits 6..0: position of the lift</li>
+<li>map_owner bit 7: if set the lift is moving</li>
+<li>map5 bit 7: if set then map5 bits 5..0 hold the final position of the lift divided by 6 (valid values 0..6 except 1)</li>
 </ul></li>
 </ul>
 </td></tr>
@@ -291,9 +279,9 @@ Town building
 <tr><td valign=top nowrap><a name="Class4"><tt> 4 </tt></a></td><td>
 Trees
 <ul>
-<li>m5 bits 7..6: number of trees minus one</li>
-<li>m5 bits 2..0: growth status: <tt>0</tt>..<tt>2</tt> - one of trees is growing, <tt>3</tt> - all trees are fully grown, <tt>4</tt>..<tt>6</tt> - one of trees is withering</li>
-<li>m3 bits 7..0: type of trees:
+<li>map5 bits 7..6: number of trees minus one</li>
+<li>map5 bits 2..0: growth status: <tt>0</tt>..<tt>2</tt> - one of trees is growing, <tt>3</tt> - all trees are fully grown, <tt>4</tt>..<tt>6</tt> - one of trees is withering</li>
+<li>map3_lo bits 7..0: type of trees:
 <table>
 <tr><td nowrap valign=top><tt>00</tt>..<tt>0B</tt>&nbsp; </td><td align=left>temperate climate trees</td></tr>
 <tr><td nowrap valign=top><tt>0C</tt>..<tt>13</tt>&nbsp; </td><td align=left>sub-arctic climate trees</td></tr>
@@ -304,24 +292,24 @@ Trees
 </table>
 (note: the actually displayed set of trees depends on both type and number of trees)
 </li>
-<li>m4 bits 7..5: type of hedge on the SW border of the tile (1 through 6, or 0=none)</li>
-<li>m4 bits 4..2: type of hedge on the SE border of the tile (1 through 6, or 0=none)</li>
-<li>m2 bits 5..4:
+<li>map3_hi bits 7..5: type of hedge on the SW border of the tile (1 through 6, or 0=none)</li>
+<li>map3_hi bits 4..2: type of hedge on the SE border of the tile (1 through 6, or 0=none)</li>
+<li>map2 bits 5..4:
 <table>
 <tr><td nowrap valign=top><tt>0</tt>&nbsp; </td><td align=left>on grass</td></tr>
 <tr><td nowrap valign=top><tt>1</tt>&nbsp; </td><td align=left>on rough land</td></tr>
-<tr><td nowrap valign=top><tt>2</tt>&nbsp; </td><td align=left>on snow or desert; m2 bits 7..6 - amount of snow or desert (for desert always set to 3 in TTD)
+<tr><td nowrap valign=top><tt>2</tt>&nbsp; </td><td align=left>on snow or desert; map2 bits 7..6 - amount of snow or desert (for desert always set to 3 in TTD)
 </td></tr>
 </table></li>
-<li>m2 bits 3..0: update counter, incremented on every periodic processing, on wraparound the growth status is updated (or, if it's <tt>3</tt>, a random action is taken)</li>
-<li>m1: <a href="#OwnershipInfo">owner</a> (normally <tt>10</tt>)</li>
+<li>map2 bits 3..0: update counter, incremented on every periodic processing, on wraparound the growth status is updated (or, if it's <tt>3</tt>, a random action is taken)</li>
+<li>map_owner: <a href="#OwnershipInfo">owner</a> (normally <tt>10</tt>)</li>
 </ul>
 </td></tr>
 
 <tr><td valign=top nowrap><a name="Class5"><tt> 5 </tt></a></td><td>
 Station tile
 <ul>
-<li>m5: tile type:
+<li>map5: tile type:
 <table>
 <tr><td nowrap valign=top><tt>00</tt>..<tt>07</tt>&nbsp; </td><td align=left>railway station
 <br><tt>00</tt>..<tt>01</tt> - open platform, <tt>02</tt>..<tt>03</tt> - open platform with station building, <tt>04</tt>....<tt>07</tt> - roofed platform
@@ -379,17 +367,17 @@ exit towards: <tt>47</tt> - NE, <tt>48</tt> - SE, <tt>49</tt> - SW, <tt>4A</tt>
 <tr><td colspan=2></td></tr> <!-- spacer -->
 </table>
 </li>
-<li>m1: <a href="#OwnershipInfo">owner</a> of the station</li>
-<li>m2: index into the <a href="#_StationArray">array of stations</a></li>
-<li>m3 bits 0..3: <a href="#TrackType">track type</a> for railway stations, must be 0 for all the other stations</li>
-<li>m3 bits 4..7: persistent random data for newstations</li>
-<li>m4 = custom station id; 0 means standard graphics</li>
+<li>map_owner: <a href="#OwnershipInfo">owner</a> of the station</li>
+<li>map2: index into the <a href="#_StationArray">array of stations</a></li>
+<li>map3_lo bits 0..3: <a href="#TrackType">track type</a> for railway stations, must be 0 for all the other stations</li>
+<li>map3_lo bit 4 = use custom sprite (valid only railway stations FOR NOW)</li>
+<li>map3_hi = custom station id</li>
 </ul>
 </td></tr>
 
 <tr><td valign=top nowrap><a name="Class6"><tt> 6 </tt></a></td><td>
 <ul>
-<li>m5: tile type:
+<li>map5: tile type:
 <table>
 <tr><td nowrap valign=top><tt>00</tt>&nbsp; </td><td align=left>water</td></tr>
 <tr><td nowrap valign=top><tt>01</tt>&nbsp; </td><td align=left>coast or riverbank</td></tr>
@@ -420,7 +408,7 @@ exit towards: <tt>47</tt> - NE, <tt>48</tt> - SE, <tt>49</tt> - SW, <tt>4A</tt>
 </table>
 </td></tr>
 </table></li>
-<li>m1: <a href="#OwnershipInfo">owner</a> (for water and coasts normally <tt>11</tt>)</li>
+<li>map_owner: <a href="#OwnershipInfo">owner</a> (for water and coasts normally <tt>11</tt>)</li>
 </ul>
 </td></tr>
 
@@ -434,19 +422,19 @@ Tiles of this class form an invisible, one tile wide border at the south (bottom
 <tr><td valign=top nowrap><a name="Class8"><tt> 8 </tt></a></td><td>
 Industry tile
 <ul>
-<li>m5: type:
+<li>map5: type:
 <br><small>(note: this is not the same as the <a href="#industry.type">industry type</a> stored in the <a href="#_IndustryArray">array of industries</a>)</small>
 <table>
 <tr><td nowrap valign=top><tt>00</tt>..<tt>06</tt>&nbsp; </td><td align=left>coal mine
 <table>
 <tr><td nowrap valign=top><tt>00</tt>&nbsp; </td><td align=left>wheel tower when not animated</td></tr>
-<tr><td nowrap valign=top><tt>01</tt>&nbsp; </td><td align=left>wheel tower when animated; animation state in m1 bits 5..0; m1 bit 6 set = sound already generated</td></tr>
+<tr><td nowrap valign=top><tt>01</tt>&nbsp; </td><td align=left>wheel tower when animated; animation state in map_owner bits 5..0; map_owner bit 6 set = sound already generated</td></tr>
 </table>
 </td></tr>
 <tr><td nowrap valign=top><tt>07</tt>..<tt>0A</tt>&nbsp; </td><td align=left>power station
 <table>
 <tr><td nowrap valign=top><tt>08</tt>&nbsp; </td><td align=left>chimney</td></tr>
-<tr><td nowrap valign=top><tt>0A</tt>&nbsp; </td><td align=left>transformer; animation progress in m1 bits 5..2 (valid range <tt>0</tt>..<tt>7</tt>)</td></tr>
+<tr><td nowrap valign=top><tt>0A</tt>&nbsp; </td><td align=left>transformer; animation progress in map_owner bits 5..2 (valid range <tt>0</tt>..<tt>7</tt>)</td></tr>
 </table>
 </td></tr>
 <tr><td nowrap valign=top><tt>0B</tt>..<tt>0F</tt>&nbsp; </td><td align=left>sawmill</td></tr>
@@ -460,7 +448,7 @@ Industry tile
 <tr><td nowrap valign=top><tt>1D</tt>..<tt>20</tt>&nbsp; </td><td align=left>oil wells
 <table>
 <tr><td nowrap valign=top><tt>1D</tt>&nbsp; </td><td align=left>not animated</td></tr>
-<tr><td nowrap valign=top><tt>1E</tt>..<tt>20</tt>&nbsp; </td><td align=left>various stages of animation; progress of animation in m1 bits 1..0</td></tr>
+<tr><td nowrap valign=top><tt>1E</tt>..<tt>20</tt>&nbsp; </td><td align=left>various stages of animation; progress of animation in map_owner bits 1..0</td></tr>
 </table>
 </td></tr>
 <tr><td nowrap valign=top><tt>21</tt>..<tt>26</tt>&nbsp; </td><td align=left>farm</td></tr>
@@ -469,7 +457,7 @@ Industry tile
 <tr><td nowrap valign=top><tt>2F</tt>..<tt>33</tt>&nbsp; </td><td align=left>copper ore mine
 <table>
 <tr><td nowrap valign=top><tt>2F</tt>&nbsp; </td><td align=left>wheel tower when not animated</td></tr>
-<tr><td nowrap valign=top><tt>30</tt>&nbsp; </td><td align=left>wheel tower when animated; animation state in m1 bits 5..0; m1 bit 6 set = sound already generated</td></tr>
+<tr><td nowrap valign=top><tt>30</tt>&nbsp; </td><td align=left>wheel tower when animated; animation state in map_owner bits 5..0; map_owner bit 6 set = sound already generated</td></tr>
 <tr><td nowrap valign=top><tt>31</tt>&nbsp; </td><td align=left>chimney</td></tr>
 </table>
 </td></tr>
@@ -480,7 +468,7 @@ Industry tile
 <tr><td nowrap valign=top><tt>48</tt>..<tt>58</tt>&nbsp; </td><td align=left>gold mine
 <table>
 <tr><td nowrap valign=top><tt>4F</tt>&nbsp; </td><td align=left>wheel tower when not animated</td></tr>
-<tr><td nowrap valign=top><tt>58</tt>&nbsp; </td><td align=left>wheel tower when animated; animation state in m1 bits 5..0; m1 bit 6 set = sound already generated</td></tr>
+<tr><td nowrap valign=top><tt>58</tt>&nbsp; </td><td align=left>wheel tower when animated; animation state in map_owner bits 5..0; map_owner bit 6 set = sound already generated</td></tr>
 </table>
 </td></tr>
 <tr><td nowrap valign=top><tt>59</tt>..<tt>5A</tt>&nbsp; </td><td align=left>bank (sub-arctic or sub-tropical climate)</td></tr>
@@ -507,9 +495,9 @@ Industry tile
 <tr><td nowrap valign=top><tt>8A</tt>..<tt>8D</tt>&nbsp; </td><td align=left>toy shop</td></tr>
 <tr><td nowrap valign=top><tt>8E</tt>..<tt>93</tt>&nbsp; </td><td align=left>toy factory
 <table>
-<tr><td nowrap valign=top><tt>8F</tt>&nbsp; </td><td align=left>animated part; animation state in m3 (valid range <tt>00</tt>..<tt>31</tt>)<br>
-tile animation is started (m4 zeroed) on the periodic processing if <a href="#industry.didtransform">field <tt>2C</tt></a> in the corresponding industry array entry is nonzero<br>
-while the animation is in progress (see the <a href="#_AnimatedTilesList">array at <tt>04328</tt></a>) m4 holds the number of animation cycles that have already taken place; when this number reaches 8 the animation is stopped</td></tr>
+<tr><td nowrap valign=top><tt>8F</tt>&nbsp; </td><td align=left>animated part; animation state in map3_lo (valid range <tt>00</tt>..<tt>31</tt>)<br>
+tile animation is started (map3_hi zeroed) on the periodic processing if <a href="#industry.didtransform">field <tt>2C</tt></a> in the corresponding industry array entry is nonzero<br>
+while the animation is in progress (see the <a href="#_AnimatedTilesList">array at <tt>04328</tt></a>) map3_hi holds the number of animation cycles that have already taken place; when this number reaches 8 the animation is stopped</td></tr>
 </table>
 </td></tr>
 <tr><td nowrap valign=top><tt>94</tt>..<tt>9B</tt>&nbsp; </td><td align=left>plastic fountains (various stages of cyclic animation)</td></tr>
@@ -517,69 +505,69 @@ while the animation is in progress (see the <a href="#_AnimatedTilesList">array
 <tr><td nowrap valign=top><tt>A0</tt>..<tt>A3</tt>&nbsp; </td><td align=left>bubble generator
 <table>
 <tr><td nowrap valign=top><tt>A1</tt>&nbsp; </td><td align=left>generators</td></tr>
-<tr><td nowrap valign=top><tt>A2</tt>&nbsp; </td><td align=left>bubble capture facility; animation state in m3 (valid range <tt>00</tt>..<tt>27</tt>)</td></tr>
+<tr><td nowrap valign=top><tt>A2</tt>&nbsp; </td><td align=left>bubble capture facility; animation state in map3_lo (valid range <tt>00</tt>..<tt>27</tt>)</td></tr>
 </table>
 </td></tr>
 <tr><td nowrap valign=top><tt>A4</tt>..<tt>A6</tt>&nbsp; </td><td align=left>toffee quarry
 <table>
-<tr><td nowrap valign=top><tt>A5</tt>&nbsp; </td><td align=left>animated part; animation state in m3 (valid range <tt>00</tt>..<tt>45</tt>)</td></tr>
+<tr><td nowrap valign=top><tt>A5</tt>&nbsp; </td><td align=left>animated part; animation state in map3_lo (valid range <tt>00</tt>..<tt>45</tt>)</td></tr>
 </table>
 </td></tr>
 <tr><td nowrap valign=top><tt>A7</tt>..<tt>AE</tt>&nbsp; </td><td align=left>sugar mine
 <table>
-<tr><td nowrap valign=top><tt>AE</tt>&nbsp; </td><td align=left>animated part; animation state in m3 (valid range <tt>00</tt>..<tt>5F</tt>)</td></tr>
+<tr><td nowrap valign=top><tt>AE</tt>&nbsp; </td><td align=left>animated part; animation state in map3_lo (valid range <tt>00</tt>..<tt>5F</tt>)</td></tr>
 </table>
 </td></tr>
 <tr><td colspan=2></td></tr> <!-- spacer -->
 </table></li>
-<li>m2: index into the <a href="#_IndustryArray">array of industries</a>
+<li>map2: index into the <a href="#_IndustryArray">array of industries</a>
 </li>
-<li>m1 bit 7: clear = under construction
+<li>map_owner bit 7: clear = under construction
 <ul>
-<li>m1 bits 4..2: construction counter, for buildings under construction incremented on every periodic tile processing
+<li>map_owner bits 4..2: construction counter, for buildings under construction incremented on every periodic tile processing
 </li>
 </ul></li>
-<li>m1 bits 1..0: stage of construction (<tt>3</tt> = completed), incremented when the construction counter wraps around
+<li>map_owner bits 1..0: stage of construction (<tt>3</tt> = completed), incremented when the construction counter wraps around
 <br>the meaning is different for some animated tiles which are never under construction (types <tt>01</tt>, <tt>1E</tt>..<tt>20</tt>, <tt>30</tt>, <tt>58</tt>; see above)
 </li>
 </ul>
 </td></tr>
 
 <tr><td valign=top nowrap><a name="Class9"><tt> 9 </tt></a></td><td>
-m5 bits 7..4 clear: tunnel entrance/exit
+map5 bits 7..4 clear: tunnel entrance/exit
 <ul>
-<li>m5 bits 3..2: <tt>0</tt> - railway tunnel, <tt>1</tt> - road tunnel</li>
-<li>m5 bits 1..0 - direction: entrance towards: <tt>0</tt> = NE, <tt>1</tt> = SE, <tt>2</tt> = SW, <tt>3</tt> = NW</li>
-<li>m1: <a href="#OwnershipInfo">owner</a> of the tunnel</li>
-<li>m3 bits 3..0 = <a href="#TrackType">track type</a> for railway tunnel, must be 0 for road tunnel</li>
-<li>m4 bit 7 set = on snow or desert</li>
+<li>map5 bits 3..2: <tt>0</tt> - railway tunnel, <tt>1</tt> - road tunnel</li>
+<li>map5 bits 1..0 - direction: entrance towards: <tt>0</tt> = NE, <tt>1</tt> = SE, <tt>2</tt> = SW, <tt>3</tt> = NW</li>
+<li>map_owner: <a href="#OwnershipInfo">owner</a> of the tunnel</li>
+<li>map3_lo bits 3..0 = <a href="#TrackType">track type</a> for railway tunnel, must be 0 for road tunnel</li>
+<li>map3_hi bit 7 set = on snow or desert</li>
 </ul>
-m5 bit 7 set: bridge
+map5 bit 7 set: bridge
 <ul><li>
-m5 bit 6 clear: bridge ending
+map5 bit 6 clear: bridge ending
 <ul>
-<li>m5 bit 5: clear - northern, set - southern ending</li>
-<li>m3 bits 3..0 = <a href="#TrackType">type of track</a> on the bridge, must be 0 for road bridge</li>
-<li>m1: <a href="#OwnershipInfo">owner</a> of the bridge</li>
+<li>map5 bit 5: clear - northern, set - southern ending</li>
+<li>map3_lo bits 3..0 = <a href="#TrackType">type of track</a> on the bridge, must be 0 for road bridge</li>
+<li>map_owner: <a href="#OwnershipInfo">owner</a> of the bridge</li>
 </ul>
-m5 bit 6 set: bridge middle part
+map5 bit 6 set: bridge middle part
 <ul>
-<li>m5 bit 5 clear:
+<li>map5 bit 5 clear:
 <ul>
-<li>m5 bits 4..3: land under bridge: <tt>0</tt> - grass, snow or desert, <tt>1</tt> - water</li>
+<li>map5 bits 4..3: land under bridge: <tt>0</tt> - grass, snow or desert, <tt>1</tt> - water</li>
 </ul>
-m5 bit 5 set:
+map5 bit 5 set:
 <ul>
-<li>m5 bits 4..3: transport route under bridge: <tt>0</tt> - railway, <tt>1</tt> - road</li>
+<li>map5 bits 4..3: transport route under bridge: <tt>0</tt> - railway, <tt>1</tt> - road</li>
 </ul>
-<li>m3 bits 7..4 = <a href="#TrackType">type of track</a> on the bridge, must be 0 for road bridge</li>
-<li>m3 bits 3..0 = <a href="#TrackType">type of track</a> under the bridge, if any</li>
-<li>m2 bits 3..0: bridge piece (<tt>0</tt>..<tt>5</tt>)
-<li>m1: <a href="#OwnershipInfo">owner</a> of the land under bridge</li>
+<li>map3_lo bits 7..4 = <a href="#TrackType">type of track</a> on the bridge, must be 0 for road bridge</li>
+<li>map3_lo bits 3..0 = <a href="#TrackType">type of track</a> under the bridge, if any</li>
+<li>map2 bits 3..0: bridge piece (<tt>0</tt>..<tt>5</tt>)
+<li>map_owner: <a href="#OwnershipInfo">owner</a> of the land under bridge</li>
 </ul></li>
-<li>m5 bits 2..1: <tt>0</tt> - railway bridge, <tt>1</tt> - road bridge</li>
-<li>m5 bit 0: clear - bridge in the X direction, set - bridge in the Y direction</li>
-<li>m2 bits 7..4: <a name="BridgeType">bridge type</a>:
+<li>map5 bits 2..1: <tt>0</tt> - railway bridge, <tt>1</tt> - road bridge</li>
+<li>map5 bit 0: clear - bridge in the X direction, set - bridge in the Y direction</li>
+<li>map2 bits 7..4: <a name="BridgeType">bridge type</a>:
 <table>
 <tr><th align=left>Type&nbsp;</th><th align=left>Max. speed (mph)&nbsp;</th><th align=left>Description</th></tr>
 <tr><td nowrap valign=top><tt>0</tt>&nbsp; </td><td align=center>20</td><td align=left>wooden</td></tr>
@@ -594,13 +582,13 @@ m5 bit 5 set:
 <tr><td nowrap valign=top><tt>9</tt>&nbsp; </td><td align=center>160</td><td align=left>girder, steel</td></tr>
 <tr><td nowrap valign=top><tt>A</tt>&nbsp; </td><td align=center>200</td><td align=left>tubular, steel</td></tr>
 </table></li>
-<li>m4 bit 7 set = on snow or desert</li>
+<li>map3_hi bit 7 set = on snow or desert</li>
 </ul>
 </td></tr>
 
 <tr><td valign=top nowrap><a name="ClassA"><tt> A </tt></a></td><td>
 <ul>
-<li>m5: tile type:
+<li>map5: tile type:
 <table>
 <tr><td nowrap valign=top><tt>00</tt>&nbsp; </td><td align=left>transmitter</td></tr>
 <tr><td nowrap valign=top><tt>01</tt>&nbsp; </td><td align=left>lighthouse</td></tr>
@@ -609,18 +597,18 @@ m5 bit 5 set:
 <tr><td nowrap valign=top><tt>80</tt>..<tt>93</tt>&nbsp; </td><td align=left>company headquarters (5 sets of 4 tiles each, updated quarterly depending on the company performance)</td></tr>
 </table>
 </li>
-<li>m1: <a href="#OwnershipInfo">owner</a> of the object (for lighthouses and transmitters normally <tt>10</tt>)</li>
+<li>map_owner: <a href="#OwnershipInfo">owner</a> of the object (for lighthouses and transmitters normally <tt>10</tt>)</li>
 </ul>
 </td></tr>
 
 <tr><td colspan=2>
-Classes <tt>B</tt> through <tt>F</tt> are reserved. The presence of a tile in one of the reserved classes will crash OTTD.
+Classes <tt>B</tt> through <tt>F</tt> are reserved. The presence of a tile in one of the reserved classes will crash TTD.
 </td></tr>
 </table>
 
 
 <hr>
-Original Copyright &copy; 2003 by Marcin Grzegorczyk for TTDLX.<br>
+Copyright &copy; 2003 by Marcin Grzegorczyk.<br>
 Transport Tycoon and Transport Tycoon Deluxe are Copyright &copy; by Chris Sawyer. All the other trademarks are the property of their respective owners.<br>
 
 </body>

docs/landscape_grid.html

@@ -1,269 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type">
-  <meta name="Description" content="Structure of OpenTTD (OTTD) landscape arrays #2">
-  <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.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; }
-    td.caption { white-space: nowrap; text-align: left; }
-    td li      { white-space: nowrap; text-align: left; }
-    th         { white-space: nowrap; text-align: center; }
-  </style>
-</head>
-<body style="direction: ltr;">
-<h3 style="font-weight: bold;">Landscape</h3>
-<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</li>
-</ul>
-<p>
-<ul>
-  <li><span style="font-weight: bold;">type_height</span> - 8 bits in size, stores tile height (lower 4 bits) and tile class (upper 4 bits)</li>
-  <li><span style="font-weight: bold;">m1</span> - 8 bits in size, used to identify the owner of that tile (eg piece of rail, bridge, etc.)</li>
-  <li><span style="font-weight: bold;">m2</span> - 16 bits in size, used to identify the index of the given tile (object) in the (object-)array</li>
-  <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>
-</ul>
-
-<table align=center border="1" cellpadding="2" cellspacing="2">
-  <tbody>
-    <tr>
-      <th colspan=2>class</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>
-    </tr>
-    <tr>
-      <td colspan=2 class="caption">bits</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>
-    </tr>
-    <tr>
-      <td rowspan="2">0</td>
-      <td class="caption">ground</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 OOOO</span></td>
-      <td class="bits">XXXX XX<span class="free">OO</span></td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
-    </tr>
-    <tr>
-      <td class="caption">farmland</td>
-      <td class="bits">-inherit-</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"><span class="free">OOO</span>X XXXX</td>
-    </tr>
-    <tr>
-      <td rowspan=3>1</td>
-      <td class="caption">rail</td>
-      <td class="bits">XXXX 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">XXXX XXXX</td>
-    </tr>
-    <tr>
-      <td class="caption">depot</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> XXXX</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">XXXX XXXX XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO</span> XXXX</td>
-      <td class="bits"><span class="free">OOOO</span> XXXX</td>
-      <td class="bits">-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">XXXX XXXX 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>
-    </tr>
-    <tr>
-      <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 XX<span class="free">OO</span></td>
-    </tr>
-    <tr>
-      <td class="caption">road depot</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 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">town</td>
-      <td class="bits"><span class="abuse">XXXX XXXX</span></td>
-      <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits">XX<span class="free">OO OOOO</span></td>
-      <td class="bits">XXXX XXXX</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="free">OOOO OOOO</span> XXXX 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>
-    </tr>
-    <tr>
-      <td>5</td>
-      <td class="caption">station</td>
-      <td class="bits">XXXX 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">XXXX XXXX</td>
-      <td class="bits">XXXX 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 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>
-    </tr>
-    <tr>
-      <td rowspan=6>8</td>
-      <td class="caption">industry</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>
-    </tr>
-    <tr>
-      <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="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">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">XXXX XXXX</td>
-      <td class="bits">XXX<span class="free">O O</span>XXX</td>
-    </tr>
-    <tr>
-      <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="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">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
-    </tr>
-  </tbody>
-</table>
-
-</body>
-</html>

docs/multiplayer.txt

@@ -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,66 +1,50 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH OPENTTD 6 "September 16, 2004"
 .\" Please adjust this date whenever revising the manpage.
-.Dd Sep 15, 2007
-.Dt OPENTTD 6
-.Sh NAME
-.Nm openttd
-.Nd An open source clone of the Microprose game "Transport Tycoon Deluxe"
-.Sh SYNOPSIS
-.Nm
-.Op Fl Defhi
-.Op Fl G Ar seed
-.Op Fl d Ar [level | cat=lvl[, ...]]
-.Op Fl g Ar [savegame]
-.Op Fl n Ar host[:port][#player]
-.Op Fl r Ar widthxheight
-.Op Fl t Ar date
-.Op Fl m Ar driver
-.Op Fl s Ar driver
-.Op Fl v Ar driver
-.Sh OPTIONS
-.Bl -tag -width ".Fl n Ar host[:port][#player]"
-.It Fl D
-Start a dedicated server
-.It Fl G Ar seed
-Seed the pseudo random number generator
-.It Fl d Ar [level]
-Set debug verbosity for all categories to
-.Ar level
-or 1 if omitted
-.It Fl d Ar cat=level[, ...]
-Set debug verbosity for a specific category
-.It Fl e
-Start in world editor mode
-.It Fl f
-Fork into background (dedicated only, see
-.Fl D )
-.It Fl g Ar [savegame]
-Load
-.Ar savegame
-at start or start a new game if omitted
-.It Fl h
-Display a summary of all options and available drivers
-.It Fl i
-Force to use the DOS palette (use this if you see a lot of magenta)
-.It Fl m Ar driver
-Set the music driver, see
-.Fl h
-.It Fl n Ar host[:port][#player]
-Join a network game, optionally specify player to play as and port to connect to
-.It Fl r Ar widthxheight
-Set the resolution
-.It Fl s Ar driver
-Set the sound driver, see
-.Fl h
-.It Fl t Ar date
-Set the starting date
-.It Fl v Ar driver
-Set the video driver, see
-.Fl h
-.El
-.Sh SEE ALSO
-http://wiki.openttd.org/, http://www.openttd.org
-.Sh HISTORY
-Transport Tycoon Deluxe was written by Chris Sawyer and published by Microprose.
-.Nm
-is a free reimplementation.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+openttd \-  An open source clone of the Microprose game "Transport Tycoon Deluxe"
+.SH SYNOPSIS
+.B openttd
+.RI [ options ]
+.br
+.SH DESCRIPTION
+Unfortanetely, there is no real manpage for openttd yet. Hopefully someone
+will write one soon. For now you should use
+.B openttd -h
+for more information, or check our Wiki manual: http://wiki.openttd.org/
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+.\" \fBopenttd\fP is a program that...
+.SH OPTIONS
+Wouldn't we like to have something here?
+.\" below are commented out, to serve as layout examples for when somebody
+.\" does actually fill this page
+.\" .TP
+.\" .B \-h, \-\-help
+.\" Show summary of options.
+.\" .TP
+.\" .B \-v, \-\-version
+.\" Show version of program.
+.\" .SH SEE ALSO
+.\" .BR bar (1),
+.\" .BR baz (1).
+.br
+.SH AUTHOR
+This manual page was written by Matthijs Kooijman <matthijs@katherina.student.utwente.nl>,
+for the Debian project (but may be used by others).

docs/textcolor.txt

@@ -0,0 +1,38 @@
+0,9,10,2,3,13,9,9,0,10,4,15,6,11,14,1
+dark blue=0	=0
+pale_green=1	=9
+pink=2		=10
+yellow=3	=2
+red=4		=3
+light blue=5	=13
+green=6		=9
+dark green=7	=9
+blue=8		=0
+cream=9		=10
+mauve=10	=4
+purple=11	=15
+orange=12	=6
+brown=13	=11
+grey=14		=14
+white=15	=1
+
+
+		=blue=0		
+		=white=1
+		=yellow=2
+		=red=3
+		=blue=4
+		=grey=5
+		=orange=6
+		=green=7
+		=light yellow=8
+		=light green=9
+		=cream=10
+		=brown=11
+		=white=12
+		=light blue=13
+		=dark grey=14
+		=purple=15
+		=black=16
+		=dark green=17=not good
+		=dark grey=21

driver.c

@@ -1,224 +0,0 @@
-/* $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__) && !defined(__OS2__)
-	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

@@ -1,13 +0,0 @@
-/* $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,67 +1,60 @@
-/* $Id$ */
-
 #include "stdafx.h"
-#include "openttd.h"
+#include "ttd.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, ti->x, ti->y, ti->z);
+	DrawGroundSpriteAt(0x3EC, ti->x, ti->y, ti->z);
 }
 
 
-static uint GetSlopeZ_Dummy(TileIndex tile, uint x, uint y)
-{
-	return 0;
+static uint GetSlopeZ_Dummy(TileInfo *ti) {
+	return GetPartialZ(ti->x&0xF, ti->y&0xF, ti->tileh) + ti->z;
 }
 
-static Slope GetSlopeTileh_Dummy(TileIndex tile, Slope tileh)
-{
-	return SLOPE_FLAT;
+static uint GetSlopeTileh_Dummy(TileInfo *ti) {
+	return ti->tileh;
 }
 
-static int32 ClearTile_Dummy(TileIndex tile, byte flags)
-{
+static int32 ClearTile_Dummy(uint tile, byte flags) {
 	return_cmd_error(STR_0001_OFF_EDGE_OF_MAP);
 }
 
 
-static void GetAcceptedCargo_Dummy(TileIndex tile, AcceptedCargo ac)
+static void GetAcceptedCargo_Dummy(uint tile, AcceptedCargo ac)
 {
 	/* not used */
 }
 
-static void GetTileDesc_Dummy(TileIndex tile, TileDesc *td)
+static void GetTileDesc_Dummy(uint tile, TileDesc *td)
 {
 	td->str = STR_EMPTY;
 	td->owner = OWNER_NONE;
 }
 
-static void AnimateTile_Dummy(TileIndex tile)
+static void AnimateTile_Dummy(uint tile)
 {
 	/* not used */
 }
 
-static void TileLoop_Dummy(TileIndex tile)
+static void TileLoop_Dummy(uint tile)
 {
 	/* not used */
 }
 
-static void ClickTile_Dummy(TileIndex tile)
+static void ClickTile_Dummy(uint tile)
 {
 	/* not used */
 }
 
-static void ChangeTileOwner_Dummy(TileIndex tile, PlayerID old_player, PlayerID new_player)
+static void ChangeTileOwner_Dummy(uint tile, byte old_player, byte new_player)
 {
 	/* not used */
 }
 
-static uint32 GetTileTrackStatus_Dummy(TileIndex tile, TransportType mode)
+static uint32 GetTileTrackStatus_Dummy(uint tile, TransportType mode)
 {
 	return 0;
 }
@@ -79,5 +72,7 @@ const TileTypeProcs _tile_type_dummy_procs = {
 	ChangeTileOwner_Dummy,		/* change_tile_owner_clear */
 	NULL,											/* get_produced_cargo_proc */
 	NULL,											/* vehicle_enter_tile_proc */
+	NULL,											/* vehicle_leave_tile_proc */
 	GetSlopeTileh_Dummy,			/* get_slope_tileh_proc */
 };
+

economy.h

@@ -1,11 +1,6 @@
-/* $Id$ */
-
 #ifndef ECONOMY_H
 #define ECONOMY_H
 
-void ResetPriceBaseMultipliers(void);
-void SetPriceBaseMultiplier(uint price, byte factor);
-
 typedef struct {
 	// Maximum possible loan
 	int32 max_loan;
@@ -21,11 +16,10 @@ typedef struct {
 VARDEF Economy _economy;
 
 typedef struct Subsidy {
-	CargoID cargo_type;
+	byte cargo_type;
 	byte age;
-	/* from and to can either be TownID, StationID or IndustryID */
-	uint16 from;
-	uint16 to;
+	byte from;
+	byte to;
 } Subsidy;
 
 
@@ -43,7 +37,7 @@ enum {
 
     NUM_SCORE = 10, // How many scores are there..
 
-	SCORE_MAX = 1000 // The max score that can be in the performance history
+    SCORE_MAX = 1000, 	// The max score that can be in the performance history
     					//  the scores together of score_info is allowed to be more!
 };
 
@@ -53,18 +47,32 @@ typedef struct ScoreInfo {
     int score;			// How much score it will give
 } ScoreInfo;
 
-extern const ScoreInfo _score_info[];
-extern int _score_part[MAX_PLAYERS][NUM_SCORE];
+static const ScoreInfo score_info[] = {
+    {SCORE_VEHICLES,		120, 			100},
+    {SCORE_STATIONS,		80, 			100},
+    {SCORE_MIN_PROFIT,	10000,		100},
+    {SCORE_MIN_INCOME,	50000,		50},
+    {SCORE_MAX_INCOME,	100000,		100},
+    {SCORE_DELIVERED,		40000, 		400},
+    {SCORE_CARGO,				8,				50},
+    {SCORE_MONEY,				10000000,	50},
+    {SCORE_LOAN,				250000,		50},
+    {SCORE_TOTAL,				0,				0}
+};
+
+int _score_part[MAX_PLAYERS][NUM_SCORE];
 
 int UpdateCompanyRatingAndValue(Player *p, bool update);
+void UpdatePlayerHouse(Player *p, uint score);
+
 
 VARDEF Subsidy _subsidies[MAX_PLAYERS];
-Pair SetupSubsidyDecodeParam(const Subsidy* s, bool mode);
-void DeleteSubsidyWithTown(TownID index);
-void DeleteSubsidyWithIndustry(IndustryID index);
-void DeleteSubsidyWithStation(StationID index);
+Pair SetupSubsidyDecodeParam(Subsidy *s, bool mode);
+void DeleteSubsidyWithIndustry(byte index);
+void DeleteSubsidyWithStation(byte index);
+void RemoteSubsidyAdd(Subsidy *s_new);
 
-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);
+int32 GetTransportedGoodsIncome(uint num_pieces, uint dist, byte transit_days, byte cargo_type);
+uint MoveGoodsToStation(uint tile, int w, int h, int type, uint amount);
 
 #endif /* ECONOMY_H */

elrail.c

@@ -1,456 +0,0 @@
-/* $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_STEEP; /* XXX - Hack to make tunnel entrances to always have a pylon */
-		} 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;
-			const SortableSpriteStruct *sss;
-			int tileh_selector;
-
-			if (IsTunnelTile(ti->tile)) {
-				const SortableSpriteStruct* sss = &CatenarySpriteData_Tunnel[GetTunnelDirection(ti->tile)];
-
-				AddSortableSpriteToDraw(
-					sss->image, ti->x + sss->x_offset, ti->y + sss->y_offset,
-					sss->x_size, sss->y_size, sss->z_size,
-					GetTileZ(ti->tile) + sss->z_offset
-				);
-				break;
-			}
-			PCPconfig = HASBIT(PCPstatus, PCPpositions[t][0]) +
-				(HASBIT(PCPstatus, PCPpositions[t][1]) << 1);
-
-			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;
-			_engine_info[e_id].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

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 #include <stdio.h>
 
 // This pretty simple file checks if the system is LITTLE_ENDIAN or BIG_ENDIAN
@@ -10,42 +8,14 @@
 //  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[]) {
+int main () {
   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;

engine.h

@@ -1,11 +1,7 @@
-/* $Id$ */
-
 #ifndef ENGINE_H
 #define ENGINE_H
 
-/** @file engine.h */
-
-#include "oldpool.h"
+#include "sprite.h"
 
 typedef struct RailVehicleInfo {
 	byte image_index;
@@ -13,40 +9,24 @@ typedef struct RailVehicleInfo {
 	byte base_cost;
 	uint16 max_speed;
 	uint16 power;
-	uint16 weight;
+	byte weight;
 	byte running_cost_base;
-	byte running_cost_class;
 	byte engclass; // 0: steam, 1: diesel, 2: electric
 	byte capacity;
-	CargoID cargo_type;
-	byte ai_rank;
-	uint16 pow_wag_power;
-	byte pow_wag_weight;
-	byte visual_effect; // NOTE: this is not 100% implemented yet, at the moment it is only used as a 'fallback' value
-	                    //       for when the 'powered wagon' callback fails. But it should really also determine what
-	                    //       kind of visual effect to generate for a vehicle (default, steam, diesel, electric).
-	                    //       Same goes for the callback result, which atm is only used to check if a wagon is powered.
-	byte shorten_factor; // length on main map for this type is 8 - shorten_factor
-	byte user_def_data; ///! Property 0x25: "User-defined bit mask" Used only for (very few) NewGRF vehicles
+	byte cargo_type;
 } RailVehicleInfo;
 
 typedef struct ShipVehicleInfo {
 	byte image_index;
 	byte base_cost;
 	uint16 max_speed;
-	CargoID cargo_type;
+	byte cargo_type;
 	uint16 capacity;
 	byte running_cost;
 	byte sfx;
 	byte refittable;
 } ShipVehicleInfo;
 
-// Aircraft subtypes
-enum {
-	AIR_CTOL = 1, // Conventional Take Off and Landing, i.e. planes
-	AIR_FAST = 2
-};
-
 typedef struct AircraftVehicleInfo {
 	byte image_index;
 	byte base_cost;
@@ -56,7 +36,7 @@ typedef struct AircraftVehicleInfo {
 	byte acceleration;
 	byte max_speed;
 	byte mail_capacity;
-	uint16 passenger_capacity;
+	uint16 passanger_capacity;
 } AircraftVehicleInfo;
 
 typedef struct RoadVehicleInfo {
@@ -66,29 +46,20 @@ typedef struct RoadVehicleInfo {
 	byte sfx;
 	byte max_speed;
 	byte capacity;
-	CargoID cargo_type;
+	byte cargo_type;
 } RoadVehicleInfo;
 
-/** Information about a vehicle
- *  @see table/engines.h
- */
 typedef struct EngineInfo {
-	Date base_intro;
-	byte unk2;              ///< Carriages have the highest bit set in this one
-	Year lifelength;
-	Year base_life;
-	byte load_amount;
-	byte railtype:4;
-	byte climates:4;
-	uint32 refit_mask;
-	byte refit_cost;
-	byte misc_flags;
-	byte callbackmask;
+	uint16 base_intro;
+	byte unk2;
+	byte lifelength;
+	byte base_life;
+	byte railtype_climates;
 } EngineInfo;
 
 typedef struct Engine {
-	Date intro_date;
-	Date age;
+	uint16 intro_date;
+	uint16 age;
 	uint16 reliability;
 	uint16 reliability_spd_dec;
 	uint16 reliability_start, reliability_max, reliability_final;
@@ -99,45 +70,67 @@ typedef struct Engine {
 	byte preview_wait;
 	byte railtype;
 	byte player_avail;
-	byte type; // type, ie VEH_Road, VEH_Train, etc. Same as in vehicle.h
 } Engine;
 
-/**
- * EngineInfo.misc_flags is a bitmask, with the following values
- */
-enum {
-	EF_RAIL_TILTS = 0, ///< Rail vehicle tilts in curves (unsupported)
-	EF_ROAD_TRAM  = 0, ///< Road vehicle is a tram/light rail vehicle (unsup)
-	EF_USES_2CC   = 1, ///< Vehicle uses two company colours
-	EF_RAIL_IS_MU = 2, ///< Rail vehicle is a multiple-unit (DMU/EMU)
-};
 
 enum {
 	RVI_MULTIHEAD = 1,
 	RVI_WAGON = 2,
 };
 
+
+void StartupEngines();
+
+
+extern byte _global_cargo_id[NUM_LANDSCAPE][NUM_CARGO];
 enum {
-	NUM_VEHICLE_TYPES = 6
+	CID_DEFAULT = 29,
+	CID_PURCHASE = 30,
+	NUM_CID = 31,
 };
+extern byte _local_cargo_id_ctype[NUM_CID];
+extern byte _local_cargo_id_landscape[NUM_CID];
 
-enum {
-	INVALID_ENGINE = 0xFFFF,
+extern uint32 _engine_refit_masks[256];
+
+extern byte _engine_original_sprites[256];
+void SetWagonOverrideSprites(byte engine, struct SpriteGroup *group, byte *train_id, int trains);
+void SetCustomEngineSprites(byte engine, byte cargo, struct SpriteGroup *group);
+// loaded is in percents, overriding_engine 0xffff is none
+int GetCustomEngineSprite(byte engine, Vehicle *v, byte direction);
+#define GetCustomVehicleSprite(v, direction) GetCustomEngineSprite(v->engine_type, v, direction)
+#define GetCustomVehicleIcon(et, direction) GetCustomEngineSprite(et, NULL, direction)
+
+enum VehicleTrigger {
+	VEHICLE_TRIGGER_NEW_CARGO = 1,
+	// Externally triggered only for the first vehicle in chain
+	VEHICLE_TRIGGER_DEPOT = 2,
+	// Externally triggered only for the first vehicle in chain, only if whole chain is empty
+	VEHICLE_TRIGGER_EMPTY = 4,
+	// Not triggered externally (called for the whole chain if we got NEW_CARGO)
+	VEHICLE_TRIGGER_ANY_NEW_CARGO = 8,
 };
+void TriggerVehicle(Vehicle *veh, enum VehicleTrigger trigger);
 
-void AddTypeToEngines(void);
-void StartupEngines(void);
+void SetCustomEngineName(int engine, char *name);
+StringID GetCustomEngineName(int engine);
 
 
-void DrawTrainEngine(int x, int y, EngineID engine, uint32 image_ormod);
-void DrawRoadVehEngine(int x, int y, EngineID engine, uint32 image_ormod);
-void DrawShipEngine(int x, int y, EngineID engine, uint32 image_ormod);
-void DrawAircraftEngine(int x, int y, EngineID engine, uint32 image_ormod);
+void DrawTrainEngine(int x, int y, int engine, uint32 image_ormod);
+void DrawRoadVehEngine(int x, int y, int engine, uint32 image_ormod);
+void DrawShipEngine(int x, int y, int engine, uint32 image_ormod);
+void DrawAircraftEngine(int x, int y, int engine, uint32 image_ormod);
 
-void LoadCustomEngineNames(void);
-void DeleteCustomEngineNames(void);
+void DrawTrainEngineInfo(int engine, int x, int y, int maxw);
+void DrawRoadVehEngineInfo(int engine, int x, int y, int maxw);
+void DrawShipEngineInfo(int engine, int x, int y, int maxw);
+void DrawAircraftEngineInfo(int engine, int x, int y, int maxw);
+
+void AcceptEnginePreview(Engine *e, int player);
+
+void LoadCustomEngineNames();
+void DeleteCustomEngineNames();
 
-bool IsEngineBuildable(EngineID engine, byte type, PlayerID player);
 
 enum {
 	NUM_NORMAL_RAIL_ENGINES = 54,
@@ -153,156 +146,39 @@ enum {
 	ROAD_ENGINES_INDEX = NUM_TRAIN_ENGINES,
 };
 VARDEF Engine _engines[TOTAL_NUM_ENGINES];
-#define FOR_ALL_ENGINES(e) for (e = _engines; e != endof(_engines); e++)
-
-static inline Engine* GetEngine(EngineID i)
-{
-	assert(i < lengthof(_engines));
-	return &_engines[i];
-}
-
+#define DEREF_ENGINE(i) (&_engines[i])
 VARDEF StringID _engine_name_strings[TOTAL_NUM_ENGINES];
 
-static inline bool IsEngineIndex(uint index)
-{
-	return index < TOTAL_NUM_ENGINES;
-}
-
 /* Access Vehicle Data */
 //#include "table/engines.h"
-extern const EngineInfo orig_engine_info[TOTAL_NUM_ENGINES];
-extern const RailVehicleInfo orig_rail_vehicle_info[NUM_TRAIN_ENGINES];
-extern const ShipVehicleInfo orig_ship_vehicle_info[NUM_SHIP_ENGINES];
-extern const AircraftVehicleInfo orig_aircraft_vehicle_info[NUM_AIRCRAFT_ENGINES];
-extern const RoadVehicleInfo orig_road_vehicle_info[NUM_ROAD_ENGINES];
-
 extern EngineInfo _engine_info[TOTAL_NUM_ENGINES];
 extern RailVehicleInfo _rail_vehicle_info[NUM_TRAIN_ENGINES];
 extern ShipVehicleInfo _ship_vehicle_info[NUM_SHIP_ENGINES];
 extern AircraftVehicleInfo _aircraft_vehicle_info[NUM_AIRCRAFT_ENGINES];
 extern RoadVehicleInfo _road_vehicle_info[NUM_ROAD_ENGINES];
 
-static inline const EngineInfo *EngInfo(EngineID e)
-{
-	assert(e < lengthof(_engine_info));
-	return &_engine_info[e];
-}
-
-static inline const RailVehicleInfo* RailVehInfo(EngineID e)
+static inline RailVehicleInfo *RailVehInfo(uint e)
 {
 	assert(e < lengthof(_rail_vehicle_info));
 	return &_rail_vehicle_info[e];
 }
 
-static inline const ShipVehicleInfo* ShipVehInfo(EngineID e)
+static inline ShipVehicleInfo *ShipVehInfo(uint e)
 {
-	assert(e >= SHIP_ENGINES_INDEX && e < SHIP_ENGINES_INDEX + lengthof(_ship_vehicle_info));
+	assert(e - SHIP_ENGINES_INDEX < lengthof(_ship_vehicle_info));
 	return &_ship_vehicle_info[e - SHIP_ENGINES_INDEX];
 }
 
-static inline const AircraftVehicleInfo* AircraftVehInfo(EngineID e)
+static inline AircraftVehicleInfo *AircraftVehInfo(uint e)
 {
-	assert(e >= AIRCRAFT_ENGINES_INDEX && e < AIRCRAFT_ENGINES_INDEX + lengthof(_aircraft_vehicle_info));
+	assert(e - AIRCRAFT_ENGINES_INDEX < lengthof(_aircraft_vehicle_info));
 	return &_aircraft_vehicle_info[e - AIRCRAFT_ENGINES_INDEX];
 }
 
-static inline const RoadVehicleInfo* RoadVehInfo(EngineID e)
+static inline RoadVehicleInfo *RoadVehInfo(uint e)
 {
-	assert(e >= ROAD_ENGINES_INDEX && e < ROAD_ENGINES_INDEX + lengthof(_road_vehicle_info));
+	assert(e - ROAD_ENGINES_INDEX < lengthof(_road_vehicle_info));
 	return &_road_vehicle_info[e - ROAD_ENGINES_INDEX];
 }
 
-/************************************************************************
- * Engine Replacement stuff
- ************************************************************************/
-
-/**
- * Struct to store engine replacements. DO NOT USE outside of engine.c. Is
- * placed here so the only exception to this rule, the saveload code, can use
- * it.
- */
-struct EngineRenew {
-	EngineRenewID index;
-	EngineID from;
-	EngineID to;
-	struct EngineRenew *next;
-};
-
-typedef struct EngineRenew EngineRenew;
-
-/**
- * Memory pool for engine renew elements. DO NOT USE outside of engine.c. Is
- * placed here so the only exception to this rule, the saveload code, can use
- * it.
- */
-DECLARE_OLD_POOL(EngineRenew, EngineRenew, 3, 8000)
-
-/**
- * Check if a EngineRenew really exists.
- */
-static inline bool IsValidEngineRenew(const EngineRenew *er)
-{
-	return er->from != INVALID_ENGINE;
-}
-
-static inline void DeleteEngineRenew(EngineRenew *er)
-{
-	er->from = INVALID_ENGINE;
-}
-
-#define FOR_ALL_ENGINE_RENEWS_FROM(er, start) for (er = GetEngineRenew(start); er != NULL; er = (er->index + 1U < GetEngineRenewPoolSize()) ? GetEngineRenew(er->index + 1U) : NULL) if (er->from != INVALID_ENGINE) if (IsValidEngineRenew(er))
-#define FOR_ALL_ENGINE_RENEWS(er) FOR_ALL_ENGINE_RENEWS_FROM(er, 0)
-
-
-/**
- * A list to group EngineRenew directives together (such as per-player).
- */
-typedef EngineRenew* EngineRenewList;
-
-/**
- * Remove all engine replacement settings for the player.
- * @param  er The renewlist for a given player.
- * @return The new renewlist for the player.
- */
-void RemoveAllEngineReplacement(EngineRenewList* erl);
-
-/**
- * Retrieve the engine replacement in a given renewlist for an original engine type.
- * @param  erl The renewlist to search in.
- * @param  engine Engine type to be replaced.
- * @return The engine type to replace with, or INVALID_ENGINE if no
- * replacement is in the list.
- */
-EngineID EngineReplacement(EngineRenewList erl, EngineID engine);
-
-/**
- * Add an engine replacement to the given renewlist.
- * @param erl The renewlist to add to.
- * @param old_engine The original engine type.
- * @param new_engine The replacement engine type.
- * @param flags The calling command flags.
- * @return 0 on success, CMD_ERROR on failure.
- */
-int32 AddEngineReplacement(EngineRenewList* erl, EngineID old_engine, EngineID new_engine, uint32 flags);
-
-/**
- * Remove an engine replacement from a given renewlist.
- * @param erl The renewlist from which to remove the replacement
- * @param engine The original engine type.
- * @param flags The calling command flags.
- * @return 0 on success, CMD_ERROR on failure.
- */
-int32 RemoveEngineReplacement(EngineRenewList* erl, EngineID engine, uint32 flags);
-
-/* Engine list manipulators - current implementation is only C wrapper of CBlobT<EngineID> class (helpers.cpp) */
-void EngList_Create(EngineList *el);            ///< Creates engine list
-void EngList_Destroy(EngineList *el);           ///< Deallocate and destroy engine list
-uint EngList_Count(const EngineList *el);       ///< Returns number of items in the engine list
-void EngList_Add(EngineList *el, EngineID eid); ///< Append one item at the end of engine list
-EngineID* EngList_Items(EngineList *el);        ///< Returns engine list items as C array
-void EngList_RemoveAll(EngineList *el);         ///< Removes all items from engine list
-typedef int CDECL EngList_SortTypeFunction(const void*, const void*); ///< argument type for EngList_Sort()
-void EngList_Sort(EngineList *el, EngList_SortTypeFunction compare); ///< qsort of the engine list
-void EngList_SortPartial(EngineList *el, EngList_SortTypeFunction compare, uint begin, uint num_items); ///< qsort of specified portion of the engine list
-
-#endif /* ENGINE_H */
+#endif

engine_gui.c

@@ -1,10 +1,6 @@
-/* $Id$ */
-
 #include "stdafx.h"
-#include "openttd.h"
+#include "ttd.h"
 #include "table/strings.h"
-#include "table/sprites.h"
-#include "functions.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
@@ -12,51 +8,50 @@
 #include "engine.h"
 #include "command.h"
 #include "news.h"
-#include "variables.h"
-#include "newgrf_engine.h"
-#include "vehicle.h"
+
+void DrawShipEngine(int x, int y, int engine, uint32 image_ormod);
+void DrawShipEngineInfo(int engine, int x, int y, int maxw);
 
 
-static StringID GetEngineCategoryName(EngineID engine)
+StringID GetEngineCategoryName(byte engine)
 {
-	switch (GetEngine(engine)->type) {
-		default: NOT_REACHED();
-		case VEH_Road:              return STR_8103_ROAD_VEHICLE;
-		case VEH_Aircraft:          return STR_8104_AIRCRAFT;
-		case VEH_Ship:              return STR_8105_SHIP;
-		case VEH_Train:
-			switch (GetEngine(engine)->railtype) {
-				default: NOT_REACHED();
-				case RAILTYPE_RAIL:     return STR_8102_RAILROAD_LOCOMOTIVE;
-				case RAILTYPE_ELECTRIC: return STR_8102_RAILROAD_LOCOMOTIVE;
-				case RAILTYPE_MONO:     return STR_8106_MONORAIL_LOCOMOTIVE;
-				case RAILTYPE_MAGLEV:   return STR_8107_MAGLEV_LOCOMOTIVE;
+	if (engine < NUM_TRAIN_ENGINES) {
+		switch (_engines[engine].railtype) {
+			case 0:
+				return STR_8102_RAILROAD_LOCOMOTIVE;
+			case 1:
+				return STR_8106_MONORAIL_LOCOMOTIVE;
+			case 2:
+				return STR_8107_MAGLEV_LOCOMOTIVE;
 		}
 	}
+
+	if (engine < NUM_TRAIN_ENGINES + NUM_ROAD_ENGINES)
+		return STR_8103_ROAD_VEHICLE;
+
+	if (engine < NUM_TRAIN_ENGINES + NUM_ROAD_ENGINES + NUM_SHIP_ENGINES)
+		return STR_8105_SHIP;
+
+	return STR_8104_AIRCRAFT;
 }
 
 static const Widget _engine_preview_widgets[] = {
-{   WWT_CLOSEBOX,   RESIZE_NONE,     5,     0,    10,     0,    13, STR_00C5,                                  STR_018B_CLOSE_WINDOW},
-{    WWT_CAPTION,   RESIZE_NONE,     5,    11,   299,     0,    13, STR_8100_MESSAGE_FROM_VEHICLE_MANUFACTURE, STR_018C_WINDOW_TITLE_DRAG_THIS},
-{      WWT_PANEL,   RESIZE_NONE,     5,     0,   299,    14,   191, 0x0,                                       STR_NULL},
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,     5,    85,   144,   172,   183, STR_00C9_NO,                               STR_NULL},
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,     5,   155,   214,   172,   183, STR_00C8_YES,                              STR_NULL},
+{    WWT_TEXTBTN,     5,     0,    10,     0,    13, STR_00C5,			STR_018B_CLOSE_WINDOW},
+{    WWT_CAPTION,     5,    11,   299,     0,    13, STR_8100_MESSAGE_FROM_VEHICLE_MANUFACTURE, STR_018C_WINDOW_TITLE_DRAG_THIS},
+{     WWT_IMGBTN,     5,     0,   299,    14,   191, 0x0,						STR_NULL},
+{ WWT_PUSHTXTBTN,     5,    85,   144,   172,   183, STR_00C9_NO,		STR_NULL},
+{ WWT_PUSHTXTBTN,     5,   155,   214,   172,   183, STR_00C8_YES,	STR_NULL},
 {   WIDGETS_END},
 };
 
-typedef void DrawEngineProc(int x, int y, EngineID engine, uint32 image_ormod);
-typedef void DrawEngineInfoProc(EngineID, int x, int y, int maxw);
+typedef void DrawEngineProc(int x, int y, int engine, uint32 image_ormod);
+typedef void DrawEngineInfoProc(int x, int y, int engine, int maxw);
 
 typedef struct DrawEngineInfo {
 	DrawEngineProc *engine_proc;
 	DrawEngineInfoProc *info_proc;
 } DrawEngineInfo;
 
-static void DrawTrainEngineInfo(EngineID engine, int x, int y, int maxw);
-static void DrawRoadVehEngineInfo(EngineID engine, int x, int y, int maxw);
-static void DrawShipEngineInfo(EngineID engine, int x, int y, int maxw);
-static void DrawAircraftEngineInfo(EngineID engine, int x, int y, int maxw);
-
 static const DrawEngineInfo _draw_engine_list[4] = {
 	{DrawTrainEngine,DrawTrainEngineInfo},
 	{DrawRoadVehEngine,DrawRoadVehEngineInfo},
@@ -66,33 +61,37 @@ static const DrawEngineInfo _draw_engine_list[4] = {
 
 static void EnginePreviewWndProc(Window *w, WindowEvent *e)
 {
-	switch (e->event) {
-	case WE_PAINT: {
-		EngineID engine = w->window_number;
+	byte eng;
+	int engine;
 	const DrawEngineInfo *dei;
 	int width;
 
+	switch(e->event) {
+	case WE_PAINT:
 		DrawWindowWidgets(w);
+		engine = w->window_number;
 
 		SetDParam(0, GetEngineCategoryName(engine));
 		DrawStringMultiCenter(150, 44, STR_8101_WE_HAVE_JUST_DESIGNED_A, 296);
 
 		DrawStringCentered(w->width >> 1, 80, GetCustomEngineName(engine), 0x10);
 
-		dei = &_draw_engine_list[GetEngine(engine)->type - VEH_Train];
+		eng = (byte)engine;
+		(dei = _draw_engine_list,eng < NUM_TRAIN_ENGINES) ||
+		(dei++,eng < NUM_TRAIN_ENGINES + NUM_ROAD_ENGINES) ||
+		(dei++,eng < NUM_TRAIN_ENGINES + NUM_ROAD_ENGINES + NUM_SHIP_ENGINES) ||
+		(dei++, true);
 
 		width = w->width;
 		dei->engine_proc(width >> 1, 100, engine, 0);
 		dei->info_proc(engine, width >> 1, 130, width - 52);
 		break;
-	}
 
 	case WE_CLICK:
-		switch (e->we.click.widget) {
+		switch(e->click.widget) {
+		case 3: DeleteWindow(w); break;
 		case 4:
 			DoCommandP(0, w->window_number, 0, NULL, CMD_WANT_ENGINE_PREVIEW);
-				/* Fallthrough */
-			case 3:
 			DeleteWindow(w);
 			break;
 		}
@@ -109,92 +108,119 @@ static const WindowDesc _engine_preview_desc = {
 };
 
 
-void ShowEnginePreviewWindow(EngineID engine)
+void ShowEnginePreviewWindow(int engine)
 {
-	AllocateWindowDescFront(&_engine_preview_desc, engine);
+	Window *w;
+
+	w = AllocateWindowDesc(&_engine_preview_desc);
+	w->window_number = engine;
 }
 
-static void DrawTrainEngineInfo(EngineID engine, int x, int y, int maxw)
+void DrawNewsNewTrainAvail(Window *w)
 {
-	const RailVehicleInfo *rvi = RailVehInfo(engine);
-	uint multihead = (rvi->flags & RVI_MULTIHEAD) ? 1 : 0;
-
-	SetDParam(0, (_price.build_railvehicle >> 3) * rvi->base_cost >> 5);
-	SetDParam(2, rvi->max_speed);
-	SetDParam(3, rvi->power << multihead);
-	SetDParam(1, rvi->weight << multihead);
-
-	SetDParam(4, rvi->running_cost_base * _price.running_rail[rvi->running_cost_class] >> 8 << multihead);
-
-	if (rvi->capacity != 0) {
-		SetDParam(5, rvi->cargo_type);
-		SetDParam(6, rvi->capacity << multihead);
-	} else {
-		SetDParam(5, CT_INVALID);
-	}
-	DrawStringMultiCenter(x, y, STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER, maxw);
-}
-
-static void DrawAircraftEngineInfo(EngineID engine, int x, int y, int maxw)
-{
-	const AircraftVehicleInfo *avi = AircraftVehInfo(engine);
-	SetDParam(0, (_price.aircraft_base >> 3) * avi->base_cost >> 5);
-	SetDParam(1, avi->max_speed * 128 / 10);
-	SetDParam(2, avi->passenger_capacity);
-	SetDParam(3, avi->mail_capacity);
-	SetDParam(4, avi->running_cost * _price.aircraft_running >> 8);
-
-	DrawStringMultiCenter(x, y, STR_A02E_COST_MAX_SPEED_CAPACITY, maxw);
-}
-
-static void DrawRoadVehEngineInfo(EngineID engine, int x, int y, int maxw)
-{
-	const RoadVehicleInfo *rvi = RoadVehInfo(engine);
-
-	SetDParam(0, (_price.roadveh_base >> 3) * rvi->base_cost >> 5);
-	SetDParam(1, rvi->max_speed / 2);
-	SetDParam(2, rvi->running_cost * _price.roadveh_running >> 8);
-	SetDParam(3, rvi->cargo_type);
-	SetDParam(4, rvi->capacity);
-
-	DrawStringMultiCenter(x, y, STR_902A_COST_SPEED_RUNNING_COST, maxw);
-}
-
-static void DrawShipEngineInfo(EngineID engine, int x, int y, int maxw)
-{
-	const ShipVehicleInfo *svi = ShipVehInfo(engine);
-	SetDParam(0, svi->base_cost * (_price.ship_base >> 3) >> 5);
-	SetDParam(1, svi->max_speed / 2);
-	SetDParam(2, svi->cargo_type);
-	SetDParam(3, svi->capacity);
-	SetDParam(4, svi->running_cost * _price.ship_running >> 8);
-	DrawStringMultiCenter(x, y, STR_982E_COST_MAX_SPEED_CAPACITY, maxw);
-}
-
-StringID GetNewsStringNewVehicleAvail(const NewsItem *ni)
- {
-	EngineID engine = ni->string_id;
-	SetDParam(0, GetEngineCategoryName(engine));
-	SetDParam(1, GetCustomEngineName(engine));
-	return STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE;
-}
-
-void DrawNewsNewVehicleAvail(Window *w)
-{
-	EngineID engine = WP(w, news_d).ni->string_id;
-	const DrawEngineInfo *dei = &_draw_engine_list[GetEngine(engine)->type - VEH_Train];
+	int engine;
 
 	DrawNewsBorder(w);
 
+	engine = WP(w,news_d).ni->string_id;
 	SetDParam(0, GetEngineCategoryName(engine));
-	DrawStringMultiCenter(w->width >> 1, 20, STR_NEW_VEHICLE_NOW_AVAILABLE, w->width - 2);
+	DrawStringMultiCenter(w->width >> 1, 20, STR_8859_NEW_NOW_AVAILABLE, w->width - 2);
 
 	GfxFillRect(25, 56, w->width - 25, w->height - 2, 10);
 
 	SetDParam(0, GetCustomEngineName(engine));
-	DrawStringMultiCenter(w->width >> 1, 57, STR_NEW_VEHICLE_TYPE, w->width - 2);
+	DrawStringMultiCenter(w->width >> 1, 57, STR_885A, w->width - 2);
 
-	dei->engine_proc(w->width >> 1, 88, engine, 0);
-	GfxFillRect(25, 56, w->width - 56, 112, 0x323 | USE_COLORTABLE);
-	dei->info_proc(engine, w->width >> 1, 129, w->width - 52);
+	DrawTrainEngine(w->width >> 1, 88, engine, 0);
+	GfxFillRect(25, 56, w->width - 56, 112, 0x4323);
+	DrawTrainEngineInfo(engine, w->width >> 1, 129, w->width - 52);
+}
+
+StringID GetNewsStringNewTrainAvail(NewsItem *ni)
+{
+	int engine = ni->string_id;
+	SetDParam(0, STR_8859_NEW_NOW_AVAILABLE);
+	SetDParam(1, GetEngineCategoryName(engine));
+	SetDParam(2, GetCustomEngineName(engine));
+	return STR_02B6;
+}
+
+void DrawNewsNewAircraftAvail(Window *w)
+{
+	int engine;
+
+	DrawNewsBorder(w);
+
+	engine = WP(w,news_d).ni->string_id;
+
+	DrawStringMultiCenter(w->width >> 1, 20, STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE, w->width - 2);
+	GfxFillRect(25, 56, w->width - 25, w->height - 2, 10);
+
+	SetDParam(0, GetCustomEngineName(engine));
+	DrawStringMultiCenter(w->width >> 1, 57, STR_A02D, w->width - 2);
+
+	DrawAircraftEngine(w->width >> 1, 93, engine, 0);
+	GfxFillRect(25, 56, w->width - 56, 110, 0x4323);
+	DrawAircraftEngineInfo(engine, w->width >> 1, 131, w->width - 52);
+}
+
+StringID GetNewsStringNewAircraftAvail(NewsItem *ni)
+{
+	int engine = ni->string_id;
+	SetDParam(0, STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE);
+	SetDParam(1, GetCustomEngineName(engine));
+	return STR_02B6;
+}
+
+void DrawNewsNewRoadVehAvail(Window *w)
+{
+	int engine;
+
+	DrawNewsBorder(w);
+
+	engine = WP(w,news_d).ni->string_id;
+	DrawStringMultiCenter(w->width >> 1, 20, STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE, w->width - 2);
+	GfxFillRect(25, 56, w->width - 25, w->height - 2, 10);
+
+	SetDParam(0, GetCustomEngineName(engine));
+	DrawStringMultiCenter(w->width >> 1, 57, STR_9029, w->width - 2);
+
+	DrawRoadVehEngine(w->width >> 1, 88, engine, 0);
+	GfxFillRect(25, 56, w->width - 56, 112, 0x4323);
+	DrawRoadVehEngineInfo(engine, w->width >> 1, 129, w->width - 52);
+}
+
+StringID GetNewsStringNewRoadVehAvail(NewsItem *ni)
+{
+	int engine = ni->string_id;
+	SetDParam(0, STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE);
+	SetDParam(1, GetCustomEngineName(engine));
+	return STR_02B6;
+}
+
+void DrawNewsNewShipAvail(Window *w)
+{
+	int engine;
+
+	DrawNewsBorder(w);
+
+	engine = WP(w,news_d).ni->string_id;
+
+	DrawStringMultiCenter(w->width >> 1, 20, STR_982C_NEW_SHIP_NOW_AVAILABLE, w->width - 2);
+	GfxFillRect(25, 56, w->width - 25, w->height - 2, 10);
+
+	SetDParam(0, GetCustomEngineName(engine));
+	DrawStringMultiCenter(w->width >> 1, 57, STR_982D, w->width - 2);
+
+	DrawShipEngine(w->width >> 1, 93, engine, 0);
+	GfxFillRect(25, 56, w->width - 56, 110, 0x4323);
+	DrawShipEngineInfo(engine, w->width >> 1, 131, w->width - 52);
+}
+
+StringID GetNewsStringNewShipAvail(NewsItem *ni)
+{
+	int engine = ni->string_id;
+	SetDParam(0, STR_982C_NEW_SHIP_NOW_AVAILABLE);
+	SetDParam(1, GetCustomEngineName(engine));
+	return STR_02B6;
 }

extmidi.c

@@ -0,0 +1,104 @@
+#ifndef __BEOS__
+#ifndef __MORPHOS__
+#include "stdafx.h"
+
+#include "ttd.h"
+#include "hal.h"
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <signal.h>
+#include <sys/stat.h>
+#include <errno.h>
+
+#ifndef EXTERNAL_PLAYER
+#define EXTERNAL_PLAYER "timidity"
+#endif
+
+static pid_t _pid;
+
+static void extmidi_kill(void)
+{
+	if (_pid > 0) {
+		kill(_pid, SIGKILL);
+		while (waitpid(_pid, NULL, WNOHANG) != _pid);
+	}
+	_pid = 0;
+}
+
+static char *extmidi_start(char **parm)
+{
+	_pid = 0;
+	return NULL;
+}
+
+static void extmidi_stop(void)
+{
+	extmidi_kill();
+}
+
+static void extmidi_play_song(const char *filename)
+{
+	extmidi_kill();
+
+	_pid = fork();
+	if (_pid < 0) {
+		fprintf(stderr, "extmidi: couldn't fork: %s\n", strerror(errno));
+		_pid = 0;
+		return;
+	}
+
+	if (_pid == 0) {
+		#if defined(MIDI_ARG)
+			execlp(EXTERNAL_PLAYER, "extmidi", MIDI_ARG, filename, NULL);
+		#else
+			execlp(EXTERNAL_PLAYER, "extmidi", filename, NULL);
+		#endif
+		fprintf(stderr, "extmidi: couldn't execl: %s\n", strerror(errno));
+		exit(0);
+	}
+
+	usleep(500);
+
+	if (_pid == waitpid(_pid, NULL, WNOHANG)) {
+		fprintf(stderr, "extmidi: play song failed\n");
+		_pid = 0;
+
+		usleep(5000);
+	}
+}
+
+static void extmidi_stop_song(void)
+{
+	extmidi_kill();
+}
+
+static bool extmidi_is_playing(void)
+{
+	if (_pid == 0)
+		return 0;
+
+	if (waitpid(_pid, NULL, WNOHANG) == _pid) {
+		_pid = 0;
+		return 0;
+	}
+
+	return 1;
+}
+
+static void extmidi_set_volume(byte vol)
+{
+	fprintf(stderr, "extmidi: set volume not implemented\n");
+}
+
+const HalMusicDriver _extmidi_music_driver = {
+	extmidi_start,
+	extmidi_stop,
+	extmidi_play_song,
+	extmidi_stop_song,
+	extmidi_is_playing,
+	extmidi_set_volume,
+};
+
+#endif /* __MORPHOS__ */
+#endif /* __BEOS__ */

fileio.c

@@ -1,12 +1,8 @@
-/* $Id$ */
-
 #include "stdafx.h"
-#include "openttd.h"
-#include "fileio.h"
-#include "functions.h"
-#include "string.h"
-#include "macros.h"
-#include "variables.h"
+#include "ttd.h"
+#if defined(UNIX)
+#include <ctype.h> // required for tolower()
+#endif
 
 /*************************************************/
 /* FILE IO ROUTINES ******************************/
@@ -15,17 +11,17 @@
 #define FIO_BUFFER_SIZE 512
 
 typedef struct {
-	byte *buffer, *buffer_end;          ///< position pointer in local buffer and last valid byte of buffer
-	uint32 pos;                         ///< current (system) position in file
-	FILE *cur_fh;                       ///< current file handle
-	FILE *handles[64];                  ///< array of file handles we can have open
-	byte buffer_start[FIO_BUFFER_SIZE]; ///< local buffer when read from file
+	byte *buffer, *buffer_end;
+	uint32 pos;
+	FILE *cur_fh;
+	FILE *handles[32];
+	byte buffer_start[512];
 } Fio;
 
 static Fio _fio;
 
 // Get current position in file
-uint32 FioGetPos(void)
+uint32 FioGetPos()
 {
 	return _fio.pos + (_fio.buffer - _fio.buffer_start) - FIO_BUFFER_SIZE;
 }
@@ -34,8 +30,7 @@ void FioSeekTo(uint32 pos, int mode)
 {
 	if (mode == SEEK_CUR) pos += FioGetPos();
 	_fio.buffer = _fio.buffer_end = _fio.buffer_start + FIO_BUFFER_SIZE;
-	_fio.pos = pos;
-	fseek(_fio.cur_fh, _fio.pos, SEEK_SET);
+	fseek(_fio.cur_fh, (_fio.pos=pos), SEEK_SET);
 }
 
 // Seek to a file and a position
@@ -44,10 +39,10 @@ void FioSeekToFile(uint32 pos)
 	FILE *f = _fio.handles[pos >> 24];
 	assert(f != NULL);
 	_fio.cur_fh = f;
-	FioSeekTo(GB(pos, 0, 24), SEEK_SET);
+	FioSeekTo(pos & 0xFFFFFF, SEEK_SET);
 }
 
-byte FioReadByte(void)
+byte FioReadByte()
 {
 	if (_fio.buffer == _fio.buffer_end) {
 		_fio.pos += FIO_BUFFER_SIZE;
@@ -68,13 +63,14 @@ void FioSkipBytes(int n)
 	}
 }
 
-uint16 FioReadWord(void)
+
+uint16 FioReadWord()
 {
 	byte b = FioReadByte();
 	return (FioReadByte() << 8) | b;
 }
 
-uint32 FioReadDword(void)
+uint32 FioReadDword()
 {
 	uint b = FioReadWord();
 	return (FioReadWord() << 16) | b;
@@ -87,82 +83,51 @@ void FioReadBlock(void *ptr, uint size)
 	fread(ptr, 1, size, _fio.cur_fh);
 }
 
-static inline void FioCloseFile(int slot)
-{
-	if (_fio.handles[slot] != NULL) {
-		fclose(_fio.handles[slot]);
-		_fio.handles[slot] = NULL;
-	}
-}
-
-void FioCloseAll(void)
+void FioCloseAll()
 {
 	int i;
 
-	for (i = 0; i != lengthof(_fio.handles); i++)
-		FioCloseFile(i);
+	for(i=0; i!=lengthof(_fio.handles); i++) {
+		if (_fio.handles[i] != NULL) {
+			fclose(_fio.handles[i]);
+			_fio.handles[i] = NULL;
+		}
+	}
 }
 
-bool FioCheckFileExists(const char *filename)
-{
-	FILE *f = FioFOpenFile(filename);
-	if (f == NULL) return false;
-
-	fclose(f);
-	return true;
-}
-
-FILE *FioFOpenFile(const char *filename)
+void FioOpenFile(int slot, const char *filename)
 {
 	FILE *f;
 	char buf[MAX_PATH];
 
-	snprintf(buf, lengthof(buf), "%s%s", _paths.data_dir, filename);
+	sprintf(buf, "%s%s", _path.data_dir, filename);
 
 	f = fopen(buf, "rb");
 #if !defined(WIN32)
 	if (f == NULL) {
-		strtolower(buf + strlen(_paths.data_dir) - 1);
+		char *s;
+		// Make lower case and try again
+		for(s=buf + strlen(_path.data_dir) - 1; *s != 0; s++)
+			*s = tolower(*s);
 		f = fopen(buf, "rb");
 		
 #if defined SECOND_DATA_DIR
 	// tries in the 2nd data directory
 		if (f == NULL) {
-			snprintf(buf, lengthof(buf), "%s%s", _paths.second_data_dir, filename);
-			strtolower(buf + strlen(_paths.second_data_dir) - 1);
+			sprintf(buf, "%s%s", _path.second_data_dir, filename);
+			for(s=buf + strlen(_path.second_data_dir) - 1; *s != 0; s++)
+			*s = tolower(*s);
 		f = fopen(buf, "rb");
 		}
 #endif
 	}
 #endif
 
-	return f;
-}
+	if (f == NULL)
+		error("Cannot open file '%s'", buf);
 
-void FioOpenFile(int slot, const char *filename)
-{
-	FILE *f = FioFOpenFile(filename);
-
-	if (f == NULL) error("Cannot open file '%s%s'", _paths.data_dir, filename);
-
-	FioCloseFile(slot); // if file was opened before, close it
 	_fio.handles[slot] = f;
 	FioSeekToFile(slot << 24);
 }
 
-/**
- * Sanitizes a filename, i.e. removes all illegal characters from it.
- * @param filename the "\0" terminated filename
- */
-void SanitizeFilename(char *filename)
-{
-	for (; *filename != '\0'; filename++) {
-		switch (*filename) {
-			/* The following characters are not allowed in filenames
-			 * on at least one of the supported operating systems: */
-			case ':': case '\\': case '*': case '?': case '/': case '<': case '>': case '|': case '"':
-				*filename = '_';
-				break;
-		}
-	}
-}
+

fileio.h

@@ -1,20 +1,15 @@
-/* $Id$ */
-
 #ifndef FILEIO_H
 #define FILEIO_H
 
 void FioSeekTo(uint32 pos, int mode);
 void FioSeekToFile(uint32 pos);
-uint32 FioGetPos(void);
-byte FioReadByte(void);
-uint16 FioReadWord(void);
-uint32 FioReadDword(void);
-void FioCloseAll(void);
-FILE *FioFOpenFile(const char *filename);
+uint32 FioGetPos();
+byte FioReadByte();
+uint16 FioReadWord();
+uint32 FioReadDword();
+void FioCloseAll();
 void FioOpenFile(int slot, const char *filename);
 void FioReadBlock(void *ptr, uint size);
 void FioSkipBytes(int n);
-bool FioCheckFileExists(const char *filename);
-void SanitizeFilename(char *filename);
 
 #endif /* FILEIO_H */