Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6047 for code


Ignore:
Timestamp:
Nov 12, 2009, 11:23:33 AM (15 years ago)
Author:
rgrieder
Message:

Forgot to set the internal activity properties of the GameStates.

Location:
code/branches/menu/src/libraries/core
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/menu/src/libraries/core/Game.cc

    r5929 r6047  
    584584
    585585        shared_ptr<GameState> state = this->getState(name);
    586         state->activate();
     586        state->activateInternal();
    587587        if (!this->loadedStates_.empty())
    588588            this->loadedStates_.back()->activity_.topState = false;
     
    603603            if (!this->loadedStates_.empty())
    604604                this->loadedStates_.back()->activity_.topState = true;
    605             state->deactivate();
     605            state->deactivateInternal();
    606606        }
    607607        catch (...)
  • code/branches/menu/src/libraries/core/GameState.cc

    r5738 r6047  
    8383        this->activity_.active = false;
    8484        this->activity_.deactivating = true;
    85         this->activate();
     85        this->deactivate();
    8686        this->activity_.deactivating = false;
    8787        this->activity_.suspended = false;
Note: See TracChangeset for help on using the changeset viewer.