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

Cleanup; start aligning this with BeginnerHelper so we can merge some

Browse Source 
duplicate code.
This commit is contained in:
Glenn Maynard
2003-09-12 00:30:18 +00:00
parent f49b417b49
commit 0a17f01401
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenHowToPlay.cpp
+5 -11
View File
@@ -151,7 +151,7 @@ ScreenHowToPlay::~ScreenHowToPlay()
delete m_pPlayer; delete m_pPlayer;
} }
void ScreenHowToPlay::Step( float fDelta ) void ScreenHowToPlay::Step()
{ {
#define ST_LEFT 0x08 #define ST_LEFT 0x08
#define ST_DOWN 0x04 #define ST_DOWN 0x04
@@ -160,13 +160,11 @@ void ScreenHowToPlay::Step( float fDelta )
#define ST_JUMPLR (ST_LEFT | ST_RIGHT) #define ST_JUMPLR (ST_LEFT | ST_RIGHT)
#define ST_JUMPUD (ST_UP | ST_DOWN) #define ST_JUMPUD (ST_UP | ST_DOWN)
float rate = 1; //GAMESTATE->m_fCurBPS;
int iStep = 0; int iStep = 0;
int iNoteRow = BeatToNoteRowNotRounded( GAMESTATE->m_fSongBeat + 0.6f ); int iNoteRow = BeatToNoteRowNotRounded( GAMESTATE->m_fSongBeat + 0.6f );
int iNumTracks = m_NoteData.GetNumTracks(); int iNumTracks = m_NoteData.GetNumTracks();
// if we want to miss from here on out, don't process steps. // if we want to miss from here on out, don't process steps.
if((m_iPerfects < m_iNumPerfects) && (m_NoteData.IsThereATapAtRow( iNoteRow ))) if( m_iPerfects < m_iNumPerfects && m_NoteData.IsThereATapAtRow( iNoteRow ) )
{ {
for( int k=0; k<iNumTracks; k++ ) for( int k=0; k<iNumTracks; k++ )
if( m_NoteData.GetTapNote(k, iNoteRow ) == TAP_TAP ) if( m_NoteData.GetTapNote(k, iNoteRow ) == TAP_TAP )
@@ -192,12 +190,6 @@ void ScreenHowToPlay::Step( float fDelta )
break; break;
} }
} }
// if we want to freeze, freeze.
if( GAMESTATE->m_bFreeze )
rate = 0;
m_pmCharacter->Update( fDelta * rate );
} }
void ScreenHowToPlay::Update( float fDelta ) void ScreenHowToPlay::Update( float fDelta )
@@ -230,7 +222,9 @@ void ScreenHowToPlay::Update( float fDelta )
if ( m_pmCharacter ) if ( m_pmCharacter )
{ {
Step( fDelta ); Step();
if( !GAMESTATE->m_bFreeze )
m_pmCharacter->Update( fDelta );
} }
} }
stepmania/src/ScreenHowToPlay.h
+1 -1
View File
@@ -27,7 +27,7 @@ public:
virtual void DrawPrimitives(); virtual void DrawPrimitives();
protected: protected:
virtual void Step( float fDelta ); virtual void Step();
LifeMeterBar* m_pLifeMeterBar; LifeMeterBar* m_pLifeMeterBar;
BGAnimation m_Overlay; BGAnimation m_Overlay;
Player* m_pPlayer; Player* m_pPlayer;