X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=4a35c8e0cd381bc6307f24e828c8352d68152239;hb=9b68c21ebf8ce26d92246ecd4a392d2908b511f7;hp=ea5139d5b2e9d9e94cc7ebbdd2455bf72f959c2d;hpb=2e3ad91af312aaf20b10f1cbe6096cda7e8a97d1;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index ea5139d..4a35c8e 100644
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -74,6 +74,7 @@ Engineer::Engineer(int argc, char **argv):
 
 	layout.signal_train_added.connect(sigc::mem_fun(this, &Engineer::train_added));
 	layout.signal_block_reserved.connect(sigc::mem_fun(this, &Engineer::block_reserved));
+	layout.get_driver().signal_sensor.connect(sigc::mem_fun(this, &Engineer::sensor_event));
 	if(FS::exists("engineer.state"))
 		DataFile::load(layout, "engineer.state");
 
@@ -83,8 +84,6 @@ Engineer::Engineer(int argc, char **argv):
 		server->use_event_dispatcher(event_disp);
 	}
 
-	layout.get_driver().signal_sensor.connect(sigc::mem_fun(this, &Engineer::sensor_event));
-
 	// Setup 3D view
 	DataFile::load(arrow_mesh, "arrow.mesh");
 
@@ -241,14 +240,11 @@ void Engineer::button_press(int x, int y, unsigned btn, unsigned)
 					track.set_active_path(i);
 				}
 			}
-			/*else if(simulate)
+			else if(options.simulate)
 			{
-				if(unsigned sid=track->get_track().get_sensor_id())
-				{
-					Sensor &sensor = control.get_sensor(sid);
-					control.signal_sensor_event.emit(sid, !sensor.get_state());
-				}
-			}*/
+				if(unsigned sid=track.get_sensor_id())
+					layout.get_driver().set_sensor(sid, !layout.get_driver().get_sensor(sid));
+			}
 		}
 	}
 }