X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainpanel.cpp;h=e6a91a8f6dc1c2b272fa38adb88c4a3adc62c165;hb=54392d65e2053d1eacb4cfcc435f1013993f2973;hp=b29836f50736be1aa94a89ac6e29e10aa668cd50;hpb=ce29d0ccf89840c9581314301de0ea2b5b261c43;p=r2c2.git

diff --git a/source/engineer/trainpanel.cpp b/source/engineer/trainpanel.cpp
index b29836f..e6a91a8 100644
--- a/source/engineer/trainpanel.cpp
+++ b/source/engineer/trainpanel.cpp
@@ -3,6 +3,7 @@
 #include "libr2c2/aicontrol.h"
 #include "libr2c2/timetable.h"
 #include "libr2c2/trackiter.h"
+#include "libr2c2/trainrouter.h"
 #include "libr2c2/vehicletype.h"
 #include "engineer.h"
 #include "routeselect.h"
@@ -65,11 +66,15 @@ TrainPanel::TrainPanel(Engineer &e, Train &t):
 	pnl_extra->set_geometry(GLtk::Geometry(0, 10, geom.w, 135));
 	pnl_extra->set_visible(false);
 
-	const Route *route = train.get_route();
+	TrainRouter *router = train.get_ai_of_type<TrainRouter>();
+	if(!router)
+		router = new TrainRouter(train);
+
+	const Route *route = router->get_route();
 	pnl_extra->add(*(lbl_route = new GLtk::Label((route ? route->get_name() : "Free run"))));
 	lbl_route->set_style("digital");
 	lbl_route->set_geometry(GLtk::Geometry(10, 85, geom.w-20, 20));
-	train.signal_route_changed.connect(sigc::mem_fun(this, &TrainPanel::train_route_changed));
+	router->signal_route_changed.connect(sigc::mem_fun(this, &TrainPanel::train_route_changed));
 
 	pnl_extra->add(*(lbl_status = new GLtk::Label(status.get_status())));
 	lbl_status->set_style("digital");
@@ -207,12 +212,9 @@ void TrainPanel::goto_clicked()
 
 void TrainPanel::timetable_clicked()
 {
-	Timetable *timetable = dynamic_cast<Timetable *>(train.get_tagged_ai("timetable"));
+	Timetable *timetable = train.get_ai_of_type<Timetable>();
 	if(!timetable)
-	{
 		timetable = new Timetable(train);
-		timetable->set_tag("timetable");
-	}
 
 	TimetableDialog *dialog = new TimetableDialog(*timetable);
 	engineer.get_root().add(*dialog);
@@ -251,31 +253,16 @@ void TrainPanel::place(Track *track, unsigned ep)
 {
 	pick_conn.disconnect();
 
-	Block &block = track->get_block();
-	TrackIter iter(track, ep);
-
-	while(block.has_track(*iter))
-	{
-		const vector<Block::Endpoint> &eps = block.get_endpoints();
-		bool ok = false;
-		for(unsigned i=0; (!ok && i<eps.size()); ++i)
-			if(eps[i].track==iter.track() && eps[i].track_ep==iter.entry())
-			{
-				train.place(block, i);
-				ok = true;
-			}
-
-		if(ok)
-			break;
-
-		iter = iter.flip().reverse();
-	}
+	BlockIter block = TrackIter(track, ep).block_iter();
+	if(block)
+		train.place(block);
 }
 
 void TrainPanel::go_to(Track *track, unsigned)
 {
 	pick_conn.disconnect();
 
-	if(!train.go_to(*track))
-		engineer.set_status("Could not set route");
+	TrainRouter *router = train.get_ai_of_type<TrainRouter>();
+	if(router)
+		router->set_destination(track->get_block());
 }