X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftimetable.cpp;h=44e859e9a5b9becbb3d943adc8bb198287428f1a;hb=1c072afdb1866ba397ee8e6155f5f68c6c7ab4da;hp=d5a09517ef045c830a0903cdb96efa4fa2be6a23;hpb=d0af7846e05691d65d8021e46c8f81e8ca05199a;p=r2c2.git

diff --git a/source/libr2c2/timetable.cpp b/source/libr2c2/timetable.cpp
index d5a0951..44e859e 100644
--- a/source/libr2c2/timetable.cpp
+++ b/source/libr2c2/timetable.cpp
@@ -88,15 +88,15 @@ void Timetable::tick(const Time::TimeStamp &t, const Time::TimeDelta &)
 		{
 		case GOTO_SENSOR:
 			arrived = false;
-			train.ai_message(Message("go-to-track", &get_sensor(row.get_param<unsigned>(0))));
+			train.ai_message(Message("set-destination-block", &get_sensor(row.get_param<unsigned>(0))));
 			break;
 		case GOTO_ZONE:
 			arrived = false;
-			train.ai_message(Message("go-to-zone", &get_zone(row.get_param<string>(0))));
+			train.ai_message(Message("set-destination-zone", &get_zone(row.get_param<string>(0))));
 			break;
 		case TRAVEL_TO:
 			{
-				Block *block = &get_sensor(row.get_param<unsigned>(0)).get_block();
+				Block *block = &get_sensor(row.get_param<unsigned>(0));
 				if(block->get_train()!=&train || block->get_state()<Block::MAYBE_ACTIVE)
 				{
 					pending_block = block;
@@ -126,7 +126,7 @@ void Timetable::tick(const Time::TimeStamp &t, const Time::TimeDelta &)
 		case WAIT_TRAIN:
 			{
 				Train *other_train = &train.get_layout().get_train(row.get_param<unsigned>(0));
-				Block *block = &get_sensor(row.get_param<unsigned>(1)).get_block();
+				Block *block = &get_sensor(row.get_param<unsigned>(1));
 				if(block->get_train()!=other_train || block->get_state()<Block::MAYBE_ACTIVE)
 				{
 					pending_train = other_train;
@@ -162,16 +162,13 @@ 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());
 }
 
-Track &Timetable::get_sensor(unsigned id)
+Block &Timetable::get_sensor(unsigned id)
 {
-	Block &block = train.get_layout().get_block(id|0x1000);
-	return **block.get_tracks().begin();
+	return train.get_layout().get_block(id|0x1000);
 }
 
 Track &Timetable::get_turnout(unsigned id)
@@ -415,7 +412,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 +459,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));