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

simplify (twice)

Browse Source
This commit is contained in:
Glenn Maynard
2003-09-12 00:39:40 +00:00
parent 0a17f01401
commit 077c5174f3
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BeginnerHelper.cpp
+6 -6
View File
@@ -24,10 +24,10 @@
#define HELPER_X THEME->GetMetricF("BeginnerHelper","HelperX") #define HELPER_X THEME->GetMetricF("BeginnerHelper","HelperX")
#define HELPER_Y THEME->GetMetricF("BeginnerHelper","HelperY") #define HELPER_Y THEME->GetMetricF("BeginnerHelper","HelperY")
#define ST_LEFT 0x08 #define ST_LEFT 0x01
#define ST_DOWN 0x04 #define ST_DOWN 0x02
#define ST_UP 0x02 #define ST_UP 0x04
#define ST_RIGHT 0x01 #define ST_RIGHT 0x08
#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)
@@ -298,10 +298,10 @@ void BeginnerHelper::Update( float fDeltaTime )
if((m_NoteData[pn].IsThereATapAtRow( iRow ))) if((m_NoteData[pn].IsThereATapAtRow( iRow )))
{ {
int iStep = 0; int iStep = 0;
int iNumTracks = m_NoteData[pn].GetNumTracks(); const int iNumTracks = m_NoteData[pn].GetNumTracks();
for( int k=0; k<iNumTracks; k++ ) for( int k=0; k<iNumTracks; k++ )
if( m_NoteData[pn].GetTapNote(k, iRow ) == TAP_TAP ) if( m_NoteData[pn].GetTapNote(k, iRow ) == TAP_TAP )
iStep += 1 << ( iNumTracks - (k + 1)); iStep |= 1 << k;
Step( pn, iStep ); Step( pn, iStep );
} }
} }
stepmania/src/ScreenHowToPlay.cpp
+7 -7
View File
@@ -153,22 +153,22 @@ ScreenHowToPlay::~ScreenHowToPlay()
void ScreenHowToPlay::Step() void ScreenHowToPlay::Step()
{ {
#define ST_LEFT 0x08 #define ST_LEFT 0x01
#define ST_DOWN 0x04 #define ST_DOWN 0x02
#define ST_UP 0x02 #define ST_UP 0x04
#define ST_RIGHT 0x01 #define ST_RIGHT 0x08
#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)
int iStep = 0; int iStep = 0;
int iNoteRow = BeatToNoteRowNotRounded( GAMESTATE->m_fSongBeat + 0.6f ); const int iNoteRow = BeatToNoteRowNotRounded( GAMESTATE->m_fSongBeat + 0.6f );
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 ) )
{ {
const int iNumTracks = m_NoteData.GetNumTracks();
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 )
iStep += 1 << (iNumTracks - (k + 1)); iStep |= 1 << k;
switch( iStep ) switch( iStep )
{ {