[Orxonox-commit 6506] r11150 - in code/branches/bindermFS16: data/gui/scripts src/orxonox/overlays

[binderm at orxonox.net]

Author: binderm
Date: 2016-03-24 15:52:07 +0100 (Thu, 24 Mar 2016)
New Revision: 11150

Modified:
   code/branches/bindermFS16/data/gui/scripts/SingleplayerMenu.lua
   code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.cc
   code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.h
   code/branches/bindermFS16/src/orxonox/overlays/GUISheet.cc
Log:
tried consoleCommand, doesn't work  yet. Please have a look;)

Modified: code/branches/bindermFS16/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- code/branches/bindermFS16/data/gui/scripts/SingleplayerMenu.lua	2016-03-24 13:12:41 UTC (rev 11149)
+++ code/branches/bindermFS16/data/gui/scripts/SingleplayerMenu.lua	2016-03-24 14:52:07 UTC (rev 11150)
@@ -171,7 +171,7 @@
 end
 
 function P.CampaignButton_clicked(e)
-    test()
+    P.test()
     showMenuSheet("CampaignMenu", true)
 end
 function P.test()

Modified: code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.cc
===================================================================
--- code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.cc	2016-03-24 13:12:41 UTC (rev 11149)
+++ code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.cc	2016-03-24 14:52:07 UTC (rev 11150)
@@ -31,16 +31,18 @@
 #include "core/GUIManager.h"
 #include "core/XMLPort.h"
 #include "core/GameMode.h"
-#include "command/ConsoleCommandIncludes.h"
+#include "core/command/ConsoleCommandIncludes.h"
 
 
 
 namespace orxonox
 {
-    SetConsoleCommand("test", &test);
+
+    SetConsoleCommand("CampaignMenu", "test", &CampaignMenu::test);
+
     RegisterClass(CampaignMenu);
 
-    CampaignMenu::CampaignMenu(context* context)
+    CampaignMenu::CampaignMenu(Context* context)
         :BaseObject(context)
 
     {
@@ -48,12 +50,16 @@
     }
 
     CampaignMenu::~CampaignMenu()
+    {}
+
+    void CampaignMenu::test()
     {
+        orxout()<<"test"<< endl;
     }
 
-    void CampaignMenu::test()
+    //loads the new campaign menu
+    void CampaignMenu::loadnewmenu()
     {
         
     }
-
 }

Modified: code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.h
===================================================================
--- code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.h	2016-03-24 13:12:41 UTC (rev 11149)
+++ code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.h	2016-03-24 14:52:07 UTC (rev 11150)
@@ -40,6 +40,7 @@
         CampaignMenu(Context* context);
         ~CampaignMenu();
         void test();
+        void loadnewmenu();
     };
 
 

Modified: code/branches/bindermFS16/src/orxonox/overlays/GUISheet.cc
===================================================================
--- code/branches/bindermFS16/src/orxonox/overlays/GUISheet.cc	2016-03-24 13:12:41 UTC (rev 11149)
+++ code/branches/bindermFS16/src/orxonox/overlays/GUISheet.cc	2016-03-24 14:52:07 UTC (rev 11150)
@@ -32,11 +32,15 @@
 #include "core/GUIManager.h"
 #include "core/XMLPort.h"
 #include "core/GameMode.h"
+#include "core/command/ConsoleCommandIncludes.h"
 
 namespace orxonox
 {
+
+
     RegisterClass(GUISheet);
 
+
     GUISheet::GUISheet(Context* context)
         : BaseObject(context)
         , bShowOnLoad_(false)
@@ -94,4 +98,5 @@
         this->bHidePreviousSet_ = true;
         // Note: This call has no effect when already showing!
     }
+
 }