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

Change ShowMissCombo bool to MissComboCommand

Browse Source
This commit is contained in:
Chris Danford
2005-10-22 09:00:27 +00:00
parent dd5353bd94
commit 9f2ef19aa6
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+2 -1
View File
@@ -2670,7 +2670,8 @@ FullComboW3Command=
FullComboW2Command= FullComboW2Command=
FullComboW1Command= FullComboW1Command=
FullComboBrokenCommand= FullComboBrokenCommand=
ShowMissCombo=0 MissComboCommand=hidden,1
[Player] [Player]
ReceptorArrowsYStandard=-144 ReceptorArrowsYStandard=-144
stepmania/src/Combo.cpp
+14 -9
View File
@@ -38,7 +38,7 @@ void Combo::Load( PlayerState *pPlayerState, PlayerStageStats *pPlayerStageStats
FULL_COMBO_W2_COMMAND .Load(m_sName,"FullComboW2Command"); FULL_COMBO_W2_COMMAND .Load(m_sName,"FullComboW2Command");
FULL_COMBO_W1_COMMAND .Load(m_sName,"FullComboW1Command"); FULL_COMBO_W1_COMMAND .Load(m_sName,"FullComboW1Command");
FULL_COMBO_BROKEN_COMMAND .Load(m_sName,"FullComboBrokenCommand"); FULL_COMBO_BROKEN_COMMAND .Load(m_sName,"FullComboBrokenCommand");
SHOW_MISS_COMBO .Load(m_sName,"ShowMissCombo"); MISS_COMBO_COMMAND .Load(m_sName,"MissComboCommand");
m_spr100Milestone.Load( THEME->GetPathG(m_sName,"100milestone") ); m_spr100Milestone.Load( THEME->GetPathG(m_sName,"100milestone") );
this->AddChild( m_spr100Milestone ); this->AddChild( m_spr100Milestone );
@@ -69,11 +69,11 @@ void Combo::Load( PlayerState *pPlayerState, PlayerStageStats *pPlayerStageStats
void Combo::SetCombo( int iCombo, int iMisses ) void Combo::SetCombo( int iCombo, int iMisses )
{ {
bool bMisses = iMisses > 0; bool bComboOfMisses = iMisses > 0;
int iNum = bMisses ? iMisses : iCombo; int iNum = bComboOfMisses ? iMisses : iCombo;
bool bShowCombo = iNum >= (int)SHOW_COMBO_AT;
if( (iNum < (int)SHOW_COMBO_AT) || if( !bShowCombo )
(bMisses && !(bool)SHOW_MISS_COMBO) )
{ {
m_sprComboLabel->SetHidden( true ); m_sprComboLabel->SetHidden( true );
m_sprMissesLabel->SetHidden( true ); m_sprMissesLabel->SetHidden( true );
@@ -95,8 +95,8 @@ void Combo::SetCombo( int iCombo, int iMisses )
} }
m_iLastSeenCombo = iCombo; m_iLastSeenCombo = iCombo;
m_sprComboLabel->SetHidden( bMisses ); m_sprComboLabel->SetHidden( bComboOfMisses );
m_sprMissesLabel->SetHidden( !bMisses ); m_sprMissesLabel->SetHidden( !bComboOfMisses );
m_textNumber.SetHidden( false ); m_textNumber.SetHidden( false );
CString txt = ssprintf("%d", iNum); CString txt = ssprintf("%d", iNum);
@@ -110,7 +110,7 @@ void Combo::SetCombo( int iCombo, int iMisses )
m_textNumber.SetZoom( fNumberZoom ); m_textNumber.SetZoom( fNumberZoom );
m_textNumber.RunCommands( PULSE_COMMAND ); m_textNumber.RunCommands( PULSE_COMMAND );
AutoActor &sprLabel = bMisses ? m_sprMissesLabel : m_sprComboLabel; AutoActor &sprLabel = bComboOfMisses ? m_sprMissesLabel : m_sprComboLabel;
sprLabel->FinishTweening(); sprLabel->FinishTweening();
sprLabel->RunCommands( PULSE_COMMAND ); sprLabel->RunCommands( PULSE_COMMAND );
@@ -124,7 +124,12 @@ void Combo::SetCombo( int iCombo, int iMisses )
bool bPastMidpoint = GAMESTATE->GetCourseSongIndex()>0 || bool bPastMidpoint = GAMESTATE->GetCourseSongIndex()>0 ||
GAMESTATE->m_fMusicSeconds > GAMESTATE->m_pCurSong->m_fMusicLengthSeconds/4; GAMESTATE->m_fMusicSeconds > GAMESTATE->m_pCurSong->m_fMusicLengthSeconds/4;
if( bPastMidpoint ) if( bComboOfMisses )
{
sprLabel->RunCommands( MISS_COMBO_COMMAND );
m_textNumber.RunCommands( MISS_COMBO_COMMAND );
}
else if( bPastMidpoint )
{ {
if( m_pPlayerStageStats->FullComboOfScore(TNS_W1) ) if( m_pPlayerStageStats->FullComboOfScore(TNS_W1) )
{ {
stepmania/src/Combo.h
+1 -1
View File
@@ -37,7 +37,7 @@ protected:
ThemeMetric<apActorCommands> FULL_COMBO_W2_COMMAND; ThemeMetric<apActorCommands> FULL_COMBO_W2_COMMAND;
ThemeMetric<apActorCommands> FULL_COMBO_W1_COMMAND; ThemeMetric<apActorCommands> FULL_COMBO_W1_COMMAND;
ThemeMetric<apActorCommands> FULL_COMBO_BROKEN_COMMAND; ThemeMetric<apActorCommands> FULL_COMBO_BROKEN_COMMAND;
ThemeMetric<bool> SHOW_MISS_COMBO; ThemeMetric<apActorCommands> MISS_COMBO_COMMAND;
PlayerState *m_pPlayerState; PlayerState *m_pPlayerState;
PlayerStageStats *m_pPlayerStageStats; PlayerStageStats *m_pPlayerStageStats;