diff options
author | rubidium <rubidium@openttd.org> | 2011-08-26 16:39:02 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2011-08-26 16:39:02 +0000 |
commit | 4836a6e50e94978e2f363d586838cea2bdb9c26e (patch) | |
tree | 14c32b2f0aa2dde2384308d54a3c0c65a4c2735f /src/order_cmd.cpp | |
parent | 9975f30eb76025ba911323f75e06b5f7d6e2e4a5 (diff) | |
download | openttd-4836a6e50e94978e2f363d586838cea2bdb9c26e.tar.xz |
(svn r22845) -Fix [FS#4745]: perform stricter checks on some commands (monoid)
Diffstat (limited to 'src/order_cmd.cpp')
-rw-r--r-- | src/order_cmd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index e8d1899fc..9a9046005 100644 --- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -727,10 +727,10 @@ CommandCost CmdInsertOrder(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 case OT_CONDITIONAL: { VehicleOrderID skip_to = new_order.GetConditionSkipToOrder(); if (skip_to != 0 && skip_to >= v->GetNumOrders()) return CMD_ERROR; // Always allow jumping to the first (even when there is no order). - if (new_order.GetConditionVariable() > OCV_END) return CMD_ERROR; + if (new_order.GetConditionVariable() >= OCV_END) return CMD_ERROR; OrderConditionComparator occ = new_order.GetConditionComparator(); - if (occ > OCC_END) return CMD_ERROR; + if (occ >= OCC_END) return CMD_ERROR; switch (new_order.GetConditionVariable()) { case OCV_REQUIRES_SERVICE: if (occ != OCC_IS_TRUE && occ != OCC_IS_FALSE) return CMD_ERROR; |