Redesign the train activation system

[r2c2.git] / source / engineer / engineer.cpp

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index e92c0ae161674c1b70d967f7fad5746245b5431a..9a3b930a01da1b55137c9a45b9279672f3d44565 100644 (file)
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -271,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
                                {
@@ -312,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;