X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftimetable.cpp;h=41cbbf00ab834350714025c865853d54462c4796;hb=dfeb2d2896fe18e55b1f6c4a8028b7cfb878dede;hp=7ce8127d433b7995a6b9ff91aa9f1f0f53909f60;hpb=b652dfb998dd416d26f909798e58964ef84eda11;p=r2c2.git

diff --git a/source/libr2c2/timetable.cpp b/source/libr2c2/timetable.cpp
index 7ce8127..41cbbf0 100644
--- a/source/libr2c2/timetable.cpp
+++ b/source/libr2c2/timetable.cpp
@@ -25,6 +25,7 @@ Timetable::Timetable(Train &t):
 		new TrainRouter(train);
 
 	train.signal_ai_event.connect(sigc::mem_fun(this, &Timetable::event));
+	train.get_layout().get_clock().signal_discontinuity.connect(sigc::mem_fun(this, &Timetable::clock_discontinuity));
 }
 
 void Timetable::append_row(const Row &r)
@@ -116,7 +117,7 @@ void Timetable::save(list<DataFile::Statement> &st) const
 	}
 }
 
-void Timetable::check_update(list<Row>::const_iterator i)
+void Timetable::check_update(const list<Row>::const_iterator &i)
 {
 	for(list<Row>::const_iterator j=current_row; (j!=rows.end() && j!=i); ++j)
 		if(j->type==ARRIVE)
@@ -176,21 +177,19 @@ void Timetable::update_route()
 	current_row = depart;
 	for(list<Row>::const_iterator i=depart; i!=rows.end(); ++i)
 	{
-		if(i->type==ARRIVE)
-		{
-			train.ai_message(Message("set-destination", i->target));
-			break;
-		}
-		else if(i->type==DEPART)
+		if(i->type==DEPART)
 		{
 			Time::TimeDelta dt = i->time-clock.get_current_time();
 			while(dt<Time::zero)
 				dt += Time::day;
-			dt /= clock.get_rate();
-			train.ai_message(Message("set-departure-delay", dt));
+			train.ai_message(Message("set-departure-delay", dt/clock.get_rate()));
+		}
+		else
+		{
+			train.ai_message(Message("add-waypoint", TrainRouter::Waypoint(*i->target, i->direction)));
+			if(i->type==ARRIVE)
+				break;
 		}
-		else if(i->type==THROUGH)
-			train.ai_message(Message("add-waypoint", i->target));
 	}
 
 	list<Row>::iterator next_depart = find_trip(arrive, 0);
@@ -231,10 +230,17 @@ void Timetable::record_time()
 	signal_row_modified.emit(i, *current_row);
 }
 
+void Timetable::clock_discontinuity()
+{
+	update_pending = true;
+	sync_to_clock = true;
+}
+
 
 Timetable::Row::Row():
 	type(ARRIVE),
-	target(0)
+	target(0),
+	direction(TrackChain::UNSPECIFIED)
 { }
 
 void Timetable::Row::save(list<DataFile::Statement> &st) const
@@ -242,6 +248,8 @@ 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(target->save_reference());
+	if(direction)
+		st.push_back((DataFile::Statement("direction"), direction));
 }
 
 
@@ -266,9 +274,11 @@ Timetable::Row::Loader::Loader(Row &r, Layout &l):
 	layout(l)
 {
 	add("block", &Loader::block);
+	add("direction", &Row::direction);
 	add("time", &Loader::time);
 	add("type", &Row::type);
 	add("zone", &Loader::zone);
+	add("zone", &Loader::zone_numbered);
 }
 
 void Timetable::Row::Loader::block(unsigned id)
@@ -281,7 +291,12 @@ void Timetable::Row::Loader::time(Time::RawTime t)
 	obj.time = Time::TimeDelta(t);
 }
 
-void Timetable::Row::Loader::zone(const string &name, unsigned number)
+void Timetable::Row::Loader::zone(const string &name)
+{
+	zone_numbered(name, 0);
+}
+
+void Timetable::Row::Loader::zone_numbered(const string &name, unsigned number)
 {
 	obj.target = &layout.get_zone(name, number);
 }