Use some template magic to deduce the proper 3D type

[r2c2.git] / source / engineer / engineer.cpp

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 9b49c847ca5a21ff11229f0bb42e5252f622b9fb..fb21f9917b0e718b4031e0e8a42937aea3375d67 100644 (file)
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -76,7 +76,7 @@ Engineer::Engineer(int argc, char **argv):
        const set<Track *> &tracks = layout.get_all<Track>();
        for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
                if((*i)->get_type().is_turnout())
-                       new Path3D(layout_3d.get<Track3D>(**i));
+                       new Path3D(layout_3d.get_3d(**i));
 
        if(FS::exists(options.state_fn))
                DataFile::load(layout, options.state_fn);
@@ -292,7 +292,7 @@ Object *Engineer::pick_object(const Vector &p)
 
 void Engineer::process_new_train(Train &train)
 {
-       Vehicle3D &loco3d = layout_3d.get<Vehicle3D>(train.get_vehicle(0));
+       Vehicle3D &loco3d = layout_3d.get_3d(train.get_vehicle(0));
        overlay->set_label(loco3d, train.get_name());
        train.signal_name_changed.connect(sigc::bind<0>(sigc::mem_fun(overlay, &Overlay3D::set_label), sigc::ref(loco3d)));
 }