Mercurial > hg > openttd
changeset 13966:d3b22fd1fff3 draft
(svn r18504) -Remove [NoAI]: AIVehicle::SkipToVehicleOrder as it was a duplicate or AIOrder.SkipToOrder
| author | yexo <yexo@openttd.org> |
|---|---|
| date | Mon, 14 Dec 2009 22:17:15 +0000 |
| parents | b9936cadbb95 |
| children | 01dfb82ddfab |
| files | bin/ai/compat_0.7.nut src/ai/api/ai_changelog.hpp src/ai/api/ai_vehicle.cpp src/ai/api/ai_vehicle.hpp src/ai/api/ai_vehicle.hpp.sq |
| diffstat | 5 files changed, 6 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/bin/ai/compat_0.7.nut +++ b/bin/ai/compat_0.7.nut @@ -86,3 +86,8 @@ { return AIRail.RemoveRailStationTileRectangle(tile, tile2, false); } + +AIVehicle.SkipToVehicleOrder <- function(vehicle_id, order_position) +{ + return AIOrder.SkipToOrder(vehicle_id, order_position); +}
--- 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:
--- 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));
--- a/src/ai/api/ai_vehicle.hpp +++ b/src/ai/api/ai_vehicle.hpp @@ -460,15 +460,6 @@ 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).
--- a/src/ai/api/ai_vehicle.hpp.sq +++ b/src/ai/api/ai_vehicle.hpp.sq @@ -143,7 +143,6 @@ 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");