Replace one more stray load function with DataFile::load

[r2c2.git] / source / engineer / engineer.h

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index 6131c6f2f4fc3d4a10596355ef442a77f4e55379..0c295bf43985623cb074403d0e57f888bfba4e32 100644 (file)
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -1,3 +1,10 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #ifndef ENGINEER_H_
 #define ENGINEER_H_
 
@@ -8,6 +15,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 +56,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 +71,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();