Reorganize data files into a directory structure

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

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index aa82dcb66b0b50475dfa16b87dbf3c23ee34969f..f5823c44550576f48521f971bf22b7985d15d1f2 100644 (file)
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -40,7 +40,7 @@ Engineer::Engineer(int argc, char **argv):
        window(options.screen_w, options.screen_h, options.fullscreen),
        keyboard(window),
        mouse(window),
-       ui_res("r2c2.res"),
+       ui_res("data/r2c2.res"),
        import_active(false),
        layout(catalogue, (options.driver.empty() ? 0 : Driver::create(options.driver))),
        layout_3d(layout),
@@ -69,10 +69,7 @@ Engineer::Engineer(int argc, char **argv):
        overlay = new Overlay3D(ui_res.get_default_font());
 
        // Setup railroad control
-       DataFile::load(catalogue, "tracks.dat");
-       DataFile::load(catalogue, "locos.dat");
-       DataFile::load(catalogue, "wagons.dat");
-       DataFile::load(catalogue, "terrain.dat");
+       catalogue.add_source("data/Märklin/H0");
        DataFile::load(layout, options.layout_fn);
 
        if(layout.has_driver())
@@ -318,6 +315,7 @@ void Engineer::emergency(Block *block, const string &msg)
        set_status(msg);
        TrackChain3D *tch3d = new TrackChain3D(layout_3d, *block);
        tch3d->set_color(GL::Color(1.0f, 0.0f, 0.0f));
+       tch3d->set_layer(2);
        emergencies.push_back(tch3d);
 }