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

(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.

release/1.0
rubidium 2009-12-08 00:16:31 +00:00
parent 1e416f90fa
commit 42f3a1e909
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/roadstop.cpp
View File

@ -289,7 +289,9 @@ void RoadStop::Entry::Leave(const RoadVehicle *rv)
*/ */
void RoadStop::Entry::Enter(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; this->occupied += rv->rcache.cached_veh_length;
} }