summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryexo <yexo@openttd.org>2009-12-14 22:17:15 +0000
committeryexo <yexo@openttd.org>2009-12-14 22:17:15 +0000
commit65642c5878b4f3c99910e59a33cb62b1f8fa1dc4 (patch)
tree56ca38eae1ae85dfb0f8dd554fb006c3588d9b68
parentb7263147c1fee884782df34d1cd29b350d53f516 (diff)
downloadopenttd-65642c5878b4f3c99910e59a33cb62b1f8fa1dc4.tar.xz
(svn r18504) -Remove [NoAI]: AIVehicle::SkipToVehicleOrder as it was a duplicate or AIOrder.SkipToOrder
-rw-r--r--bin/ai/compat_0.7.nut5
-rw-r--r--src/ai/api/ai_changelog.hpp1
-rw-r--r--src/ai/api/ai_vehicle.cpp5
-rw-r--r--src/ai/api/ai_vehicle.hpp9
-rw-r--r--src/ai/api/ai_vehicle.hpp.sq1
5 files changed, 6 insertions, 15 deletions
diff --git a/bin/ai/compat_0.7.nut b/bin/ai/compat_0.7.nut
index 18f5a2a3a..0cd8fe8d2 100644
--- a/bin/ai/compat_0.7.nut
+++ b/bin/ai/compat_0.7.nut
@@ -86,3 +86,8 @@ AIRail.RemoveRailStationTileRect <- function(tile, tile2)
{
return AIRail.RemoveRailStationTileRectangle(tile, tile2, false);
}
+
+AIVehicle.SkipToVehicleOrder <- function(vehicle_id, order_position)
+{
+ return AIOrder.SkipToOrder(vehicle_id, order_position);
+}
diff --git a/src/ai/api/ai_changelog.hpp b/src/ai/api/ai_changelog.hpp
index 61ce3d5a8..309fa681d 100644
--- a/src/ai/api/ai_changelog.hpp
+++ b/src/ai/api/ai_changelog.hpp
@@ -44,6 +44,7 @@
* \li AISubsidy::GetDestination, use AISubsidy::GetDestinationIndex instead
* \li AITile::GetHeight, use AITile::GetMinHeight/GetMaxHeight/GetCornerHeight instead
* \li AITown::GetMaxProduction, use AITown::GetLastMonthProduction instead
+ * \li AIVehicle::SkipToVehicleOrder, use AIOrder::SkipToOrder instead
* \li AIWaypoint::WAYPOINT_INVALID, use AIBaseStation::STATION_INVALID instead
*
* Other changes:
diff --git a/src/ai/api/ai_vehicle.cpp b/src/ai/api/ai_vehicle.cpp
index 91c3cf547..c05f67909 100644
--- a/src/ai/api/ai_vehicle.cpp
+++ b/src/ai/api/ai_vehicle.cpp
@@ -193,11 +193,6 @@
return AIObject::DoCommand(0, vehicle_id, 0, CMD_START_STOP_VEHICLE);
}
-/* static */ bool AIVehicle::SkipToVehicleOrder(VehicleID vehicle_id, AIOrder::OrderPosition order_position)
-{
- return AIOrder::SkipToOrder(vehicle_id, order_position);
-}
-
/* static */ bool AIVehicle::ReverseVehicle(VehicleID vehicle_id)
{
EnforcePrecondition(false, IsValidVehicle(vehicle_id));
diff --git a/src/ai/api/ai_vehicle.hpp b/src/ai/api/ai_vehicle.hpp
index dfe056fe9..3e050b570 100644
--- a/src/ai/api/ai_vehicle.hpp
+++ b/src/ai/api/ai_vehicle.hpp
@@ -460,15 +460,6 @@ public:
static bool StartStopVehicle(VehicleID vehicle_id);
/**
- * Skips the current order of the given vehicle.
- * @param vehicle_id The vehicle to skip the order for.
- * @param order_position The selected order to which we want to skip.
- * @pre IsValidVehicleOrder(vehicle_id, order_position).
- * @return True if and only if the order has been skipped.
- */
- static bool SkipToVehicleOrder(VehicleID vehicle_id, AIOrder::OrderPosition order_position);
-
- /**
* Turn the given vehicle so it'll drive the other way.
* @param vehicle_id The vehicle to turn.
* @pre IsValidVehicle(vehicle_id).
diff --git a/src/ai/api/ai_vehicle.hpp.sq b/src/ai/api/ai_vehicle.hpp.sq
index 8f9f7586e..edd28b019 100644
--- a/src/ai/api/ai_vehicle.hpp.sq
+++ b/src/ai/api/ai_vehicle.hpp.sq
@@ -143,7 +143,6 @@ void SQAIVehicle_Register(Squirrel *engine)
SQAIVehicle.DefSQStaticMethod(engine, &AIVehicle::SendVehicleToDepot, "SendVehicleToDepot", 2, ".i");
SQAIVehicle.DefSQStaticMethod(engine, &AIVehicle::SendVehicleToDepotForServicing, "SendVehicleToDepotForServicing", 2, ".i");
SQAIVehicle.DefSQStaticMethod(engine, &AIVehicle::StartStopVehicle, "StartStopVehicle", 2, ".i");
- SQAIVehicle.DefSQStaticMethod(engine, &AIVehicle::SkipToVehicleOrder, "SkipToVehicleOrder", 3, ".ii");
SQAIVehicle.DefSQStaticMethod(engine, &AIVehicle::ReverseVehicle, "ReverseVehicle", 2, ".i");
SQAIVehicle.DefSQStaticMethod(engine, &AIVehicle::GetCapacity, "GetCapacity", 3, ".ii");
SQAIVehicle.DefSQStaticMethod(engine, &AIVehicle::GetLength, "GetLength", 2, ".i");