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

only apply MercifulBeginner if playing beginner steps

Browse Source
This commit is contained in:
Chris Danford
2005-05-23 19:15:45 +00:00
parent e99a874161
commit b0e9a78fe2
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Player.cpp
+20 -16
View File
@@ -48,21 +48,8 @@ static const float StepSearchDistance = 1.0f;
enum HoldWindow { HW_OK, HW_Roll }; enum HoldWindow { HW_OK, HW_Roll };
enum TapWindow { TW_Marvelous, TW_Perfect, TW_Great, TW_Good, TW_Boo, TW_Mine, TW_Attack }; enum TapWindow { TW_Marvelous, TW_Perfect, TW_Great, TW_Good, TW_Boo, TW_Mine, TW_Attack };
float ADJUSTED_WINDOW_HOLD( HoldWindow hw )
{
float fSecs = 0;
switch( hw )
{
case HW_OK: fSecs = PREFSMAN->m_fJudgeWindowSecondsOK; break;
case HW_Roll: fSecs = PREFSMAN->m_fJudgeWindowSecondsRoll; break;
default: ASSERT(0);
}
fSecs *= PREFSMAN->m_fJudgeWindowScale;
fSecs += PREFSMAN->m_fJudgeWindowAdd;
return fSecs;
}
float ADJUSTED_WINDOW_TAP( TapWindow tw ) float AdjustedWindowTap( TapWindow tw, bool bIsPlayingBeginner )
{ {
float fSecs = 0; float fSecs = 0;
switch( tw ) switch( tw )
@@ -78,11 +65,28 @@ float ADJUSTED_WINDOW_TAP( TapWindow tw )
} }
fSecs *= PREFSMAN->m_fJudgeWindowScale; fSecs *= PREFSMAN->m_fJudgeWindowScale;
fSecs += PREFSMAN->m_fJudgeWindowAdd; fSecs += PREFSMAN->m_fJudgeWindowAdd;
if( PREFSMAN->m_bMercifulBeginner && tw==TW_Boo ) if( bIsPlayingBeginner && PREFSMAN->m_bMercifulBeginner && tw==TW_Boo )
fSecs += 0.5f; fSecs += 0.5f;
return fSecs; return fSecs;
} }
float AdjustedWindowHold( HoldWindow hw, bool bIsPlayingBeginner )
{
float fSecs = 0;
switch( hw )
{
case HW_OK: fSecs = PREFSMAN->m_fJudgeWindowSecondsOK; break;
case HW_Roll: fSecs = PREFSMAN->m_fJudgeWindowSecondsRoll; break;
default: ASSERT(0);
}
fSecs *= PREFSMAN->m_fJudgeWindowScale;
fSecs += PREFSMAN->m_fJudgeWindowAdd;
return fSecs;
}
#define ADJUSTED_WINDOW_TAP( tw ) AdjustedWindowTap( tw, IsPlayingBeginner() )
#define ADJUSTED_WINDOW_HOLD( hw ) AdjustedWindowHold( hw, IsPlayingBeginner() )
Player::Player() Player::Player()
{ {
@@ -1025,7 +1029,7 @@ void Player::HandleStep( int col, const RageTimer &tm, bool bHeld )
bool bSteppedEarly = -fNoteOffset < 0; bool bSteppedEarly = -fNoteOffset < 0;
bool bScoreThis = true; bool bScoreThis = true;
if( PREFSMAN->m_bMercifulBeginner && score==TNS_BOO && bSteppedEarly ) if( IsPlayingBeginner() && PREFSMAN->m_bMercifulBeginner && score==TNS_BOO && bSteppedEarly )
{ {
m_Judgment.SetJudgment( score, bSteppedEarly ); m_Judgment.SetJudgment( score, bSteppedEarly );
} }