This commit is contained in:
Glenn Maynard
2004-02-04 06:45:56 +00:00
parent 508bc0f6d4
commit 72bbadb18b
3 changed files with 6 additions and 0 deletions
+1
View File
@@ -390,6 +390,7 @@ void GameState::UpdateSongPosition( float fPositionSeconds, const TimingData &ti
else else
m_LastBeatUpdate.Touch(); m_LastBeatUpdate.Touch();
timing.GetBeatAndBPSFromElapsedTime( fPositionSeconds, m_fSongBeat, m_fCurBPS, m_bFreeze ); timing.GetBeatAndBPSFromElapsedTime( fPositionSeconds, m_fSongBeat, m_fCurBPS, m_bFreeze );
RAGE_ASSERT_M( m_fSongBeat > -2000, ssprintf("%f %f", m_fSongBeat, fPositionSeconds) );
m_fMusicSeconds = 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 ); // LOG->Trace( "m_fMusicSeconds = %f, m_fSongBeat = %f, m_fCurBPS = %f, m_bFreeze = %f", m_fMusicSeconds, m_fSongBeat, m_fCurBPS, m_bFreeze );
+2
View File
@@ -555,6 +555,7 @@ void NoteField::DrawPrimitives()
continue; // skip 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) ); SearchForBeat( CurDisplay, NextDisplay, NoteRowToBeat(hn.iStartRow) );
bool bIsInSelectionRange = false; bool bIsInSelectionRange = false;
@@ -618,6 +619,7 @@ void NoteField::DrawPrimitives()
bool bIsMine = (tn == TAP_MINE); bool bIsMine = (tn == TAP_MINE);
bool bIsAttack = IsTapAttack(tn); 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) ); SearchForBeat( CurDisplay, NextDisplay, NoteRowToBeat(i) );
NoteDisplayCols *nd = CurDisplay->second; NoteDisplayCols *nd = CurDisplay->second;
if( bIsAttack ) if( bIsAttack )
+3
View File
@@ -322,6 +322,7 @@ void RageSounds::Update( float fDeltaTime )
if( !g_Playing->m_Music->IsPlaying() ) if( !g_Playing->m_Music->IsPlaying() )
{ {
/* There's no song playing. Fake it. */ /* 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 ); GAMESTATE->UpdateSongPosition( GAMESTATE->m_fMusicSeconds + fDeltaTime, g_Playing->m_Timing );
return; 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 /* We're still waiting for the new sound to start playing, so keep using the
* old timing data and fake the time. */ * 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 ); GAMESTATE->UpdateSongPosition( GAMESTATE->m_fMusicSeconds + fDeltaTime, g_Playing->m_Timing );
return; return;
} }
@@ -367,6 +369,7 @@ void RageSounds::Update( float fDeltaTime )
sLastFile = ThisFile; sLastFile = ThisFile;
} }
CHECKPOINT_M( ssprintf("%f", fSeconds) );
GAMESTATE->UpdateSongPosition( fSeconds, g_Playing->m_Timing, tm ); GAMESTATE->UpdateSongPosition( fSeconds, g_Playing->m_Timing, tm );
} }