X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=1f3b7dc4accc617e56eb8c587f4064c0d9e091d2;hb=90f9efba8d88f41c7a180734b7bcbdd1501d995e;hp=e7b047d311b42db72493adfc2d0e290ae95c7343;hpb=9def58c4bbec8788430740a1e9afce64a496231f;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index e7b047d..1f3b7dc 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,13 +61,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);
@@ -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();