X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.h;h=f0a292f580e9847507a57f3acb49c64d175b54eb;hb=e8d06e16ab1679eb87e21cbfa788eea02144927d;hp=ecb801f0e07c5bc8d4c4af4f9edb300967fba6db;hpb=7e27b311e33beda1746eb63e0945633f262427f6;p=r2c2.git

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index ecb801f..f0a292f 100644
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of R²C²
-Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2011  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -22,6 +22,7 @@ class Driver;
 class Route;
 class Track;
 class Train;
+class Vector;
 class Vehicle;
 class Zone;
 
@@ -43,6 +44,7 @@ public:
 		void track(ArticleNumber);
 		void train(unsigned, unsigned, const std::string &);
 		void train(ArticleNumber, unsigned, const std::string &);
+		void turnout(unsigned, unsigned);
 		void zone();
 	};
 
@@ -86,8 +88,9 @@ public:
 
 	void add_track(Track &);
 	const std::set<Track *> &get_tracks() const { return tracks; }
+	Track *pick_track(const Vector &, const Vector &);
 	void remove_track(Track &);
-	unsigned allocate_turnout_id(bool);
+	unsigned allocate_turnout_id();
 
 	void add_block(Block &);
 	Block &get_block(unsigned) const;
@@ -120,7 +123,7 @@ public:
 	void emergency(const std::string &);
 
 	void save(const std::string &) const;
-	void save_trains(const std::string &) const;
+	void save_dynamic(const std::string &) const;
 private:
 	void sensor_event(unsigned, bool);
 };