X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fblock.h;h=f255e43f2e2421fb18b81bd9c0a6e862e0218a63;hb=399b48a7a80dafde49e7530ff8dfd2820232a73f;hp=558d425016ffe050a937ef47726536229b2b9eee;hpb=91385545a7d76784a17af421b0def49775be0d4c;p=r2c2.git

diff --git a/source/libr2c2/block.h b/source/libr2c2/block.h
index 558d425..f255e43 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;
@@ -42,14 +43,16 @@ public:
 	Block(Layout &, Track &);
 	~Block();
 
+	virtual void set_name(const std::string &);
+
 private:
 	virtual void on_track_added(Track &);
 	virtual Validity check_validity(Track &) const;
 
 public:
 	unsigned get_id() const { return id; }
-	unsigned get_sensor_id() const { return sensor_id; }
-	unsigned get_turnout_id() const { return turnout_id; }
+	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;
@@ -62,6 +65,9 @@ public:
 	Train *get_train() const { return train; }
 private:
 	void determine_id();
+
+public:
+	virtual Msp::DataFile::Statement save_reference() const;
 };
 
 } // namespace R2C2