diff --git a/stepmania/Themes/default/Graphics/CombinedLifeMeterTug separator.png b/stepmania/Themes/default/Graphics/CombinedLifeMeterTug separator.png new file mode 100644 index 0000000000..e7fe9e5090 Binary files /dev/null and b/stepmania/Themes/default/Graphics/CombinedLifeMeterTug separator.png differ diff --git a/stepmania/src/CombinedLifeMeterTug.cpp b/stepmania/src/CombinedLifeMeterTug.cpp index 73b1dc0ce8..b9eb6d0d5a 100644 --- a/stepmania/src/CombinedLifeMeterTug.cpp +++ b/stepmania/src/CombinedLifeMeterTug.cpp @@ -33,6 +33,9 @@ CombinedLifeMeterTug::CombinedLifeMeterTug() } m_Stream[PLAYER_2].SetZoomX( -1 ); + m_sprSeparator.Load( THEME->GetPathToG(ssprintf("CombinedLifeMeterTug separator")) ); + this->AddChild( &m_sprSeparator ); + m_sprFrame.Load( THEME->GetPathToG(ssprintf("CombinedLifeMeterTug frame")) ); this->AddChild( &m_sprFrame ); @@ -53,6 +56,10 @@ void CombinedLifeMeterTug::Update( float fDelta ) m_Stream[PLAYER_1].SetPercent( GAMESTATE->m_fTugLifePercentP1 ); m_Stream[PLAYER_2].SetPercent( 1-GAMESTATE->m_fTugLifePercentP1 ); + float fSeparatorX = SCALE( GAMESTATE->m_fTugLifePercentP1, 0.f, 1.f, -METER_WIDTH/2.f, +METER_WIDTH/2.f ); + + m_sprSeparator.SetX( fSeparatorX ); + ActorFrame::Update( fDelta ); } diff --git a/stepmania/src/CombinedLifeMeterTug.h b/stepmania/src/CombinedLifeMeterTug.h index 6d54d05287..c41dc100b4 100644 --- a/stepmania/src/CombinedLifeMeterTug.h +++ b/stepmania/src/CombinedLifeMeterTug.h @@ -34,7 +34,8 @@ public: protected: MeterDisplay m_Stream[NUM_PLAYERS]; - Sprite m_sprFrame; + Sprite m_sprSeparator; + Sprite m_sprFrame; CharacterHead m_Head[NUM_PLAYERS]; }; diff --git a/stepmania/src/ScoreDisplayRave.cpp b/stepmania/src/ScoreDisplayRave.cpp index 24adc7e483..b0c3d3c3ac 100644 --- a/stepmania/src/ScoreDisplayRave.cpp +++ b/stepmania/src/ScoreDisplayRave.cpp @@ -37,11 +37,12 @@ ScoreDisplayRave::ScoreDisplayRave() this->AddChild( &m_sprMeter[i] ); } + this->AddChild( &m_sprFrameOverlay ); + m_textLevel.LoadFromNumbers( THEME->GetPathToN("ScoreDisplayRave level") ); m_textLevel.SetText( "1" ); + m_textLevel.SetShadowLength( 0 ); this->AddChild( &m_textLevel ); - - this->AddChild( &m_sprFrameOverlay ); } void ScoreDisplayRave::Init( PlayerNumber pn )