X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=d9026c7be84ba78299874d63305b92c204176f82;hb=25c26706d400228110e14a4a9a9765cb1298372d;hp=319119b93828fd745639a7a37b8c1ae3d6a69794;hpb=182ee232f01d5bb25ddc4cf6e00249698871412f;p=r2c2.git

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 319119b..d9026c7 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;
@@ -74,10 +82,13 @@ private:
 	unsigned address;
 	std::string name;
 	int priority;
+	const Train *yielding_to;
 	std::vector<Vehicle *> vehicles;
 	std::list<BlockRef> cur_blocks;
 	std::list<BlockRef> rsv_blocks;
 	Block *pending_block;
+	bool reserving;
+	bool advancing;
 	Controller *controller;
 	Timetable *timetable;
 	bool active;
@@ -86,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;
 
@@ -108,6 +118,7 @@ public:
 	void set_name(const std::string &);
 	const std::string &get_name() const { return name; }
 	void set_priority(int);
+	void yield_to(const Train &);
 	int get_priority() const { return priority; }
 	Controller &get_controller() const { return *controller; }
 
@@ -131,10 +142,13 @@ public:
 
 	void set_route(const Route *);
 	void go_to(const Track &);
-	const Route *get_route() const { return route; }
+	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;
 
@@ -152,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;
@@ -159,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 &, const Track &);
+	Route *create_lead_route(Route *, const Route *);
+	bool is_valid_diversion(const Route &, const Track &, unsigned);
 };
 
 } // namespace Marklin