cpp/openttd-patchpack/source Changeset - r10917:cfd8adad57b0

Changeset - r10917:cfd8adad57b0

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

frosch - 15 years ago 2009-01-24 13:05:04
frosch@openttd.org

(svn r15252) -Fix (r15027): AIMarine::AreWaterTilesConnected() reported aqueducts being connected with all surrounding tiles. Also add some type safety.

2 files changed with 9 insertions and 9 deletions:

src/ai/api/ai_marine.cpp

src/ai/api/ai_tile.cpp

0 comments (0 inline, 0 general)

src/ai/api/ai_marine.cpp

➞

Show inline comments

@@ @@ -55,16 +55,16 @@ @@
 	if (::DistanceManhattan(t1, t2) != 1) return false;
 	if (t1 > t2) Swap(t1, t2);
 	uint32 gtts1 = ::GetTileTrackStatus(t1, TRANSPORT_WATER, 0);
 	uint32 gtts2 = ::GetTileTrackStatus(t2, TRANSPORT_WATER, 0);
 	/* Ship can't travel on one of the tiles. */
 	if (gtts1 == 0 || gtts2 == 0) return false;
 	DiagDirection to_other_tile = (TileX(t1) == TileX(t2)) ? DIAGDIR_SE : DIAGDIR_SW;
 	/* Check whether we can 'leave' the tile at the border and 'enter' the other tile at the border */
 	return (gtts1 & DiagdirReachesTrackdirs(ReverseDiagDir(to_other_tile))) != 0 && (gtts2 & DiagdirReachesTrackdirs(to_other_tile)) != 0;
 	/* Determine the reachable tracks from the shared edge */
 	TrackBits gtts2 = ::TrackStatusToTrackBits(::GetTileTrackStatus(t2, TRANSPORT_WATER, 0, to_other_tile)) & ::DiagdirReachesTracks(to_other_tile);
 	if (gtts2 == TRACK_BIT_NONE) return false;
 	to_other_tile = ReverseDiagDir(to_other_tile);
 	TrackBits gtts1 = ::TrackStatusToTrackBits(::GetTileTrackStatus(t1, TRANSPORT_WATER, 0, to_other_tile)) & ::DiagdirReachesTracks(to_other_tile);
 	return gtts1 != TRACK_BIT_NONE;
+}
 /* static */ bool AIMarine::BuildWaterDepot(TileIndex tile, bool vertical)

src/ai/api/ai_tile.cpp

➞

Show inline comments

@@ @@ -157,7 +157,7 @@ @@
+{
 	if (!::IsValidTile(tile)) return false;
-	return GB(::GetTileTrackStatus(tile, (::TransportType)transport_type, UINT32_MAX), 0, 16) != 0;
+	return ::TrackStatusToTrackdirBits(::GetTileTrackStatus(tile, (::TransportType)transport_type, UINT32_MAX)) != TRACKDIR_BIT_NONE;
+}
 /* static */ int32 AITile::GetCargoAcceptance(TileIndex tile, CargoID cargo_type, uint width, uint height, uint radius)

0 comments (0 inline, 0 general)