From: Mikko Rasa Date: Thu, 17 Jan 2013 14:25:20 +0000 (+0200) Subject: Give filename to GLtk::Resources constructor X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=c164ce9409008e9b5a72cdbd09c332f95846e920;p=r2c2.git Give filename to GLtk::Resources constructor This is required to load external files correctly. --- diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp index 365fee0..c396b5e 100644 --- a/source/engineer/engineer.cpp +++ b/source/engineer/engineer.cpp @@ -37,6 +37,7 @@ Engineer::Engineer(int argc, char **argv): window(options.screen_w, options.screen_h, options.fullscreen), keyboard(window), mouse(window), + ui_res("r2c2.res"), layout(catalogue, (options.driver.empty() ? 0 : Driver::create(options.driver))), layout_3d(layout), server(0), @@ -51,7 +52,6 @@ Engineer::Engineer(int argc, char **argv): window.set_title("Railroad Engineer"); window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Engineer::exit), 0)); - DataFile::load(ui_res, "r2c2.res"); root = new GLtk::Root(ui_res, window); mouse.signal_button_press.connect(sigc::mem_fun(this, &Engineer::button_press)); mouse.signal_axis_motion.connect(sigc::mem_fun(this, &Engineer::axis_motion));