X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=e7b047d311b42db72493adfc2d0e290ae95c7343;hb=d6ad508feda1aaa9b2ac2ca2d303c8d28d3094b9;hp=9db63fe0c70c22f81eb68074e88067fb6ade1fd6;hpb=2152b8a18d1a716f51b80c53f11d2a9599d94e23;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 9db63fe..e7b047d 100644
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -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);