Proper ID management for Signals

[r2c2.git] / source / libr2c2 / signal.h

diff --git a/source/libr2c2/signal.h b/source/libr2c2/signal.h
index 7f6e011d148c55add40d610a0ae9124695d89ee0..801a0b1d6fce596732ddf26309422f7aaab64e34 100644 (file)
--- a/source/libr2c2/signal.h
+++ b/source/libr2c2/signal.h
@@ -6,7 +6,6 @@
 #include "blockiter.h"
 #include "geometry.h"
 #include "signaltype.h"
-#include "track.h"
 #include "trackattachment.h"
 
 namespace R2C2 {
@@ -31,6 +30,7 @@ public:
 private:
        const SignalType &type;
        unsigned address;
+       unsigned id;
        BlockIter block;
        Train *train;
        sigc::connection train_conn;
@@ -45,6 +45,7 @@ public:
        virtual const SignalType &get_type() const { return type; }
 
        void set_address(unsigned);
+       unsigned get_address() const { return address; }
        virtual void set_position(const Vector &);
        virtual void set_rotation(const Angle &);
        virtual void set_tilt(const Angle &) { }