X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.h;h=f6e23bc28e18c1fc27d6b48f1e44c528563176ce;hb=447d621e93e71b710fed0920b473350122426b97;hp=6131c6f2f4fc3d4a10596355ef442a77f4e55379;hpb=1d735b80482317fd930eb47ca255ab9f1f120a7d;p=r2c2.git

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index 6131c6f..f6e23bc 100644
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -8,6 +8,7 @@
 #include <msp/gltk/root.h>
 #include "libmarklin/catalogue.h"
 #include "libmarklin/control.h"
+#include "libmarklin/locotype.h"
 #include "libmarklin/trafficmanager.h"
 #include "libmarklin/train.h"
 #include "3d/layout.h"
@@ -48,8 +49,11 @@ public:
 	Engineer(int argc, char **argv);
 	~Engineer();
 
+	const Marklin::Catalogue &get_catalogue() const { return catalogue; }
 	Marklin::Control &get_control()    { return control; }
-	Marklin::Train   *add_train(unsigned);
+	void             add_train();
+	Marklin::Train   *add_train(const Marklin::LocoType &, unsigned);
+	void     place_train(Marklin::Train &);
 	int      main();
 	void     quit() { exit(0); }
 private:
@@ -60,6 +64,7 @@ private:
 	void pointer_motion(int, int);
 	void view_all();
 	void set_block_color(const Marklin::Block &, const Msp::GL::Color &);
+	void reset_block_color(const Marklin::Block &);
 	void sensor_event(bool, Marklin::Sensor *);
 	void block_reserved(const Marklin::Block &, const Marklin::Train *);
 	void project_3d();