--- a/bin/ai/regression/regression.nut	Sat Feb 23 14:50:11 2008 +0000
+++ b/bin/ai/regression/regression.nut	Sat Feb 23 15:16:21 2008 +0000
@@ -463,10 +463,10 @@
 	print("  UnshareOrders():       " + AIOrder.UnshareOrders(12));
 	print("  AppendOrder():         " + AIOrder.AppendOrder(11, 33421, AIOrder.AIOF_NONE));
 
-	local list = AIVehicleStationList(11);
+	local list = AIStationList_Vehicle(11);
 
 	print("");
-	print("--VehicleStationList--");
+	print("--StationList_Vehicle--");
 	print("  Count():             " + list.Count());
 	list.Valuate(AIStationListLocation());
 	print("  Location ListDump:");
@@ -499,10 +499,10 @@
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
-	list = AIStationVehicleList(3);
+	list = AIVehicleList_Station(3);
 
 	print("");
-	print("--StationVehicleList--");
+	print("--VehicleList_Station--");
 	print("  Count():             " + list.Count());
 	list.Valuate(AIVehicleListLocation());
 	print("  Location ListDump:");

--- a/bin/ai/wrightai/main.nut	Sat Feb 23 14:50:11 2008 +0000
+++ b/bin/ai/wrightai/main.nut	Sat Feb 23 15:16:21 2008 +0000
@@ -230,7 +230,7 @@
 			if (AIVehicle.SellVehicle(i)) {
 				print(this.name + ": [INFO] Selling " + i + " as it finally is in a depot.");
 				/* Check if we are the last one serving those airports; else sell the airports */
-				local list2 = AIStationVehicleList(AIStation.GetStationID(this.route_1.GetValue(i)));
+				local list2 = AIVehicleList_Station(AIStation.GetStationID(this.route_1.GetValue(i)));
 				if (list2.Count() == 0) {
 					/* Remove the airports */
 					print(this.name + ": [INFO] Removing airports as nobody serves them anymore.");
@@ -253,7 +253,7 @@
 	list.KeepAboveValue(250);
 
 	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
-		local list2 = AIStationVehicleList(i);
+		local list2 = AIVehicleList_Station(i);
 		/* No vehicles going to this station, abort */
 		/* TODO -- Sell station */
 		if (list2.Count() == 0) continue;

--- a/src/ai/ai_squirrel.cpp	Sat Feb 23 14:50:11 2008 +0000
+++ b/src/ai/ai_squirrel.cpp	Sat Feb 23 15:16:21 2008 +0000
@@ -257,7 +257,7 @@
 	SQAIStationListDistanceManhattanToTile_Register(this->engine);
 	SQAIStationListDistanceSquareToTile_Register(this->engine);
 	SQAIStationListLocation_Register(this->engine);
-	SQAIStationVehicleList_Register(this->engine);
+	SQAIStationList_Vehicle_Register(this->engine);
 	SQAITestMode_Register(this->engine);
 	SQAITile_Register(this->engine);
 	SQAITileList_Register(this->engine);
@@ -290,7 +290,7 @@
 	SQAIVehicleListProfitThisYear_Register(this->engine);
 	SQAIVehicleListUnitNumber_Register(this->engine);
 	SQAIVehicleListVehicleType_Register(this->engine);
-	SQAIVehicleStationList_Register(this->engine);
+	SQAIVehicleList_Station_Register(this->engine);
 
 	this->engine->SetGlobalPointer(this->engine);
 }

--- a/src/ai/api/ai_stationlist.cpp	Sat Feb 23 14:50:11 2008 +0000
+++ b/src/ai/api/ai_stationlist.cpp	Sat Feb 23 15:16:21 2008 +0000
@@ -15,8 +15,9 @@
 	}
 }
 
-AIVehicleStationList::AIVehicleStationList(VehicleID vehicle_id)
+AIStationList_Vehicle::AIStationList_Vehicle(VehicleID vehicle_id) : AIStationList(AIStation::STATION_ANY)
 {
+	this->Clear();
 	if (!AIVehicle::IsValidVehicle(vehicle_id)) return;
 
 	Vehicle *v = ::GetVehicle(vehicle_id);

--- a/src/ai/api/ai_stationlist.hpp	Sat Feb 23 14:50:11 2008 +0000
+++ b/src/ai/api/ai_stationlist.hpp	Sat Feb 23 15:16:21 2008 +0000
@@ -28,18 +28,18 @@
 /**
  * Class that creates a list of stations the vehicles goes to.
  */
-class AIVehicleStationList : public AIAbstractList {
+class AIStationList_Vehicle : public AIStationList {
 public:
 	/**
 	 * The name of the class, needed by several sub-processes.
 	 */
-	static const char *GetClassName() { return "AIVehicleStationList"; }
+	static const char *GetClassName() { return "AIStationList_Vehicle"; }
 
 	/**
 	 * The constructor to make a list of stations.
 	 * @param vehicle_id The vehicles to get the list of stations he goes to from.
 	 */
-	AIVehicleStationList(VehicleID vehicle_id);
+	AIStationList_Vehicle(VehicleID vehicle_id);
 };
 
 #endif /* AI_STATIONLIST_HPP */

--- a/src/ai/api/ai_stationlist.hpp.sq	Sat Feb 23 14:50:11 2008 +0000
+++ b/src/ai/api/ai_stationlist.hpp.sq	Sat Feb 23 15:16:21 2008 +0000
@@ -20,20 +20,20 @@
 }
 
 namespace SQConvert {
-	/* Allow AIVehicleStationList to be used as Squirrel parameter */
-	template <> AIVehicleStationList *GetParam(ForceType<AIVehicleStationList *>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return  (AIVehicleStationList *)instance; }
-	template <> AIVehicleStationList &GetParam(ForceType<AIVehicleStationList &>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(AIVehicleStationList *)instance; }
-	template <> const AIVehicleStationList *GetParam(ForceType<const AIVehicleStationList *>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return  (AIVehicleStationList *)instance; }
-	template <> const AIVehicleStationList &GetParam(ForceType<const AIVehicleStationList &>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(AIVehicleStationList *)instance; }
-	template <> int Return<AIVehicleStationList *>(HSQUIRRELVM vm, AIVehicleStationList *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIVehicleStationList", res, NULL, DefSQDestructorCallback<AIVehicleStationList>); return 1; }
+	/* Allow AIStationList_Vehicle to be used as Squirrel parameter */
+	template <> AIStationList_Vehicle *GetParam(ForceType<AIStationList_Vehicle *>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return  (AIStationList_Vehicle *)instance; }
+	template <> AIStationList_Vehicle &GetParam(ForceType<AIStationList_Vehicle &>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(AIStationList_Vehicle *)instance; }
+	template <> const AIStationList_Vehicle *GetParam(ForceType<const AIStationList_Vehicle *>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return  (AIStationList_Vehicle *)instance; }
+	template <> const AIStationList_Vehicle &GetParam(ForceType<const AIStationList_Vehicle &>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(AIStationList_Vehicle *)instance; }
+	template <> int Return<AIStationList_Vehicle *>(HSQUIRRELVM vm, AIStationList_Vehicle *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIStationList_Vehicle", res, NULL, DefSQDestructorCallback<AIStationList_Vehicle>); return 1; }
 }; // namespace SQConvert
 
-void SQAIVehicleStationList_Register(Squirrel *engine) {
-	DefSQClass <AIVehicleStationList> SQAIVehicleStationList("AIVehicleStationList");
-	SQAIVehicleStationList.PreRegister(engine, "AIAbstractList");
-	SQAIVehicleStationList.AddConstructor<void (AIVehicleStationList::*)(VehicleID vehicle_id), 2>(engine, "xi");
+void SQAIStationList_Vehicle_Register(Squirrel *engine) {
+	DefSQClass <AIStationList_Vehicle> SQAIStationList_Vehicle("AIStationList_Vehicle");
+	SQAIStationList_Vehicle.PreRegister(engine, "AIStationList");
+	SQAIStationList_Vehicle.AddConstructor<void (AIStationList_Vehicle::*)(VehicleID vehicle_id), 2>(engine, "xi");
 
-	SQAIVehicleStationList.DefSQStaticMethod(engine, &AIVehicleStationList::GetClassName, "GetClassName", 1, "x");
+	SQAIStationList_Vehicle.DefSQStaticMethod(engine, &AIStationList_Vehicle::GetClassName, "GetClassName", 1, "x");
 
-	SQAIVehicleStationList.PostRegister(engine);
+	SQAIStationList_Vehicle.PostRegister(engine);
 }

--- a/src/ai/api/ai_vehiclelist.cpp	Sat Feb 23 14:50:11 2008 +0000
+++ b/src/ai/api/ai_vehiclelist.cpp	Sat Feb 23 15:16:21 2008 +0000
@@ -12,8 +12,9 @@
 	}
 }
 
-AIStationVehicleList::AIStationVehicleList(StationID station_id)
+AIVehicleList_Station::AIVehicleList_Station(StationID station_id)
 {
+	this->Clear();
 	if (!AIStation::IsValidStation(station_id)) return;
 
 	Vehicle *v;

--- a/src/ai/api/ai_vehiclelist.hpp	Sat Feb 23 14:50:11 2008 +0000
+++ b/src/ai/api/ai_vehiclelist.hpp	Sat Feb 23 15:16:21 2008 +0000
@@ -26,18 +26,18 @@
 /**
  * Class that creates a list of vehicles that go to a given station.
  */
-class AIStationVehicleList : public AIAbstractList {
+class AIVehicleList_Station : public AIVehicleList {
 public:
 	/**
 	 * The name of the class, needed by several sub-processes.
 	 */
-	static const char *GetClassName() { return "AIStationVehicleList"; }
+	static const char *GetClassName() { return "AIVehicleList_Station"; }
 
 	/**
 	 * The constructor to make a list of vehicles that goes to this station.
 	 * @param station_id The station to get the list of vehicles that go here from.
 	 */
-	AIStationVehicleList(StationID station_id);
+	AIVehicleList_Station(StationID station_id);
 };
 
 #endif /* AI_VEHICLELIST_HPP */

--- a/src/ai/api/ai_vehiclelist.hpp.sq	Sat Feb 23 14:50:11 2008 +0000
+++ b/src/ai/api/ai_vehiclelist.hpp.sq	Sat Feb 23 15:16:21 2008 +0000
@@ -20,20 +20,20 @@
 }
 
 namespace SQConvert {
-	/* Allow AIStationVehicleList to be used as Squirrel parameter */
-	template <> AIStationVehicleList *GetParam(ForceType<AIStationVehicleList *>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return  (AIStationVehicleList *)instance; }
-	template <> AIStationVehicleList &GetParam(ForceType<AIStationVehicleList &>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(AIStationVehicleList *)instance; }
-	template <> const AIStationVehicleList *GetParam(ForceType<const AIStationVehicleList *>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return  (AIStationVehicleList *)instance; }
-	template <> const AIStationVehicleList &GetParam(ForceType<const AIStationVehicleList &>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(AIStationVehicleList *)instance; }
-	template <> int Return<AIStationVehicleList *>(HSQUIRRELVM vm, AIStationVehicleList *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIStationVehicleList", res, NULL, DefSQDestructorCallback<AIStationVehicleList>); return 1; }
+	/* Allow AIVehicleList_Station to be used as Squirrel parameter */
+	template <> AIVehicleList_Station *GetParam(ForceType<AIVehicleList_Station *>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return  (AIVehicleList_Station *)instance; }
+	template <> AIVehicleList_Station &GetParam(ForceType<AIVehicleList_Station &>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(AIVehicleList_Station *)instance; }
+	template <> const AIVehicleList_Station *GetParam(ForceType<const AIVehicleList_Station *>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return  (AIVehicleList_Station *)instance; }
+	template <> const AIVehicleList_Station &GetParam(ForceType<const AIVehicleList_Station &>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(AIVehicleList_Station *)instance; }
+	template <> int Return<AIVehicleList_Station *>(HSQUIRRELVM vm, AIVehicleList_Station *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIVehicleList_Station", res, NULL, DefSQDestructorCallback<AIVehicleList_Station>); return 1; }
 }; // namespace SQConvert
 
-void SQAIStationVehicleList_Register(Squirrel *engine) {
-	DefSQClass <AIStationVehicleList> SQAIStationVehicleList("AIStationVehicleList");
-	SQAIStationVehicleList.PreRegister(engine, "AIAbstractList");
-	SQAIStationVehicleList.AddConstructor<void (AIStationVehicleList::*)(StationID station_id), 2>(engine, "xi");
+void SQAIVehicleList_Station_Register(Squirrel *engine) {
+	DefSQClass <AIVehicleList_Station> SQAIVehicleList_Station("AIVehicleList_Station");
+	SQAIVehicleList_Station.PreRegister(engine, "AIVehicleList");
+	SQAIVehicleList_Station.AddConstructor<void (AIVehicleList_Station::*)(StationID station_id), 2>(engine, "xi");
 
-	SQAIStationVehicleList.DefSQStaticMethod(engine, &AIStationVehicleList::GetClassName, "GetClassName", 1, "x");
+	SQAIVehicleList_Station.DefSQStaticMethod(engine, &AIVehicleList_Station::GetClassName, "GetClassName", 1, "x");
 
-	SQAIStationVehicleList.PostRegister(engine);
+	SQAIVehicleList_Station.PostRegister(engine);
 }