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

fix Various showed as BPM for some courses with <= MAX_COURSE_ENTRIES_BEFORE_VARIOUS

Browse Source
This commit is contained in:
Chris Danford
2005-03-17 17:53:10 +00:00
parent 0eb271a1b1
commit 1f112ae2ca
6 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BPMDisplay.cpp
+10 -10
View File
@@ -92,13 +92,6 @@ void BPMDisplay::SetBPMRange( const DisplayBpms &bpms )
const vector<float> &BPMS = bpms.vfBpms;
if( (int) BPMS.size() > MAX_COURSE_ENTRIES_BEFORE_VARIOUS )
{
m_BPMS.push_back( -1 );
m_textBPM.SetText( "Various" );
return;
}
bool AllIdentical = true;
for( unsigned i = 0; i < BPMS.size(); ++i )
{
@@ -181,7 +174,7 @@ void BPMDisplay::NoBPM()
m_sprLabel->SetDiffuse( NORMAL_COLOR );
}
void BPMDisplay::SetBPM( const Song* pSong )
void BPMDisplay::SetBpmFromSong( const Song* pSong )
{
ASSERT( pSong );
switch( pSong->m_DisplayBPMType )
@@ -203,7 +196,7 @@ void BPMDisplay::SetBPM( const Song* pSong )
}
}
void BPMDisplay::SetBPM( const Course* pCourse )
void BPMDisplay::SetBpmFromCourse( const Course* pCourse )
{
ASSERT( pCourse );
@@ -218,13 +211,20 @@ void BPMDisplay::SetBPM( const Course* pCourse )
m_fCycleTime = 0.2f;
}
void BPMDisplay::SetBPM( float fBPM )
void BPMDisplay::SetConstantBpm( float fBPM )
{
DisplayBpms bpms;
bpms.Add( fBPM );
SetBPMRange( bpms );
}
void BPMDisplay::SetVarious()
{
m_BPMS.clear();
m_BPMS.push_back( -1 );
m_textBPM.SetText( "Various" );
}
void BPMDisplay::DrawPrimitives()
{
ActorFrame::DrawPrimitives();