Move gauge to TrackAppearance

[r2c2.git] / source / libr2c2 / track.cpp

diff --git a/source/libr2c2/track.cpp b/source/libr2c2/track.cpp
index 030d428f18068dd6f8b7e7d08773c1a2d7155f83..680e6ea8746cbe63ba7a2c797c8a952da6a625a4 100644 (file)
--- 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,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;
@@ -421,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)