X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrack.cpp;h=680e6ea8746cbe63ba7a2c797c8a952da6a625a4;hb=5929b101ee38b5668b328e7b1eac4bf49c912412;hp=26886344b0a1312a9bb8023c065ed6220fdcb70c;hpb=73e4a36bbf828e07b83a779b696875e1f80045cc;p=r2c2.git

diff --git a/source/libr2c2/track.cpp b/source/libr2c2/track.cpp
index 2688634..680e6ea 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));
 		}
 	}
 
@@ -193,6 +195,9 @@ void Track::set_active_path(unsigned p)
 	if(!(type.get_paths()&(1<<p)))
 		throw invalid_argument("Track::set_active_path");
 
+	if(active_path==p)
+		return;
+
 	signal_path_changing(p);
 	path_changing = true;
 	layout.get_driver().set_turnout(turnout_id, p);
@@ -315,7 +320,7 @@ bool Track::link_to(Object &other)
 	if(!otrack)
 		return false;
 
-	float limit = layout.get_catalogue().get_gauge();
+	float limit = type.get_appearance().get_gauge();
 	if(!flex && !otrack->get_flex())
 		limit /= 10;
 	limit *= limit;
@@ -418,6 +423,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)