--- a/src/ai/api/ai_stationlist_valuator.cpp	Tue Feb 26 16:03:39 2008 +0000
+++ b/src/ai/api/ai_stationlist_valuator.cpp	Tue Feb 26 18:32:35 2008 +0000
@@ -4,27 +4,27 @@
 #include "ai_station.hpp"
 #include "ai_map.hpp"
 
-int32 AIStationList_vLocation::Valuate(int32 station) const
+int32 AIStationList_vLocation::Valuate(int32 station_id) const
 {
-	return AIStation::GetLocation(station);
-}
-
-int32 AIStationList_vCargoWaiting::Valuate(int32 station) const
-{
-	return AIStation::GetCargoWaiting(station, this->cargo_type);
+	return AIStation::GetLocation(station_id);
 }
 
-int32 AIStationList_vCargoRating::Valuate(int32 station) const
+int32 AIStationList_vCargoWaiting::Valuate(int32 station_id) const
 {
-	return AIStation::GetCargoRating(station, this->cargo_type);
+	return AIStation::GetCargoWaiting(station_id, this->cargo_id);
 }
 
-int32 AIStationList_vDistanceManhattanToTile::Valuate(int32 station) const
+int32 AIStationList_vCargoRating::Valuate(int32 station_id) const
 {
-	return AIMap::DistanceManhattan(this->tile, AIStation::GetLocation(station));
+	return AIStation::GetCargoRating(station_id, this->cargo_id);
 }
 
-int32 AIStationList_vDistanceSquareToTile::Valuate(int32 station) const
+int32 AIStationList_vDistanceManhattanToTile::Valuate(int32 station_id) const
 {
-	return AIMap::DistanceSquare(this->tile, AIStation::GetLocation(station));
+	return AIMap::DistanceManhattan(this->tile, AIStation::GetLocation(station_id));
 }
+
+int32 AIStationList_vDistanceSquareToTile::Valuate(int32 station_id) const
+{
+	return AIMap::DistanceSquare(this->tile, AIStation::GetLocation(station_id));
+}