X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fblock.h;h=2f898b0992af7e14799fc576532265f8b808bff8;hb=708a7e00bf24e3abc08f96ba1cef0ce246a8c0e1;hp=4309290da3f3145a553a405009dc35a4c60b8ad9;hpb=cb4e53ba1b8ea41b978190de6668e9862b9cfea8;p=r2c2.git

diff --git a/source/libr2c2/block.h b/source/libr2c2/block.h
index 4309290..2f898b0 100644
--- a/source/libr2c2/block.h
+++ b/source/libr2c2/block.h
@@ -32,8 +32,9 @@ public:
 
 private:
 	unsigned id;
-	unsigned sensor_id;
-	unsigned turnout_id;
+	unsigned sensor_addr;
+	unsigned turnout_addr;
+	bool conflict;
 	TrackCircuit *sensor;
 	std::vector<Endpoint> endpoints;
 	Train *train;
@@ -48,9 +49,9 @@ private:
 
 public:
 	unsigned get_id() const { return id; }
-	unsigned get_sensor_id() const { return sensor_id; }
-	unsigned get_turnout_id() const { return turnout_id; }
-	TrackCircuit &get_sensor() const { return *sensor; }
+	unsigned get_sensor_address() const { return sensor_addr; }
+	unsigned get_turnout_address() const { return turnout_addr; }
+	TrackCircuit *get_sensor() const { return sensor; }
 	const std::vector<Endpoint> &get_endpoints() const { return endpoints; }
 	const Endpoint &get_endpoint(unsigned) const;
 	int get_endpoint_by_link(Block &) const;