summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-07-20 12:59:27 +0000
committerrubidium <rubidium@openttd.org>2008-07-20 12:59:27 +0000
commitb607b51d9342a44a20cc6c03fc36db38c2bab72f (patch)
treeb72ab6b416aaf659ffed1a892d548fbaa85b13cd
parenta6e314bbba071b8a8b12d13b8c1960903aae77f8 (diff)
downloadopenttd-b607b51d9342a44a20cc6c03fc36db38c2bab72f.tar.xz
(svn r13753) -Cleanup (r13752): save before commit instead of the other way around is usually better.
-rw-r--r--src/order_cmd.cpp18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp
index ffaa607a1..df84553ed 100644
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -453,27 +453,27 @@ CommandCost CmdInsertOrder(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
case OT_CONDITIONAL: {
VehicleOrderID skip_to = new_order.GetConditionSkipToOrder();
- if (skip_to != 0 && skip_to >= v->num_orders) {printf("%i: %i\n", skip_to, __LINE__); return CMD_ERROR;} // Always allow jumping to the first (even when there is no order).
- if (new_order.GetConditionVariable() > OCV_END) {printf("%i\n", __LINE__); return CMD_ERROR;}
+ if (skip_to != 0 && skip_to >= v->num_orders) return CMD_ERROR; // Always allow jumping to the first (even when there is no order).
+ if (new_order.GetConditionVariable() > OCV_END) return CMD_ERROR;
OrderConditionComparator occ = new_order.GetConditionComparator();
- if (occ > OCC_END) {printf("%i\n", __LINE__); 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) {printf("%i\n", __LINE__); return CMD_ERROR;}
+ if (occ != OCC_IS_TRUE && occ != OCC_IS_FALSE) return CMD_ERROR;
break;
case OCV_UNCONDITIONALLY:
- if (occ != OCC_EQUALS) {printf("%i\n", __LINE__); return CMD_ERROR;}
- if (new_order.GetConditionValue() != 0) {printf("%i\n", __LINE__); return CMD_ERROR;}
+ if (occ != OCC_EQUALS) return CMD_ERROR;
+ if (new_order.GetConditionValue() != 0) return CMD_ERROR;
break;
case OCV_LOAD_PERCENTAGE:
case OCV_RELIABILITY:
- if (new_order.GetConditionValue() > 100) {printf("%i\n", __LINE__); return CMD_ERROR;}
+ if (new_order.GetConditionValue() > 100) return CMD_ERROR;
/* FALL THROUGH */
default:
- if (occ == OCC_IS_TRUE || occ == OCC_IS_FALSE) {printf("%i\n", __LINE__); return CMD_ERROR;}
+ if (occ == OCC_IS_TRUE || occ == OCC_IS_FALSE) return CMD_ERROR;
break;
}
} break;
@@ -1312,7 +1312,6 @@ void RestoreVehicleOrders(const Vehicle *v, const BackuppedOrders *bak)
if (!DoCommandP(0, v->index + (i << 16), o.Pack(), NULL,
CMD_INSERT_ORDER | CMD_NO_TEST_IF_IN_NETWORK)) {
- printf("huh?\n");
break;
}
@@ -1320,7 +1319,6 @@ void RestoreVehicleOrders(const Vehicle *v, const BackuppedOrders *bak)
if (_settings_game.order.timetabling && !DoCommandP(0, v->index | (i << 16) | (1 << 25),
o.wait_time << 16 | o.travel_time, NULL,
CMD_CHANGE_TIMETABLE | CMD_NO_TEST_IF_IN_NETWORK)) {
- printf("umh?\n");
break;
}
}