X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=8de191b70ef0ac6fcf5cae6e289d238e3038d35a;hb=0c2a3e6c435fd4cf05cc5275f750d341842aa543;hp=d29438fef588b1107a70bddc620b7aa4a9bfb56e;hpb=dda1e6c8716b6ac70d63a3f6ff95474a8b8b7336;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index d29438f..8de191b 100644
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -30,14 +30,14 @@ void TrainRouter::set_priority(int p)
 
 bool TrainRouter::set_route(const Route *r)
 {
-	train.free_noncritical_blocks();
+	BlockIter fncb = train.get_first_noncritical_block();
 
 	Route *lead = 0;
 	if(r && train.is_placed())
 	{
 		const BlockAllocator &allocator = train.get_block_allocator();
 		TrackIter first = allocator.first().track_iter();
-		TrackIter next = allocator.last().next().track_iter();
+		TrackIter next = fncb.track_iter();
 		if(!r->has_track(*next))
 		{
 			lead = Route::find(next, *r);
@@ -57,7 +57,7 @@ bool TrainRouter::set_route(const Route *r)
 	train.stop_at(0);
 	arriving = false;
 
-	train.reserve_more();
+	train.refresh_blocks_from(*fncb);
 
 	const Route *route = get_route();
 	signal_route_changed.emit(route);
@@ -137,14 +137,13 @@ void TrainRouter::message(const Message &msg)
 	}
 }
 
-void TrainRouter::tick(const Time::TimeStamp &, const Time::TimeDelta &)
+void TrainRouter::tick(const Time::TimeDelta &)
 {
 	if(update_pending)
 		create_plans(train.get_layout());
 
 	if(arriving && !train.get_speed())
 	{
-		train.set_active(false);
 		signal_arrived.emit();
 		signal_event.emit(Message("arrived"));
 		set_route(0);