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 1575c0c31e381ad1d18a0a9727b2727746fff3db..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"
@@ -18,17 +26,7 @@ class TrainProperties;
 
 class Engineer: public Msp::Application
 {
-public:
-       Engineer(int argc, char **argv);
-       ~Engineer();
-
-       Marklin::Control &get_control()    { return control; }
-       Marklin::Train   *add_train(unsigned);
-       int      main();
-       void     quit() { exit(0); }
 private:
-       typedef std::list<TrainPanel *> TrainPanelSeq;
-
        Msp::Graphics::Display   *dpy;
        Msp::Graphics::Window    *wnd;
        Msp::Graphics::GLContext *glc;
@@ -44,7 +42,7 @@ private:
        float              cam_rot;
        Msp::GLtk::Resources ui_res;
        MainPanel          *main_panel;
-       TrainPanelSeq      train_panels;
+       std::list<TrainPanel *> train_panels;
        bool               no_lighting;
        Marklin::TrafficManager *trfc_mgr;
        Marklin::Train     *placing_train;
@@ -54,13 +52,26 @@ private:
        TrainProperties    *train_prop;
        bool               train_prop_stale;
 
+public:
+       Engineer(int argc, char **argv);
+       ~Engineer();
+
+       const Marklin::Catalogue &get_catalogue() const { return catalogue; }
+       Marklin::Control &get_control()    { return control; }
+       void             add_train();
+       Marklin::Train   *add_train(const Marklin::LocoType &, unsigned);
+       void     place_train(Marklin::Train &);
+       int      main();
+       void     quit() { exit(0); }
+private:
        void tick();
        void key_press(unsigned, unsigned, wchar_t);
        void button_press(int, int, unsigned, unsigned);
        void button_release(int, int, unsigned, unsigned);
        void pointer_motion(int, int);
        void view_all();
-       void set_block_color(const Marklin::Block &, const Marklin::Color &);
+       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();