Changeset 11150 for code/branches/bindermFS16

Timestamp:

Mar 24, 2016, 3:52:07 PM (9 years ago)

Author:

binderm

Message:

tried consoleCommand, doesn't work yet. Please have a look;)

Location:

code/branches/bindermFS16

Files:

• data/gui/scripts/SingleplayerMenu.lua (modified) (1 diff)
• src/orxonox/overlays/CampaignMenu.cc (modified) (3 diffs)
• src/orxonox/overlays/CampaignMenu.h (modified) (1 diff)
• src/orxonox/overlays/GUISheet.cc (modified) (2 diffs)

code/branches/bindermFS16/data/gui/scripts/SingleplayerMenu.lua

@@ -172 +172 @@
 
 function P.CampaignButton_clicked(e)
-    test()
+    P.test()
     showMenuSheet("CampaignMenu", true)
 end

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

@@ -32 +32 @@
 #include "core/XMLPort.h"
 #include "core/GameMode.h"
-#include "command/ConsoleCommandIncludes.h"
+#include "core/command/ConsoleCommandIncludes.h"
 
 
@@ -38 +38 @@
 namespace orxonox
 {
-    SetConsoleCommand("test", &test);
+
+    SetConsoleCommand("CampaignMenu", "test", &CampaignMenu::test);
+
     RegisterClass(CampaignMenu);
 
-    CampaignMenu::CampaignMenu(context* context)
+    CampaignMenu::CampaignMenu(Context* context)
         :BaseObject(context)
 
@@ -49 +51 @@
 
     CampaignMenu::~CampaignMenu()
-    {
-    }
+    {}
 
     void CampaignMenu::test()
     {
+        orxout()<<"test"<< endl;
+    }
+
+    //loads the new campaign menu
+    void CampaignMenu::loadnewmenu()
+    {
         
     }
-
 }

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

@@ -41 +41 @@
         ~CampaignMenu();
         void test();
+        void loadnewmenu();
     };
 

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

@@ -33 +33 @@
 #include "core/XMLPort.h"
 #include "core/GameMode.h"
+#include "core/command/ConsoleCommandIncludes.h"
 
 namespace orxonox
 {
+
+
     RegisterClass(GUISheet);
+
 
     GUISheet::GUISheet(Context* context)
@@ -95 +99 @@
         // Note: This call has no effect when already showing!
     }
+
 }