X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=da3b7d515fe253b79db3412ea0e98d2bd062d6ea;hb=29878263d8faf9b7e5845e8b1c3d52b139a255cf;hp=65a4a24500206cb0286a1f5cb3da4efc22358c7c;hpb=64989fc7180b55a6f12c997cb13d326c388eddc8;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index 65a4a24..da3b7d5 100644
--- 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,8 @@ 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;
+		waypoints.clear();
 	}
 
 	train.refresh_blocks_from(*fncb);
@@ -89,33 +88,32 @@ 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)
+bool TrainRouter::is_destination(Track &track) const
 {
-	dest_zone = 0;
-	dest_block = █
-	update_pending = true;
+	if(destination)
+		return destination->has_track(track);
+	else
+		return false;
 }
 
-bool TrainRouter::has_destination() const
+void TrainRouter::add_waypoint(const TrackChain &wp)
 {
-	return dest_zone || dest_block;
+	waypoints.push_back(&wp);
+	update_pending = true;
 }
 
-bool TrainRouter::is_destination(Track &track) const
+bool TrainRouter::is_waypoint(unsigned index, Track &track) const
 {
-	if(dest_zone)
-		return dest_zone->has_track(track);
-	else if(dest_block)
-		return dest_block->has_track(track);
-	else
-		return false;
+	if(index>=waypoints.size())
+		throw out_of_range("TrainRouter::is_waypoint");
+
+	return waypoints[index]->has_track(track);
 }
 
 void TrainRouter::set_departure_delay(const Time::TimeDelta &d)
@@ -135,19 +133,19 @@ void TrainRouter::message(const Message &msg)
 	}
 	else if(msg.type=="clear-route")
 		set_route(0);
-	else if(msg.type=="set-destination-block")
+	else if(msg.type=="set-destination")
 	{
-		if(msg.value.check_type<Block *>())
-			set_destination(*msg.value.value<Block *>());
+		if(msg.value.check_type<TrackChain *>())
+			set_destination(*msg.value.value<TrackChain *>());
 		else
-			set_destination(*msg.value.value<const Block *>());
+			set_destination(*msg.value.value<const TrackChain *>());
 	}
-	else if(msg.type=="set-destination-zone")
+	else if(msg.type=="add-waypoint")
 	{
-		if(msg.value.check_type<Zone *>())
-			set_destination(*msg.value.value<Zone *>());
+		if(msg.value.check_type<TrackChain *>())
+			add_waypoint(*msg.value.value<TrackChain *>());
 		else
-			set_destination(*msg.value.value<const Zone *>());
+			add_waypoint(*msg.value.value<const TrackChain *>());
 	}
 	else if(msg.type=="set-departure-delay")
 		set_departure_delay(msg.value.value<Time::TimeDelta>());