Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2016-07-29 22:21:49 +0200
committerStijn Buys <ingar@osirion.org>2016-07-29 22:21:49 +0200
commit0707e358b29089bf419327bf034aff39c5f31001 (patch)
treef0fa349da33842ffa3d437e5bc4322744b0384ca /src/client/mainmenu.cc
parent21e93bd260d2e74221da6f6560643d3c884d0128 (diff)
Added graphics settings menu.
Diffstat (limited to 'src/client/mainmenu.cc')
-rw-r--r--src/client/mainmenu.cc12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/client/mainmenu.cc b/src/client/mainmenu.cc
index d9250bc..823ebfb 100644
--- a/src/client/mainmenu.cc
+++ b/src/client/mainmenu.cc
@@ -7,6 +7,7 @@
#include "client/audiosettingsmenu.h"
#include "client/buttonmenu.h"
#include "client/controlsettingsmenu.h"
+#include "client/graphicssettingsmenu.h"
#include "client/mainmenu.h"
#include "client/playersettingsmenu.h"
#include "client/savegamemenu.h"
@@ -195,13 +196,18 @@ void MainMenu::load()
mainmenu_joinmenu = (ui::Widget *) new ButtonMenu(this, "join");
static_cast<ButtonMenu *>(mainmenu_joinmenu)->set_compact();
+ // graphics settings menu
+ new GraphicsSettingsMenu(this, "graphics");
+
// audio settings menu
new AudioSettingsMenu(this, "audio");
- // control settings menu
- new ControlSettingsMenu(this, "controls");
// player settings menu
- new PlayerSettingsMenu(this, "player");
+ new PlayerSettingsMenu(this, "player");
+
+ // controls menu
+ new ControlSettingsMenu(this, "controls");
+
// load custom menus, this needs to be done before the
// non-buttonmenu child widgets are created