X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.h;h=9a9978137cfeb58caa9164e66f41ab3b2ee1c5cd;hb=83c6923396fcfa42e6adf949b9476663f322748b;hp=34dcce69daeddb8a5f8d20255497eca8a453fcef;hpb=8a2b5c1ac2fc07e280dc678165d2ca58f7d07e32;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index 34dcce6..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