From 72bbadb18b30bdd0d8ad747377947ca1461e7d75 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 4 Feb 2004 06:45:56 +0000 Subject: [PATCH] debug --- stepmania/src/GameState.cpp | 1 + stepmania/src/NoteField.cpp | 2 ++ stepmania/src/RageSounds.cpp | 3 +++ 3 files changed, 6 insertions(+) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index efb580aa8a..6864934156 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -390,6 +390,7 @@ void GameState::UpdateSongPosition( float fPositionSeconds, const TimingData &ti else m_LastBeatUpdate.Touch(); timing.GetBeatAndBPSFromElapsedTime( fPositionSeconds, m_fSongBeat, m_fCurBPS, m_bFreeze ); + RAGE_ASSERT_M( m_fSongBeat > -2000, ssprintf("%f %f", m_fSongBeat, fPositionSeconds) ); m_fMusicSeconds = fPositionSeconds; // 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/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp index d045535b10..575365e14d 100644 --- a/stepmania/src/NoteField.cpp +++ b/stepmania/src/NoteField.cpp @@ -555,6 +555,7 @@ void NoteField::DrawPrimitives() continue; // skip } + RAGE_ASSERT_M( NoteRowToBeat(hn.iStartRow) > -2000, ssprintf("%i %i %i", hn.iStartRow, hn.iEndRow, hn.iTrack) ); SearchForBeat( CurDisplay, NextDisplay, NoteRowToBeat(hn.iStartRow) ); bool bIsInSelectionRange = false; @@ -618,6 +619,7 @@ void NoteField::DrawPrimitives() bool bIsMine = (tn == TAP_MINE); bool bIsAttack = IsTapAttack(tn); + RAGE_ASSERT_M( NoteRowToBeat(i) > -2000, ssprintf("%i %i %i, %f %f", i, iLastIndexToDraw, iFirstIndexToDraw, GAMESTATE->m_fSongBeat, GAMESTATE->m_fMusicSeconds) ); SearchForBeat( CurDisplay, NextDisplay, NoteRowToBeat(i) ); NoteDisplayCols *nd = CurDisplay->second; if( bIsAttack ) diff --git a/stepmania/src/RageSounds.cpp b/stepmania/src/RageSounds.cpp index de85df308a..d2b2e431c1 100644 --- a/stepmania/src/RageSounds.cpp +++ b/stepmania/src/RageSounds.cpp @@ -322,6 +322,7 @@ void RageSounds::Update( float fDeltaTime ) if( !g_Playing->m_Music->IsPlaying() ) { /* There's no song playing. Fake it. */ + CHECKPOINT_M( ssprintf("%f, delta %f", GAMESTATE->m_fMusicSeconds, fDeltaTime) ); GAMESTATE->UpdateSongPosition( GAMESTATE->m_fMusicSeconds + fDeltaTime, g_Playing->m_Timing ); return; } @@ -340,6 +341,7 @@ void RageSounds::Update( float fDeltaTime ) { /* We're still waiting for the new sound to start playing, so keep using the * old timing data and fake the time. */ + CHECKPOINT_M( ssprintf("%f, delta %f", GAMESTATE->m_fMusicSeconds, fDeltaTime) ); GAMESTATE->UpdateSongPosition( GAMESTATE->m_fMusicSeconds + fDeltaTime, g_Playing->m_Timing ); return; } @@ -367,6 +369,7 @@ void RageSounds::Update( float fDeltaTime ) sLastFile = ThisFile; } + CHECKPOINT_M( ssprintf("%f", fSeconds) ); GAMESTATE->UpdateSongPosition( fSeconds, g_Playing->m_Timing, tm ); }