X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.h;h=02a4654e2d8f6ea63000b183d662511960e1a620;hb=8b828fc32fd210b6e335ac6614d269aa892d4d57;hp=8c143ac3d79b0a6508ce8fbba5ed50cda37eb4bd;hpb=6010ad6857ce5690f4053bf8795f2c476daa4694;p=r2c2.git

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index 8c143ac..02a4654 100644
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef LIBR2C2_LAYOUT_H_
 #define LIBR2C2_LAYOUT_H_
 
@@ -12,16 +5,17 @@ Distributed under the GPL
 #include <sigc++/sigc++.h>
 #include <msp/datafile/loader.h>
 #include <msp/time/timestamp.h>
+#include "block.h"
 
 namespace R2C2 {
 
 class ArticleNumber;
-class Block;
 class Catalogue;
 class Driver;
 class Route;
 class Track;
 class Train;
+class Vector;
 class Vehicle;
 class Zone;
 
@@ -61,6 +55,7 @@ public:
 	sigc::signal<void, Vehicle &> signal_vehicle_added;
 	sigc::signal<void, Vehicle &> signal_vehicle_removed;
 	sigc::signal<void, Block &, Train *> signal_block_reserved;
+	sigc::signal<void, Block &, Block::State> signal_block_state_changed;
 	sigc::signal<void, const std::string &> signal_emergency;
 
 private:
@@ -87,6 +82,7 @@ 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();
 
@@ -123,7 +119,7 @@ public:
 	void save(const std::string &) const;
 	void save_dynamic(const std::string &) const;
 private:
-	void sensor_event(unsigned, bool);
+	void block_state_changed(Block &, Block::State);
 };
 
 } // namespace R2C2