X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fengineer%2Fengineer.cpp;h=9a3b930a01da1b55137c9a45b9279672f3d44565;hb=ab64a17394440c3cb18d0b30d75fb4ed6297a6b4;hp=69dc47bc98832a080180c99c510fc649971a9f55;hpb=bde934f7d5ba07a9442a305192e10024820d13ed;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 69dc47b..9a3b930 100644
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -17,6 +17,7 @@
 #include <msp/time/units.h>
 #include <msp/time/utils.h>
 #include "libr2c2/driver.h"
+#include "libr2c2/trackcircuit.h"
 #include "libr2c2/tracktype.h"
 #include "3d/path.h"
 #include "3d/track.h"
@@ -71,8 +72,10 @@ Engineer::Engineer(int argc, char **argv):
 
 	layout.signal_train_added.connect(sigc::mem_fun(this, &Engineer::train_added));
 	layout.signal_block_reserved.connect(sigc::hide<1>(sigc::mem_fun(this, &Engineer::reset_block_color)));
-	layout.signal_block_state_changed.connect(sigc::hide<1>(sigc::mem_fun(this, &Engineer::reset_block_color)));
 	layout.signal_emergency.connect(sigc::mem_fun(this, &Engineer::set_status));
+	const set<Block *> &blocks = layout.get_all<Block>();
+	for(set<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
+		(*i)->get_sensor().signal_state_changed.connect(sigc::hide(sigc::bind(sigc::mem_fun(this, &Engineer::reset_block_color), sigc::ref(**i))));
 
 	if(FS::exists(options.state_fn))
 		DataFile::load(layout, options.state_fn);
@@ -268,7 +271,7 @@ void Engineer::button_press(unsigned btn)
 			if(track->get_turnout_id())
 			{
 				Block &block = track->get_block();
-				if(block.get_train() && !block.get_train()->free_block(block))
+				if(block.get_train() && block.get_train()->is_block_critical(block))
 					set_status("Turnout is busy");
 				else
 				{
@@ -309,7 +312,7 @@ void Engineer::view_all()
 	const Layout3D::TrackMap &tracks = layout_3d.get_tracks();
 
 	float view_aspect = float(window.get_width()-200)/window.get_height();
-	float view_height = tan(camera.get_field_of_view()/2)*2;
+	float view_height = tan(camera.get_field_of_view()/2.0f)*2.0f;
 	float best_score = 0;
 	GL::Vector3 pos;
 	GL::Vector3 up;
@@ -360,7 +363,7 @@ void Engineer::set_block_color(const Block &block, const GL::Color &color)
 
 void Engineer::reset_block_color(const Block &block)
 {
-	bool active = block.get_state()>Block::INACTIVE;
+	bool active = block.get_sensor().get_state()>Sensor::INACTIVE;
 
 	if(block.get_train())
 	{
@@ -385,7 +388,7 @@ Track *Engineer::pick_track(const Vector &p)
 	const GL::Vector3 &start = camera.get_position();
 	GL::Vector4 ray = camera.unproject(GL::Vector4(p.x, p.y, 0, 0));
 
-	return layout.pick_track(Ray(start, Vector(ray)));
+	return layout.pick<Track>(Ray(start, Vector(ray)));
 }
 
 void Engineer::process_new_train(Train &train)