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

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 5cf22ba..90cb8eb 100644
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -1,6 +1,6 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
@@ -12,6 +12,7 @@ Distributed under the GPL
 #include <signal.h>
 #include <msp/core/except.h>
 #include <msp/fs/stat.h>
+#include <msp/fs/utils.h>
 #include <msp/gbase/display.h>
 #include <msp/gbase/window.h>
 #include <msp/gl/blend.h>
@@ -25,8 +26,8 @@ Distributed under the GPL
 #include <msp/strings/formatter.h>
 #include <msp/time/units.h>
 #include <msp/time/utils.h>
-#include "libmarklin/driver.h"
-#include "libmarklin/tracktype.h"
+#include "libr2c2/driver.h"
+#include "libr2c2/tracktype.h"
 #include "3d/path.h"
 #include "3d/track.h"
 #include "3d/vehicle.h"
@@ -37,7 +38,7 @@ Distributed under the GPL
 #include "trainview.h"
 
 using namespace std;
-using namespace Marklin;
+using namespace R2C2;
 using namespace Msp;
 
 Application::RegApp<Engineer> Engineer::reg;
@@ -61,13 +62,13 @@ Engineer::Engineer(int argc, char **argv):
 	window.set_title("Railroad Engineer");
 	window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Engineer::exit), 0));
 
-	DataFile::load(ui_res, "marklin.res");
+	DataFile::load(ui_res, "r2c2.res");
 	root = new GLtk::Root(ui_res, window);
 	root->signal_button_press.connect(sigc::mem_fun(this, &Engineer::button_press));
 	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);
@@ -84,8 +85,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 +132,10 @@ Engineer::~Engineer()
 	layout.get_driver().flush();
 
 	if(!options.simulate)
-		layout.save_trains("engineer.state");
+	{
+		layout.save_dynamic(options.state_fn+".tmp");
+		FS::rename(options.state_fn+".tmp", options.state_fn);
+	}
 
 	delete overlay;
 	delete root;
@@ -219,7 +223,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 +275,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 +286,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 +323,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 +336,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 +432,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();