X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=0885bd2861d1e8c81eff3cc8b1f6d415fa8cee22;hb=d607c5454e63ac9be1384419a0ec5d561859c2a3;hp=c55105026e3710e859692c934a3a1353f3fb5662;hpb=d4c2cc962dc4c7b11c2db360fef7a80de3334c11;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index c551050..0885bd2 100644
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -15,7 +15,7 @@ namespace R2C2 {
 TrainRouter::TrainRouter(Train &t):
 	TrainAI(t),
 	priority(0),
-	arriving(0),
+	arrival(ON_THE_WAY),
 	destination(0),
 	destination_changed(false),
 	metrics_stale(false),
@@ -24,6 +24,7 @@ TrainRouter::TrainRouter(Train &t):
 {
 	train.get_layout().signal_block_reserved.connect(sigc::mem_fun(this, &TrainRouter::block_reserved));
 	train.signal_advanced.connect(sigc::mem_fun(this, &TrainRouter::train_advanced));
+	train.signal_rear_advanced.connect(sigc::mem_fun(this, &TrainRouter::train_rear_advanced));
 }
 
 TrainRouter::~TrainRouter()
@@ -105,9 +106,16 @@ void TrainRouter::route_changed()
 
 	if(!already_at_end)
 	{
+		arrival = ON_THE_WAY;
 		train.stop_at(0);
 		train.refresh_blocks_from(*fncb);
 	}
+	else if(!arrival)
+	{
+		arrival = RESERVED_TO_END;
+		train.stop_at(&*fncb.flip());
+		train.refresh_blocks_from(*fncb);
+	}
 
 	const Route *route = get_route();
 	signal_route_changed.emit(route);
@@ -233,13 +241,13 @@ void TrainRouter::tick(const Time::TimeDelta &dt)
 		sequence_check_pending = false;
 	}
 
-	if(arriving==1 && !train.get_speed())
+	if(arrival==RESERVED_TO_END && !train.get_speed())
 	{
 		signal_arrived.emit(destination);
 		signal_event.emit(Message("arrived", destination));
-		arriving = 2;
+		arrival = ARRIVED;
 	}
-	else if(arriving==2 && !train.get_block_allocator().is_active())
+	else if(arrival==ARRIVED && !train.get_block_allocator().is_active())
 		set_route(0);
 }
 
@@ -301,6 +309,7 @@ void TrainRouter::block_reserved(Block &block, Train *t)
 	if(reserving_route==routes.end() || !(*reserving_route)->has_track(*track))
 	{
 		reserving_route = routes.begin();
+		arrival = ON_THE_WAY;
 		track = t->get_block_allocator().first().track_iter();
 		for(; track; track=track.next())
 		{
@@ -316,6 +325,7 @@ void TrainRouter::block_reserved(Block &block, Train *t)
 	{
 		if(!advance_to_track(reserving_route, *track))
 		{
+			arrival = RESERVED_TO_END;
 			train.stop_at(&block);
 			return;
 		}
@@ -335,27 +345,6 @@ void TrainRouter::train_advanced(Block &block)
 {
 	BlockIter b_iter = train.get_block_allocator().iter_for(block);
 
-	// Check if we've reached the next route
-	if(routes.size()>1)
-	{
-		Track &track = *b_iter.endpoint().track;
-		const Route *route = get_route();
-		bool change_route = false;
-		if(route->is_loop())
-			change_route = (*++routes.begin())->has_track(track);
-		else
-			change_route = !route->has_track(track);
-
-		if(change_route)
-		{
-			routes.pop_front();
-			route = get_route();
-			// XXX Exceptions?
-			signal_route_changed.emit(route);
-			signal_event.emit(Message("route-changed", route));
-		}
-	}
-
 	if(!waypoints.empty())
 	{
 		const TrackChain &wp = *waypoints.front();
@@ -376,13 +365,25 @@ void TrainRouter::train_advanced(Block &block)
 			}
 		}
 	}
+}
 
-	if(!routes.empty())
-	{
-		b_iter = b_iter.next();
-		if(b_iter && !is_on_route(*b_iter))
-			arriving = 1;
-	}
+void TrainRouter::train_rear_advanced(Block &block)
+{
+	Track &track = *train.get_block_allocator().iter_for(block).endpoint().track;
+
+	// Have we left some routes completely behind?
+	for(RouteList::iterator i=routes.begin(); i!=routes.end(); ++i)
+		if((*i)->has_track(track))
+		{
+			if(i!=routes.begin())
+			{
+				routes.erase(routes.begin(), i);
+				const Route *route = get_route();
+				signal_route_changed.emit(route);
+				signal_event.emit(Message("route-changed", route));
+			}
+			break;
+		}
 }
 
 void TrainRouter::create_metrics()