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

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 2b08289..f267263 100644
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -12,6 +12,7 @@ Distributed under the GPL
 #include <sigc++/trackable.h>
 #include <msp/time/timestamp.h>
 #include "block.h"
+#include "blockiter.h"
 #include "controller.h"
 
 namespace Marklin {
@@ -51,13 +52,12 @@ public:
 	sigc::signal<void, const std::string &> signal_status_changed;
 
 private:
-	struct BlockRef
+	struct RouteRef
 	{
-		Block *block;
-		unsigned entry;
+		const Route *route;
+		unsigned diversion;
 
-		BlockRef(Block *, unsigned);
-		BlockRef next() const;
+		RouteRef(const Route *, unsigned = 0);
 	};
 
 	struct RealSpeed
@@ -69,6 +69,8 @@ private:
 		void add(float, float);
 	};
 
+	typedef std::list<BlockIter> BlockList;
+
 	Layout &layout;
 	const VehicleType &loco_type;
 	unsigned address;
@@ -76,8 +78,8 @@ private:
 	int priority;
 	const Train *yielding_to;
 	std::vector<Vehicle *> vehicles;
-	std::list<BlockRef> cur_blocks;
-	std::list<BlockRef> rsv_blocks;
+	BlockList cur_blocks;
+	BlockList rsv_blocks;
 	Block *pending_block;
 	bool reserving;
 	bool advancing;
@@ -89,8 +91,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 +135,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,13 +160,17 @@ 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;
 	void set_status(const std::string &);
-	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;
+	void release_blocks(BlockList &);
+	void release_blocks(BlockList &, BlockList::iterator, BlockList::iterator);
+	void reverse_blocks(BlockList &) 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