diff options
author | Stijn Buys <ingar@osirion.org> | 2015-02-08 21:51:53 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2015-02-08 21:51:53 +0000 |
commit | 77d877160d5c3b8a7e9c30e81bd6ca1f4060b5f9 (patch) | |
tree | 7e3c8de8f0aeea2e03b086b5ff1a3c7b60892e25 /src/client/mainmenu.cc | |
parent | 4fdf7de0f1454966754bb22d1828fc2b69c172f4 (diff) |
Added a menu to configure key controls.
Diffstat (limited to 'src/client/mainmenu.cc')
-rw-r--r-- | src/client/mainmenu.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/client/mainmenu.cc b/src/client/mainmenu.cc index 89c29be..8813688 100644 --- a/src/client/mainmenu.cc +++ b/src/client/mainmenu.cc @@ -5,6 +5,7 @@ */ #include "client/buttonmenu.h" +#include "client/controlsettingsmenu.h" #include "client/mainmenu.h" #include "client/savegamemenu.h" #include "core/core.h" @@ -192,6 +193,9 @@ void MainMenu::load() mainmenu_joinmenu = (ui::Widget *) new ButtonMenu(this, "join"); static_cast<ButtonMenu *>(mainmenu_joinmenu)->set_compact(); + // control settings menu + new ControlSettingsMenu(this, "controls"); + // load custom menus, this needs to be done before the // non-buttonmenu child widgets are created load_definitions(); |