[Orxonox-commit 1329] r6047 - code/branches/menu/src/libraries/core

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-11-12 11:23:33 +0100 (Thu, 12 Nov 2009)
New Revision: 6047

Modified:
   code/branches/menu/src/libraries/core/Game.cc
   code/branches/menu/src/libraries/core/GameState.cc
Log:
Forgot to set the internal activity properties of the GameStates.

Modified: code/branches/menu/src/libraries/core/Game.cc
===================================================================
--- code/branches/menu/src/libraries/core/Game.cc	2009-11-11 16:55:26 UTC (rev 6046)
+++ code/branches/menu/src/libraries/core/Game.cc	2009-11-12 10:23:33 UTC (rev 6047)
@@ -583,7 +583,7 @@
             graphicsUnloader.Dismiss();
 
         shared_ptr<GameState> state = this->getState(name);
-        state->activate();
+        state->activateInternal();
         if (!this->loadedStates_.empty())
             this->loadedStates_.back()->activity_.topState = false;
         this->loadedStates_.push_back(state);
@@ -602,7 +602,7 @@
             this->loadedStates_.pop_back();
             if (!this->loadedStates_.empty())
                 this->loadedStates_.back()->activity_.topState = true;
-            state->deactivate();
+            state->deactivateInternal();
         }
         catch (...)
         {

Modified: code/branches/menu/src/libraries/core/GameState.cc
===================================================================
--- code/branches/menu/src/libraries/core/GameState.cc	2009-11-11 16:55:26 UTC (rev 6046)
+++ code/branches/menu/src/libraries/core/GameState.cc	2009-11-12 10:23:33 UTC (rev 6047)
@@ -82,7 +82,7 @@
     {
         this->activity_.active = false;
         this->activity_.deactivating = true;
-        this->activate();
+        this->deactivate();
         this->activity_.deactivating = false;
         this->activity_.suspended = false;
         this->activity_.updating = false;