Another TODO done. Sorry, ??? != xxx.

This commit is contained in:
Jason Felds
2011-01-15 15:36:07 -05:00
parent 4e4d91aba7
commit 56d1f3cc04
3 changed files with 4 additions and 4 deletions
+1
View File
@@ -185,6 +185,7 @@ RandomCycleSpeed=0.1
Separator="-" Separator="-"
# ??? when it cycles. # ??? when it cycles.
ShowQMarksInRandomCycle=true ShowQMarksInRandomCycle=true
QuestionMarksTest="???"
RandomText="!!!" RandomText="!!!"
# xxx: localize me -aj # xxx: localize me -aj
VariousText="000" VariousText="000"
+2 -4
View File
@@ -35,7 +35,7 @@ void BPMDisplay::Load()
SEPARATOR.Load( m_sName, "Separator" ); SEPARATOR.Load( m_sName, "Separator" );
SHOW_QMARKS.Load( m_sName, "ShowQMarksInRandomCycle" ); SHOW_QMARKS.Load( m_sName, "ShowQMarksInRandomCycle" );
NO_BPM_TEXT.Load( m_sName, "NoBpmText" ); NO_BPM_TEXT.Load( m_sName, "NoBpmText" );
//QUESTIONMARKS_TEXT.Load( m_sName, "QuestionMarksText" ); QUESTIONMARKS_TEXT.Load( m_sName, "QuestionMarksText" );
RANDOM_TEXT.Load( m_sName, "RandomText" ); RANDOM_TEXT.Load( m_sName, "RandomText" );
VARIOUS_TEXT.Load( m_sName, "VariousText" ); VARIOUS_TEXT.Load( m_sName, "VariousText" );
@@ -75,10 +75,8 @@ void BPMDisplay::Update( float fDeltaTime )
if(m_fBPMTo == -1) if(m_fBPMTo == -1)
{ {
m_fBPMFrom = -1; m_fBPMFrom = -1;
// todo: allow themer to customize "xxx" string -aj
if( (bool)SHOW_QMARKS ) if( (bool)SHOW_QMARKS )
SetText( (RandomFloat(0,1)>0.90f) ? RString("xxx") : ssprintf("%03.0f",RandomFloat(0,999)) ); SetText( (RandomFloat(0,1)>0.90f) ? (RString)QUESTIONMARKS_TEXT : ssprintf("%03.0f",RandomFloat(0,999)) );
else else
SetText( ssprintf("%03.0f",RandomFloat(0,999)) ); SetText( ssprintf("%03.0f",RandomFloat(0,999)) );
} }
+1
View File
@@ -47,6 +47,7 @@ protected:
ThemeMetric<RString> NO_BPM_TEXT; ThemeMetric<RString> NO_BPM_TEXT;
ThemeMetric<RString> VARIOUS_TEXT; ThemeMetric<RString> VARIOUS_TEXT;
ThemeMetric<RString> RANDOM_TEXT; ThemeMetric<RString> RANDOM_TEXT;
ThemeMetric<RString> QUESTIONMARKS_TEXT;
float m_fBPMFrom, m_fBPMTo; float m_fBPMFrom, m_fBPMTo;
int m_iCurrentBPM; int m_iCurrentBPM;