Changeset 11173 for code/branches/bindermFS16/src/orxonox/overlays

Timestamp:

Apr 21, 2016, 4:05:15 PM (9 years ago)

Author:

binderm

Message:

Campaignmenu improved, it's now possible to only show single levels and not all together.

Location:

code/branches/bindermFS16/src/orxonox/overlays

Files:

• CampaignMenu.cc (modified) (2 diffs)
• CampaignMenu.h (modified) (1 diff)

code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.cc

@@ -33 +33 @@
 #include "core/GameMode.h"
 
+
 namespace orxonox
 {
+
+    
     RegisterClass(CampaignMenu);
 
@@ -52 +55 @@
     }
 
-    //loads the campaign menu
-    void CampaignMenu::loadNewMenu()
+
+    //loads the new campaign menu
+    void CampaignMenu::loadnewmenu()
     {
         

code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.h

@@ -32 +32 @@
 #include <string>
 #include "core/BaseObject.h"
+#include "util/Singleton.h"
 
-
-namespace orxonox // tolua_export
-{ // tolua_export
-
-        class _OrxonoxExport CampaignMenu // tolua_export
-         : public BaseObject
-    { // tolua_export
+//tolua_begin
+namespace orxonox
+{
+//tolua_end
+class _OrxonoxExport CampaignMenu : public BaseObject //tolua_export
+    { //tolua_export
     public:
         CampaignMenu(Context* context);
         ~CampaignMenu();
-        static void test(); // tolua_export
-        void loadNewMenu();
-    };// tolua_export
-} // tolua_export
+        static void test(); //tolua_export
+        void loadnewmenu();
+    }; //tolua_export
+
+
+
+} //tolua_export
 
 #endif /* _CampaignMenu_H__ */