X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fblock.h;h=6823b2730343faa69c03b14b0f507701ad26b85d;hb=ece91e92af821bd6b468bd1134302efb7c28f019;hp=7d6211b0a5b303b9e85669fb96d72882606c838d;hpb=73edcbd8841752a2722fc8b3927fee2abbbba750;p=r2c2.git

diff --git a/source/libr2c2/block.h b/source/libr2c2/block.h
index 7d6211b..6823b27 100644
--- a/source/libr2c2/block.h
+++ b/source/libr2c2/block.h
@@ -22,7 +22,6 @@ public:
 		Track *track;
 		unsigned track_ep;
 		Block *link;
-		unsigned paths;
 
 		Endpoint(Track *, unsigned);
 
@@ -33,24 +32,30 @@ 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;
+	Train *pending_train;
+	bool emitting_reserve;
 
 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; }
-	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;
@@ -61,8 +66,10 @@ public:
 	bool reserve(Train *);
 	Train *get_train() const { return train; }
 private:
-	void find_paths(const TrackIter &, unsigned);
 	void determine_id();
+
+public:
+	virtual Msp::DataFile::Statement save_reference() const;
 };
 
 } // namespace R2C2