X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.h;h=3c23496710a7b8e3b8df004ca40f1a988faf5e26;hb=d4c2cc962dc4c7b11c2db360fef7a80de3334c11;hp=47a409cd7cb2bdb36064f753e5c2f9cadd4bca77;hpb=0ac334781fcb5029e4ea9236a8e93f43169eb7f2;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 47a409c..3c23496 100644
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -46,6 +46,7 @@ private:
 
 	int priority;
 	RouteList routes;
+	RouteList::iterator reserving_route;
 	unsigned arriving;
 	const TrackChain *destination;
 	std::vector<const TrackChain *> waypoints;
@@ -90,12 +91,11 @@ public:
 private:
 	void block_reserved(Block &, Train *);
 	void train_advanced(Block &);
-	const Route *get_route_for_block(const Block &) const;
 
 	void create_metrics();
 	Route *create_lead_route(Route *, const Route *);
-	bool advance_route(RouteList::iterator &, const Block &);
-	bool is_on_route(const Block &);
+	bool is_valid_for_track(const Route &, Track &) const;
+	bool advance_to_track(RouteList::iterator &, Track &);
 
 	static void start_planning(Layout &);
 };