diff options
| author | Stijn Buys <ingar@osirion.org> | 2010-10-25 12:40:53 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2010-10-25 12:40:53 +0000 |
| commit | 787002ec11bf41bba01b899c53a38830768fc260 (patch) | |
| tree | 5a4b4e60617b0167a9e32a3882342a85f0fde4ab /src/client | |
| parent | 6a86e7f0f9e021498c1df44653a42643bd79dfbf (diff) | |
directory prefix is no required for ini files, merge ui.ini and menu.ini
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/client.cc | 5 | ||||
| -rw-r--r-- | src/client/video.cc | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/client/client.cc b/src/client/client.cc index a40023b..318a0d4 100644 --- a/src/client/client.cc +++ b/src/client/client.cc @@ -415,13 +415,10 @@ void Client::func_list_ui(std::string const &args) void Client::func_ui_restart(std::string const &args) { if (ui::root()) { - ui::root()->load_menus(); ui::root()->load_settings(); - ui::root()->apply_render_options(); } } - void Client::func_ui_console(std::string const &args) { ui::console()->toggle(); @@ -469,9 +466,7 @@ void Client::func_ui(std::string const &args) } else if (command.compare("visible") == 0) { ui::root()->list_visible(); } else if (command.compare("restart") == 0) { - ui::root()->load_menus(); ui::root()->load_settings(); - ui::root()->apply_render_options(); } else { func_ui_help(); } diff --git a/src/client/video.cc b/src/client/video.cc index 5610f36..cd675f7 100644 --- a/src/client/video.cc +++ b/src/client/video.cc @@ -200,7 +200,7 @@ bool init() render::init(width, height); // apply render options - ui::root()->apply_render_options(); + ui::root()->load_settings(); // initialize target drawer targets::init(); |