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

separate milestones for 500 and 1000

Browse Source
This commit is contained in:
Chris Danford
2005-05-02 03:31:53 +00:00
parent 6facdccdfe
commit beac79e4f3
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Combo.cpp
+13 -7
View File
@@ -40,8 +40,11 @@ void Combo::Load( PlayerState *pPlayerState, PlayerStageStats *pPlayerStageStats
FULL_COMBO_BROKEN_COMMAND .Load(m_sName,"FullComboBrokenCommand"); FULL_COMBO_BROKEN_COMMAND .Load(m_sName,"FullComboBrokenCommand");
SHOW_MISS_COMBO .Load(m_sName,"ShowMissCombo"); SHOW_MISS_COMBO .Load(m_sName,"ShowMissCombo");
m_sprMilestone.Load( THEME->GetPathG(m_sName,"milestone") ); m_spr100Milestone.Load( THEME->GetPathG(m_sName,"100milestone") );
this->AddChild( m_sprMilestone ); this->AddChild( m_spr100Milestone );
m_spr1000Milestone.Load( THEME->GetPathG(m_sName,"1000milestone") );
this->AddChild( m_spr1000Milestone );
m_sprComboLabel.Load( THEME->GetPathG(m_sName,"label") ); m_sprComboLabel.Load( THEME->GetPathG(m_sName,"label") );
m_sprComboLabel->StopAnimating(); m_sprComboLabel->StopAnimating();
@@ -81,13 +84,14 @@ void Combo::SetCombo( int iCombo, int iMisses )
if( m_iLastSeenCombo == -1 ) // first update, don't set bIsMilestone=true if( m_iLastSeenCombo == -1 ) // first update, don't set bIsMilestone=true
m_iLastSeenCombo = iCombo; m_iLastSeenCombo = iCombo;
bool bIsMilestone = false; bool b100Milestone = false;
bool b1000Milestone = false;
for( int i=m_iLastSeenCombo+1; i<=iCombo; i++ ) for( int i=m_iLastSeenCombo+1; i<=iCombo; i++ )
{ {
if( i <= 1000 ) if( i <= 1000 )
bIsMilestone |= ((i % 100) == 0); b100Milestone |= ((i % 100) == 0);
else else
bIsMilestone |= ((i % 500) == 0); b1000Milestone |= ((i % 1000) == 0);
} }
m_iLastSeenCombo = iCombo; m_iLastSeenCombo = iCombo;
@@ -111,8 +115,10 @@ void Combo::SetCombo( int iCombo, int iMisses )
sprLabel->FinishTweening(); sprLabel->FinishTweening();
sprLabel->RunCommands( PULSE_COMMAND ); sprLabel->RunCommands( PULSE_COMMAND );
if( bIsMilestone ) if( b100Milestone )
m_sprMilestone->PlayCommand( "Milestone" ); m_spr100Milestone->PlayCommand( "Milestone" );
if( b1000Milestone )
m_spr1000Milestone->PlayCommand( "Milestone" );
// don't show a colored combo until 1/4 of the way through the song // don't show a colored combo until 1/4 of the way through the song
bool bPastMidpoint = GAMESTATE->GetCourseSongIndex()>0 || bool bPastMidpoint = GAMESTATE->GetCourseSongIndex()>0 ||
stepmania/src/Combo.h
+2 -1
View File
@@ -42,7 +42,8 @@ protected:
PlayerState *m_pPlayerState; PlayerState *m_pPlayerState;
PlayerStageStats *m_pPlayerStageStats; PlayerStageStats *m_pPlayerStageStats;
AutoActor m_sprMilestone; AutoActor m_spr100Milestone;
AutoActor m_spr1000Milestone;
AutoActor m_sprComboLabel; AutoActor m_sprComboLabel;
AutoActor m_sprMissesLabel; AutoActor m_sprMissesLabel;
BitmapText m_textNumber; BitmapText m_textNumber;