diff --git a/stepmania/src/FootMeter.cpp b/stepmania/src/FootMeter.cpp deleted file mode 100644 index 65594cf1dd..0000000000 --- a/stepmania/src/FootMeter.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "stdafx.h" -/* ------------------------------------------------------------------------------ - File: FootMeter.h - - Desc: The song's foot difficulty displayed in SelectSteps. - - Copyright (c) 2001 Chris Danford. All rights reserved. ------------------------------------------------------------------------------ -*/ - - -#include "RageUtil.h" - -#include "FootMeter.h" - - - diff --git a/stepmania/src/FootMeter.h b/stepmania/src/FootMeter.h deleted file mode 100644 index 4b35c2de20..0000000000 --- a/stepmania/src/FootMeter.h +++ /dev/null @@ -1,60 +0,0 @@ -/* ------------------------------------------------------------------------------ - File: FootMeter.h - - Desc: The song's foot difficulty displayed in SelectSteps. - - Copyright (c) 2001 Chris Danford. All rights reserved. ------------------------------------------------------------------------------ -*/ - -#ifndef _FootBar_H_ -#define _FootBar_H_ - - -#include "Sprite.h" -#include "BitmapText.h" - - -const int MAX_NUM_FEET = 9; - - -class FootMeter : public Sprite -{ -public: - - void SetNumFeet( int iNumFeet ) - { - m_iNumFeet = iNumFeet; - } - - void Draw() - { - float fCenterX = GetX(); - float fCenterY = GetY(); - float fWidth = GetZoomedWidth() * 0.8f; - D3DXCOLOR color = GetColor(); - - for( int i=0; i 0 ); - m_textScoreNum.SetText( ssprintf( "%9.0f", m_fScore ) ); + m_ScoreNumber.SetSequence( ssprintf( "%9.0f", m_fScore ) ); } \ No newline at end of file diff --git a/stepmania/src/Player.h b/stepmania/src/Player.h index 27d1555824..4c5b4f5c3a 100644 --- a/stepmania/src/Player.h +++ b/stepmania/src/Player.h @@ -15,7 +15,7 @@ #include "GameInfo.h" // for ScoreSummary #include "Steps.h" #include "Sprite.h" -#include "BitmapText.h" +#include "SpriteSequence.h" const int MAX_NUM_COLUMNS = 8; @@ -94,7 +94,7 @@ protected: void SetCombo( int iNum ); BOOL m_bComboVisible; Sprite m_sprCombo; - BitmapText m_textComboNum; + SpriteSequence m_ComboNumber; // life meter void SetLifeMeterX( int iX ); @@ -115,7 +115,7 @@ private: void ChangeScore( StepScore stepscore, int iCurCombo ); float m_fScore; Sprite m_sprScoreFrame; - BitmapText m_textScoreNum; + SpriteSequence m_ScoreNumber; }; diff --git a/stepmania/src/Sprite.h b/stepmania/src/Sprite.h index e06b84d1e6..40b667d15c 100644 --- a/stepmania/src/Sprite.h +++ b/stepmania/src/Sprite.h @@ -63,8 +63,8 @@ public: D3DXCOLOR Color = D3DXCOLOR(0,0,0,1), D3DXCOLOR Color2 = D3DXCOLOR(1,1,1,1) ); void SetEffectGlowing( FLOAT fDeltaPercentPerSecond = 2.5, - D3DXCOLOR Color = D3DXCOLOR(0.4f,0.4f,0.4f,0), - D3DXCOLOR Color2 = D3DXCOLOR(1.0f,1.0f,1.0f,0) ); + D3DXCOLOR Color = D3DXCOLOR(0.2f,0.2f,0.2f,0), + D3DXCOLOR Color2 = D3DXCOLOR(0.8f,0.8f,0.8f,0) ); void SetEffectWagging( FLOAT fWagRadians = 0.2, FLOAT fWagPeriod = 2.0 ); void SetEffectSpinning( FLOAT fRadsPerSpeed = 2.0 ); diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp index d77ba5832f..923bbf20bb 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -308,14 +308,6 @@ SOURCE=.\BlurredTitle.h # End Source File # Begin Source File -SOURCE=.\FootMeter.cpp -# End Source File -# Begin Source File - -SOURCE=.\FootMeter.h -# End Source File -# Begin Source File - SOURCE=.\GameInfo.cpp # End Source File # Begin Source File @@ -368,6 +360,14 @@ SOURCE=.\Sprite.h # End Source File # Begin Source File +SOURCE=.\SpriteSequence.cpp +# End Source File +# Begin Source File + +SOURCE=.\SpriteSequence.h +# End Source File +# Begin Source File + SOURCE=.\Steps.cpp # End Source File # Begin Source File