--- a/src/ai/api/ai_stationlist_valuator.cpp	Thu Jul 12 15:50:55 2007 +0000
+++ b/src/ai/api/ai_stationlist_valuator.cpp	Thu Jul 12 15:51:19 2007 +0000
@@ -1,15 +1,14 @@
+/* $Id$ */
+
 #include "ai_stationlist_valuator.hpp"
-#include "../../station.h"
+#include "ai_station.hpp"
 
 int32 AIStationListLocation::Valuate(int32 station) const
 {
-	if (!IsValidStationID(station)) return INVALID_TILE;
-	return GetStation(station)->xy;
+	return AIStation::GetLocation(station);
 }
 
 int32 AIStationListCargoWaiting::Valuate(int32 station) const
 {
-	if (!IsValidStationID(station)) return -1;
-	return GetStation(station)->goods[this->cargo_type].cargo.Count();
+	return AIStation::GetCargoWaiting(station, this->cargo_type);
 }
-