X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftimetable.cpp;h=753aae83f719a2f453605a78f6dac417a7bcec30;hb=bde934f7d5ba07a9442a305192e10024820d13ed;hp=9fd44df6d80a480b6d9eb95e9a3cec1cc82e6550;hpb=621c5c938d70ba0d155e0eda91a708db0a52c0dc;p=r2c2.git

diff --git a/source/libr2c2/timetable.cpp b/source/libr2c2/timetable.cpp
index 9fd44df..753aae8 100644
--- a/source/libr2c2/timetable.cpp
+++ b/source/libr2c2/timetable.cpp
@@ -22,7 +22,7 @@ Timetable::Timetable(Train &t):
 	arrived(false)
 {
 	train.signal_advanced.connect(sigc::mem_fun(this, &Timetable::train_advanced));
-	train.signal_arrived.connect(sigc::mem_fun(this, &Timetable::train_arrived));
+	train.signal_ai_event.connect(sigc::mem_fun(this, &Timetable::event));
 	Layout &layout = train.get_layout();
 	layout.signal_block_state_changed.connect(sigc::mem_fun(this, &Timetable::block_state_changed));
 	layout.signal_block_reserved.connect(sigc::mem_fun(this, &Timetable::block_reserved));
@@ -88,13 +88,11 @@ void Timetable::tick(const Time::TimeStamp &t, const Time::TimeDelta &)
 		{
 		case GOTO_SENSOR:
 			arrived = false;
-			if(!train.go_to(get_sensor(row.get_param<unsigned>(0))))
-				set_enabled(false);
+			train.ai_message(Message("go-to-track", &get_sensor(row.get_param<unsigned>(0))));
 			break;
 		case GOTO_ZONE:
 			arrived = false;
-			if(!train.go_to(get_zone(row.get_param<string>(0))))
-				set_enabled(false);
+			train.ai_message(Message("go-to-zone", &get_zone(row.get_param<string>(0))));
 			break;
 		case TRAVEL_TO:
 			{
@@ -153,8 +151,7 @@ void Timetable::tick(const Time::TimeStamp &t, const Time::TimeDelta &)
 			train.ai_message(Message("toggle-reverse"));
 			break;
 		case ROUTE:
-			if(!train.set_route(&train.get_layout().get_route(row.get_param<string>(0))))
-				set_enabled(false);
+			train.ai_message(Message("set-route", &train.get_layout().get_route(row.get_param<string>(0))));
 			break;
 		}
 
@@ -165,8 +162,6 @@ void Timetable::tick(const Time::TimeStamp &t, const Time::TimeDelta &)
 
 void Timetable::save(list<DataFile::Statement> &st) const
 {
-	if(!tag.empty())
-		st.push_back((DataFile::Statement("tag"), tag));
 	for(vector<Row>::const_iterator i=rows.begin(); i!=rows.end(); ++i)
 		st.push_back(i->save());
 }
@@ -232,19 +227,22 @@ void Timetable::train_advanced(Block &block)
 		pending_train = 0;
 }
 
-void Timetable::train_arrived()
+void Timetable::event(TrainAI &, const Message &ev)
 {
-	if(rows.empty() || !enabled)
-		return;
-
-	Row &row = rows[current_row];
-	if(row.type==ARRIVE)
+	if(ev.type=="arrived")
 	{
-		current_row = (current_row+1)%rows.size();
-		executing = true;
+		if(rows.empty() || !enabled)
+			return;
+
+		Row &row = rows[current_row];
+		if(row.type==ARRIVE)
+		{
+			current_row = (current_row+1)%rows.size();
+			executing = true;
+		}
+		else
+			arrived = true;
 	}
-	else
-		arrived = true;
 }
 
 
@@ -415,7 +413,6 @@ Timetable::Loader::Loader(Timetable &tt):
 	add("route",       &Loader::route);
 	add("speed",       &Loader::speed);
 	add("reverse",     &Loader::reverse);
-	add("tag",         &Loader::tag);
 	add("travel_to",   &Loader::travel_to);
 	add("travel_past", &Loader::travel_past);
 	add("wait",        &Loader::wait);
@@ -463,11 +460,6 @@ void Timetable::Loader::speed(unsigned s)
 	obj.rows.push_back(Row(SPEED, s));
 }
 
-void Timetable::Loader::tag(const string &t)
-{
-	obj.tag = t;
-}
-
 void Timetable::Loader::travel_to(unsigned s)
 {
 	obj.rows.push_back(Row(TRAVEL_TO, s));