X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftimetable.cpp;h=96081820a56a54f236ee88d40032354cded852b0;hb=7b0f113892d7202c17bb873ade72e5e74dbaffa4;hp=631f58a0894ec4fa15c8978c8279fbc4f571cb1c;hpb=a7b4305930090851623da7e02e21650510ce7dae;p=r2c2.git

diff --git a/source/libr2c2/timetable.cpp b/source/libr2c2/timetable.cpp
index 631f58a..9608182 100644
--- a/source/libr2c2/timetable.cpp
+++ b/source/libr2c2/timetable.cpp
@@ -162,6 +162,8 @@ void Timetable::update_route()
 			dt /= clock.get_rate();
 			train.ai_message(Message("set-departure-delay", dt));
 		}
+		else if(i->type==THROUGH)
+			train.ai_message(Message("add-waypoint", i->target));
 	}
 }
 
@@ -170,26 +172,38 @@ void Timetable::event(TrainAI &, const Message &msg)
 	if(msg.type=="arrived")
 	{
 		if(current_row->type==ARRIVE)
+			record_time();
+		update_pending = true;
+	}
+	else if(msg.type=="waypoint-reached")
+	{
+		const TrackChain *wp = msg.value.value<const TrackChain *>();
+		if(current_row->type==THROUGH && current_row->target==wp)
 		{
-			current_row->time = train.get_layout().get_clock().get_current_time();
-			unsigned i = distance(rows.begin(), current_row);
-			signal_row_modified.emit(i, *current_row);
+			record_time();
+			++current_row;
 		}
-		update_pending = true;
 	}
 }
 
+void Timetable::record_time()
+{
+	current_row->time = train.get_layout().get_clock().get_current_time();
+	unsigned i = distance(rows.begin(), current_row);
+	signal_row_modified.emit(i, *current_row);
+}
+
 
 Timetable::Row::Row():
 	type(ARRIVE),
-	zone(0)
+	target(0)
 { }
 
 void Timetable::Row::save(list<DataFile::Statement> &st) const
 {
 	st.push_back((DataFile::Statement("type"), type));
 	st.push_back((DataFile::Statement("time"), time.raw()));
-	st.push_back((DataFile::Statement("zone"), zone->get_group(), zone->get_number()));
+	st.push_back(target->save_reference());
 }
 
 
@@ -213,14 +227,15 @@ Timetable::Row::Loader::Loader(Row &r, Layout &l):
 	DataFile::ObjectLoader<Timetable::Row>(r),
 	layout(l)
 {
-	add("zone", &Loader::zone);
+	add("block", &Loader::block);
 	add("time", &Loader::time);
 	add("type", &Row::type);
+	add("zone", &Loader::zone);
 }
 
-void Timetable::Row::Loader::zone(const string &name, unsigned number)
+void Timetable::Row::Loader::block(unsigned id)
 {
-	obj.zone = &layout.get_zone(name, number);
+	obj.target = &layout.get_block(id);
 }
 
 void Timetable::Row::Loader::time(Time::RawTime t)
@@ -228,6 +243,11 @@ void Timetable::Row::Loader::time(Time::RawTime t)
 	obj.time = Time::TimeDelta(t);
 }
 
+void Timetable::Row::Loader::zone(const string &name, unsigned number)
+{
+	obj.target = &layout.get_zone(name, number);
+}
+
 
 void operator<<(LexicalConverter &conv, Timetable::RowType rt)
 {
@@ -235,6 +255,7 @@ void operator<<(LexicalConverter &conv, Timetable::RowType rt)
 	{
 	case Timetable::ARRIVE: conv.result("ARRIVE"); return;
 	case Timetable::DEPART: conv.result("DEPART"); return;
+	case Timetable::THROUGH: conv.result("THROUGH"); return;
 	default: throw lexical_error(format("conversion of RowType(%d) to string", rt));
 	}
 }
@@ -245,6 +266,8 @@ void operator>>(const LexicalConverter &conv, Timetable::RowType &rt)
 		rt = Timetable::ARRIVE;
 	else if(conv.get()=="DEPART")
 		rt = Timetable::DEPART;
+	else if(conv.get()=="THROUGH")
+		rt = Timetable::THROUGH;
 	else
 		throw lexical_error(format("conversion of '%s' to RowType", conv.get()));
 }