(svn r12226) [NoAI] -Fix: remove the dep for AIStationList_Vehicle on AIStationList, as Squirrel doesn't like it noai
authortruebrain
Sat, 23 Feb 2008 16:21:10 +0000
branchnoai
changeset 9746 e4ab7ea8d897
parent 9745 fb2454d70f37
child 9747 7e8f23e8d0c8
(svn r12226) [NoAI] -Fix: remove the dep for AIStationList_Vehicle on AIStationList, as Squirrel doesn't like it
bin/ai/regression/regression.txt
src/ai/api/ai_stationlist.cpp
src/ai/api/ai_stationlist.hpp
src/ai/api/ai_stationlist.hpp.sq
src/ai/api/ai_vehiclelist.cpp
src/ai/api/ai_vehiclelist.hpp
src/ai/api/ai_vehiclelist.hpp.sq
--- a/bin/ai/regression/regression.txt	Sat Feb 23 15:16:21 2008 +0000
+++ b/bin/ai/regression/regression.txt	Sat Feb 23 16:21:10 2008 +0000
@@ -5646,7 +5646,7 @@
   UnshareOrders():       true
   AppendOrder():         true
 
---VehicleStationList--
+--StationList_Vehicle--
   Count():             2
   Location ListDump:
     4 => 33421
@@ -5667,7 +5667,7 @@
     4 => 8818
     3 => 7058
 
---StationVehicleList--
+--VehicleList_Station--
   Count():             1
   Location ListDump:
     11 => 33417
--- a/src/ai/api/ai_stationlist.cpp	Sat Feb 23 15:16:21 2008 +0000
+++ b/src/ai/api/ai_stationlist.cpp	Sat Feb 23 16:21:10 2008 +0000
@@ -15,9 +15,8 @@
 	}
 }
 
-AIStationList_Vehicle::AIStationList_Vehicle(VehicleID vehicle_id) : AIStationList(AIStation::STATION_ANY)
+AIStationList_Vehicle::AIStationList_Vehicle(VehicleID vehicle_id)
 {
-	this->Clear();
 	if (!AIVehicle::IsValidVehicle(vehicle_id)) return;
 
 	Vehicle *v = ::GetVehicle(vehicle_id);
--- a/src/ai/api/ai_stationlist.hpp	Sat Feb 23 15:16:21 2008 +0000
+++ b/src/ai/api/ai_stationlist.hpp	Sat Feb 23 16:21:10 2008 +0000
@@ -28,7 +28,7 @@
 /**
  * Class that creates a list of stations the vehicles goes to.
  */
-class AIStationList_Vehicle : public AIStationList {
+class AIStationList_Vehicle : public AIAbstractList {
 public:
 	/**
 	 * The name of the class, needed by several sub-processes.
--- a/src/ai/api/ai_stationlist.hpp.sq	Sat Feb 23 15:16:21 2008 +0000
+++ b/src/ai/api/ai_stationlist.hpp.sq	Sat Feb 23 16:21:10 2008 +0000
@@ -30,7 +30,7 @@
 
 void SQAIStationList_Vehicle_Register(Squirrel *engine) {
 	DefSQClass <AIStationList_Vehicle> SQAIStationList_Vehicle("AIStationList_Vehicle");
-	SQAIStationList_Vehicle.PreRegister(engine, "AIStationList");
+	SQAIStationList_Vehicle.PreRegister(engine, "AIAbstractList");
 	SQAIStationList_Vehicle.AddConstructor<void (AIStationList_Vehicle::*)(VehicleID vehicle_id), 2>(engine, "xi");
 
 	SQAIStationList_Vehicle.DefSQStaticMethod(engine, &AIStationList_Vehicle::GetClassName, "GetClassName", 1, "x");
--- a/src/ai/api/ai_vehiclelist.cpp	Sat Feb 23 15:16:21 2008 +0000
+++ b/src/ai/api/ai_vehiclelist.cpp	Sat Feb 23 16:21:10 2008 +0000
@@ -14,7 +14,6 @@
 
 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 15:16:21 2008 +0000
+++ b/src/ai/api/ai_vehiclelist.hpp	Sat Feb 23 16:21:10 2008 +0000
@@ -26,7 +26,7 @@
 /**
  * Class that creates a list of vehicles that go to a given station.
  */
-class AIVehicleList_Station : public AIVehicleList {
+class AIVehicleList_Station : public AIAbstractList {
 public:
 	/**
 	 * The name of the class, needed by several sub-processes.
--- a/src/ai/api/ai_vehiclelist.hpp.sq	Sat Feb 23 15:16:21 2008 +0000
+++ b/src/ai/api/ai_vehiclelist.hpp.sq	Sat Feb 23 16:21:10 2008 +0000
@@ -30,7 +30,7 @@
 
 void SQAIVehicleList_Station_Register(Squirrel *engine) {
 	DefSQClass <AIVehicleList_Station> SQAIVehicleList_Station("AIVehicleList_Station");
-	SQAIVehicleList_Station.PreRegister(engine, "AIVehicleList");
+	SQAIVehicleList_Station.PreRegister(engine, "AIAbstractList");
 	SQAIVehicleList_Station.AddConstructor<void (AIVehicleList_Station::*)(StationID station_id), 2>(engine, "xi");
 
 	SQAIVehicleList_Station.DefSQStaticMethod(engine, &AIVehicleList_Station::GetClassName, "GetClassName", 1, "x");