#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"
{
const map<unsigned, Train *> &trains = layout.get_trains();
for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
- i->second->set_speed(0);
+ layout.get_driver().set_loco_speed(i->first, 0);
layout.get_driver().flush();
if(!options.simulate)
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;
IO::print(IO::cerr, "Fatal signal received, terminating\n");
const map<unsigned, Train *> &trains = layout.get_trains();
for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
- i->second->set_speed(0);
+ layout.get_driver().set_loco_speed(i->first, 0);
layout.get_driver().flush();
raise(sig);
}