fix uninitialized stage index

This commit is contained in:
Chris Danford
2004-01-24 19:09:51 +00:00
parent 8ba5efc31b
commit ec6fb7968d
+4 -1
View File
@@ -103,6 +103,7 @@ void GameState::Reset()
m_iCurrentStageIndex = 0; m_iCurrentStageIndex = 0;
m_bAllow2ndExtraStage = true; m_bAllow2ndExtraStage = true;
m_BeatToNoteSkinRev = 0; m_BeatToNoteSkinRev = 0;
m_iNumStagesOfThisSong = 0;
NOTESKIN->RefreshNoteSkinData( GAMESTATE->m_CurGame ); NOTESKIN->RefreshNoteSkinData( GAMESTATE->m_CurGame );
@@ -163,7 +164,6 @@ void GameState::Reset()
MEMCARDMAN->LockCards( false ); MEMCARDMAN->LockCards( false );
LIGHTSMAN->SetLightMode( LIGHTMODE_ATTRACT ); LIGHTSMAN->SetLightMode( LIGHTMODE_ATTRACT );
} }
void GameState::BeginGame() void GameState::BeginGame()
@@ -430,6 +430,8 @@ void GameState::BeginStage()
else else
FAIL_M("fail"); /* what are we playing? */ FAIL_M("fail"); /* what are we playing? */
ASSERT( m_iNumStagesOfThisSong >= 1 && m_iNumStagesOfThisSong <= 3 );
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() ) if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
{ {
/* If it's an extra stage, always increment by one. This is because in some /* If it's an extra stage, always increment by one. This is because in some
@@ -457,6 +459,7 @@ void GameState::FinishStage()
return; return;
// Increment the stage counter. // Increment the stage counter.
ASSERT( m_iNumStagesOfThisSong >= 1 && m_iNumStagesOfThisSong <= 3 );
m_iCurrentStageIndex += m_iNumStagesOfThisSong; m_iCurrentStageIndex += m_iNumStagesOfThisSong;
m_iNumStagesOfThisSong = 0; m_iNumStagesOfThisSong = 0;