From eb19d4b440a6b02c7c7f5f4d6c37e26d2b8b36ae Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 2 Jul 2010 19:54:29 +0000 Subject: (svn r20053) -Fix [FS#3919] (r20034): crashing road vehicles crashed OpenTTD with slower/longer trains --- src/roadveh_cmd.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src') 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); } -- cgit v1.2.3-54-g00ecf