X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftimetable.cpp;h=44e859e9a5b9becbb3d943adc8bb198287428f1a;hb=5c1ddd2f213af3fea15237e02f7da112c0abba36;hp=82c5411378c6e5c0f67277f2e328f3ad56e450f0;hpb=ce29d0ccf89840c9581314301de0ea2b5b261c43;p=r2c2.git

diff --git a/source/libr2c2/timetable.cpp b/source/libr2c2/timetable.cpp
index 82c5411..44e859e 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));
@@ -55,7 +55,7 @@ void Timetable::append(const Row &row)
 void Timetable::insert(unsigned i, const Row &row)
 {
 	if(i>rows.size())
-		throw InvalidParameterValue("Insert position out of range");
+		throw out_of_range("Timetable::insert");
 
 	rows.insert(rows.begin()+i, row);
 	if(i<=current_row)
@@ -65,7 +65,7 @@ void Timetable::insert(unsigned i, const Row &row)
 const Timetable::Row &Timetable::get_row(unsigned i) const
 {
 	if(i>=rows.size())
-		throw InvalidParameterValue("Row index out of range");
+		throw out_of_range("Timetable::get_row");
 	return rows[i];
 }
 
@@ -88,17 +88,15 @@ 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("set-destination-block", &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("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;
@@ -128,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;
@@ -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,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)
@@ -187,7 +181,7 @@ Zone &Timetable::get_zone(const string &name)
 {
 	string::size_type space = name.rfind(' ');
 	if(space==string::npos || space==0)
-		throw InvalidParameterValue("Invalid zone name");
+		throw invalid_argument("Timetable::get_zone");
 	unsigned number = lexical_cast<unsigned>(name.substr(space+1));
 	return train.get_layout().get_zone(name.substr(0, space), number);
 }
@@ -232,19 +226,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;
 }
 
 
@@ -263,7 +260,7 @@ template<typename T>
 const T &Timetable::Row::get_param(unsigned i) const
 {
 	if(i>=params.size())
-		throw InvalidParameterValue("Parameter index out of range");
+		throw out_of_range("Timetable::Row::get_param");
 	return params[i].value<T>();
 }
 
@@ -402,7 +399,7 @@ Timetable::Row Timetable::Row::parse(const string &s)
 		return Row(ROUTE, s.substr(10));
 	}
 
-	throw InvalidParameterValue("Invalid row");
+	throw invalid_argument("Timetable::Row::parse");
 }
 
 
@@ -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));