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

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index e675c4b..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,15 +52,6 @@ public:
 	sigc::signal<void, const std::string &> signal_status_changed;
 
 private:
-	struct BlockRef
-	{
-		Block *block;
-		unsigned entry;
-
-		BlockRef(Block *, unsigned);
-		BlockRef next() const;
-	};
-
 	struct RouteRef
 	{
 		const Route *route;
@@ -77,6 +69,8 @@ private:
 		void add(float, float);
 	};
 
+	typedef std::list<BlockIter> BlockList;
+
 	Layout &layout;
 	const VehicleType &loco_type;
 	unsigned address;
@@ -84,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;
@@ -141,7 +135,7 @@ public:
 	Timetable *get_timetable() { return timetable; }
 
 	void set_route(const Route *);
-	void go_to(const Track &);
+	void go_to(Track &);
 	bool divert(Track &);
 	const Route *get_route() const;
 	void place(Block &, unsigned);
@@ -171,12 +165,12 @@ private:
 	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;
-	bool advance_route(std::list<RouteRef>::iterator &, const Track &);
-	Route *create_lead_route();
-	bool is_valid_diversion(const Route &, const Track &, unsigned);
+	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