X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Flibr2c2%2Ftrain.cpp;h=38765cee7fde73517df49f546c5205bdd95caefa;hb=d3a7a9e9ad694d52ccca8b6038501772fdc1dfd5;hp=16077ef8e4878823fe406e6098911e2ba6ee0e4b;hpb=251270c97a5e5eb8630bc1662a406255dedae90e;p=r2c2.git

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index 16077ef..38765ce 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -5,6 +5,7 @@ Copyright © 2006-2011  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
+#include <algorithm>
 #include <cmath>
 #include <msp/strings/formatter.h>
 #include <msp/time/units.h>
@@ -55,8 +56,7 @@ Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p):
 	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),
@@ -101,7 +101,6 @@ Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p):
 Train::~Train()
 {
 	delete controller;
-	delete timetable;
 	for(vector<Vehicle *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
 		delete *i;
 	layout.remove_train(*this);
@@ -209,10 +208,32 @@ bool Train::get_function(unsigned func) const
 	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)
@@ -559,8 +580,8 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
 
 	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();
 
@@ -679,12 +700,14 @@ void Train::save(list<DataFile::Statement> &st) const
 			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)
@@ -1379,11 +1402,8 @@ void Train::Loader::route(const string &n)
 
 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)