ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make abstract state manager more consistent; previously, some methods would always log, others never. Now use the logging level setting uniformly

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7452 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2011-01-16 19:38:59 +00:00
parent f95f747dfd
commit 6fa952766b
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/guiengine/abstract_state_manager.cpp
View File

@ -86,6 +86,12 @@ void AbstractStateManager::pushMenu(std::string name)
assert(!ModalDialog::isADialogActive()); // you need to close any dialog before calling this
if (UserConfigParams::m_verbosity >= 3)
{
std::cout << "[AbstractStateManager::pushMenu] switching to screen "
<< name.c_str() << std::endl;
}
// Send tear-down event to previous menu
if (m_menu_stack.size() > 0 && m_game_mode != GAME) getCurrentScreen()->tearDown();
@ -110,6 +116,12 @@ void AbstractStateManager::pushScreen(Screen* screen)
{
assert(!ModalDialog::isADialogActive()); // you need to close any dialog before calling this
if (UserConfigParams::m_verbosity >= 3)
{
std::cout << "[AbstractStateManager::pushScreen] switching to screen "
<< screen->getName().c_str() << std::endl;
}
if (!screen->isLoaded()) screen->loadFromFile();
pushMenu(screen->getName());
screen->init();
@ -127,6 +139,12 @@ void AbstractStateManager::replaceTopMostScreen(Screen* screen)
if (!screen->isLoaded()) screen->loadFromFile();
std::string name = screen->getName();
if (UserConfigParams::m_verbosity >= 3)
{
std::cout << "[AbstractStateManager::replaceTopmostScreen] switching to screen "
<< name.c_str() << std::endl;
}
assert(m_menu_stack.size() > 0);
// Send tear-down event to previous menu
@ -180,8 +198,12 @@ void AbstractStateManager::popMenu()
onStackEmptied();
return;
}
std::cout << "-- switching to screen " << m_menu_stack[m_menu_stack.size()-1].c_str() << std::endl;
if (UserConfigParams::m_verbosity >= 3)
{
std::cout << "[AbstractStateManager::popMenu] switching to screen "
<< m_menu_stack[m_menu_stack.size()-1].c_str() << std::endl;
}
if (m_menu_stack[m_menu_stack.size()-1] == RACE_STATE_NAME)
{
@ -209,6 +231,12 @@ void AbstractStateManager::resetAndGoToScreen(Screen* screen)
std::string name = screen->getName();
if (UserConfigParams::m_verbosity >= 3)
{
std::cout << "[AbstractStateManager::resetAndGoToScreen] switching to screen "
<< name.c_str() << std::endl;
}
if (m_game_mode != GAME) getCurrentScreen()->tearDown();
m_menu_stack.clear();