Use the TrackChain base class as destination in Router

[r2c2.git] / source / libr2c2 / trainrouter.cpp

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index 65a4a24500206cb0286a1f5cb3da4efc22358c7c..b2993ee74ba47d0620234719016ff465f06b7aeb 100644 (file)
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -2,9 +2,9 @@
 #include "route.h"
 #include "trackiter.h"
 #include "train.h"
+#include "trackchain.h"
 #include "trainrouteplanner.h"
 #include "trainrouter.h"
-#include "zone.h"
 
 using namespace std;
 using namespace Msp;
@@ -15,8 +15,7 @@ TrainRouter::TrainRouter(Train &t):
        TrainAI(t),
        priority(0),
        arriving(0),
-       dest_zone(0),
-       dest_block(0),
+       destination(0),
        update_pending(false)
 {
        train.get_layout().signal_block_reserved.connect(sigc::mem_fun(this, &TrainRouter::block_reserved));
@@ -61,8 +60,7 @@ bool TrainRouter::set_route(const Route *r)
        route, but not when the planner calls this. */
        if(!r)
        {
-               dest_zone = 0;
-               dest_block = 0;
+               destination = 0;
        }
 
        train.refresh_blocks_from(*fncb);
@@ -89,31 +87,16 @@ const Route *TrainRouter::get_route() const
        return routes.front();
 }
 
-void TrainRouter::set_destination(const Zone &zone)
+void TrainRouter::set_destination(const TrackChain &d)
 {
-       dest_zone = &zone;
-       dest_block = 0;
+       destination = &d;
        update_pending = true;
 }
 
-void TrainRouter::set_destination(const Block &block)
-{
-       dest_zone = 0;
-       dest_block = █
-       update_pending = true;
-}
-
-bool TrainRouter::has_destination() const
-{
-       return dest_zone || dest_block;
-}
-
 bool TrainRouter::is_destination(Track &track) const
 {
-       if(dest_zone)
-               return dest_zone->has_track(track);
-       else if(dest_block)
-               return dest_block->has_track(track);
+       if(destination)
+               return destination->has_track(track);
        else
                return false;
 }
@@ -135,19 +118,12 @@ void TrainRouter::message(const Message &msg)
        }
        else if(msg.type=="clear-route")
                set_route(0);
-       else if(msg.type=="set-destination-block")
-       {
-               if(msg.value.check_type<Block *>())
-                       set_destination(*msg.value.value<Block *>());
-               else
-                       set_destination(*msg.value.value<const Block *>());
-       }
-       else if(msg.type=="set-destination-zone")
+       else if(msg.type=="set-destination")
        {
-               if(msg.value.check_type<Zone *>())
-                       set_destination(*msg.value.value<Zone *>());
+               if(msg.value.check_type<TrackChain *>())
+                       set_destination(*msg.value.value<TrackChain *>());
                else
-                       set_destination(*msg.value.value<const Zone *>());
+                       set_destination(*msg.value.value<const TrackChain *>());
        }
        else if(msg.type=="set-departure-delay")
                set_departure_delay(msg.value.value<Time::TimeDelta>());