[Orxonox-commit 284] r2928 - trunk/src/orxonox/gamestates

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-04-20 14:05:49 +0200 (Mon, 20 Apr 2009)
New Revision: 2928

Modified:
   trunk/src/orxonox/gamestates/GSGraphics.cc
   trunk/src/orxonox/gamestates/GSIOConsole.cc
   trunk/src/orxonox/gamestates/GSLevel.cc
   trunk/src/orxonox/gamestates/GSMainMenu.cc
   trunk/src/orxonox/gamestates/GSRoot.cc
Log:
Deleting console commands currently seems to be a rather bad idea (though on by box the console still worked, including tab completion).
--> Commented all the temporary console commands in the GameStates until we have a proper solution.

Modified: trunk/src/orxonox/gamestates/GSGraphics.cc
===================================================================
--- trunk/src/orxonox/gamestates/GSGraphics.cc	2009-04-19 20:59:59 UTC (rev 2927)
+++ trunk/src/orxonox/gamestates/GSGraphics.cc	2009-04-20 12:05:49 UTC (rev 2928)
@@ -155,12 +155,13 @@
     */
     void GSGraphics::deactivate()
     {
-
+/*
         if (this->ccToggleGUI_)
         {
             delete this->ccToggleGUI_;
             this->ccToggleGUI_ = 0;
         }
+*/
 
         masterInputState_->setHandler(0);
         InputManager::getInstance().requestDestroyState("master");

Modified: trunk/src/orxonox/gamestates/GSIOConsole.cc
===================================================================
--- trunk/src/orxonox/gamestates/GSIOConsole.cc	2009-04-19 20:59:59 UTC (rev 2927)
+++ trunk/src/orxonox/gamestates/GSIOConsole.cc	2009-04-20 12:05:49 UTC (rev 2928)
@@ -62,11 +62,13 @@
 
     void GSIOConsole::deactivate()
     {
+/*
         if (this->ccLoadMenu_)
         {
             delete this->ccLoadMenu_;
             this->ccLoadMenu_ = 0;
         }
+*/
     }
 
     void GSIOConsole::update(const Clock& time)

Modified: trunk/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- trunk/src/orxonox/gamestates/GSLevel.cc	2009-04-19 20:59:59 UTC (rev 2927)
+++ trunk/src/orxonox/gamestates/GSLevel.cc	2009-04-20 12:05:49 UTC (rev 2928)
@@ -161,6 +161,7 @@
 
     void GSLevel::deactivate()
     {
+/*
         // destroy console commands
         if (this->ccKeybind_)
         {
@@ -172,6 +173,7 @@
             delete this->ccTkeybind_;
             this->ccTkeybind_ = 0;
         }
+*/
 
 
         // this call will delete every BaseObject!

Modified: trunk/src/orxonox/gamestates/GSMainMenu.cc
===================================================================
--- trunk/src/orxonox/gamestates/GSMainMenu.cc	2009-04-19 20:59:59 UTC (rev 2927)
+++ trunk/src/orxonox/gamestates/GSMainMenu.cc	2009-04-20 12:05:49 UTC (rev 2928)
@@ -90,11 +90,13 @@
         this->scene_->getSceneManager()->destroyCamera(this->camera_);
         delete this->scene_;
 
+/*
         if (this->ccStartGame_)
         {
             delete this->ccStartGame_;
             this->ccStartGame_ = 0;
         }
+*/
     }
 
     void GSMainMenu::update(const Clock& time)

Modified: trunk/src/orxonox/gamestates/GSRoot.cc
===================================================================
--- trunk/src/orxonox/gamestates/GSRoot.cc	2009-04-19 20:59:59 UTC (rev 2927)
+++ trunk/src/orxonox/gamestates/GSRoot.cc	2009-04-20 12:05:49 UTC (rev 2928)
@@ -118,6 +118,7 @@
 
     void GSRoot::deactivate()
     {
+/*
         if (this->ccSetTimeFactor_)
         {
             delete this->ccSetTimeFactor_;
@@ -129,6 +130,7 @@
             delete this->ccPause_;
             this->ccPause_ = 0;
         }
+*/
     }
 
     void GSRoot::update(const Clock& time)