X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.h;h=887b2d189f453dcc2dab13e59316f0642ce54df5;hb=b3f8467442aac111e9a316db0dda67d37ae240b8;hp=44c4cde42efd861b804c3008525bc33ee62d0ef5;hpb=9b07b35fd438f077896652258ac26453fc1c15dc;p=r2c2.git

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index 44c4cde..887b2d1 100644
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -36,10 +36,10 @@ public:
 		void beamgate();
 		void clock();
 		void route();
-		void signal(ArticleNumber);
-		void terrain(ArticleNumber);
-		void track(ArticleNumber);
-		void train(ArticleNumber, unsigned, const std::string &);
+		void signal(const std::string &);
+		void terrain(const std::string &);
+		void track(const std::string &);
+		void train(const std::string &, unsigned, const std::string &);
 		void turnout(unsigned, unsigned);
 		void zone();
 	};
@@ -78,7 +78,7 @@ public:
 	sigc::signal<void, Train &> signal_train_removed;
 	sigc::signal<void, Block &, Train *> signal_block_reserved;
 	sigc::signal<void, Sensor &, Sensor::State> signal_sensor_state_changed;
-	sigc::signal<void, const std::string &> signal_emergency;
+	sigc::signal<void, Block *, const std::string &> signal_emergency;
 
 private:
 	Catalogue &catalogue;
@@ -139,7 +139,7 @@ public:
 	void remove_train(Train &);
 
 	void tick();
-	void emergency(const std::string &);
+	void emergency(Block *, const std::string &);
 
 	void save(const std::string &) const;
 	void save_dynamic(const std::string &) const;