Mercurial > hg > openttd
changeset 17252:c52379fc5dd0 draft
(svn r21992) -Fix [FS#4467]: AIs trying to change the AIOF_GOTO_NEAREST_DEPOT flag for existing orders triggered an assert. Explicitly forbid this as precondition for SetOrderFlags
| author | yexo <yexo@openttd.org> |
|---|---|
| date | Sun, 06 Feb 2011 12:15:17 +0000 |
| parents | ee3dc725dbcc |
| children | fdb46cbf3f60 |
| files | src/ai/api/ai_order.cpp src/ai/api/ai_order.hpp |
| diffstat | 2 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ai/api/ai_order.cpp +++ b/src/ai/api/ai_order.cpp @@ -509,6 +509,8 @@ AIOrderFlags current = GetOrderFlags(vehicle_id, order_position); + EnforcePrecondition(false, (order_flags & AIOF_GOTO_NEAREST_DEPOT) == (current & AIOF_GOTO_NEAREST_DEPOT)); + if ((current & AIOF_NON_STOP_FLAGS) != (order_flags & AIOF_NON_STOP_FLAGS)) { return AIObject::DoCommand(0, vehicle_id | (order_position << 20), (order_flags & AIOF_NON_STOP_FLAGS) << 4 | MOF_NON_STOP, CMD_MODIFY_ORDER, NULL, &_DoCommandReturnSetOrderFlags); }
--- a/src/ai/api/ai_order.hpp +++ b/src/ai/api/ai_order.hpp @@ -457,6 +457,7 @@ * @param order_flags The new flags given to the order. * @pre IsValidVehicleOrder(vehicle_id, order_position). * @pre AreOrderFlagsValid(GetOrderDestination(vehicle_id, order_position), order_flags). + * @pre (order_flags & AIOF_GOTO_NEAREST_DEPOT) == (GetOrderFlags(vehicle_id, order_position) & AIOF_GOTO_NEAREST_DEPOT). * @exception AIError::ERR_OWNED_BY_ANOTHER_COMPANY * @return True if and only if the order was changed. */