From e114133d18c3b893e59d9e52c8bee46764852334 Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 25 Apr 2008 06:15:12 +0000 Subject: [PATCH] (svn r12891) [0.6] -Fix (r12868): breakdowns were broken and would cause vehicles to go slower than they should have been moving. --- src/aircraft_cmd.cpp | 2 +- src/roadveh_cmd.cpp | 2 +- src/ship_cmd.cpp | 2 +- src/train_cmd.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index 8f6487cd31..423aa5dfce 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -2150,7 +2150,7 @@ static void AircraftEventHandler(Vehicle *v, int loop) if (v->breakdown_ctr <= 2) { HandleBrokenAircraft(v); } else { - if (!v->current_order.type == OT_LOADING) v->breakdown_ctr--; + if (v->current_order.type != OT_LOADING) v->breakdown_ctr--; } } diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index 2950604c19..0e1843e2f4 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -1938,7 +1938,7 @@ static void RoadVehController(Vehicle *v) HandleBrokenRoadVeh(v); return; } - if (!v->current_order.type == OT_LOADING) v->breakdown_ctr--; + if (v->current_order.type != OT_LOADING) v->breakdown_ctr--; } if (v->vehstatus & VS_STOPPED) return; diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp index 053cf69fe1..7055fbb598 100644 --- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -646,7 +646,7 @@ static void ShipController(Vehicle *v) HandleBrokenShip(v); return; } - if (!v->current_order.type == OT_LOADING) v->breakdown_ctr--; + if (v->current_order.type != OT_LOADING) v->breakdown_ctr--; } if (v->vehstatus & VS_STOPPED) return; diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index f8a263a339..74e74ff385 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -3570,7 +3570,7 @@ static void TrainLocoHandler(Vehicle *v, bool mode) HandleBrokenTrain(v); return; } - if (!v->current_order.type == OT_LOADING) v->breakdown_ctr--; + if (v->current_order.type != OT_LOADING) v->breakdown_ctr--; } if (HasBit(v->u.rail.flags, VRF_REVERSING) && v->cur_speed == 0) {