From e1e605b736b369850fccf6b4dcb1239db4202038 Mon Sep 17 00:00:00 2001 From: Thai Pangsakulyanont Date: Tue, 10 May 2011 20:03:51 +0700 Subject: [PATCH] [splittiming] move bogus variables back to GameState (210) --- src/GameState.cpp | 8 +++++++- src/GameState.h | 2 ++ src/SongPosition.cpp | 7 ------- src/SongPosition.h | 3 --- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/GameState.cpp b/src/GameState.cpp index 6f3dc9f6a0..9ad930dcd3 100644 --- a/src/GameState.cpp +++ b/src/GameState.cpp @@ -957,7 +957,13 @@ void GameState::UpdateSongPosition( float fPositionSeconds, const TimingData &ti FOREACH_EnabledPlayer( pn ) m_pPlayerState[pn]->m_Position.UpdateSongPosition( fPositionSeconds, m_pCurSteps[pn]->m_Timing, timestamp ); - Actor::SetBGMTime( m_Position.m_fMusicSecondsVisible, m_Position.m_fSongBeatVisible, m_Position.fPositionSeconds, m_Position.m_fSongBeatNoOffset ); + m_fMusicSecondsVisible = fPositionSeconds - g_fVisualDelaySeconds.Get(); + float fThrowAway, fThrowAway2; + bool bThrowAway; + int iThrowAway; + timing.GetBeatAndBPSFromElapsedTime( m_fMusicSecondsVisible, m_fSongBeatVisible, fThrowAway, bThrowAway, bThrowAway, iThrowAway, fThrowAway2 ); + + Actor::SetBGMTime( m_Position.m_fMusicSecondsVisible, m_Position.m_fSongBeatVisible, fPositionSeconds, m_Position.m_fSongBeatNoOffset ); // LOG->Trace( "m_fMusicSeconds = %f, m_fSongBeat = %f, m_fCurBPS = %f, m_bFreeze = %f", m_fMusicSeconds, m_fSongBeat, m_fCurBPS, m_bFreeze ); } diff --git a/src/GameState.h b/src/GameState.h index 9b192156c3..f0446c28b8 100644 --- a/src/GameState.h +++ b/src/GameState.h @@ -196,6 +196,8 @@ public: // Music statistics: SongPosition m_Position; + float m_fMusicSecondsVisible; + float m_fSongBeatVisible; BroadcastOnChange m_bGameplayLeadIn; diff --git a/src/SongPosition.cpp b/src/SongPosition.cpp index c3e6c30ffc..f6e6afb35b 100644 --- a/src/SongPosition.cpp +++ b/src/SongPosition.cpp @@ -34,12 +34,6 @@ void SongPosition::UpdateSongPosition( float fPositionSeconds, const TimingData m_fSongBeatNoOffset = timing.GetBeatFromElapsedTimeNoOffset( fPositionSeconds ); - m_fMusicSecondsVisible = fPositionSeconds - g_fVisualDelaySeconds.Get(); - float fThrowAway, fThrowAway2; - bool bThrowAway; - int iThrowAway; - timing.GetBeatAndBPSFromElapsedTime( m_fMusicSecondsVisible, m_fSongBeatVisible, fThrowAway, bThrowAway, bThrowAway, iThrowAway, fThrowAway2 ); - /* // xxx testing: only do this on monotune survivor if( m_pCurSong && m_pCurSong->GetDisplayFullTitle() == "monotune survivor" ) @@ -59,5 +53,4 @@ void SongPosition::UpdateSongPosition( float fPositionSeconds, const TimingData } */ - } diff --git a/src/SongPosition.h b/src/SongPosition.h index 8890e3a87d..4571ca29d4 100644 --- a/src/SongPosition.h +++ b/src/SongPosition.h @@ -32,9 +32,6 @@ class SongPosition float m_fWarpDestination; RageTimer m_LastBeatUpdate; // time of last m_fSongBeat, etc. update - float m_fMusicSecondsVisible; - float m_fSongBeatVisible; - void UpdateSongPosition( float fPositionSeconds, const TimingData &timing, const RageTimer ×tamp = RageZeroTimer ); };