X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=7de62363455549e92360039850982b6995e5765a;hb=1c072afdb1866ba397ee8e6155f5f68c6c7ab4da;hp=a45675c90c146e078427bb754848b6b907d806d5;hpb=5b1b2196908c159d4a1339bce2682afa22700c35;p=r2c2.git

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index a45675c..7de6236 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -206,15 +206,6 @@ void Train::remove_ai(TrainAI &ai)
 		ais.erase(i);
 }
 
-TrainAI *Train::get_tagged_ai(const string &tag) const
-{
-	for(list<TrainAI *>::const_iterator i=ais.begin(); i!=ais.end(); ++i)
-		if((*i)->get_tag()==tag)
-			return *i;
-
-	return 0;
-}
-
 void Train::ai_message(const TrainAI::Message &msg)
 {
 	for(list<TrainAI *>::iterator i=ais.begin(); i!=ais.end(); ++i)
@@ -267,6 +258,8 @@ void Train::unplace()
 void Train::stop_at(Block *block)
 {
 	stop_at_block = block;
+	if(active && !stop_at_block)
+		reserve_more();
 }
 
 bool Train::free_block(Block &block)
@@ -674,7 +667,7 @@ void Train::reserve_more()
 	else if(&*start==pending_block)
 	{
 		TrackIter track = start.track_iter();
-		if(!(track.endpoint().paths&(1<<track->get_active_path())))
+		if(!track.endpoint().has_path(track->get_active_path()))
 			return;
 	}
 
@@ -736,11 +729,12 @@ void Train::reserve_more()
 		{
 			const TrackType::Endpoint &entry_ep = track.endpoint();
 			unsigned path = track->get_active_path();
-			if(!(entry_ep.paths&(1<<path)))
+			if(!entry_ep.has_path(path))
 			{
 				const TrackType::Endpoint &exit_ep = track.reverse().endpoint();
-				if(unsigned mask = entry_ep.paths&exit_ep.paths)
+				if(entry_ep.has_common_paths(exit_ep))
 				{
+					unsigned mask = entry_ep.paths&exit_ep.paths;
 					for(path=0; mask>1; ++path, mask>>=1) ;
 
 					track->set_active_path(path);