openttd-mini: comparison pathfind.c

equal deleted inserted replaced

-:00aa2d4cf39e
+:e83501906eae
 	0,
 	0x5,
 	0x2A,
 };
-static void TPFMode2(TrackPathFinder *tpf, TileIndex tile, int direction)
+static void TPFMode2(TrackPathFinder* tpf, TileIndex tile, DiagDirection direction)
 {
 	uint bits;
 	int i;
 	RememberData rd;
 	int owner = -1;
 32,40,40,42,40,44,44,46,
 32,48,48,50,48,52,52,54,
 48,56,56,58,56,60,60,62,
 };
-static void TPFMode1(TrackPathFinder *tpf, TileIndex tile, uint direction)
+static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection direction)
 {
 	uint bits;
 	int i;
 	RememberData rd;
 	TileIndex tile_org = tile;
 	 * not reach it (for example, when two lines merge */
 	if (tpf->hasbit_13)
 		return;
 	tile = tile_org;
-	direction ^= 2;
+	direction = ReverseDiagDir(direction);
 	bits = GetTileTrackStatus(tile, tpf->tracktype);
 	bits |= (bits >> 8);
 	if ( (byte)bits != tpf->var2) {
 		}
 		tpf->rd = rd;
 	} while (bits != 0);
 }
-void FollowTrack(TileIndex tile, uint16 flags, byte direction, TPFEnumProc *enum_proc, TPFAfterProc *after_proc, void *data)
+void FollowTrack(TileIndex tile, uint16 flags, DiagDirection direction, TPFEnumProc *enum_proc, TPFAfterProc *after_proc, void *data)
 {
 	TrackPathFinder tpf;
 	assert(direction < 4);
 }
 // mark a tile as visited and store the length of the path.
 // if we already had a better path to this tile, return false.
 // otherwise return true.
-static bool NtpVisit(NewTrackPathFinder *tpf, TileIndex tile, uint dir, uint length)
+static bool NtpVisit(NewTrackPathFinder* tpf, TileIndex tile, DiagDirection dir, uint length)
 {
 	uint hash,head;
 	HashLink *link, *new_link;
 	assert(length < 16384-1);
 // new more optimized pathfinder for trains...
 // Tile is the tile the train is at.
 // direction is the tile the train is moving towards.
-static void NTPEnum(NewTrackPathFinder *tpf, TileIndex tile, uint direction)
+static void NTPEnum(NewTrackPathFinder* tpf, TileIndex tile, DiagDirection direction)
 {
 	TrackBits bits, allbits;
 	uint track;
 	TileIndex tile_org;
 	StackedItem si;
 	}
 }
 // new pathfinder for trains. better and faster.
-void NewTrainPathfind(TileIndex tile, TileIndex dest, byte direction, NTPEnumProc *enum_proc, void *data)
+void NewTrainPathfind(TileIndex tile, TileIndex dest, DiagDirection direction, NTPEnumProc* enum_proc, void* data)
 {
 	NewTrackPathFinder tpf;
 	tpf.dest = dest;
 	tpf.userdata = data;

changeset 3153	e83501906eae
parent 3132	4ecd7f40fc76
child 3154	6ab0cb6b7ab3