(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.

This commit is contained in:
rubidium
2007-01-10 18:56:51 +00:00
parent ce75f6549d
commit a7d0cdf95f
190 changed files with 2825 additions and 2208 deletions

View File

@@ -4,6 +4,7 @@
#define PATHFIND_H
#include "direction.h"
#include "openttd.h"
enum {
STR_FACTOR = 2,
@@ -14,7 +15,7 @@ enum {
//supported on all archs)
typedef struct TrackPathFinder TrackPathFinder;
typedef bool TPFEnumProc(TileIndex tile, void *data, int track, uint length, byte *state);
typedef bool TPFEnumProc(TileIndex tile, void *data, Trackdir trackdir, uint length, byte *state);
typedef void TPFAfterProc(TrackPathFinder *tpf);
typedef bool NTPEnumProc(TileIndex tile, void *data, int track, uint length);
@@ -51,9 +52,9 @@ struct TrackPathFinder {
RememberData rd;
int the_dir;
TrackdirByte the_dir;
byte tracktype;
TransportTypeByte tracktype;
byte var2;
bool disable_tile_hash;
bool hasbit_13;