X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.h;h=9a9978137cfeb58caa9164e66f41ab3b2ee1c5cd;hb=19a73af1fb956636cb8b9d563ffb6a42e827a5bf;hp=0ed2e118e7bb4e5ef503769f7ef3c765848752e2;hpb=bb75bc76ddd99e7d3edaf6e7dbd3719ea332052c;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index 0ed2e11..9a99781 100644
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -34,7 +34,6 @@ private:
 		float speed;
 		Block *first_noncritical;
 		TrainRouter *router;
-		const TrackChain *destination;
 		std::vector<const TrackChain *> waypoints;
 		std::vector<const TrainRouteMetric *> metrics;
 		bool has_duration;
@@ -78,7 +77,7 @@ private:
 		TrainState state;
 		Msp::Time::TimeDelta delay;
 		Msp::Time::TimeDelta duration;
-		int waypoint;
+		unsigned waypoint;
 		float distance_traveled;
 		float remaining_estimate;
 		Msp::Time::TimeDelta wait_time;
@@ -95,6 +94,7 @@ private:
 		void advance(const Msp::Time::TimeDelta &);
 		void advance_track(unsigned);
 		void update_estimate();
+		bool is_viable() const;
 	};
 
 	struct RoutingStep
@@ -147,7 +147,7 @@ public:
 	Result plan();
 	void plan_async();
 	Result check();
-	Result get_result() { return result; }
+	Result get_result() const { return result; }
 	const std::list<Route *> &get_routes_for(const Train &) const;
 	const std::list<TrainRouter::SequencePoint> &get_sequence_for(const Train &) const;
 private: