X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.h;h=9fab2892efe15803da1f413277f7a6bd25678122;hb=83c6923396fcfa42e6adf949b9476663f322748b;hp=2b59603dff6b9e8ef2753c36917a3335931e64c7;hpb=dd41422054c277b44059d5d2d127ce34a2c2119f;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 2b59603..9fab289 100644
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -43,7 +43,9 @@ private:
 	enum ArrivalState
 	{
 		ON_THE_WAY,
+		WAITING_FOR_SEQUENCE,
 		RESERVED_TO_END,
+		ADVANCED_TO_END,
 		ARRIVED
 	};
 
@@ -57,9 +59,8 @@ private:
 	RouteList routes;
 	RouteList::iterator reserving_route;
 	ArrivalState arrival;
-	const TrackChain *destination;
 	std::vector<const TrackChain *> waypoints;
-	bool destination_changed;
+	bool waypoints_changed;
 	std::vector<TrainRouteMetric *> metrics;
 	bool metrics_stale;
 	std::list<SequencePoint> sequence_points;
@@ -80,11 +81,12 @@ public:
 	const Route *get_route() const;
 	unsigned get_current_sequence() const { return current_sequence; }
 private:
+	void use_planned_route();
 	void route_changed();
 
 public:
 	void set_destination(const TrackChain &);
-	const TrackChain *get_destination() const { return destination; }
+	const TrackChain *get_destination() const { return waypoints.empty() ? 0 : waypoints.back(); }
 	void add_waypoint(const TrackChain &);
 	unsigned get_n_waypoints() const { return waypoints.size(); }
 	const TrackChain &get_waypoint(unsigned) const;
@@ -105,11 +107,12 @@ private:
 	void train_rear_advanced(Block &);
 
 	void create_metrics();
-	Route *create_lead_route(Route *, const Route *);
-	bool is_valid_for_track(const Route &, Track &) const;
-	bool advance_to_track(RouteList::iterator &, Track &);
+	bool create_lead_route();
+	bool advance_to_track(RouteList::iterator &, const TrackIter &);
 
+	static void get_routers(Layout &, std::vector<TrainRouter *> &);
 	static void start_planning(Layout &);
+	static void apply_plan(Layout &, TrainRoutePlanner &);
 };
 
 } // namespace R2C2