occupied_tracks(0),
state(MOVING),
delay(info->router->get_departure_delay()),
+ duration(info->router->get_trip_duration()),
waypoint(info->router->get_n_waypoints() ? 0 : -1),
blocked_by(-1)
{
back_offset(other.back_offset),
state(other.state),
delay(other.delay),
+ duration(other.duration),
waypoint(other.waypoint),
distance_traveled(other.distance_traveled),
remaining_estimate(other.remaining_estimate),
bool TrainRoutePlanner::TrainRoutingState::is_occupying(Track &trk) const
{
+ if(state==ARRIVED && !duration && info->router->get_trip_duration())
+ return false;
+
OccupiedTrack *occ = occupied_tracks;
for(unsigned n=occ->n_tracks; n>0; --n, occ=occ->next)
if(occ->track==&trk)
delay = Time::zero;
}
+ if(duration)
+ duration = max(duration-secs*Time::sec, Time::zero);
+
if(state==MOVING)
advance(info->speed*secs);
else if(state!=ARRIVED)