fixed generous Toasty

CHANGE:  Simplified NoteSkin format.  Old NoteSkins will need to be updated.
fixed BGAnimationLayer effect_bounce objects getting stuck
This commit is contained in:
Chris Danford
2003-01-13 08:31:34 +00:00
parent a5f17c7df1
commit fa75b5200b
9 changed files with 98 additions and 198 deletions
+16 -12
View File
@@ -55,6 +55,22 @@ void Combo::UpdateScore( TapNoteScore score, int iNumNotesInThisRow )
return;
}
// combo of marvelous/perfect
switch( score )
{
case TNS_MARVELOUS:
case TNS_PERFECT:
m_iCurComboOfPerfects += iNumNotesInThisRow;
if( (m_iCurComboOfPerfects>=150) && (m_iCurComboOfPerfects%150)==0 && !GAMESTATE->m_bDemonstration )
SCREENMAN->SendMessageToTopScreen( SM_BeginToasty, 0 );
break;
default:
m_iCurComboOfPerfects = 0;
break;
}
// combo of marvelous/perfect/great
switch( score )
{
case TNS_MARVELOUS:
@@ -65,18 +81,6 @@ void Combo::UpdateScore( TapNoteScore score, int iNumNotesInThisRow )
m_iCurCombo += iNumNotesInThisRow; // continue combo
switch( score )
{
case TNS_MARVELOUS:
case TNS_PERFECT:
m_iCurComboOfPerfects += iNumNotesInThisRow;
break;
}
if( (m_iCurComboOfPerfects>=150) && (m_iCurComboOfPerfects%150)==0 && !GAMESTATE->m_bDemonstration )
SCREENMAN->SendMessageToTopScreen( SM_BeginToasty, 0 );
#define CROSSED( i ) (iOldCombo<i && i<=m_iCurCombo)
if ( CROSSED(100) ) SCREENMAN->SendMessageToTopScreen( SM_100Combo, 0 );