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

fix combo announcer

Browse Source
This commit is contained in:
Glenn Maynard
2005-01-08 15:34:22 +00:00
parent 7e9a296b7a
commit 3366f50e31
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Player.cpp
+7 -7
View File
@@ -1284,7 +1284,11 @@ void PlayerMinus::HandleTapRowScore( unsigned row )
return; return;
/* Update miss combo, and handle "combo stopped" messages. */ /* Update miss combo, and handle "combo stopped" messages. */
/* When is m_pPlayerStageStats NULL? Would it be cleaner to pass Player a dummy
* PlayerStageStats in this case, instead of having to carefully check for NULL
* every time we use it? -glenn */
int iDummy = 0; int iDummy = 0;
int &iCurCombo = m_pPlayerStageStats ? m_pPlayerStageStats->iCurCombo : iDummy;
int &iCurMissCombo = m_pPlayerStageStats ? m_pPlayerStageStats->iCurMissCombo : iDummy; int &iCurMissCombo = m_pPlayerStageStats ? m_pPlayerStageStats->iCurMissCombo : iDummy;
switch( scoreOfLastTap ) switch( scoreOfLastTap )
{ {
@@ -1301,7 +1305,7 @@ void PlayerMinus::HandleTapRowScore( unsigned row )
case TNS_GOOD: case TNS_GOOD:
case TNS_BOO: case TNS_BOO:
if( iCurMissCombo > 50 ) if( iCurCombo > 50 )
SCREENMAN->PostMessageToTopScreen( SM_ComboStopped, 0 ); SCREENMAN->PostMessageToTopScreen( SM_ComboStopped, 0 );
iCurMissCombo = 0; iCurMissCombo = 0;
break; break;
@@ -1310,12 +1314,8 @@ void PlayerMinus::HandleTapRowScore( unsigned row )
ASSERT( 0 ); ASSERT( 0 );
} }
/* The score keeper updates the hit combo. */ /* The score keeper updates the hit combo. Remember the old combo for handling announcers. */
int &iCurCombo = m_pPlayerStageStats ? m_pPlayerStageStats->iCurCombo : iDummy; const int iOldCombo = iCurCombo;
/* Remember the old combo for handling announcers. */
const int iOldCombo = 0;
if( m_pPlayerStageStats )
m_pPlayerStageStats->iCurCombo;
if( m_pPrimaryScoreKeeper != NULL ) if( m_pPrimaryScoreKeeper != NULL )
m_pPrimaryScoreKeeper->HandleTapRowScore( scoreOfLastTap, iNumTapsInRow ); m_pPrimaryScoreKeeper->HandleTapRowScore( scoreOfLastTap, iNumTapsInRow );