X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=7039c9ea87d9ec8484ee6b9de6c7d981b0044203;hb=e9653dffd0026fb3c02c91a4c0feca688a86c721;hp=2b082893b308f02782b5ba5d7415bde7b76e5ffb;hpb=98047057e4adae31aa449161ca845db1a6c2db77;p=r2c2.git

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 2b08289..7039c9e 100644
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -60,6 +60,14 @@ private:
 		BlockRef next() const;
 	};
 
+	struct RouteRef
+	{
+		const Route *route;
+		unsigned diversion;
+
+		RouteRef(const Route *, unsigned = 0);
+	};
+
 	struct RealSpeed
 	{
 		float speed;
@@ -89,8 +97,7 @@ private:
 	bool reverse;
 	Msp::Time::TimeStamp stop_timeout;
 	unsigned functions;
-	const Route *route;
-	const Route *next_route;
+	std::list<RouteRef> routes;
 	bool end_of_route;
 	std::string status;
 
@@ -134,11 +141,14 @@ public:
 	Timetable *get_timetable() { return timetable; }
 
 	void set_route(const Route *);
-	void go_to(const Track &);
-	const Route *get_route() const { return route; }
+	void go_to(Track &);
+	bool divert(Track &);
+	const Route *get_route() const;
 	void place(Block &, unsigned);
+	void unplace();
 	bool is_placed() const { return !cur_blocks.empty(); }
 	bool free_block(Block &);
+	void free_noncritical_blocks();
 	int get_entry_to_block(Block &) const;
 	float get_reserved_distance() const;
 
@@ -156,6 +166,7 @@ private:
 	void halt_event(bool);
 	void block_reserved(const Block &, const Train *);
 	unsigned reserve_more();
+	float get_reserved_distance_until(const Block *, bool) const;
 	float get_real_speed(unsigned) const;
 	unsigned find_speed(float) const;
 	float get_travel_speed() const;
@@ -163,6 +174,9 @@ private:
 	void release_blocks(std::list<BlockRef> &);
 	void release_blocks(std::list<BlockRef> &, std::list<BlockRef>::iterator, std::list<BlockRef>::iterator);
 	void reverse_blocks(std::list<BlockRef> &) const;
+	bool advance_route(std::list<RouteRef>::iterator &, Track &);
+	Route *create_lead_route(Route *, const Route *);
+	bool is_valid_diversion(const Route &, Track &, unsigned);
 };
 
 } // namespace Marklin