X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=f5823c44550576f48521f971bf22b7985d15d1f2;hb=78d36019ec11d62d6fd016fcbe19f566d11771ff;hp=07ab83b67eb3c086b6aa29e95c68f0bfbea174cd;hpb=759fee443361cdcafe6fb259df3ba1b05bea0b21;p=r2c2.git diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp index 07ab83b..f5823c4 100644 --- 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())