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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2006-02-01 04:35:37 +00:00
parent 8297c213c8
commit fa5f51a637
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Attack.cpp
+4 -4
View File
@@ -6,15 +6,15 @@
#include "Foreach.h" #include "Foreach.h"
#include "PlayerOptions.h" #include "PlayerOptions.h"
void Attack::GetAttackBeats( const Song *song, const PlayerState* pPlayerState, float &fStartBeat, float &fEndBeat ) const void Attack::GetAttackBeats( const Song *pSong, const PlayerState* pPlayerState, float &fStartBeat, float &fEndBeat ) const
{ {
ASSERT( song ); ASSERT( pSong );
if( fStartSecond >= 0 ) if( fStartSecond >= 0 )
{ {
CHECKPOINT; CHECKPOINT;
fStartBeat = song->GetBeatFromElapsedTime( fStartSecond ); fStartBeat = pSong->GetBeatFromElapsedTime( fStartSecond );
fEndBeat = song->GetBeatFromElapsedTime( fStartSecond+fSecsRemaining ); fEndBeat = pSong->GetBeatFromElapsedTime( fStartSecond+fSecsRemaining );
} }
else else
{ {
stepmania/src/Attack.h
+1 -1
View File
@@ -45,7 +45,7 @@ struct Attack
bShowInAttackList = bShowInAttackList_; bShowInAttackList = bShowInAttackList_;
} }
void GetAttackBeats( const Song *song, const PlayerState* pPlayerState, float &fStartBeat, float &fEndBeat ) const; void GetAttackBeats( 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;
bool ContainsTransformOrTurn() const; bool ContainsTransformOrTurn() const;