X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.cpp;h=df6989d3320cd3c7cbf4fb0f850915920f8ff431;hb=b14059de03324aecde3efc649293d98ce5b7aaf2;hp=5c4cf9e1d82d26f604fbb4f5a20736cf944937d6;hpb=45abb4c64c714cb655988a855158a22976f5e35f;p=r2c2.git

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index 5c4cf9e..df6989d 100644
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -41,14 +41,13 @@ Layout::Layout(Catalogue &c, Driver *d):
 	catalogue(c),
 	driver(d),
 	next_turnout_id(0x800)
-{
-	if(driver)
-		driver->signal_sensor.connect(sigc::mem_fun(this, &Layout::sensor_event));
-}
+{ }
 
 Layout::~Layout()
 {
 	delete driver;
+	driver = 0;
+
 	while(!trains.empty())
 		delete trains.begin()->second;
 	while(!routes.empty())
@@ -113,6 +112,12 @@ unsigned Layout::allocate_turnout_id()
 void Layout::add_block(Block &b)
 {
 	blocks.insert(&b);
+	b.signal_reserved.connect(sigc::bind<0>(signal_block_reserved, sigc::ref(b)));
+	if(b.get_sensor_id())
+	{
+		b.signal_state_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Layout::block_state_changed), sigc::ref(b)));
+		b.signal_state_changed.connect(sigc::bind<0>(signal_block_state_changed, sigc::ref(b)));
+	}
 }
 
 Block &Layout::get_block(unsigned id) const
@@ -275,6 +280,8 @@ void Layout::tick()
 		dt = t-last_tick;
 	last_tick = t;
 
+	for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
+		(*i)->tick(dt);
 	for(map<unsigned, Train *>::iterator i=trains.begin(); i!=trains.end(); ++i)
 		i->second->tick(t, dt);
 }
@@ -341,18 +348,10 @@ void Layout::save_dynamic(const string &fn) const
 	}
 }
 
-void Layout::sensor_event(unsigned addr, bool state)
+void Layout::block_state_changed(Block &block, Block::State state)
 {
-	if(state)
-	{
-		for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
-			if((*i)->get_sensor_id()==addr)
-			{
-				if(!(*i)->get_train())
-					emergency(format("Unreserved sensor %d triggered", addr));
-				break;
-			}
-	}
+	if(state==Block::ACTIVE && !block.get_train())
+		emergency(format("Unreserved sensor %d triggered", block.get_sensor_id()));
 }