TrainRoutePlanner::TrainRoutingInfo::TrainRoutingInfo(Train &t):
train(&t),
speed(train->get_maximum_speed()),
- first_noncritical(train->get_first_noncritical_block().block()),
+ first_noncritical(train->get_last_critical_block().next().block()),
router(train->get_ai_of_type<TrainRouter>()),
waypoints(router ? router->get_n_waypoints() : 0),
has_duration(false)
remaining_estimate = distance;
}
+bool TrainRoutePlanner::TrainRoutingState::is_viable() const
+{
+ if(remaining_estimate<0)
+ return false;
+ if(critical && state==BLOCKED)
+ return false;
+ return true;
+}
+
TrainRoutePlanner::RoutingStep::RoutingStep():
prev(0)
return;
}
- TrackIter next_track = train.track.next(train.path);
train.advance_track(0);
- const TrackType::Endpoint &next_entry_ep = next_track.endpoint();
+ const TrackType::Endpoint &entry_ep = train.track.endpoint();
if(train.critical)
{
train.path = train.track->get_type().coerce_path(train.track.entry(), train.track->get_active_path());
}
else
{
- for(unsigned i=0; next_entry_ep.paths>>i; ++i)
- if(next_entry_ep.has_path(i))
+ for(unsigned i=0; entry_ep.paths>>i; ++i)
+ if(entry_ep.has_path(i))
{
train.path = i;
train.update_estimate();
i->update_estimate();
}
- if(next_entry_ep.paths!=next_track->get_type().get_paths() && !train.critical)
+ if(entry_ep.paths!=train.track->get_type().get_paths() && !train.critical)
{
RoutingStep wait(this);
wait.advance(dt);
{
i->blocked_by = get_occupant(*next_track);
if(i->blocked_by>=0)
+ {
+ if(i->info->first_noncritical->has_track(*next_track))
+ i->critical = false;
i->state = BLOCKED;
+ }
else if(i->state==BLOCKED)
i->state = MOVING;
}
bool TrainRoutePlanner::RoutingStep::is_viable() const
{
for(vector<TrainRoutingState>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
- if(i->remaining_estimate<0)
+ if(!i->is_viable())
return false;
for(vector<TrainRoutingState>::const_iterator i=trains.begin(); i!=trains.end(); ++i)