X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftimetable.cpp;h=b94cbf08fcfc37ad9d3485aeaf78f1ffe76ec615;hb=3dd660ffad729fbd6e75e6401f5c7f27b9013faf;hp=93f61c50608d0b56839bf6ba59af8ba6b4410c47;hpb=e8d2abb48b5236cc3455a035628292ae7908240e;p=r2c2.git

diff --git a/source/libr2c2/timetable.cpp b/source/libr2c2/timetable.cpp
index 93f61c5..b94cbf0 100644
--- a/source/libr2c2/timetable.cpp
+++ b/source/libr2c2/timetable.cpp
@@ -16,7 +16,8 @@ namespace R2C2 {
 Timetable::Timetable(Train &t):
 	TrainAI(t),
 	current_row(rows.end()),
-	update_pending(false)
+	update_pending(false),
+	sync_to_clock(true)
 {
 	if(!train.get_ai_of_type<AIControl>())
 		new AIControl(train);
@@ -115,7 +116,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)
@@ -144,6 +145,20 @@ void Timetable::update_route()
 	if(rows.empty())
 		return;
 
+	const Clock &clock = train.get_layout().get_clock();
+
+	if(sync_to_clock)
+	{
+		sync_to_clock = false;
+		current_row = rows.begin();
+		for(list<Row>::iterator i=rows.begin(); i!=rows.end(); ++i)
+			if(i->type==DEPART && i->time>=clock.get_current_time())
+			{
+				current_row = i;
+				break;
+			}
+	}
+
 	list<Row>::iterator arrive;
 	list<Row>::iterator depart = find_trip(current_row, &arrive);
 	if(depart==rows.end())
@@ -158,26 +173,22 @@ void Timetable::update_route()
 
 	train.ai_message(Message("clear-route"));
 
-	const Clock &clock = train.get_layout().get_clock();
-
 	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);
@@ -221,7 +232,8 @@ void Timetable::record_time()
 
 Timetable::Row::Row():
 	type(ARRIVE),
-	target(0)
+	target(0),
+	direction(TrackChain::UNSPECIFIED)
 { }
 
 void Timetable::Row::save(list<DataFile::Statement> &st) const
@@ -229,6 +241,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));
 }
 
 
@@ -253,6 +267,7 @@ 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);