Fix a segfault in removing vehicles when creating a new train

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

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 9db63fe0c70c22f81eb68074e88067fb6ade1fd6..7e13f7b50471ad61261f43a8cfa7608ede759a9d 100644 (file)
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -67,7 +67,7 @@ Engineer::Engineer(int argc, char **argv):
        root->signal_pointer_motion.connect(sigc::mem_fun(this, &Engineer::pointer_motion));
        root->set_visible(true);
 
-       main_panel = new MainPanel(*this, ui_res);
+       main_panel = new MainPanel(*this);
        root->add(*main_panel);
        main_panel->set_position(0, window.get_height()-main_panel->get_geometry().h);
        main_panel->set_visible(true);
@@ -219,7 +219,7 @@ void Engineer::tick()
                                delete picking_path;
                                picking_path = new Path3D(*track);
                                if(picking_entry>=0)
-                                       picking_path->set_mask(picking_track->get_type().get_endpoints()[picking_entry].paths);
+                                       picking_path->set_mask(picking_track->get_type().get_endpoint(picking_entry).paths);
                                else
                                        picking_path->set_mask(picking_track->get_type().get_paths());
                                picking_path->set_color(GL::Color(0));
@@ -271,7 +271,7 @@ void Engineer::button_press(int x, int y, unsigned btn, unsigned)
                else if(btn==3 && picking_entry>=0)
                {
                        picking_entry = (picking_entry+1)%picking_track->get_type().get_endpoints().size();
-                       picking_path->set_mask(picking_track->get_type().get_endpoints()[picking_entry].paths);
+                       picking_path->set_mask(picking_track->get_type().get_endpoint(picking_entry).paths);
                }
        }
        else
@@ -282,7 +282,7 @@ void Engineer::button_press(int x, int y, unsigned btn, unsigned)
                        Track &track = t3d->get_track();
                        if(track.get_turnout_id())
                        {
-                               Block &block = layout.get_block_by_track(track);
+                               Block &block = track.get_block();
                                if(block.get_train() && !block.get_train()->free_block(block))
                                        set_status("Turnout is busy");
                                else
@@ -319,7 +319,7 @@ void Engineer::pointer_motion(int x, int y)
 
 void Engineer::view_all()
 {
-       const list<Track3D *> &tracks = layout_3d.get_tracks();
+       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;
@@ -332,10 +332,10 @@ void Engineer::view_all()
                float max_x = 0;
                float min_y = 0;
                float max_y = 0;
-               for(list<Track3D *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+               for(Layout3D::TrackMap::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
                {
                        Point minp, maxp;
-                       (*i)->get_bounds(angle, minp, maxp);
+                       i->second->get_bounds(angle, minp, maxp);
                        min_x = min(min_x, minp.x);
                        max_x = max(max_x, maxp.x);
                        min_y = min(min_y, minp.y);
@@ -428,7 +428,7 @@ Track3D *Engineer::pick_track(int x, int y)
 
 void Engineer::train_added(Train &train)
 {
-       TrainPanel *tpanel = new TrainPanel(*this, ui_res, train);
+       TrainPanel *tpanel = new TrainPanel(*this, train);
        root->add(*tpanel);
        train_panels.push_back(tpanel);
        rearrange_panels();