X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Flibr2c2%2Fblock.h;fp=source%2Flibr2c2%2Fblock.h;h=c3b7c8742fe8faa247b5af2948c885eea7c522a7;hb=cf38d0a8208fab7ba7aaafc5eed9a86dfc3722a5;hp=558d425016ffe050a937ef47726536229b2b9eee;hpb=695f7651bf45b3991ddbab5efe4c2213dbd76f07;p=r2c2.git

diff --git a/source/libr2c2/block.h b/source/libr2c2/block.h
index 558d425..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;