X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fblock.h;h=b72215ae03d1608092fd0c41943fdea7b7abeb54;hb=48dff17ed3144d944965e7cb534e1f8fb92bd620;hp=568d1736dbd85228d707559aed803f0056e546fa;hpb=25b79ab38c2be2e5c89b8240504f641fd9c4899c;p=r2c2.git

diff --git a/source/libmarklin/block.h b/source/libmarklin/block.h
index 568d173..b72215a 100644
--- a/source/libmarklin/block.h
+++ b/source/libmarklin/block.h
@@ -1,3 +1,10 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2009  Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #ifndef MARKLIN_3D_BLOCK_H_
 #define MARKLIN_3D_BLOCK_H_
 
@@ -15,39 +22,40 @@ 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_id() const { return id; }
 	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;
-	int traverse(unsigned, float * =0) const;
+	unsigned traverse(unsigned, float * =0) const;
 	void check_link(Block &);
 	Block *get_link(unsigned) const;
 	bool reserve(const Train *);
 	const Train *get_train() const { return train; }
 	void print_debug();
 private:
-	void find_routes(Track &, unsigned, unsigned, std::set<Track *> &);
-
-	static unsigned next_id;
+	void find_paths(Track &, unsigned, unsigned, std::set<Track *> &);
 };
 
 } // namespace Marklin