Reorganize data files into a directory structure

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

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index 744f975799f32c0834457df1104dd4b012e52b24..a45026410915e611511bd15878349251e9f92e9c 100644 (file)
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -49,7 +49,7 @@ Designer::Designer(int argc, char **argv):
        window(1280, 960),
        keyboard(window),
        mouse(window),
-       ui_res("r2c2.res"),
+       ui_res("data/r2c2.res"),
        root(ui_res, &window, &keyboard, &mouse),
        base_object(0),
        cur_route(0),
@@ -63,8 +63,7 @@ Designer::Designer(int argc, char **argv):
        window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0));
 
        // Setup catalogue and layout
-       DataFile::load(catalogue, "tracks.dat");
-       DataFile::load(catalogue, "terrain.dat");
+       catalogue.add_source("data/Märklin/H0");
 
        cat_layout_3d = new Layout3D(catalogue.get_layout());