X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftimetable.cpp;h=42414f63d0baf3ecfe14fcbda9afb4de8c3669e3;hb=76e277499fec494a96a1120692a1c6b4dc85ba60;hp=ed7d01831445e3745a4e7a297d687e5f3c3d7e00;hpb=1ac853ffc606b29ffd88b923ed3551ee6282afb2;p=r2c2.git

diff --git a/source/libr2c2/timetable.cpp b/source/libr2c2/timetable.cpp
index ed7d018..42414f6 100644
--- a/source/libr2c2/timetable.cpp
+++ b/source/libr2c2/timetable.cpp
@@ -1,8 +1,10 @@
 #include <msp/strings/format.h>
+#include "aicontrol.h"
 #include "clock.h"
 #include "layout.h"
 #include "timetable.h"
 #include "train.h"
+#include "trainrouter.h"
 #include "zone.h"
 
 using namespace std;
@@ -15,6 +17,11 @@ Timetable::Timetable(Train &t):
 	current_row(rows.end()),
 	update_pending(false)
 {
+	if(!train.get_ai_of_type<AIControl>())
+		new AIControl(train);
+	if(!train.get_ai_of_type<TrainRouter>())
+		new TrainRouter(train);
+
 	train.signal_ai_event.connect(sigc::mem_fun(this, &Timetable::event));
 }
 
@@ -162,6 +169,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,15 +179,27 @@ 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),
@@ -241,6 +262,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));
 	}
 }
@@ -251,6 +273,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()));
 }