Changeset 10624 for code/trunk/src/orxonox/gamestates/GSMainMenu.cc

Timestamp:

Oct 4, 2015, 9:12:21 PM (10 years ago)

Author:

landauf

Message:

merged branch core7 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/gamestates/GSMainMenu.cc (modified) (2 diffs)

code/trunk/src/orxonox/gamestates/GSMainMenu.cc

@@ -36 +36 @@
 #include "core/GraphicsManager.h"
 #include "core/GUIManager.h"
-#include "core/command/ConsoleCommand.h"
+#include "core/command/ConsoleCommandIncludes.h"
 #include "core/input/KeyBinderManager.h"
 #include "network/Client.h"
@@ -63 +63 @@
     SetConsoleCommand(__CC_setMainMenuSoundPath_name, &GSMainMenu::setMainMenuSoundPath).hide();
 
+    RegisterAbstractClass(GSMainMenu).inheritsFrom<Configurable>();
+
     GSMainMenu::GSMainMenu(const GameStateInfo& info)
         : GameState(info)