mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r12891) [0.6] -Fix (r12868): breakdowns were broken and would cause vehicles to go slower than they should have been moving.

release/0.6
rubidium 2008-04-25 06:15:12 +00:00
parent 9241c4649d
commit e114133d18
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/aircraft_cmd.cpp
View File

@ -2150,7 +2150,7 @@ static void AircraftEventHandler(Vehicle *v, int loop)
if (v->breakdown_ctr <= 2) { if (v->breakdown_ctr <= 2) {
HandleBrokenAircraft(v); HandleBrokenAircraft(v);
} else { } else {
if (!v->current_order.type == OT_LOADING) v->breakdown_ctr--; if (v->current_order.type != OT_LOADING) v->breakdown_ctr--;
} }
} }

2
src/roadveh_cmd.cpp
View File

@ -1938,7 +1938,7 @@ static void RoadVehController(Vehicle *v)
HandleBrokenRoadVeh(v); HandleBrokenRoadVeh(v);
return; 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; if (v->vehstatus & VS_STOPPED) return;

2
src/ship_cmd.cpp
View File

@ -646,7 +646,7 @@ static void ShipController(Vehicle *v)
HandleBrokenShip(v); HandleBrokenShip(v);
return; 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; if (v->vehstatus & VS_STOPPED) return;

2
src/train_cmd.cpp
View File

@ -3570,7 +3570,7 @@ static void TrainLocoHandler(Vehicle *v, bool mode)
HandleBrokenTrain(v); HandleBrokenTrain(v);
return; 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) { if (HasBit(v->u.rail.flags, VRF_REVERSING) && v->cur_speed == 0) {