Separate train routing logic to a class derived from TrainAI

[r2c2.git] / source / engineer / trainpanel.cpp

diff --git a/source/engineer/trainpanel.cpp b/source/engineer/trainpanel.cpp
index b29836f50736be1aa94a89ac6e29e10aa668cd50..97592be1bed92dc2547c5fb79ca3eb2399ca38f2 100644 (file)
--- 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,18 @@ 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 = dynamic_cast<TrainRouter *>(train.get_tagged_ai("router"));
+       if(!router)
+       {
+               router = new TrainRouter(train);
+               router->set_tag("router");
+       }
+
+       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");
@@ -276,6 +284,7 @@ void TrainPanel::go_to(Track *track, unsigned)
 {
        pick_conn.disconnect();
 
-       if(!train.go_to(*track))
+       TrainRouter *router = dynamic_cast<TrainRouter *>(train.get_tagged_ai("router"));
+       if(!router || !router->go_to(*track))
                engineer.set_status("Could not set route");
 }