X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=68b85aa04cf3c3acdc8c89bd438b3ffcc75a5400;hb=3889ed84ee54c312436503f2fd1e328f4a2ba5e5;hp=5cf22ba0f2f9c8390f557a26fb000bd1f5a6c23d;hpb=e8987fa39c3275a0a293b011e83bccd322e0958a;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 5cf22ba..68b85aa 100644
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -84,8 +84,8 @@ Engineer::Engineer(int argc, char **argv):
 	layout.signal_block_reserved.connect(sigc::mem_fun(this, &Engineer::block_reserved));
 	layout.signal_emergency.connect(sigc::mem_fun(this, &Engineer::set_status));
 	layout.get_driver().signal_sensor.connect(sigc::mem_fun(this, &Engineer::sensor_event));
-	if(FS::exists("engineer.state"))
-		DataFile::load(layout, "engineer.state");
+	if(FS::exists(options.state_fn))
+		DataFile::load(layout, options.state_fn);
 
 	if(options.network)
 	{
@@ -131,7 +131,7 @@ Engineer::~Engineer()
 	layout.get_driver().flush();
 
 	if(!options.simulate)
-		layout.save_trains("engineer.state");
+		layout.save_trains(options.state_fn);
 
 	delete overlay;
 	delete root;
@@ -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);