X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.cpp;h=b98b37e7ee1b2c9b41d6b4a0c41a7f545052f03b;hb=f2092c352667a3178bfea9c2bc90882e4b7fb3aa;hp=c5455899e6befc6f9f7e7c6830e7234d1357e5f5;hpb=c15850a46dd56df199c0c165f7817859634eb330;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index c545589..b98b37e 100644
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -16,7 +16,7 @@ TrainRoutePlanner::TrainRoutePlanner(Layout &layout)
 	for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
 	{
 		TrainRoutingInfo info(*i->second);
-		if(info.router && info.router->has_destination())
+		if(info.router && info.router->get_destination())
 			routed_trains.push_back(info);
 	}
 
@@ -121,13 +121,20 @@ void TrainRoutePlanner::add_steps(RoutingStep &step, unsigned train_index)
 	RoutingStep next(&step);
 	next.advance(dt);
 	TrainRouter &router = *train.info->router;
-	if(router.is_destination(*train.track) && !router.is_destination(*next_track))
+	if(train.waypoint<0 && router.is_destination(*train.track) && !router.is_destination(*next_track))
 	{
 		next.trains[train_index].state = ARRIVED;
 		new_steps.push_back(next);
 	}
 	else
 	{
+		if(train.waypoint>=0 && router.is_waypoint(train.waypoint, *train.track) && !router.is_waypoint(train.waypoint, *next_track))
+		{
+			++next.trains[train_index].waypoint;
+			if(next.trains[train_index].waypoint>=static_cast<int>(router.get_n_waypoints()))
+				next.trains[train_index].waypoint = -1;
+		}
+
 		next.trains[train_index].advance_track(0);
 
 		const TrackType::Endpoint &next_entry_ep = next_track.endpoint();
@@ -224,7 +231,9 @@ TrainRoutePlanner::OccupiedTrack::~OccupiedTrack()
 TrainRoutePlanner::TrainRoutingState::TrainRoutingState(TrainRoutingInfo &inf):
 	info(&inf),
 	occupied_tracks(0),
-	state(MOVING)
+	state(MOVING),
+	delay(info->router->get_departure_delay()),
+	waypoint(info->router->get_n_waypoints() ? 0 : -1)
 {
 	const Vehicle *veh = &info->train->get_vehicle(0);
 	// TODO margins
@@ -255,7 +264,8 @@ TrainRoutePlanner::TrainRoutingState::TrainRoutingState(const TrainRoutingState
 	occupied_tracks(other.occupied_tracks),
 	offset(other.offset),
 	back_offset(other.back_offset),
-	state(other.state)
+	state(other.state),
+	waypoint(other.waypoint)
 {
 	++occupied_tracks->refcount;
 }
@@ -269,7 +279,7 @@ TrainRoutePlanner::TrainRoutingState::~TrainRoutingState()
 Time::TimeDelta TrainRoutePlanner::TrainRoutingState::get_time_to_next_track() const
 {
 	// TODO Consider the speed of the train
-	return (track->get_type().get_path_length(path)-offset)*Time::sec;
+	return (track->get_type().get_path_length(path)-offset)*Time::sec+delay;
 }
 
 bool TrainRoutePlanner::TrainRoutingState::is_occupied(Track &trk) const
@@ -328,11 +338,20 @@ void TrainRoutePlanner::RoutingStep::advance(const Time::TimeDelta &dt)
 {
 	time += dt;
 	for(vector<TrainRoutingState>::iterator i=trains.begin(); i!=trains.end(); ++i)
-		if(i->state==MOVING)
+	{
+		if(i->delay)
+		{
+			i->delay -= dt;
+			if(i->delay>Time::zero)
+				continue;
+			i->delay = Time::zero;
+		}
+		else if(i->state==MOVING)
 		{
 			float distance = dt/Time::sec;
 			i->advance(distance);
 		}
+	}
 }
 
 bool TrainRoutePlanner::RoutingStep::is_goal() const