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

remove pPlayerState param from Attack::GetAttackBeats

Browse Source
This commit is contained in:
Glenn Maynard
2006-02-01 04:44:34 +00:00
parent 4d248c29f8
commit 7ace9857af
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Attack.cpp
+3 -2
View File
@@ -5,8 +5,9 @@
#include "song.h" #include "song.h"
#include "Foreach.h" #include "Foreach.h"
#include "PlayerOptions.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( pSong );
ASSERT_M( fStartSecond >= 0, ssprintf("%f",fStartSecond) ); ASSERT_M( fStartSecond >= 0, ssprintf("%f",fStartSecond) );
@@ -22,7 +23,7 @@ void Attack::GetRealtimeAttackBeats( const Song *pSong, const PlayerState* pPlay
{ {
if( fStartSecond >= 0 ) if( fStartSecond >= 0 )
{ {
GetAttackBeats( pSong, pPlayerState, fStartBeat, fEndBeat ); GetAttackBeats( pSong, fStartBeat, fEndBeat );
return; return;
} }
stepmania/src/Attack.h
+1 -1
View File
@@ -45,7 +45,7 @@ struct Attack
bShowInAttackList = bShowInAttackList_; 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; void GetRealtimeAttackBeats( const Song *pSong, const PlayerState* pPlayerState, float &fStartBeat, float &fEndBeat ) const;
bool IsBlank() const { return sModifiers.empty(); } bool IsBlank() const { return sModifiers.empty(); }
bool operator== ( const Attack &rhs ) const; bool operator== ( const Attack &rhs ) const;
stepmania/src/NoteDataUtil.cpp
+1 -1
View File
@@ -1749,7 +1749,7 @@ void NoteDataUtil::TransformNoteData( NoteData &nd, const AttackArray &aa, Steps
if( po.ContainsTransformOrTurn() ) if( po.ContainsTransformOrTurn() )
{ {
float fStartBeat, fEndBeat; float fStartBeat, fEndBeat;
a->GetAttackBeats( pSong, NULL, fStartBeat, fEndBeat ); a->GetAttackBeats( pSong, fStartBeat, fEndBeat );
NoteDataUtil::TransformNoteData( nd, po, st, BeatToNoteRow(fStartBeat), BeatToNoteRow(fEndBeat) ); NoteDataUtil::TransformNoteData( nd, po, st, BeatToNoteRow(fStartBeat), BeatToNoteRow(fEndBeat) );
} }