X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=d1a123bb7b5e44282e7045da291309a67a8dc91c;hb=e5cd9e4fbc577036a0385c985b6b65df8218d0a2;hp=4a35c8e0cd381bc6307f24e828c8352d68152239;hpb=9b68c21ebf8ce26d92246ecd4a392d2908b511f7;p=r2c2.git diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp index 4a35c8e..d1a123b 100644 --- a/source/engineer/engineer.cpp +++ b/source/engineer/engineer.cpp @@ -27,6 +27,8 @@ Distributed under the GPL #include "libmarklin/driver.h" #include "libmarklin/tracktype.h" #include "3d/path.h" +#include "3d/track.h" +#include "3d/vehicle.h" #include "engineer.h" #include "mainpanel.h" #include "trainpanel.h" @@ -391,9 +393,9 @@ void Engineer::train_added(Train &train) train_panels.push_back(tpanel); tpanel->set_visible(true); - Train3D &t3d = layout_3d.get_train(train); - overlay->set_label(t3d, train.get_name()); - train.signal_name_changed.connect(sigc::bind<0>(sigc::mem_fun(overlay, &Overlay3D::set_label), sigc::ref(t3d))); + Vehicle3D &loco3d = layout_3d.get_vehicle(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))); GL::Color best_color; float best_d_sq = 0;