Major architecture rework

[r2c2.git] / source / 3d / layout.cpp

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index 8ea58bf8454661be87d7e731903411c8d35b3986..1a557153fda308ce56a18066e281ca2e3e1b8830 100644 (file)
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -13,7 +13,6 @@ Distributed under the GPL
 #include <msp/gl/select.h>
 #include <msp/gl/texture.h>
 #include <msp/datafile/parser.h>
-#include "libmarklin/trafficmanager.h"
 #include "layout.h"
 
 using namespace std;
@@ -27,6 +26,7 @@ Layout3D::Layout3D(Layout &l):
 {
        layout.signal_track_added.connect(sigc::mem_fun(this, &Layout3D::track_added));
        layout.signal_track_removed.connect(sigc::mem_fun(this, &Layout3D::track_removed));
+       layout.signal_train_added.connect(sigc::mem_fun(this, &Layout3D::train_added));
 
        const set<Track *> &ltracks = layout.get_tracks();
        for(set<Track *>::iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
@@ -98,11 +98,6 @@ Track3D *Layout3D::pick_track(float x, float y, float size) const
        return track;
 }
 
-void Layout3D::set_traffic_manager(TrafficManager &tm)
-{
-       tm.signal_train_added.connect(sigc::mem_fun(this, &Layout3D::train_added));
-}
-
 void Layout3D::add_train(Train3D &t)
 {
        trains.push_back(&t);