From 7ace9857afdc571674a4a64c548dae0a236cec7c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 1 Feb 2006 04:44:34 +0000 Subject: [PATCH] remove pPlayerState param from Attack::GetAttackBeats --- stepmania/src/Attack.cpp | 5 +++-- stepmania/src/Attack.h | 2 +- stepmania/src/NoteDataUtil.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/stepmania/src/Attack.cpp b/stepmania/src/Attack.cpp index ee30e182c6..d3b91fb082 100644 --- a/stepmania/src/Attack.cpp +++ b/stepmania/src/Attack.cpp @@ -5,8 +5,9 @@ #include "song.h" #include "Foreach.h" #include "PlayerOptions.h" +#include "PlayerState.h" -void Attack::GetAttackBeats( const Song *pSong, const PlayerState* pPlayerState, float &fStartBeat, float &fEndBeat ) const +void Attack::GetAttackBeats( const Song *pSong, float &fStartBeat, float &fEndBeat ) const { ASSERT( pSong ); ASSERT_M( fStartSecond >= 0, ssprintf("%f",fStartSecond) ); @@ -22,7 +23,7 @@ void Attack::GetRealtimeAttackBeats( const Song *pSong, const PlayerState* pPlay { if( fStartSecond >= 0 ) { - GetAttackBeats( pSong, pPlayerState, fStartBeat, fEndBeat ); + GetAttackBeats( pSong, fStartBeat, fEndBeat ); return; } diff --git a/stepmania/src/Attack.h b/stepmania/src/Attack.h index 0b1019577c..c47cdb8aba 100644 --- a/stepmania/src/Attack.h +++ b/stepmania/src/Attack.h @@ -45,7 +45,7 @@ struct Attack bShowInAttackList = bShowInAttackList_; } - void GetAttackBeats( const Song *pSong, const PlayerState* pPlayerState, float &fStartBeat, float &fEndBeat ) const; + void GetAttackBeats( const Song *pSong, float &fStartBeat, float &fEndBeat ) const; void GetRealtimeAttackBeats( const Song *pSong, const PlayerState* pPlayerState, float &fStartBeat, float &fEndBeat ) const; bool IsBlank() const { return sModifiers.empty(); } bool operator== ( const Attack &rhs ) const; diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp index 3fadfc650e..81a4b05292 100644 --- a/stepmania/src/NoteDataUtil.cpp +++ b/stepmania/src/NoteDataUtil.cpp @@ -1749,7 +1749,7 @@ void NoteDataUtil::TransformNoteData( NoteData &nd, const AttackArray &aa, Steps if( po.ContainsTransformOrTurn() ) { float fStartBeat, fEndBeat; - a->GetAttackBeats( pSong, NULL, fStartBeat, fEndBeat ); + a->GetAttackBeats( pSong, fStartBeat, fEndBeat ); NoteDataUtil::TransformNoteData( nd, po, st, BeatToNoteRow(fStartBeat), BeatToNoteRow(fEndBeat) ); }