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

cache

Browse Source
This commit is contained in:
Glenn Maynard
2005-02-02 03:58:41 +00:00
parent d4eff6b050
commit a3f785974d
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BPMDisplay.cpp
+8 -10
View File
@@ -6,16 +6,14 @@
#include "GameState.h" #include "GameState.h"
#include "Course.h" #include "Course.h"
#include "Style.h" #include "Style.h"
#include "ThemeManager.h"
#define NORMAL_COLOR THEME->GetMetricC(m_sName,"NormalColor") BPMDisplay::BPMDisplay():
#define CHANGE_COLOR THEME->GetMetricC(m_sName,"ChangeColor") NORMAL_COLOR( m_sName, "NormalColor"),
#define EXTRA_COLOR THEME->GetMetricC(m_sName,"ExtraColor") CHANGE_COLOR( m_sName, "ChangeColor" ),
#define CYCLE THEME->GetMetricB(m_sName,"Cycle") EXTRA_COLOR( m_sName, "ExtraColor" ),
#define SEPARATOR THEME->GetMetric (m_sName,"Separator") CYCLE( m_sName, "Cycle" ),
#define NO_BPM_TEXT THEME->GetMetric (m_sName,"NoBPMText") SEPARATOR( m_sName, "Separator" ),
NO_BPM_TEXT( m_sName, "NoBPMText" )
BPMDisplay::BPMDisplay()
{ {
m_fBPMFrom = m_fBPMTo = 0; m_fBPMFrom = m_fBPMTo = 0;
m_iCurrentBPM = 0; m_iCurrentBPM = 0;
@@ -110,7 +108,7 @@ void BPMDisplay::SetBPMRange( const DisplayBpms &bpms )
m_textBPM.SetText( ssprintf("%i", MinBPM) ); m_textBPM.SetText( ssprintf("%i", MinBPM) );
} }
else else
m_textBPM.SetText( ssprintf("%i%s%i", MinBPM, SEPARATOR.c_str(), MaxBPM) ); m_textBPM.SetText( ssprintf("%i%s%i", MinBPM, SEPARATOR.GetValue().c_str(), MaxBPM) );
} else { } else {
m_BPMS.clear(); m_BPMS.clear();
for( unsigned i = 0; i < BPMS.size(); ++i ) for( unsigned i = 0; i < BPMS.size(); ++i )
stepmania/src/BPMDisplay.h
+8
View File
@@ -9,6 +9,7 @@
#include "BitmapText.h" #include "BitmapText.h"
#include "Quad.h" #include "Quad.h"
#include "ActorUtil.h" #include "ActorUtil.h"
#include "ThemeMetric.h"
class Song; class Song;
class Course; class Course;
@@ -29,6 +30,13 @@ protected:
float GetActiveBPM() const; float GetActiveBPM() const;
void SetBPMRange( const DisplayBpms &bpms ); void SetBPMRange( const DisplayBpms &bpms );
ThemeMetric<RageColor> NORMAL_COLOR;
ThemeMetric<RageColor> CHANGE_COLOR;
ThemeMetric<RageColor> EXTRA_COLOR;
ThemeMetric<bool> CYCLE;
ThemeMetric<CString> SEPARATOR;
ThemeMetric<CString> NO_BPM_TEXT;
BitmapText m_textBPM; BitmapText m_textBPM;
AutoActor m_sprLabel; AutoActor m_sprLabel;