X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fsignal.cpp;h=7aa999438055f4fa31fd6d73ee052f556eeab9ef;hb=8a2b5c1ac2fc07e280dc678165d2ca58f7d07e32;hp=73563b6e815d1d6b7d3c8fd6ca957a4120ca8cca;hpb=ce2ff9a6e154f5b245cfb35114566489ab3e597c;p=r2c2.git

diff --git a/source/libr2c2/signal.cpp b/source/libr2c2/signal.cpp
index 73563b6..7aa9994 100644
--- a/source/libr2c2/signal.cpp
+++ b/source/libr2c2/signal.cpp
@@ -70,7 +70,7 @@ void Signal::set_rotation(const Angle &r)
 
 void Signal::update_attachment()
 {
-	attach_to_closest(layout.get_catalogue().get_gauge()*2);
+	attach_to_closest(2);
 
 	if(track)
 		block = track.block_iter();
@@ -110,9 +110,9 @@ void Signal::tick(const Time::TimeDelta &)
 		BlockIter iter = block.next();
 		while(iter && iter->get_train()==train)
 		{
-			if(iter->get_sensor_id())
+			if(iter->get_sensor_address())
 				++n_blocks;
-			iter=iter.next();
+			iter = iter.next();
 		}
 		check_allocated_blocks = false;
 
@@ -160,7 +160,7 @@ void Signal::train_advanced(Block &b)
 {
 	if(&b==block.block())
 		passing = true;
-	else if(passing && b.get_sensor_id())
+	else if(passing && b.get_sensor_address())
 	{
 		layout.get_driver().set_signal(address, type.get_indications().back().aspect);
 		reset();