X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fblock.h;h=64f02e50b7babe2242de6dd9d023b0e1075862f9;hb=6dc18b0e518407bd2a86602bae1e9bbae05da7c8;hp=bdbcc3f3eb0ed2687a6d09e6e5d743782cef5ce9;hpb=3e9c210ddc036cd015228504cc0803c909e27f84;p=r2c2.git

diff --git a/source/libmarklin/block.h b/source/libmarklin/block.h
index bdbcc3f..64f02e5 100644
--- a/source/libmarklin/block.h
+++ b/source/libmarklin/block.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2009  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -22,26 +22,28 @@ class Block
 public:
 	struct Endpoint
 	{
-		Track    *track;
+		Track *track;
 		unsigned track_ep;
-		Block    *link;
-		unsigned routes;
+		Block *link;
+		unsigned paths;
 
 		Endpoint(Track *, unsigned);
 	};
 
 private:
 	TrafficManager &trfc_mgr;
-	unsigned       id;
-	unsigned       sensor_id;
-	std::set<Track *>     tracks;
+	unsigned id;
+	unsigned sensor_id;
+	unsigned turnout_id;
+	std::set<Track *> tracks;
 	std::vector<Endpoint> endpoints;
-	const Train    *train;
+	const Train *train;
 
 public:
 	Block(TrafficManager &, Track &);
 
 	unsigned get_sensor_id() const { return sensor_id; }
+	unsigned get_turnout_id() const { return turnout_id; }
 	const std::set<Track *> &get_tracks() const { return tracks; }
 	const std::vector<Endpoint> &get_endpoints() const { return endpoints; }
 	int get_endpoint_by_link(const Block &) const;
@@ -52,7 +54,7 @@ public:
 	const Train *get_train() const { return train; }
 	void print_debug();
 private:
-	void find_routes(Track &, unsigned, unsigned, std::set<Track *> &);
+	void find_paths(Track &, unsigned, unsigned, std::set<Track *> &);
 
 	static unsigned next_id;
 };