X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrack.cpp;h=f1fdd992822180c26ddd5c39a6095bb8145516e4;hb=93c148ff88ba2c8266b44c336ba7ddd948010de7;hp=030d428f18068dd6f8b7e7d08773c1a2d7155f83;hpb=e85512838472070722b9e0b010e88ce0f1572b80;p=r2c2.git

diff --git a/source/libr2c2/track.cpp b/source/libr2c2/track.cpp
index 030d428..f1fdd99 100644
--- a/source/libr2c2/track.cpp
+++ b/source/libr2c2/track.cpp
@@ -1,5 +1,6 @@
 #include <cmath>
 #include <msp/core/maputils.h>
+#include <msp/strings/format.h>
 #include "block.h"
 #include "catalogue.h"
 #include "driver.h"
@@ -48,6 +49,7 @@ Track::Track(Layout &l, const TrackType &t):
 			Driver &driver = layout.get_driver();
 			turnout_id = driver.add_turnout(turnout_addr, type);
 			driver.signal_turnout.connect(sigc::mem_fun(this, &Track::turnout_event));
+			driver.signal_turnout_failed.connect(sigc::mem_fun(this, &Track::turnout_failed));
 		}
 	}
 
@@ -318,7 +320,11 @@ bool Track::link_to(Object &other)
 	if(!otrack)
 		return false;
 
-	float limit = layout.get_catalogue().get_gauge();
+	float gauge_ratio = otrack->get_type().get_gauge()/type.get_gauge();
+	if(gauge_ratio<0.99 || gauge_ratio>1.01)
+		return false;
+
+	float limit = type.get_gauge();
 	if(!flex && !otrack->get_flex())
 		limit /= 10;
 	limit *= limit;
@@ -421,6 +427,15 @@ void Track::turnout_event(unsigned id, unsigned state)
 	}
 }
 
+void Track::turnout_failed(unsigned id)
+{
+	if(id==turnout_id)
+	{
+		path_changing = false;
+		layout.emergency(block, "Turnout failed");
+	}
+}
+
 
 Track::Loader::Loader(Track &t):
 	DataFile::ObjectLoader<Track>(t)