Add locomotive types

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

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 3ac7c7682a605cc06942c23cfee7607db157259c..0d4f7291745473c8785141d9231edc69e7ff670a 100644 (file)
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -71,6 +71,7 @@ Engineer::Engineer(int argc, char **argv):
        layout_3d.set_quality(quality);
 
        catalogue.load("tracks.dat");
+       catalogue.load("locos.dat");
 
        const vector<string> &args=getopt.get_args();
        if(args.empty())
@@ -92,39 +93,40 @@ Engineer::~Engineer()
        delete trfc_mgr;
 }
 
-Train *Engineer::add_train(unsigned addr)
+void Engineer::add_train()
 {
-       if(addr==0)
-       {
-               train_prop=new TrainProperties(*this, ui_res, 0);
-               root->add(*train_prop);
-               train_prop->signal_ok.connect(sigc::mem_fun(this, &Engineer::dismiss_train_prop));
-               train_prop_stale=false;
-               train_prop->set_visible(true);
+       train_prop=new TrainProperties(*this, ui_res, 0);
+       root->add(*train_prop);
+       train_prop->signal_ok.connect(sigc::mem_fun(this, &Engineer::dismiss_train_prop));
+       train_prop_stale=false;
+       train_prop->set_visible(true);
+}
 
-               return 0;
-       }
-       else
-       {
-               Locomotive *loco=new Locomotive(control, addr);
-               Train *train=new Train(*trfc_mgr, *loco);
-               train->set_name(format("Train %d", trfc_mgr->get_trains().size()));
-
-               TrainPanel *tpanel=new TrainPanel(*this, ui_res, *train);
-               root->add(*tpanel);
-               int y=main_panel->get_geometry().y;
-               for(list<TrainPanel *>::iterator i=train_panels.begin(); i!=train_panels.end(); ++i)
-                       y-=(*i)->get_geometry().h;
-               tpanel->set_position(0, y-tpanel->get_geometry().h);
-               train_panels.push_back(tpanel);
-               tpanel->set_visible(true);
-
-               placing_train=train;
-               placing_block=0;
-               main_panel->set_status_text("Select location");
-
-               return train;
-       }
+Train *Engineer::add_train(const LocoType &type, unsigned addr)
+{
+       Locomotive *loco=new Locomotive(type, control, addr);
+       Train *train=new Train(*trfc_mgr, *loco);
+       train->set_name(format("Train %d", trfc_mgr->get_trains().size()));
+
+       TrainPanel *tpanel=new TrainPanel(*this, ui_res, *train);
+       root->add(*tpanel);
+       int y=main_panel->get_geometry().y;
+       for(list<TrainPanel *>::iterator i=train_panels.begin(); i!=train_panels.end(); ++i)
+               y-=(*i)->get_geometry().h;
+       tpanel->set_position(0, y-tpanel->get_geometry().h);
+       train_panels.push_back(tpanel);
+       tpanel->set_visible(true);
+
+       place_train(*train);
+
+       return train;
+}
+
+void Engineer::place_train(Train &train)
+{
+       placing_train=&train;
+       placing_block=0;
+       main_panel->set_status_text("Select location");
 }
 
 int Engineer::main()
@@ -284,7 +286,7 @@ void Engineer::button_press(int x, int y, unsigned btn, unsigned)
 {
        if(placing_train)
        {
-               if(btn==1 && placing_block)
+               if(btn==1 && placing_block && !placing_block->get_train())
                {
                        set_block_color(*placing_block, GL::Color(1, 1, 1));
 
@@ -335,7 +337,7 @@ void Engineer::pointer_motion(int x, int y)
                        if(&block!=placing_block)
                        {
                                if(placing_block)
-                                       set_block_color(*placing_block, GL::Color(1, 1, 1));
+                                       reset_block_color(*placing_block);
                                placing_block=&block;
                                placing_entry=0;
                                set_block_color(*placing_block, GL::Color(0.5, 1, 0.7));
@@ -399,37 +401,37 @@ void Engineer::set_block_color(const Block &block, const GL::Color &color)
                layout_3d.get_track(**i).set_color(color);
 }
 
-void Engineer::sensor_event(bool state, Sensor *sensor)
-{
-       const list<Track3D *> &ltracks=layout_3d.get_tracks();
-       for(list<Track3D *>::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
-               if((*i)->get_track().get_sensor_id()==sensor->get_address())
-               {
-                       Block &block=trfc_mgr->get_block_by_track((*i)->get_track());
-                       if(state)
-                               (*i)->set_color(GL::Color(1, 0.5, 0.3));
-                       else if(block.get_train())
-                               set_block_color(block, GL::Color(1, 1, 0.3));
-                       else
-                               (*i)->set_color(GL::Color(1, 1, 1));
-               }
-}
-
-void Engineer::block_reserved(const Block &block, const Train *train)
+void Engineer::reset_block_color(const Block &block)
 {
        if(unsigned sid=block.get_sensor_id())
        {
                Sensor &sensor=control.get_sensor(sid);
                if(sensor.get_state())
+               {
+                       set_block_color(block, GL::Color(1, 0.5, 0.3));
                        return;
+               }
        }
 
-       if(train)
+       if(block.get_train())
                set_block_color(block, GL::Color(1, 1, 0.3));
        else
                set_block_color(block, GL::Color(1, 1, 1));
 }
 
+void Engineer::sensor_event(bool, Sensor *sensor)
+{
+       const list<Block *> &blocks=trfc_mgr->get_blocks();
+       for(list<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
+               if((*i)->get_sensor_id()==sensor->get_address())
+                       reset_block_color(**i);
+}
+
+void Engineer::block_reserved(const Block &block, const Train *)
+{
+       reset_block_color(block);
+}
+
 void Engineer::project_3d()
 {
        glMatrixMode(GL_PROJECTION);