X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=b5a5bef11f674f3301a36c1304558bc63b2bc8fa;hb=9afe42fc94eed6754da8401082e76121f8c66783;hp=77d6f71c8a082f9108921b3d3051b58b4fada51f;hpb=1c072afdb1866ba397ee8e6155f5f68c6c7ab4da;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index 77d6f71..b5a5bef 100644
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -14,7 +14,7 @@ namespace R2C2 {
 TrainRouter::TrainRouter(Train &t):
 	TrainAI(t),
 	priority(0),
-	arriving(false),
+	arriving(0),
 	dest_zone(0),
 	dest_block(0),
 	update_pending(false)
@@ -30,13 +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())
 	{
-		TrackIter first = train.get_tail_block().track_iter();
-		TrackIter next = train.get_head_block().next().track_iter();
+		const BlockAllocator &allocator = train.get_block_allocator();
+		TrackIter first = allocator.first().track_iter();
+		TrackIter next = fncb.track_iter();
 		if(!r->has_track(*next))
 		{
 			lead = Route::find(next, *r);
@@ -54,9 +55,9 @@ bool TrainRouter::set_route(const Route *r)
 	if(r)
 		routes.push_back(r);
 	train.stop_at(0);
-	arriving = false;
+	arriving = 0;
 
-	train.reserve_more();
+	train.refresh_blocks_from(*fncb);
 
 	const Route *route = get_route();
 	signal_route_changed.emit(route);
@@ -136,18 +137,19 @@ 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())
+	if(arriving==1 && !train.get_speed())
 	{
-		train.set_active(false);
 		signal_arrived.emit();
 		signal_event.emit(Message("arrived"));
-		set_route(0);
+		arriving = 2;
 	}
+	else if(arriving==2 && !train.get_block_allocator().is_active())
+		set_route(0);
 }
 
 void TrainRouter::save(list<DataFile::Statement> &st) const
@@ -175,15 +177,15 @@ void TrainRouter::block_reserved(Block &block, Train *t)
 		return;
 	}
 
-	BlockIter b_iter(&block, t->get_entry_to_block(block));
+	BlockIter b_iter = t->get_block_allocator().iter_for(block);
 
 	RouteList::iterator route = routes.begin();
 	if(advance_route(route, block))
 	{
 		// Check if the block is a turnout and set it to proper path
-		if(unsigned tid = block.get_turnout_id())
+		if(unsigned taddr = block.get_turnout_address())
 		{
-			int path = (*route)->get_turnout(tid);
+			int path = (*route)->get_turnout(taddr);
 			if(path>=0)
 				b_iter.track_iter()->set_active_path(path);
 		}
@@ -205,13 +207,13 @@ void TrainRouter::block_reserved(Block &block, Train *t)
 
 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)
 	{
-		unsigned entry = train.get_entry_to_block(block);
-		Track &track = *block.get_endpoint(entry).track;
 		const Route &route = **++routes.begin();
-		if(route.has_track(track))
+		if(route.has_track(*b_iter.endpoint().track))
 		{
 			routes.pop_front();
 			// XXX Exceptions?
@@ -221,10 +223,9 @@ void TrainRouter::train_advanced(Block &block)
 
 	if(!routes.empty())
 	{
-		BlockIter iter(&block, train.get_entry_to_block(block));
-		iter = iter.next();
-		if(iter && !is_on_route(*iter))
-			arriving = true;
+		b_iter = b_iter.next();
+		if(b_iter && !is_on_route(*b_iter))
+			arriving = 1;
 	}
 }
 
@@ -249,7 +250,7 @@ Route *TrainRouter::create_lead_route(Route *lead, const Route *target)
 	}
 
 	set<Track *> tracks;
-	for(BlockIter i=train.get_tail_block(); (i && i->get_train()==&train); i=i.next())
+	for(BlockIter i=train.get_block_allocator().first(); (i && i->get_train()==&train); i=i.next())
 	{
 		const set<Track *> &btracks = i->get_tracks();
 		for(set<Track *>::const_iterator j=btracks.begin(); j!=btracks.end(); ++j)