X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=8db0be6c2465433f23cef8ea3610fb3fb9da0aaf;hb=f4e02a59008181013e57cdf2a8cf1695e89b24bb;hp=7e13f7b50471ad61261f43a8cfa7608ede759a9d;hpb=62ce775d9af8f3321dbdebd6243b551fbbb0b976;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 7e13f7b..8db0be6 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
 */
@@ -25,8 +25,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 +37,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,7 +61,7 @@ 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));
@@ -131,7 +131,7 @@ Engineer::~Engineer()
 	layout.get_driver().flush();
 
 	if(!options.simulate)
-		layout.save_trains(options.state_fn);
+		layout.save_dynamic(options.state_fn);
 
 	delete overlay;
 	delete root;