From f98fca77f58a2f88958ea6c501413bf29f219d36 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Tue, 28 Dec 2010 13:45:39 -0600 Subject: [PATCH] remove old logging --- src/GameState.cpp | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/GameState.cpp b/src/GameState.cpp index 3e8bff889c..0a190e750e 100644 --- a/src/GameState.cpp +++ b/src/GameState.cpp @@ -936,7 +936,7 @@ void GameState::ResetStageStatistics() m_vLastPeakComboAwards[p].clear(); } - // Reset the round seed. Do this here and not in FinishStage so that players + // Reset the round seed. Do this here and not in FinishStage so that players // get new shuffle patterns if they Back out of gameplay and play again. m_iStageSeed = rand(); } @@ -961,23 +961,15 @@ void GameState::UpdateSongPosition( float fPositionSeconds, const TimingData &ti ASSERT_M( m_fSongBeat > -2000, ssprintf("Song beat %f at %f seconds", m_fSongBeat, fPositionSeconds) ); //if( m_iWarpBeginRow != -1 || m_iWarpEndRow == -1 ) - if( m_iWarpBeginRow != -1 && m_fWarpLength > 0.f ) + if( m_iWarpBeginRow != -1 && m_fWarpLength > 0.0f ) { - // we got a warp in this section. + // There is a warp in this section. LOG->Trace("warp at %i lasts for %f, jumps to %i",m_iWarpBeginRow,m_fWarpLength,m_iWarpBeginRow+BeatToNoteRow(m_fWarpLength)); //fPositionSeconds += (m_fWarpLength * m_fCurBPS); } - /* - // xxx testing: only do this on monotune survivor - if( m_pCurSong && m_pCurSong->GetDisplayFullTitle() == "monotune survivor" ) - LOG->Trace( ssprintf("[GameState::UpdateSongPosition] m_fMusicSeconds before = %f",m_fMusicSeconds) ); - */ + m_fMusicSeconds = fPositionSeconds; - /* - // xxx testing: only do this on monotune survivor - if( m_pCurSong && m_pCurSong->GetDisplayFullTitle() == "monotune survivor" ) - LOG->Trace( ssprintf("[GameState::UpdateSongPosition] m_fMusicSeconds after = %f",m_fMusicSeconds) ); - */ + m_fLightSongBeat = timing.GetBeatFromElapsedTime( fPositionSeconds + g_fLightsAheadSeconds ); m_fSongBeatNoOffset = timing.GetBeatFromElapsedTimeNoOffset( fPositionSeconds );