-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2011 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
#include <cmath>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
#include "libr2c2/aicontrol.h"
#include "libr2c2/timetable.h"
#include "libr2c2/trackiter.h"
+#include "libr2c2/trainrouter.h"
#include "libr2c2/vehicletype.h"
#include "engineer.h"
#include "routeselect.h"
pnl_extra->set_geometry(GLtk::Geometry(0, 10, geom.w, 135));
pnl_extra->set_visible(false);
- const Route *route = train.get_route();
+ TrainRouter *router = train.get_ai_of_type<TrainRouter>();
+ if(!router)
+ router = new TrainRouter(train);
+
+ const Route *route = router->get_route();
pnl_extra->add(*(lbl_route = new GLtk::Label((route ? route->get_name() : "Free run"))));
lbl_route->set_style("digital");
lbl_route->set_geometry(GLtk::Geometry(10, 85, geom.w-20, 20));
- train.signal_route_changed.connect(sigc::mem_fun(this, &TrainPanel::train_route_changed));
+ router->signal_route_changed.connect(sigc::mem_fun(this, &TrainPanel::train_route_changed));
pnl_extra->add(*(lbl_status = new GLtk::Label(status.get_status())));
lbl_status->set_style("digital");
lbl_status->set_geometry(GLtk::Geometry(10, 60, geom.w-20, 20));
status.signal_changed.connect(sigc::mem_fun(this, &TrainPanel::train_status_changed));
- const map<unsigned, string> &funcs = train.get_locomotive_type().get_functions();
+ const VehicleType::FunctionMap &funcs = train.get_locomotive_type().get_functions();
unsigned x = 10;
- for(map<unsigned, string>::const_iterator i=funcs.begin(); i!=funcs.end(); ++i, x+=36)
+ for(VehicleType::FunctionMap::const_iterator i=funcs.begin(); i!=funcs.end(); ++i, x+=36)
{
string fname = i->second;
fname[0] = toupper(fname[0]);
void TrainPanel::timetable_clicked()
{
- Timetable *timetable = dynamic_cast<Timetable *>(train.get_tagged_ai("timetable"));
+ Timetable *timetable = train.get_ai_of_type<Timetable>();
if(!timetable)
- {
timetable = new Timetable(train);
- timetable->set_tag("timetable");
- }
TimetableDialog *dialog = new TimetableDialog(*timetable);
engineer.get_root().add(*dialog);
{
pick_conn.disconnect();
- if(!train.go_to(*track))
+ TrainRouter *router = train.get_ai_of_type<TrainRouter>();
+ if(!router || !router->go_to(*track))
engineer.set_status("Could not set route");
}