summaryrefslogtreecommitdiff
path: root/src/ship_cmd.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-08-28 14:14:37 +0000
committerrubidium <rubidium@openttd.org>2010-08-28 14:14:37 +0000
commit2fb18e975c0d9bcd75e3536bf41192c5fedda8b6 (patch)
tree1679e9e6786d2599682c0bcc697071426b5d7e22 /src/ship_cmd.cpp
parent702cc96943a5ffb52fd59718075667044a86775e (diff)
downloadopenttd-2fb18e975c0d9bcd75e3536bf41192c5fedda8b6.tar.xz
(svn r20645) -Codechange [FS#4086]: unify the code for checking for breakdown handling as well (Hirundo)
Diffstat (limited to 'src/ship_cmd.cpp')
-rw-r--r--src/ship_cmd.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index a58fe7b29..ef2b49fcc 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -424,13 +424,7 @@ static void ShipController(Ship *v)
v->tick_counter++;
v->current_order_time++;
- if (v->breakdown_ctr != 0) {
- if (v->breakdown_ctr <= 2) {
- v->HandleBreakdown();
- return;
- }
- if (!v->current_order.IsType(OT_LOADING)) v->breakdown_ctr--;
- }
+ if (v->HandleBreakdown()) return;
if (v->vehstatus & VS_STOPPED) return;