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

Fix crashes: m_pLifeMeter[p] and GetDancingCharacters() might be NULL.

Browse Source
This commit is contained in:
Glenn Maynard
2003-11-14 18:33:12 +00:00
parent 62b5a16d28
commit b796957fd5
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+14 -11
View File
@@ -1587,6 +1587,7 @@ void ScreenGameplay::ShowSavePrompt( ScreenMessage SM_SendWhenDone )
void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
{
CHECKPOINT_M( ssprintf("HandleScreenMessage(%i)", SM) );
switch( SM )
{
case SM_PlayReady:
@@ -1685,19 +1686,21 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
}
// update dancing characters for win / lose
for(p=0; p<NUM_PLAYERS;p++)
{
if( GAMESTATE->IsPlayerEnabled(p) && GAMESTATE->m_CurStageStats.bFailed[p] )
m_Background.GetDancingCharacters()->Change2DAnimState(p,AS2D_FAIL); // fail anim
else
DancingCharacters *Dancers = m_Background.GetDancingCharacters();
if( Dancers )
for( p=0; p<NUM_PLAYERS; p++ )
{
if(m_pLifeMeter[p]->GetLife() == 1.0f) // full life
m_Background.GetDancingCharacters()->Change2DAnimState(p,AS2D_WINFEVER); // full life pass anim
else
m_Background.GetDancingCharacters()->Change2DAnimState(p,AS2D_WIN); // pass anim
}
if( !GAMESTATE->IsPlayerEnabled(p) )
continue;
}
/* XXX: In battle modes, switch( GAMESTATE->GetStageResult(p) ). */
if( GAMESTATE->m_CurStageStats.bFailed[p] )
Dancers->Change2DAnimState( p, AS2D_FAIL ); // fail anim
else if( m_pLifeMeter[p] && m_pLifeMeter[p]->GetLife() == 1.0f ) // full life
Dancers->Change2DAnimState( p, AS2D_WINFEVER ); // full life pass anim
else
Dancers->Change2DAnimState( p, AS2D_WIN ); // pass anim
}
/* End round. */
if( m_DancingState == STATE_OUTRO ) // ScreenGameplay already ended