actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-04 23:43:19 +00:00
parent 6c6402b2ee
commit a3cd21e698
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+10 -12
View File
@@ -100,6 +100,16 @@ ScreenGameplay::ScreenGameplay( CString sName ) : ScreenWithMenuElements(sName)
FAIL_AFTER_30_MISSES.Load( sName, "FailAfter30Misses" ); FAIL_AFTER_30_MISSES.Load( sName, "FailAfter30Misses" );
USE_FORCED_MODIFIERS_IN_BEGINNER.Load( sName, "UseForcedModifiersInBeginner" ); USE_FORCED_MODIFIERS_IN_BEGINNER.Load( sName, "UseForcedModifiersInBeginner" );
FORCED_MODIFIERS_IN_BEGINNER.Load( sName, "ForcedModifiersInBeginner" ); FORCED_MODIFIERS_IN_BEGINNER.Load( sName, "ForcedModifiersInBeginner" );
FOREACH_PlayerNumber(pn)
{
m_pLifeMeter[pn] = NULL;
m_pPrimaryScoreDisplay[pn] = NULL;
m_pSecondaryScoreDisplay[pn] = NULL;
m_pPrimaryScoreKeeper[pn] = NULL;
m_pSecondaryScoreKeeper[pn] = NULL;
m_pInventory[pn] = NULL;
}
} }
void ScreenGameplay::Init() void ScreenGameplay::Init()
@@ -123,18 +133,6 @@ void ScreenGameplay::Init()
m_pSoundMusic = NULL; m_pSoundMusic = NULL;
m_bPaused = false; m_bPaused = false;
//need to initialize these before checking for demonstration mode
//otherwise destructor will try to delete possibly invalid pointers
FOREACH_PlayerNumber(p)
{
m_pLifeMeter[p] = NULL;
m_pPrimaryScoreDisplay[p] = NULL;
m_pSecondaryScoreDisplay[p] = NULL;
m_pPrimaryScoreKeeper[p] = NULL;
m_pSecondaryScoreKeeper[p] = NULL;
m_pInventory[p] = NULL ;
}
m_pCombinedLifeMeter = NULL; m_pCombinedLifeMeter = NULL;
if( GAMESTATE->m_pCurSong == NULL && GAMESTATE->m_pCurCourse == NULL ) if( GAMESTATE->m_pCurSong == NULL && GAMESTATE->m_pCurCourse == NULL )