X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.h;h=f0a292f580e9847507a57f3acb49c64d175b54eb;hb=6c2b29fb45402ee86b010f05367dad20972d25ed;hp=86db65895c3fead5aa8b83206a2d26e84043b3ee;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index 86db658..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,7 +22,9 @@ class Driver;
 class Route;
 class Track;
 class Train;
+class Vector;
 class Vehicle;
+class Zone;
 
 class Layout
 {
@@ -42,13 +44,19 @@ public:
 		void track(ArticleNumber);
 		void train(unsigned, unsigned, const std::string &);
 		void train(ArticleNumber, unsigned, const std::string &);
+		void turnout(unsigned, unsigned);
+		void zone();
 	};
 
-public:
+	typedef std::set<Zone *> ZoneSet;
+	typedef std::vector<Zone *> ZoneArray;
+
 	sigc::signal<void, Track &> signal_track_added;
 	sigc::signal<void, Track &> signal_track_removed;
 	sigc::signal<void, Route &> signal_route_added;
 	sigc::signal<void, Route &> signal_route_removed;
+	sigc::signal<void, Zone &> signal_zone_added;
+	sigc::signal<void, Zone &> signal_zone_removed;
 	sigc::signal<void, Train &> signal_train_added;
 	sigc::signal<void, Train &> signal_train_removed;
 	sigc::signal<void, Vehicle &> signal_vehicle_added;
@@ -62,6 +70,7 @@ private:
 	std::string base;
 	std::set<Track *> tracks;
 	std::set<Route *> routes;
+	ZoneSet zones;
 	std::set<Block *> blocks;
 	std::map<unsigned, Train *> trains;
 	std::set<Vehicle *> vehicles;
@@ -79,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;
@@ -95,6 +105,12 @@ public:
 	void update_routes();
 	void remove_route(Route &);
 
+	void add_zone(Zone &);
+	const ZoneSet &get_zones() const { return zones; }
+	ZoneArray get_zones(const std::string &) const;
+	Zone &get_zone(const std::string &, unsigned) const;
+	void remove_zone(Zone &);
+
 	void add_train(Train &);
 	Train &get_train(unsigned) const;
 	const std::map<unsigned, Train *> &get_trains() const { return trains; }
@@ -106,8 +122,8 @@ public:
 	void tick();
 	void emergency(const std::string &);
 
-	void save(const std::string &);
-	void save_trains(const std::string &);
+	void save(const std::string &) const;
+	void save_dynamic(const std::string &) const;
 private:
 	void sensor_event(unsigned, bool);
 };