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

diff --git a/source/libr2c2/block.h b/source/libr2c2/block.h
index 4309290..c3b7c87 100644
--- a/source/libr2c2/block.h
+++ b/source/libr2c2/block.h
@@ -34,6 +34,7 @@ private:
 	unsigned id;
 	unsigned sensor_id;
 	unsigned turnout_id;
+	bool conflict;
 	TrackCircuit *sensor;
 	std::vector<Endpoint> endpoints;
 	Train *train;
@@ -50,7 +51,7 @@ 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; }
+	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;