From 42f3a1e909210a4f2df06c3aacb9dd49e62b6174 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 8 Dec 2009 00:16:31 +0000 Subject: (svn r18429) -Fix [FS#3360]: when road vehicles are, because of the 'jam protection' running through eachother more vehicles could be in a road stop than there could be under normal circumstances. As such an assert when the road stop's limits are reached isn't good. --- src/roadstop.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/roadstop.cpp b/src/roadstop.cpp index 9547814b7..ce9bd62ee 100644 --- a/src/roadstop.cpp +++ b/src/roadstop.cpp @@ -289,7 +289,9 @@ void RoadStop::Entry::Leave(const RoadVehicle *rv) */ void RoadStop::Entry::Enter(const RoadVehicle *rv) { - assert(this->occupied < this->length); + /* we cannot assert on this->occupied < this->length because of the + * remote possibility that RVs are running through eachother when + * trying to prevention an infinite jam. */ this->occupied += rv->rcache.cached_veh_length; } -- cgit v1.2.3-54-g00ecf