actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

propagate Attack::GetAttackBeats precondition

Browse Source
This commit is contained in:
Devin J. Pohly
2013-11-02 00:58:01 -04:00
parent 4520186722
commit 5d9c3aaa59
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Attack.cpp
+2 -1
View File
@@ -22,6 +22,8 @@ void Attack::GetAttackBeats( const Song *pSong, float &fStartBeat, float &fEndBe
* prevent popping when the attack has note modifers. */ * prevent popping when the attack has note modifers. */
void Attack::GetRealtimeAttackBeats( const Song *pSong, const PlayerState* pPlayerState, float &fStartBeat, float &fEndBeat ) const void Attack::GetRealtimeAttackBeats( const Song *pSong, const PlayerState* pPlayerState, float &fStartBeat, float &fEndBeat ) const
{ {
ASSERT( pSong != NULL );
if( fStartSecond >= 0 ) if( fStartSecond >= 0 )
{ {
GetAttackBeats( pSong, fStartBeat, fEndBeat ); GetAttackBeats( pSong, fStartBeat, fEndBeat );
@@ -29,7 +31,6 @@ void Attack::GetRealtimeAttackBeats( const Song *pSong, const PlayerState* pPlay
} }
ASSERT( pPlayerState != NULL ); ASSERT( pPlayerState != NULL );
ASSERT( pSong != NULL );
/* If reasonable, push the attack forward 8 beats so that notes on screen don't change suddenly. */ /* If reasonable, push the attack forward 8 beats so that notes on screen don't change suddenly. */
fStartBeat = min( GAMESTATE->m_Position.m_fSongBeat+8, pPlayerState->m_fLastDrawnBeat ); fStartBeat = min( GAMESTATE->m_Position.m_fSongBeat+8, pPlayerState->m_fLastDrawnBeat );