change elements to have format "<name> <piece>"
This commit is contained in:
@@ -31,7 +31,7 @@ ThemeMetric<bool> SHOW_MISS_COMBO ("Combo","ShowMissCombo");
|
|||||||
|
|
||||||
Combo::Combo()
|
Combo::Combo()
|
||||||
{
|
{
|
||||||
m_sprComboLabel.Load( THEME->GetPathToG( "Combo label") );
|
m_sprComboLabel.Load( THEME->GetPathG("Combo","label") );
|
||||||
m_sprComboLabel.SetShadowLength( 4 );
|
m_sprComboLabel.SetShadowLength( 4 );
|
||||||
m_sprComboLabel.StopAnimating();
|
m_sprComboLabel.StopAnimating();
|
||||||
m_sprComboLabel.SetXY( LABEL_X, LABEL_Y );
|
m_sprComboLabel.SetXY( LABEL_X, LABEL_Y );
|
||||||
@@ -40,7 +40,7 @@ Combo::Combo()
|
|||||||
m_sprComboLabel.SetHidden( true );
|
m_sprComboLabel.SetHidden( true );
|
||||||
this->AddChild( &m_sprComboLabel );
|
this->AddChild( &m_sprComboLabel );
|
||||||
|
|
||||||
m_sprMissesLabel.Load( THEME->GetPathToG( "Combo misses") );
|
m_sprMissesLabel.Load( THEME->GetPathG("Combo","misses") );
|
||||||
m_sprMissesLabel.SetShadowLength( 4 );
|
m_sprMissesLabel.SetShadowLength( 4 );
|
||||||
m_sprMissesLabel.StopAnimating();
|
m_sprMissesLabel.StopAnimating();
|
||||||
m_sprMissesLabel.SetXY( LABEL_X, LABEL_Y );
|
m_sprMissesLabel.SetXY( LABEL_X, LABEL_Y );
|
||||||
@@ -49,7 +49,7 @@ Combo::Combo()
|
|||||||
m_sprMissesLabel.SetHidden( true );
|
m_sprMissesLabel.SetHidden( true );
|
||||||
this->AddChild( &m_sprMissesLabel );
|
this->AddChild( &m_sprMissesLabel );
|
||||||
|
|
||||||
m_textNumber.LoadFromFont( THEME->GetPathToF("Combo") );
|
m_textNumber.LoadFromFont( THEME->GetPathF("Combo","numbers") );
|
||||||
m_textNumber.SetShadowLength( 4 );
|
m_textNumber.SetShadowLength( 4 );
|
||||||
m_textNumber.SetXY( NUMBER_X, NUMBER_Y );
|
m_textNumber.SetXY( NUMBER_X, NUMBER_Y );
|
||||||
m_textNumber.SetHorizAlign( (Actor::HorizAlign)(int)NUMBER_HORIZ_ALIGN );
|
m_textNumber.SetHorizAlign( (Actor::HorizAlign)(int)NUMBER_HORIZ_ALIGN );
|
||||||
|
|||||||
@@ -17,11 +17,11 @@ ScoreDisplayNormal::ScoreDisplayNormal()
|
|||||||
{
|
{
|
||||||
LOG->Trace( "ScoreDisplayNormal::ScoreDisplayNormal()" );
|
LOG->Trace( "ScoreDisplayNormal::ScoreDisplayNormal()" );
|
||||||
|
|
||||||
m_sprFrame.Load( THEME->GetPathToG("ScoreDisplayNormal frame") );
|
m_sprFrame.Load( THEME->GetPathG("ScoreDisplayNormal","frame") );
|
||||||
this->AddChild( &m_sprFrame );
|
this->AddChild( &m_sprFrame );
|
||||||
|
|
||||||
// init the text
|
// init the text
|
||||||
m_text.LoadFromFont( THEME->GetPathToF("ScoreDisplayNormal") );
|
m_text.LoadFromFont( THEME->GetPathF("ScoreDisplayNormal","numbers") );
|
||||||
m_text.SetShadowLength( 0 );
|
m_text.SetShadowLength( 0 );
|
||||||
|
|
||||||
m_iScore = 0;
|
m_iScore = 0;
|
||||||
|
|||||||
@@ -14,11 +14,11 @@ ScoreDisplayOni::ScoreDisplayOni()
|
|||||||
{
|
{
|
||||||
LOG->Trace( "ScoreDisplayOni::ScoreDisplayOni()" );
|
LOG->Trace( "ScoreDisplayOni::ScoreDisplayOni()" );
|
||||||
|
|
||||||
m_sprFrame.Load( THEME->GetPathToG("ScoreDisplayOni frame") );
|
m_sprFrame.Load( THEME->GetPathG("ScoreDisplayOni","frame") );
|
||||||
this->AddChild( &m_sprFrame );
|
this->AddChild( &m_sprFrame );
|
||||||
|
|
||||||
// init the text
|
// init the text
|
||||||
m_text.LoadFromFont( THEME->GetPathToF("ScoreDisplayOni") );
|
m_text.LoadFromFont( THEME->GetPathF("ScoreDisplayOni","numbers") );
|
||||||
m_text.SetShadowLength( 0 );
|
m_text.SetShadowLength( 0 );
|
||||||
this->AddChild( &m_text );
|
this->AddChild( &m_text );
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user