(svn r15614) -Add [NoAI]: AIVehicleList_Group(group_id) and AIVehicleList_DefaultGroup(vehicle_type).

1 files changed, 27 insertions, 3 deletions

diff --git a/src/ai/api/ai_vehiclelist.cpp b/src/ai/api/ai_vehiclelist.cpp
index 424f4e6bb..c7daff5c5 100644
--- a/src/ai/api/ai_vehiclelist.cpp
+++ b/src/ai/api/ai_vehiclelist.cpp
@@ -3,6 +3,7 @@
 /** @file ai_vehiclelist.cpp Implementation of AIVehicleList and friends. */
 
 #include "ai_vehiclelist.hpp"
+#include "ai_group.hpp"
 #include "ai_station.hpp"
 #include "ai_vehicle.hpp"
 #include "../../company_func.h"
@@ -10,7 +11,7 @@
 
 AIVehicleList::AIVehicleList()
 {
-	Vehicle *v;
+	const Vehicle *v;
 	FOR_ALL_VEHICLES(v) {
 		if (v->owner == _current_company && v->IsPrimaryVehicle()) this->AddItem(v->index);
 	}
@@ -20,8 +21,7 @@ AIVehicleList_Station::AIVehicleList_Station(StationID station_id)
 {
 	if (!AIStation::IsValidStation(station_id)) return;
 
-	Vehicle *v;
-
+	const Vehicle *v;
 	FOR_ALL_VEHICLES(v) {
 		if (v->owner == _current_company && v->IsPrimaryVehicle()) {
 			const Order *order;
@@ -44,3 +44,27 @@ AIVehicleList_SharedOrders::AIVehicleList_SharedOrders(VehicleID vehicle_id)
 		this->AddItem(v->index);
 	}
 }
+
+AIVehicleList_Group::AIVehicleList_Group(GroupID group_id)
+{
+	if (!AIGroup::IsValidGroup((AIGroup::GroupID)group_id)) return;
+
+	const Vehicle *v;
+	FOR_ALL_VEHICLES(v) {
+		if (v->owner == _current_company && v->IsPrimaryVehicle()) {
+			if (v->group_id == group_id) this->AddItem(v->index);
+		}
+	}
+}
+
+AIVehicleList_DefaultGroup::AIVehicleList_DefaultGroup(AIVehicle::VehicleType vehicle_type)
+{
+	if (vehicle_type < AIVehicle::VT_RAIL || vehicle_type > AIVehicle::VT_AIR) return;
+
+	const Vehicle *v;
+	FOR_ALL_VEHICLES(v) {
+		if (v->owner == _current_company && v->IsPrimaryVehicle()) {
+			if (v->type == vehicle_type && v->group_id == AIGroup::GROUP_DEFAULT) this->AddItem(v->index);
+		}
+	}
+}