X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftimetable.cpp;h=ed7d01831445e3745a4e7a297d687e5f3c3d7e00;hb=f2092c352667a3178bfea9c2bc90882e4b7fb3aa;hp=f0e49ffb85eac5c0aded58018c5a4c6a289c3490;hpb=9ad36841021cdd5c7f14d52e946d8ecdb602cf78;p=r2c2.git

diff --git a/source/libr2c2/timetable.cpp b/source/libr2c2/timetable.cpp
index f0e49ff..ed7d018 100644
--- a/source/libr2c2/timetable.cpp
+++ b/source/libr2c2/timetable.cpp
@@ -150,7 +150,7 @@ void Timetable::update_route()
 	{
 		if(i->type==ARRIVE)
 		{
-			train.ai_message(Message("set-destination-zone", i->zone));
+			train.ai_message(Message("set-destination", i->target));
 			break;
 		}
 		else if(i->type==DEPART)
@@ -182,14 +182,14 @@ void Timetable::event(TrainAI &, const Message &msg)
 
 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 +213,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 +229,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)
 {