From 8d3253442ccca4b198fe40ebc0bea5fdc53c92a1 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 28 Mar 2006 08:58:30 +0000 Subject: [PATCH] remove GetBeatAndBPSFromElapsedTime compat --- stepmania/src/Player.cpp | 2 +- stepmania/src/song.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index 4c4263a9ab..ad47d8b902 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -1411,7 +1411,7 @@ void Player::UpdateTapNotesMissedOlderThan( float fMissIfOlderThanSeconds ) bool bFreeze; float fMissIfOlderThanThisBeat; float fThrowAway; - GAMESTATE->m_pCurSong->GetBeatAndBPSFromElapsedTime( fEarliestTime, fMissIfOlderThanThisBeat, fThrowAway, bFreeze ); + GAMESTATE->m_pCurSong->m_Timing.GetBeatAndBPSFromElapsedTime( fEarliestTime, fMissIfOlderThanThisBeat, fThrowAway, bFreeze ); iMissIfOlderThanThisIndex = BeatToNoteRow( fMissIfOlderThanThisBeat ); if( bFreeze ) diff --git a/stepmania/src/song.h b/stepmania/src/song.h index 068031f75d..1b7825b785 100644 --- a/stepmania/src/song.h +++ b/stepmania/src/song.h @@ -176,7 +176,6 @@ public: float GetBPMAtBeat( float fBeat ) const { return m_Timing.GetBPMAtBeat( fBeat ); } void SetBPMAtBeat( float fBeat, float fBPM ) { m_Timing.SetBPMAtBeat( fBeat, fBPM ); } BPMSegment& GetBPMSegmentAtBeat( float fBeat ) { return m_Timing.GetBPMSegmentAtBeat( fBeat ); } - void GetBeatAndBPSFromElapsedTime( float fElapsedTime, float &fBeatOut, float &fBPSOut, bool &bFreezeOut ) const { m_Timing.GetBeatAndBPSFromElapsedTime( fElapsedTime, fBeatOut, fBPSOut, bFreezeOut ); } float GetBeatFromElapsedTime( float fElapsedTime ) const { return m_Timing.GetBeatFromElapsedTime( fElapsedTime ); } float GetElapsedTimeFromBeat( float fBeat ) const { return m_Timing.GetElapsedTimeFromBeat( fBeat ); } bool HasSignificantBpmChangesOrStops() const;