From 1b3c786213c1a3a5ec5a4b29d4d8f03fe87849ef Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 24 Oct 2004 10:20:24 +0000 Subject: [PATCH] cleanup: variable name and const --- stepmania/src/NoteData.cpp | 149 +++++--- stepmania/src/NoteData.h | 36 +- stepmania/src/NoteDataUtil.cpp | 510 +++++++++++++------------- stepmania/src/NoteDataUtil.h | 70 ++-- stepmania/src/NoteDataWithScoring.cpp | 4 +- stepmania/src/NoteTypes.h | 16 +- stepmania/src/ScreenGameplay.cpp | 7 +- 7 files changed, 412 insertions(+), 380 deletions(-) diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp index 717221dcd1..9b8a7fb5c7 100644 --- a/stepmania/src/NoteData.cpp +++ b/stepmania/src/NoteData.cpp @@ -50,8 +50,8 @@ void NoteData::ClearRange( int rowBegin, int rowEnd ) this->ConvertHoldNotesTo4s(); for( int t=0; tConvert4sToHoldNotes(); } @@ -65,7 +65,7 @@ void NoteData::ClearAll() /* Copy a range from pFrom to this. (Note that this does *not* overlay; * all data in the range is overwritten.) */ -void NoteData::CopyRange( const NoteData& from, int iFromIndexBegin, int iFromIndexEnd, int iToIndexBegin ) +void NoteData::CopyRange( const NoteData& from, int rowFromBegin, int rowFromEnd, int rowToBegin ) { ASSERT( from.GetNumTracks() == GetNumTracks() ); @@ -77,10 +77,10 @@ void NoteData::CopyRange( const NoteData& from, int iFromIndexBegin, int iFromIn for( int t=0; t& addTo ) const +void NoteData::GetTapNonEmptyTracks( int row, set& addTo ) const { for( int t=0; t=0; t-- ) + { + if( GetTapNoteX( t, row ).type == TapNote::empty ) + { + iEmptyTrackOut = t; + return true; + } + } + return false; +} + +int NoteData::GetNumTracksWithTap( int row ) const { int iNum = 0; for( int t=0; t= MinTaps ) + if( iNumNotesThisIndex >= iMinTaps ) iNum++; } @@ -519,15 +550,15 @@ void NoteData::Convert2sAnd3sToHoldNotes() for( int t=0; t=0 && track& addTo ) const; - int GetFirstNonEmptyTrack( int index ) const; - int GetNumTracksWithTap( int index ) const; - int GetNumTracksWithTapOrHoldHead( int index ) const; - int GetFirstTrackWithTap( int index ) const; - int GetFirstTrackWithTapOrHoldHead( int index ) const; + bool IsRowEmpty( int row ) const; + bool IsRangeEmpty( int track, int rowBegin, int rowEnd ) const; + int GetNumTapNonEmptyTracks( int row ) const; + void GetTapNonEmptyTracks( int row, set& addTo ) const; + bool GetTapFirstNonEmptyTrack( int row, int &iNonEmptyTrackOut ) const; // return false if no non-empty tracks at row + bool GetTapFirstEmptyTrack( int row, int &iEmptyTrackOut ) const; // return false if no non-empty tracks at row + bool GetTapLastEmptyTrack( int row, int &iEmptyTrackOut ) const; // return false if no empty tracks at row + int GetNumTracksWithTap( int row ) const; + int GetNumTracksWithTapOrHoldHead( int row ) const; + int GetFirstTrackWithTap( int row ) const; + int GetFirstTrackWithTapOrHoldHead( int row ) const; - inline bool IsThereATapAtRow( int index ) const + inline bool IsThereATapAtRow( int row ) const { - return GetFirstTrackWithTap( index ) != -1; + return GetFirstTrackWithTap( row ) != -1; } - inline bool IsThereATapOrHoldHeadAtRow( int index ) const + inline bool IsThereATapOrHoldHeadAtRow( int row ) const { - return GetFirstTrackWithTapOrHoldHead( index ) != -1; + return GetFirstTrackWithTapOrHoldHead( row ) != -1; } void GetTracksHeldAtRow( int row, set& addTo ); int GetNumTracksHeldAtRow( int row ); diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp index d881f99335..14dafb23e0 100644 --- a/stepmania/src/NoteDataUtil.cpp +++ b/stepmania/src/NoteDataUtil.cpp @@ -99,15 +99,15 @@ void NoteDataUtil::LoadFromSMNoteDataString( NoteData &out, CString sSMNoteData char ch = *p; switch( ch ) { - case '0': tn = TAP_EMPTY; break; - case '1': tn = TAP_ORIGINAL_TAP; break; - case '2': tn = TAP_ORIGINAL_HOLD_HEAD; break; - case '3': tn = TAP_ORIGINAL_HOLD_TAIL; break; + case '0': tn = TAP_EMPTY; break; + case '1': tn = TAP_ORIGINAL_TAP; break; + case '2': tn = TAP_ORIGINAL_HOLD_HEAD; break; + case '3': tn = TAP_ORIGINAL_HOLD_TAIL; break; // case 'm': // Don't be loose with the definition. Use only 'M' since // that's what we've been writing to disk. -Chris - case 'M': tn = TAP_ORIGINAL_MINE; break; - case 'A': tn = TAP_ORIGINAL_ATTACK; break; + case 'M': tn = TAP_ORIGINAL_MINE; break; + case 'A': tn = TAP_ORIGINAL_ATTACK; break; default: /* Invalid data. We don't want to assert, since there might * simply be invalid data in an .SM, and we don't want to die @@ -215,7 +215,7 @@ void NoteDataUtil::GetSMNoteDataString( const NoteData &in_, CString ¬es_out { for( int t=0; t=0; i-- ) - if( fmodf(in.GetHoldNote(i).GetStartBeat(),1) != 0 ) // doesn't start on a beat - in.RemoveHoldNote( i ); + for( int i=inout.GetNumHoldNotes()-1; i>=0; i-- ) + if( fmodf(inout.GetHoldNote(i).GetStartBeat(),1) != 0 ) // doesn't start on a beat + inout.RemoveHoldNote( i ); } -void NoteDataUtil::Wide( NoteData &in, float fStartBeat, float fEndBeat ) +void NoteDataUtil::Wide( NoteData &inout, float fStartBeat, float fEndBeat ) { // Make all all quarter notes into jumps. - in.ConvertHoldNotesTo4s(); + inout.ConvertHoldNotesTo4s(); /* Start on an even beat. */ fStartBeat = froundf( fStartBeat, 2 ); const int first_row = BeatToNoteRow( fStartBeat ); - const int last_row = min( BeatToNoteRow(fEndBeat), in.GetLastRow() ); + const int last_row = min( BeatToNoteRow(fEndBeat), inout.GetLastRow() ); for( int i=first_row; i 0 ) + if( j!=i && inout.GetNumTapNonEmptyTracks(j) > 0 ) { bSpaceAroundIsEmpty = false; break; @@ -888,51 +887,51 @@ void NoteDataUtil::Wide( NoteData &in, float fStartBeat, float fEndBeat ) // add a note determinitsitcally int iBeat = (int)roundf( NoteRowToBeat(i) ); - int iTrackOfNote = in.GetFirstTrackWithTap(i); + int iTrackOfNote = inout.GetFirstTrackWithTap(i); int iTrackToAdd = iTrackOfNote + (iBeat%5)-2; // won't be more than 2 tracks away from the existing note - CLAMP( iTrackToAdd, 0, in.GetNumTracks()-1 ); + CLAMP( iTrackToAdd, 0, inout.GetNumTracks()-1 ); if( iTrackToAdd == iTrackOfNote ) iTrackToAdd++; - CLAMP( iTrackToAdd, 0, in.GetNumTracks()-1 ); + CLAMP( iTrackToAdd, 0, inout.GetNumTracks()-1 ); if( iTrackToAdd == iTrackOfNote ) iTrackToAdd--; - CLAMP( iTrackToAdd, 0, in.GetNumTracks()-1 ); + CLAMP( iTrackToAdd, 0, inout.GetNumTracks()-1 ); - if( in.GetTapNote(iTrackToAdd, i).type != TapNote::empty ) + if( inout.GetTapNote(iTrackToAdd, i).type != TapNote::empty ) { - iTrackToAdd = (iTrackToAdd+1) % in.GetNumTracks(); + iTrackToAdd = (iTrackToAdd+1) % inout.GetNumTracks(); } - in.SetTapNote(iTrackToAdd, i, TAP_ADDITION_TAP); + inout.SetTapNote(iTrackToAdd, i, TAP_ADDITION_TAP); } - in.Convert4sToHoldNotes(); + inout.Convert4sToHoldNotes(); } -void NoteDataUtil::Big( NoteData &in, float fStartBeat, float fEndBeat ) +void NoteDataUtil::Big( NoteData &inout, float fStartBeat, float fEndBeat ) { - InsertIntelligentTaps(in,1.0f,0.5f,1.0f,false,fStartBeat,fEndBeat); // add 8ths between 4ths + InsertIntelligentTaps(inout,1.0f,0.5f,1.0f,false,fStartBeat,fEndBeat); // add 8ths between 4ths } -void NoteDataUtil::Quick( NoteData &in, float fStartBeat, float fEndBeat ) +void NoteDataUtil::Quick( NoteData &inout, float fStartBeat, float fEndBeat ) { - InsertIntelligentTaps(in,0.5f,0.25f,1.0f,false,fStartBeat,fEndBeat); // add 16ths between 8ths + InsertIntelligentTaps(inout,0.5f,0.25f,1.0f,false,fStartBeat,fEndBeat); // add 16ths between 8ths } // Due to popular request by people annoyed with the "new" implementation of Quick, we now have // this BMR-izer for your steps. Use with caution. -void NoteDataUtil::BMRize( NoteData &in, float fStartBeat, float fEndBeat ) +void NoteDataUtil::BMRize( NoteData &inout, float fStartBeat, float fEndBeat ) { - Big( in, fStartBeat, fEndBeat ); - Quick( in, fStartBeat, fEndBeat ); + Big( inout, fStartBeat, fEndBeat ); + Quick( inout, fStartBeat, fEndBeat ); } -void NoteDataUtil::Skippy( NoteData &in, float fStartBeat, float fEndBeat ) +void NoteDataUtil::Skippy( NoteData &inout, float fStartBeat, float fEndBeat ) { - InsertIntelligentTaps(in,1.0f,0.75f,1.0f,true,fStartBeat,fEndBeat); // add 16ths between 4ths + InsertIntelligentTaps(inout,1.0f,0.75f,1.0f,true,fStartBeat,fEndBeat); // add 16ths between 4ths } void NoteDataUtil::InsertIntelligentTaps( - NoteData &in, + NoteData &inout, float fWindowSizeBeats, float fInsertOffsetBeats, float fWindowStrideBeats, @@ -942,7 +941,7 @@ void NoteDataUtil::InsertIntelligentTaps( { ASSERT( fInsertOffsetBeats <= fWindowSizeBeats ); ASSERT( fWindowSizeBeats <= fWindowStrideBeats ); - in.ConvertHoldNotesTo4s(); + inout.ConvertHoldNotesTo4s(); bool bRequireNoteAtBeginningOfWindow = !bSkippy; bool bRequireNoteAtEndOfWindow = true; @@ -952,7 +951,7 @@ void NoteDataUtil::InsertIntelligentTaps( // Insert a beat in the middle of every fBeatInterval. const int first_row = BeatToNoteRow( fStartBeat ); - const int last_row = min( BeatToNoteRow(fEndBeat), in.GetLastRow() ); + const int last_row = min( BeatToNoteRow(fEndBeat), inout.GetLastRow() ); const int rows_per_window = BeatToNoteRow( fWindowSizeBeats ); const int rows_per_stride = BeatToNoteRow( fWindowStrideBeats ); @@ -967,17 +966,17 @@ void NoteDataUtil::InsertIntelligentTaps( // as different from taps doesn't feel right, and because we need to check // against TAP_ADDITION with the BMRize mod. if( bRequireNoteAtBeginningOfWindow ) - if( in.GetNumTapNonEmptyTracks(iRowEarlier)!=1 || in.GetNumTracksWithTapOrHoldHead(iRowEarlier)!=1 ) + if( inout.GetNumTapNonEmptyTracks(iRowEarlier)!=1 || inout.GetNumTracksWithTapOrHoldHead(iRowEarlier)!=1 ) continue; if( bRequireNoteAtEndOfWindow ) - if( in.GetNumTapNonEmptyTracks(iRowLater)!=1 || in.GetNumTracksWithTapOrHoldHead(iRowLater)!=1 ) + if( inout.GetNumTapNonEmptyTracks(iRowLater)!=1 || inout.GetNumTracksWithTapOrHoldHead(iRowLater)!=1 ) continue; // there is a 4th and 8th note surrounding iRowBetween // don't insert a new note if there's already one within this interval bool bNoteInMiddle = false; for( int j=iRowEarlier+1; j<=iRowLater-1; j++ ) - if( !in.IsRowEmpty(j) ) + if( !inout.IsRowEmpty(j) ) { bNoteInMiddle = true; break; @@ -986,13 +985,15 @@ void NoteDataUtil::InsertIntelligentTaps( continue; // add a note determinitsitcally somewhere on a track different from the two surrounding notes - int iTrackOfNoteEarlier = in.GetFirstNonEmptyTrack(iRowEarlier); - int iTrackOfNoteLater = in.GetFirstNonEmptyTrack(iRowLater); + int iTrackOfNoteEarlier = -1; + bool bEarlierHasNonEmptyTrack = inout.GetTapFirstNonEmptyTrack( iRowEarlier, iTrackOfNoteEarlier ); + int iTrackOfNoteLater = -1; + bool bLaterHasNonEmptyTrack = inout.GetTapFirstNonEmptyTrack( iRowLater, iTrackOfNoteLater ); int iTrackOfNoteToAdd = 0; if( bSkippy && iTrackOfNoteEarlier != iTrackOfNoteLater ) // Don't make skips on the same note { - if( iTrackOfNoteEarlier != -1 ) + if( bEarlierHasNonEmptyTrack ) { iTrackOfNoteToAdd = iTrackOfNoteEarlier; goto done_looking_for_track_to_add; @@ -1014,23 +1015,23 @@ void NoteDataUtil::InsertIntelligentTaps( } // try to choose a track just to the right - if( max(iTrackOfNoteEarlier,iTrackOfNoteLater)+1 < in.GetNumTracks() ) + if( max(iTrackOfNoteEarlier,iTrackOfNoteLater)+1 < inout.GetNumTracks() ) { iTrackOfNoteToAdd = max(iTrackOfNoteEarlier,iTrackOfNoteLater)+1; goto done_looking_for_track_to_add; } done_looking_for_track_to_add: - in.SetTapNote(iTrackOfNoteToAdd, iRowToAdd, TAP_ADDITION_TAP); + inout.SetTapNote(iTrackOfNoteToAdd, iRowToAdd, TAP_ADDITION_TAP); } - in.Convert4sToHoldNotes(); + inout.Convert4sToHoldNotes(); } -void NoteDataUtil::AddMines( NoteData &in, float fStartBeat, float fEndBeat ) +void NoteDataUtil::AddMines( NoteData &inout, float fStartBeat, float fEndBeat ) { const int first_row = BeatToNoteRow( fStartBeat ); - const int last_row = min( BeatToNoteRow(fEndBeat), in.GetLastRow() ); + const int last_row = min( BeatToNoteRow(fEndBeat), inout.GetLastRow() ); // // Change whole rows at a time to be tap notes. Otherwise, it causes @@ -1041,16 +1042,16 @@ void NoteDataUtil::AddMines( NoteData &in, float fStartBeat, float fEndBeat ) int iPlaceEveryRows = 6; for( int r=first_row; r<=last_row; r++ ) { - if( !in.IsRowEmpty(r) ) + if( !inout.IsRowEmpty(r) ) { iRowCount++; // place every 6 or 7 rows if( iRowCount>=iPlaceEveryRows ) { - for( int t=0; t viTracks; - in.GetTracksHeldAtRow( iRowEcho, viTracks ); + inout.GetTracksHeldAtRow( iRowEcho, viTracks ); // don't lay if holding 2 already if( viTracks.size() >= 2 ) @@ -1140,36 +1141,36 @@ void NoteDataUtil::Echo( NoteData &in, float fStartBeat, float fEndBeat ) continue; // don't lay } - in.SetTapNote( iEchoTrack, iRowEcho, TAP_ADDITION_TAP ); + inout.SetTapNote( iEchoTrack, iRowEcho, TAP_ADDITION_TAP ); } } -void NoteDataUtil::Planted( NoteData &in, float fStartBeat, float fEndBeat ) +void NoteDataUtil::Planted( NoteData &inout, float fStartBeat, float fEndBeat ) { - ConvertTapsToHolds( in, 1, fStartBeat, fEndBeat ); + ConvertTapsToHolds( inout, 1, fStartBeat, fEndBeat ); } -void NoteDataUtil::Floored( NoteData &in, float fStartBeat, float fEndBeat ) +void NoteDataUtil::Floored( NoteData &inout, float fStartBeat, float fEndBeat ) { - ConvertTapsToHolds( in, 2, fStartBeat, fEndBeat ); + ConvertTapsToHolds( inout, 2, fStartBeat, fEndBeat ); } -void NoteDataUtil::Twister( NoteData &in, float fStartBeat, float fEndBeat ) +void NoteDataUtil::Twister( NoteData &inout, float fStartBeat, float fEndBeat ) { - ConvertTapsToHolds( in, 3, fStartBeat, fEndBeat ); + ConvertTapsToHolds( inout, 3, fStartBeat, fEndBeat ); } -void NoteDataUtil::ConvertTapsToHolds( NoteData &in, int iSimultaneousHolds, float fStartBeat, float fEndBeat ) +void NoteDataUtil::ConvertTapsToHolds( NoteData &inout, int iSimultaneousHolds, float fStartBeat, float fEndBeat ) { // Convert all taps to freezes. const int first_row = BeatToNoteRow( fStartBeat ); - const int last_row = min( BeatToNoteRow(fEndBeat), in.GetLastRow() ); + const int last_row = min( BeatToNoteRow(fEndBeat), inout.GetLastRow() ); for( int r=first_row; r<=last_row; r++ ) { int iTrackAddedThisRow = 0; - for( int t=0; t iSimultaneousHolds ) break; - if( in.GetTapNote(t,r).type == TapNote::tap ) + if( inout.GetTapNote(t,r).type == TapNote::tap ) { // Find the ending row for this hold int iTapsLeft = iSimultaneousHolds; @@ -1178,17 +1179,17 @@ void NoteDataUtil::ConvertTapsToHolds( NoteData &in, int iSimultaneousHolds, flo for( ; r2<=last_row; r2++ ) { // quick test - if( in.IsRowEmpty(r2) ) + if( inout.IsRowEmpty(r2) ) continue; - // If there are two taps in a row on the same track, + // If there are two taps inout a row on the same track, // don't convert the earlier one to a hold. - if( in.GetTapNote(t,r2).type != TapNote::empty ) + if( inout.GetTapNote(t,r2).type != TapNote::empty ) goto dont_add_hold; set tracksDown; - in.GetTracksHeldAtRow( r2, tracksDown ); - in.GetTapNonEmptyTracks( r2, tracksDown ); + inout.GetTracksHeldAtRow( r2, tracksDown ); + inout.GetTapNonEmptyTracks( r2, tracksDown ); iTapsLeft -= tracksDown.size(); if( iTapsLeft == 0 ) break; // we found the ending row for this hold @@ -1198,12 +1199,12 @@ void NoteDataUtil::ConvertTapsToHolds( NoteData &in, int iSimultaneousHolds, flo float fStartBeat = NoteRowToBeat(r); float fEndBeat = NoteRowToBeat(r2); - // If the steps end in a tap, convert that tap + // If the steps end inout a tap, convert that tap // to a hold that lasts for at least one beat. if( r2==r+1 ) fEndBeat = fStartBeat+1; - in.AddHoldNote( HoldNote(t,BeatToNoteRow(fStartBeat),BeatToNoteRow(fEndBeat)) ); + inout.AddHoldNote( HoldNote(t,BeatToNoteRow(fStartBeat),BeatToNoteRow(fEndBeat)) ); iTrackAddedThisRow++; } dont_add_hold: @@ -1213,24 +1214,24 @@ dont_add_hold: } -void NoteDataUtil::Stomp( NoteData &in, StepsType st, float fStartBeat, float fEndBeat ) +void NoteDataUtil::Stomp( NoteData &inout, StepsType st, float fStartBeat, float fEndBeat ) { // Make all non jumps with ample space around them into jumps. const int first_row = BeatToNoteRow( fStartBeat ); - const int last_row = min( BeatToNoteRow(fEndBeat), in.GetLastRow() ); + const int last_row = min( BeatToNoteRow(fEndBeat), inout.GetLastRow() ); int iTrackMapping[MAX_NOTE_TRACKS]; - GetTrackMapping( st, stomp, in.GetNumTracks(), iTrackMapping ); + GetTrackMapping( st, stomp, inout.GetNumTracks(), iTrackMapping ); for( int r=first_row; r= 1 ) continue; int iOppositeTrack = iTrackMapping[t]; - in.SetTapNote( iOppositeTrack, r, TAP_ADDITION_TAP ); + inout.SetTapNote( iOppositeTrack, r, TAP_ADDITION_TAP ); } } } } -void NoteDataUtil::SnapToNearestNoteType( NoteData &in, NoteType nt1, NoteType nt2, float fBeginBeat, float fEndBeat ) +void NoteDataUtil::SnapToNearestNoteType( NoteData &inout, NoteType nt1, NoteType nt2, float fBeginBeat, float fEndBeat ) { // nt2 is optional and should be -1 if it is not used @@ -1294,7 +1295,7 @@ void NoteDataUtil::SnapToNearestNoteType( NoteData &in, NoteType nt1, NoteType n int rowBegin = BeatToNoteRow( fBeginBeat ); int rowEnd = BeatToNoteRow( fEndBeat ); - in.ConvertHoldNotesTo2sAnd3s(); + inout.ConvertHoldNotesTo2sAnd3s(); // iterate over all TapNotes in the interval and snap them for( int i=rowBegin; i<=rowEnd; i++ ) @@ -1308,172 +1309,172 @@ void NoteDataUtil::SnapToNearestNoteType( NoteData &in, NoteType nt1, NoteType n float fNewBeat = bNewBeat1IsCloser ? fNewBeat1 : fNewBeat2; int iNewIndex = BeatToNoteRow( fNewBeat ); - for( int c=0; c0; t-- ) // in.GetNumTracks()-1 times + for( int t=inout.GetNumTracks()-1; t>0; t-- ) // inout.GetNumTracks()-1 times { int iTrackEarlier = t; - int iTrackLater = (t+1) % in.GetNumTracks(); + int iTrackLater = (t+1) % inout.GetNumTracks(); // swap - TapNote tnEarlier = in.GetTapNote(iTrackEarlier, r); - TapNote tnLater = in.GetTapNote(iTrackLater, r); - in.SetTapNote(iTrackEarlier, r, tnLater); - in.SetTapNote(iTrackLater, r, tnEarlier); + TapNote tnEarlier = inout.GetTapNote(iTrackEarlier, r); + TapNote tnLater = inout.GetTapNote(iTrackLater, r); + inout.SetTapNote(iTrackEarlier, r, tnLater); + inout.SetTapNote(iTrackLater, r, tnEarlier); } } - in.Convert4sToHoldNotes(); + inout.Convert4sToHoldNotes(); } @@ -1492,7 +1493,7 @@ const ValidRow g_ValidRows[] = { STEPS_TYPE_DANCE_DOUBLE, { f,f,f,f,T,T,T,T } }, }; -void NoteDataUtil::FixImpossibleRows( NoteData &in, StepsType st ) +void NoteDataUtil::FixImpossibleRows( NoteData &inout, StepsType st ) { vector vpValidRowsToCheck; for( unsigned i=0; i= tns ) + if( GetTapNoteScore(t, r) >= tns ) iNumSuccessfulTapNotes++; } } diff --git a/stepmania/src/NoteTypes.h b/stepmania/src/NoteTypes.h index 76a03735a2..c14934f82c 100644 --- a/stepmania/src/NoteTypes.h +++ b/stepmania/src/NoteTypes.h @@ -53,7 +53,7 @@ struct TapNote bKeysound = bKeysound_; iKeysoundIndex = iKeysoundIndex_; } - bool operator==( const TapNote &other ) + bool operator==( const TapNote &other ) const { #define COMPARE(x) if(x!=other.x) return false; COMPARE(type); @@ -69,13 +69,13 @@ struct TapNote const unsigned MAX_NUM_ATTACKS = 2*2*2; // 3 bits to hold the attack index currently -extern TapNote TAP_EMPTY; // '0' -extern TapNote TAP_ORIGINAL_TAP; // '1' -extern TapNote TAP_ORIGINAL_HOLD_HEAD; // '2' -extern TapNote TAP_ORIGINAL_HOLD_TAIL; // '3' -extern TapNote TAP_ORIGINAL_HOLD; // '4' -extern TapNote TAP_ORIGINAL_MINE; // 'M' -extern TapNote TAP_ORIGINAL_ATTACK; // 'A' +extern TapNote TAP_EMPTY; // '0' +extern TapNote TAP_ORIGINAL_TAP; // '1' +extern TapNote TAP_ORIGINAL_HOLD_HEAD; // '2' +extern TapNote TAP_ORIGINAL_HOLD_TAIL; // '3' +extern TapNote TAP_ORIGINAL_HOLD; // '4' +extern TapNote TAP_ORIGINAL_MINE; // 'M' +extern TapNote TAP_ORIGINAL_ATTACK; // 'A' extern TapNote TAP_ADDITION_TAP; extern TapNote TAP_ADDITION_MINE; diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 552786e111..5c05f3f800 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -827,7 +827,6 @@ void ScreenGameplay::SetupSong( PlayerNumber p, int iSongIndex ) m_pPrimaryScoreKeeper[p], m_pSecondaryScoreKeeper[p] ); - // Put course options into effect. Do this after Player::Load so // that mods aren't double-applied. GAMESTATE->m_ModsToApply[p].clear(); @@ -899,7 +898,6 @@ void ScreenGameplay::LoadNextSong() m_textSongOptions.SetText( GAMESTATE->m_SongOptions.GetString() ); - FOREACH_EnabledPlayer( p ) { SetupSong( p, iPlaySongIndex ); @@ -1273,7 +1271,9 @@ void ScreenGameplay::Update( float fDeltaTime ) m_bZeroDeltaOnNextUpdate = false; } else + { Screen::Update( fDeltaTime ); + } /* This happens if ScreenDemonstration::HandleScreenMessage sets a new screen when * PREFSMAN->m_bDelayedScreenLoad. */ @@ -1291,7 +1291,6 @@ void ScreenGameplay::Update( float fDeltaTime ) //LOG->Trace( "m_fOffsetInBeats = %f, m_fBeatsPerSecond = %f, m_Music.GetPositionSeconds = %f", m_fOffsetInBeats, m_fBeatsPerSecond, m_Music.GetPositionSeconds() ); m_BeginnerHelper.Update(fDeltaTime); - // // update GameState HealthState @@ -1524,8 +1523,6 @@ void ScreenGameplay::Update( float fDeltaTime ) { FOREACH_CabinetLight( cl ) { - // Somehow, step data was getting majorly corrupted, therefor causing light - // signals to be sent at incorrect times where notes were not even present. bool bBlink = (m_CabinetLightsNoteData.GetTapNote( cl, r ).type != TapNote::empty ); bBlinkCabinetLight[cl] |= bBlink; }