changeset 12033:3a06a1a551f5 draft

(svn r16440) -Fix [NoAI]: AIRail::GetRailStationDirection returned incorrect information
author yexo <yexo@openttd.org>
date Tue, 26 May 2009 22:03:16 +0000
parents 2afeb10ae6ba
children aa140a9c419c
files src/ai/api/ai_rail.cpp src/station_map.h
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ai/api/ai_rail.cpp
+++ b/src/ai/api/ai_rail.cpp
@@ -110,7 +110,7 @@
 {
 	if (!IsRailStationTile(tile)) return RAILTRACK_INVALID;
 
-	return (RailTrack)::GetRailStationTrack(tile);
+	return (RailTrack)::GetRailStationTrackBits(tile);
 }
 
 /* static */ bool AIRail::BuildRailDepot(TileIndex tile, TileIndex front)
--- a/src/station_map.h
+++ b/src/station_map.h
@@ -202,6 +202,11 @@
 	return AxisToTrack(GetRailStationAxis(t));
 }
 
+static inline TrackBits GetRailStationTrackBits(TileIndex t)
+{
+	return AxisToTrackBits(GetRailStationAxis(t));
+}
+
 static inline bool IsCompatibleTrainStationTile(TileIndex t1, TileIndex t2)
 {
 	assert(IsRailwayStationTile(t2));
@@ -245,7 +250,7 @@
  */
 static inline TrackBits GetRailStationReservation(TileIndex t)
 {
-	return GetRailwayStationReservation(t) ? AxisToTrackBits(GetRailStationAxis(t)) : TRACK_BIT_NONE;
+	return GetRailwayStationReservation(t) ? GetRailStationTrackBits(t) : TRACK_BIT_NONE;
 }