This commit is contained in:
Glenn Maynard
2006-01-30 22:51:01 +00:00
parent 3507956b71
commit 16bd1d06cb
2 changed files with 7 additions and 7 deletions
+5 -5
View File
@@ -158,7 +158,7 @@ void NoteField::ProcessMessages( float fDeltaTime )
} }
} }
float NoteField::GetWidth() float NoteField::GetWidth() const
{ {
const Style* pStyle = GAMESTATE->GetCurrentStyle(); const Style* pStyle = GAMESTATE->GetCurrentStyle();
float fMinX, fMaxX; float fMinX, fMaxX;
@@ -376,7 +376,7 @@ float FindLastDisplayedBeat( const PlayerState* pPlayerState, int iLastPixelToDr
return fLastBeatToDraw; return fLastBeatToDraw;
} }
bool NoteField::IsOnScreen( float fBeat, int iFirstPixelToDraw, int iLastPixelToDraw ) bool NoteField::IsOnScreen( float fBeat, int iFirstPixelToDraw, int iLastPixelToDraw ) const
{ {
// TRICKY: If boomerang is on, then ones in the range // TRICKY: If boomerang is on, then ones in the range
// [iFirstIndexToDraw,iLastIndexToDraw] aren't necessarily visible. // [iFirstIndexToDraw,iLastIndexToDraw] aren't necessarily visible.
@@ -456,7 +456,7 @@ void NoteField::DrawPrimitives()
// //
// BPM text // BPM text
// //
vector<BPMSegment> &aBPMSegments = GAMESTATE->m_pCurSong->m_Timing.m_BPMSegments; const vector<BPMSegment> &aBPMSegments = GAMESTATE->m_pCurSong->m_Timing.m_BPMSegments;
for( unsigned i=0; i<aBPMSegments.size(); i++ ) for( unsigned i=0; i<aBPMSegments.size(); i++ )
{ {
if( aBPMSegments[i].m_iStartIndex >= iFirstIndexToDraw && if( aBPMSegments[i].m_iStartIndex >= iFirstIndexToDraw &&
@@ -471,7 +471,7 @@ void NoteField::DrawPrimitives()
// //
// Freeze text // Freeze text
// //
vector<StopSegment> &aStopSegments = GAMESTATE->m_pCurSong->m_Timing.m_StopSegments; const vector<StopSegment> &aStopSegments = GAMESTATE->m_pCurSong->m_Timing.m_StopSegments;
for( unsigned i=0; i<aStopSegments.size(); i++ ) for( unsigned i=0; i<aStopSegments.size(); i++ )
{ {
if( aStopSegments[i].m_iStartRow >= iFirstIndexToDraw && if( aStopSegments[i].m_iStartRow >= iFirstIndexToDraw &&
@@ -486,7 +486,7 @@ void NoteField::DrawPrimitives()
// //
// Course mods text // Course mods text
// //
Course *pCourse = GAMESTATE->m_pCurCourse; const Course *pCourse = GAMESTATE->m_pCurCourse;
if( pCourse ) if( pCourse )
{ {
const CourseEntry &ce = pCourse->m_vEntries[GAMESTATE->m_iEditCourseEntryIndex]; const CourseEntry &ce = pCourse->m_vEntries[GAMESTATE->m_iEditCourseEntryIndex];
+2 -2
View File
@@ -43,7 +43,7 @@ public:
protected: protected:
void CacheAllUsedNoteSkins(); void CacheAllUsedNoteSkins();
bool IsOnScreen( float fBeat, int iFirstPixelToDraw, int iLastPixelToDraw ); bool IsOnScreen( float fBeat, int iFirstPixelToDraw, int iLastPixelToDraw ) const;
void DrawBeatBar( const float fBeat ); void DrawBeatBar( const float fBeat );
void DrawMarkerBar( int fBeat ); void DrawMarkerBar( int fBeat );
@@ -52,7 +52,7 @@ protected:
void DrawFreezeText( const float fBeat, const float fBPM ); void DrawFreezeText( const float fBeat, const float fBPM );
void DrawAttackText( const float fBeat, const Attack &attack ); void DrawAttackText( const float fBeat, const Attack &attack );
void DrawBGChangeText( const float fBeat, const RString sNewBGName ); void DrawBGChangeText( const float fBeat, const RString sNewBGName );
float GetWidth(); float GetWidth() const;
const NoteData *m_pNoteData; const NoteData *m_pNoteData;