Changeset 6047

Timestamp:

Nov 12, 2009, 11:23:33 AM (14 years ago)

Author:

rgrieder

Message:

Forgot to set the internal activity properties of the GameStates.

Location:

code/branches/menu/src/libraries/core

Files:

• Game.cc (modified) (2 diffs)
• GameState.cc (modified) (1 diff)

code/branches/menu/src/libraries/core/Game.cc

@@ -584 +584 @@
 
         shared_ptr<GameState> state = this->getState(name);
-        state->activate();
+        state->activateInternal();
         if (!this->loadedStates_.empty())
             this->loadedStates_.back()->activity_.topState = false;
@@ -603 +603 @@
             if (!this->loadedStates_.empty())
                 this->loadedStates_.back()->activity_.topState = true;
-            state->deactivate();
+            state->deactivateInternal();
         }
         catch (...)

code/branches/menu/src/libraries/core/GameState.cc

@@ -83 +83 @@
         this->activity_.active = false;
         this->activity_.deactivating = true;
-        this->activate();
+        this->deactivate();
         this->activity_.deactivating = false;
         this->activity_.suspended = false;