X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=959eba2393df2d3c5443670e239b91e0e449e159;hb=d284c154438ffec9f0feb6b8dc4d9aa77ae13e24;hp=c55105026e3710e859692c934a3a1353f3fb5662;hpb=6eba064c477836843a2647d777e95823a96dda43;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index c551050..959eba2 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),
@@ -105,6 +105,7 @@ void TrainRouter::route_changed()
 
 	if(!already_at_end)
 	{
+		arrival = ON_THE_WAY;
 		train.stop_at(0);
 		train.refresh_blocks_from(*fncb);
 	}
@@ -233,13 +234,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 +302,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 +318,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;
 		}
@@ -376,13 +379,6 @@ 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::create_metrics()