diff options
| author | rubidium <rubidium@openttd.org> | 2009-04-21 23:40:56 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-04-21 23:40:56 +0000 |
| commit | 59d45a04d606cf7eeffed150f09497dfc56d1014 (patch) | |
| tree | 9ee92bfa0c3076957e0f2d3bfe29777c0f79a512 /src/order_cmd.cpp | |
| parent | 58db962353cfb87ef4571462e6d0656781939edd (diff) | |
| download | openttd-59d45a04d606cf7eeffed150f09497dfc56d1014.tar.xz | |
(svn r16118) -Change/cleanup: remove the hexadecimal 'in TTD the string had this ID' from 'some' strings and replace the string name with something more sensible.
Diffstat (limited to 'src/order_cmd.cpp')
| -rw-r--r-- | src/order_cmd.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index c2736b26c..b89c7ff89 100644 --- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -434,9 +434,9 @@ CommandCost CmdInsertOrder(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 if (st->owner != OWNER_NONE && !CheckOwnership(st->owner)) return CMD_ERROR; - if (!CanVehicleUseStation(v, st)) return_cmd_error(STR_CAN_T_ADD_ORDER); + if (!CanVehicleUseStation(v, st)) return_cmd_error(STR_ERROR_CAN_T_ADD_ORDER); for (Vehicle *u = v->FirstShared(); u != NULL; u = u->NextShared()) { - if (!CanVehicleUseStation(u, st)) return_cmd_error(STR_CAN_T_ADD_ORDER_SHARED); + if (!CanVehicleUseStation(u, st)) return_cmd_error(STR_ERROR_CAN_T_ADD_ORDER_SHARED); } /* Non stop not allowed for non-trains. */ @@ -564,9 +564,9 @@ CommandCost CmdInsertOrder(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 if (sel_ord > v->GetNumOrders()) return CMD_ERROR; - if (v->GetNumOrders() >= MAX_VEH_ORDER_ID) return_cmd_error(STR_8832_TOO_MANY_ORDERS); - if (!Order::CanAllocateItem()) return_cmd_error(STR_8831_NO_MORE_SPACE_FOR_ORDERS); - if (v->orders.list == NULL && !OrderList::CanAllocateItem()) return_cmd_error(STR_8831_NO_MORE_SPACE_FOR_ORDERS); + if (v->GetNumOrders() >= MAX_VEH_ORDER_ID) return_cmd_error(STR_ERROR_TOO_MANY_ORDERS); + if (!Order::CanAllocateItem()) return_cmd_error(STR_ERROR_NO_MORE_SPACE_FOR_ORDERS); + if (v->orders.list == NULL && !OrderList::CanAllocateItem()) return_cmd_error(STR_ERROR_NO_MORE_SPACE_FOR_ORDERS); if (v->type == VEH_SHIP && _settings_game.pf.pathfinder_for_ships != VPF_NPF) { /* Make sure the new destination is not too far away from the previous */ @@ -584,7 +584,7 @@ CommandCost CmdInsertOrder(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 if (prev != NULL) { uint dist = GetOrderDistance(prev, &new_order, v); if (dist >= 130) { - return_cmd_error(STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO); + return_cmd_error(STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION); } } } @@ -1110,7 +1110,7 @@ CommandCost CmdCloneOrder(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 FOR_VEHICLE_ORDERS(src, order) { if (OrderGoesToStation(dst, order) && !CanVehicleUseStation(dst, GetStation(order->GetDestination()))) { - return_cmd_error(STR_CAN_T_COPY_SHARE_ORDER); + return_cmd_error(STR_ERROR_CAN_T_COPY_SHARE_ORDER); } } @@ -1148,7 +1148,7 @@ CommandCost CmdCloneOrder(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 FOR_VEHICLE_ORDERS(src, order) { if (OrderGoesToStation(dst, order) && !CanVehicleUseStation(dst, GetStation(order->GetDestination()))) { - return_cmd_error(STR_CAN_T_COPY_SHARE_ORDER); + return_cmd_error(STR_ERROR_CAN_T_COPY_SHARE_ORDER); } } @@ -1156,7 +1156,7 @@ CommandCost CmdCloneOrder(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 delta = dst->IsOrderListShared() ? src->GetNumOrders() + 1 : src->GetNumOrders() - dst->GetNumOrders(); if (!Order::CanAllocateItem(delta) || ((dst->orders.list == NULL || dst->IsOrderListShared()) && !OrderList::CanAllocateItem())) { - return_cmd_error(STR_8831_NO_MORE_SPACE_FOR_ORDERS); + return_cmd_error(STR_ERROR_NO_MORE_SPACE_FOR_ORDERS); } if (flags & DC_EXEC) { |