summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-04-08 13:32:44 +0000
committerrubidium <rubidium@openttd.org>2008-04-08 13:32:44 +0000
commit71a2dd21fd7cb180022ce10793bbbf144d499bdd (patch)
tree429aa97c65369c027a6dba3ca3df0df712fa285a
parent310170364ff7e22ce631e2c5afeef9be12a8aca4 (diff)
downloadopenttd-71a2dd21fd7cb180022ce10793bbbf144d499bdd.tar.xz
(svn r12628) -Fix: TTDP compatible non-stop wasn't handled properly.
-rw-r--r--src/order_cmd.cpp12
-rw-r--r--src/order_gui.cpp2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp
index 8951841df..adabeb4a3 100644
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -43,11 +43,11 @@ DEFINE_OLD_POOL_GENERIC(Order, Order);
OrderNonStopFlags Order::GetNonStopType() const
{
- return (this->flags & 0x8) ?
- ((!_patches.new_nonstop || !this->IsType(OT_GOTO_STATION)) ?
- ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS :
- ONSF_NO_STOP_AT_DESTINATION_STATION) :
- ONSF_STOP_EVERYWHERE;
+ if (_patches.new_nonstop || this->IsType(OT_GOTO_DEPOT)) {
+ return (this->flags & 0x08) ? ONSF_NO_STOP_AT_ANY_STATION : ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS;
+ }
+
+ return (this->flags & 0x08) ? ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS : ONSF_STOP_EVERYWHERE;
}
void Order::Free()
@@ -759,7 +759,7 @@ CommandCost CmdModifyOrder(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
order->SetLoadType(OLF_LOAD_IF_POSSIBLE);
break;
case OF_NON_STOP:
- order->SetNonStopType(order->GetNonStopType() == ONSF_STOP_EVERYWHERE ? ONSF_NO_STOP_AT_ANY_STATION : ONSF_STOP_EVERYWHERE);
+ order->SetNonStopType((order->GetNonStopType() == (_patches.new_nonstop ? ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS : ONSF_STOP_EVERYWHERE)) ? ONSF_NO_STOP_AT_ANY_STATION : ONSF_STOP_EVERYWHERE);
break;
case OF_TRANSFER:
order->SetUnloadType((OrderUnloadFlags)(order->GetUnloadType() ^ OUFB_TRANSFER));
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index 633189850..b4559a1f5 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -201,7 +201,7 @@ static void DrawOrdersWindow(Window *w)
break;
case OT_GOTO_STATION:
- SetDParam(1, _station_order_strings[!!order->GetNonStopType()][order->GetLoadType() | order->GetUnloadType()]);
+ SetDParam(1, _station_order_strings[!(order->GetNonStopType() == (_patches.new_nonstop ? ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS : ONSF_STOP_EVERYWHERE))][order->GetLoadType() | order->GetUnloadType()]);
SetDParam(2, order->GetDestination());
break;