#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;
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));
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);
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)
}
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>());