(svn r26557) -Fix: clean up, test (somewhat), and complete the API for waiting cargo

2 files changed, 57 insertions, 7 deletions

diff --git a/bin/ai/regression/regression.nut b/bin/ai/regression/regression.nut
index 5e8533a2e..72a0c5a97 100644
--- a/bin/ai/regression/regression.nut
+++ b/bin/ai/regression/regression.nut
@@ -1234,10 +1234,6 @@ function Regression::Station()
 	print("  GetLocation(1000):        " + AIStation.GetLocation(1000));
 	print("  GetStationID(33411):      " + AIStation.GetStationID(33411));
 	print("  GetStationID(34411):      " + AIStation.GetStationID(34411));
-	print("  GetCargoWaiting(0, 0):    " + AIStation.GetCargoWaiting(0, 0));
-	print("  GetCargoWaiting(1000, 0): " + AIStation.GetCargoWaiting(1000, 0));
-	print("  GetCargoWaiting(0, 1000): " + AIStation.GetCargoWaiting(0, 1000));
-
 	print("  GetStationID(33411):      " + AIStation.GetStationID(33411));
 	print("  HasRoadType(3, TRAM):     " + AIStation.HasRoadType(3, AIRoad.ROADTYPE_TRAM));
 	print("  HasRoadType(3, ROAD):     " + AIStation.HasRoadType(3, AIRoad.ROADTYPE_ROAD));
@@ -1254,6 +1250,25 @@ function Regression::Station()
 	print("  GetNearestTown():         " + AIStation.GetNearestTown(10000));
 	print("  GetNearestTown():         " + AIStation.GetNearestTown(3));
 
+	print("");
+	print("--CargoWaiting--");
+	for (local cargo = 0; cargo <= 1000; cargo += 1000) {
+		for (local station0 = 0; station0 <= 1000; station0 += 1000) {
+			print("  GetCargoWaiting(" + station0 + ", " + cargo + "): " +
+					AIStation.GetCargoWaiting(station0, cargo));
+			for (local station1 = 0; station1 <= 1000; station1 += 1000) {
+				print("  GetCargoWaitingFrom(" + station0 + ", " + station1 + ", " + cargo + "): " +
+						AIStation.GetCargoWaitingFrom(station0, station1, cargo));
+				print("  GetCargoWaitingVia(" + station0 + ", " + station1 + ", " + cargo + "): " +
+						AIStation.GetCargoWaitingFrom(station0, station1, cargo));
+				for (local station2 = 0; station2 <= 1000; station2 += 1000) {
+					print("  GetCargoWaitingFromVia(" + station0 + ", " + station1 + ", " + station2 + ", " + cargo + "): " +
+							AIStation.GetCargoWaitingFromVia(station0, station1, station2, cargo));
+				}
+			}
+		}
+	}
+
 	local list = AIStationList(AIStation.STATION_BUS_STOP + AIStation.STATION_TRUCK_STOP);
 
 	print("");
diff --git a/bin/ai/regression/regression.txt b/bin/ai/regression/regression.txt
index 5eab44103..e6f30d220 100644
--- a/bin/ai/regression/regression.txt
+++ b/bin/ai/regression/regression.txt
@@ -7487,9 +7487,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
   GetLocation(1000):        -1
   GetStationID(33411):      4
   GetStationID(34411):      65535
-  GetCargoWaiting(0, 0):    0
-  GetCargoWaiting(1000, 0): -1
-  GetCargoWaiting(0, 1000): -1
   GetStationID(33411):      4
   HasRoadType(3, TRAM):     false
   HasRoadType(3, ROAD):     false
@@ -7504,6 +7501,44 @@ ERROR: IsEnd() is invalid as Begin() is never called
   GetNearestTown():         65535
   GetNearestTown():         10
 
+--CargoWaiting--
+  GetCargoWaiting(0, 0): 0
+  GetCargoWaitingFrom(0, 0, 0): 0
+  GetCargoWaitingVia(0, 0, 0): 0
+  GetCargoWaitingFromVia(0, 0, 0, 0): 0
+  GetCargoWaitingFromVia(0, 0, 1000, 0): -1
+  GetCargoWaitingFrom(0, 1000, 0): -1
+  GetCargoWaitingVia(0, 1000, 0): -1
+  GetCargoWaitingFromVia(0, 1000, 0, 0): -1
+  GetCargoWaitingFromVia(0, 1000, 1000, 0): -1
+  GetCargoWaiting(1000, 0): -1
+  GetCargoWaitingFrom(1000, 0, 0): -1
+  GetCargoWaitingVia(1000, 0, 0): -1
+  GetCargoWaitingFromVia(1000, 0, 0, 0): -1
+  GetCargoWaitingFromVia(1000, 0, 1000, 0): -1
+  GetCargoWaitingFrom(1000, 1000, 0): -1
+  GetCargoWaitingVia(1000, 1000, 0): -1
+  GetCargoWaitingFromVia(1000, 1000, 0, 0): -1
+  GetCargoWaitingFromVia(1000, 1000, 1000, 0): -1
+  GetCargoWaiting(0, 1000): -1
+  GetCargoWaitingFrom(0, 0, 1000): -1
+  GetCargoWaitingVia(0, 0, 1000): -1
+  GetCargoWaitingFromVia(0, 0, 0, 1000): -1
+  GetCargoWaitingFromVia(0, 0, 1000, 1000): -1
+  GetCargoWaitingFrom(0, 1000, 1000): -1
+  GetCargoWaitingVia(0, 1000, 1000): -1
+  GetCargoWaitingFromVia(0, 1000, 0, 1000): -1
+  GetCargoWaitingFromVia(0, 1000, 1000, 1000): -1
+  GetCargoWaiting(1000, 1000): -1
+  GetCargoWaitingFrom(1000, 0, 1000): -1
+  GetCargoWaitingVia(1000, 0, 1000): -1
+  GetCargoWaitingFromVia(1000, 0, 0, 1000): -1
+  GetCargoWaitingFromVia(1000, 0, 1000, 1000): -1
+  GetCargoWaitingFrom(1000, 1000, 1000): -1
+  GetCargoWaitingVia(1000, 1000, 1000): -1
+  GetCargoWaitingFromVia(1000, 1000, 0, 1000): -1
+  GetCargoWaitingFromVia(1000, 1000, 1000, 1000): -1
+
 --StationList--
   Count():             2
   Location ListDump: