summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-07-02 19:54:29 +0000
committerrubidium <rubidium@openttd.org>2010-07-02 19:54:29 +0000
commiteb19d4b440a6b02c7c7f5f4d6c37e26d2b8b36ae (patch)
treec2bbeaade3035d4de4628c759edbefba99a6396b
parent6709714f975e8dd0bcafc86b838a8266b4c54b4c (diff)
downloadopenttd-eb19d4b440a6b02c7c7f5f4d6c37e26d2b8b36ae.tar.xz
(svn r20053) -Fix [FS#3919] (r20034): crashing road vehicles crashed OpenTTD with slower/longer trains
-rw-r--r--src/roadveh_cmd.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index f0ce5d808..2ff830922 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -1569,10 +1569,8 @@ static bool RoadVehController(RoadVehicle *v)
v->current_order_time++;
if (v->reverse_ctr != 0) v->reverse_ctr--;
- RoadVehCheckTrainCrash(v);
-
/* handle crashed */
- if (v->vehstatus & VS_CRASHED) {
+ if (v->vehstatus & VS_CRASHED || RoadVehCheckTrainCrash(v)) {
return RoadVehIsCrashed(v);
}