Distributed under the GPL
*/
+#include <algorithm>
#include <cmath>
#include <msp/strings/formatter.h>
#include <msp/time/units.h>
pending_block(0),
reserving(false),
advancing(false),
- controller(new AIControl(*this, new SimpleController)),
- timetable(0),
+ controller(new SimpleController),
active(false),
current_speed_step(0),
speed_changing(false),
Train::~Train()
{
delete controller;
- delete timetable;
for(vector<Vehicle *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
delete *i;
layout.remove_train(*this);
return (functions>>func)&1;
}
-void Train::set_timetable(Timetable *tt)
+void Train::add_ai(TrainAI &ai)
{
- delete timetable;
- timetable = tt;
+ ais.push_back(&ai);
+ ai.signal_event.connect(sigc::bind<0>(signal_ai_event, sigc::ref(ai)));
+}
+
+void Train::remove_ai(TrainAI &ai)
+{
+ list<TrainAI *>::iterator i = find(ais.begin(), ais.end(), &ai);
+ if(i!=ais.end())
+ ais.erase(i);
+}
+
+TrainAI *Train::get_tagged_ai(const string &tag)
+{
+ for(list<TrainAI *>::iterator i=ais.begin(); i!=ais.end(); ++i)
+ if((*i)->get_tag()==tag)
+ return *i;
+
+ return 0;
+}
+
+void Train::ai_message(const TrainAI::Message &msg)
+{
+ for(list<TrainAI *>::iterator i=ais.begin(); i!=ais.end(); ++i)
+ (*i)->message(msg);
}
bool Train::set_route(const Route *r)
Driver &driver = layout.get_driver();
- if(timetable)
- timetable->tick(t);
+ for(list<TrainAI *>::iterator i=ais.begin(); i!=ais.end(); ++i)
+ (*i)->tick(t, dt);
controller->tick(dt);
float speed = controller->get_speed();
st.push_back((DataFile::Statement("route"), i->route->get_name()));
}
- if(timetable)
- {
- DataFile::Statement ss("timetable");
- timetable->save(ss.sub);
- st.push_back(ss);
- }
+ // XXX Need more generic way of saving AI state
+ for(list<TrainAI *>::const_iterator i=ais.begin(); i!=ais.end(); ++i)
+ if(Timetable *timetable = dynamic_cast<Timetable *>(*i))
+ {
+ DataFile::Statement ss("timetable");
+ timetable->save(ss.sub);
+ st.push_back(ss);
+ }
}
void Train::control_changed(const Controller::Control &ctrl)
void Train::Loader::timetable()
{
- if(obj.timetable)
- throw InvalidState("A timetable has already been loaded");
-
- obj.timetable = new Timetable(obj);
- load_sub(*obj.timetable);
+ Timetable *ttbl = new Timetable(obj);
+ load_sub(*ttbl);
}
void Train::Loader::vehicle(ArticleNumber art_nr)