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

remove funky beginner hacks to judgment window

Browse Source
This commit is contained in:
Chris Danford
2006-03-17 02:23:45 +00:00
parent 1fd4b7f05f
commit dc05d4b0c8
1 changed files with 40 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Player.cpp
+2 -13
View File
@@ -52,18 +52,16 @@ RString ATTACK_DISPLAY_X_NAME( size_t p, size_t both_sides ){ return "AttackDisp
static const float StepSearchDistance = 1.0f;
static const float JUMP_WINDOW_SECONDS = 0.25f;
float AdjustedWindowSeconds( TimingWindow tw, bool bIsPlayingBeginner )
float AdjustedWindowSeconds( TimingWindow tw )
{
float fSecs = PREFSMAN->m_fTimingWindowSeconds[tw];
fSecs *= PREFSMAN->m_fTimingWindowScale;
fSecs += PREFSMAN->m_fTimingWindowAdd;
if( tw==TW_W5 && bIsPlayingBeginner && PREFSMAN->m_bMercifulBeginner )
fSecs += 0.5f;
return fSecs;
}
#define ADJUSTED_WINDOW_SECONDS( tw ) AdjustedWindowSeconds( tw, IsPlayingBeginner() )
#define ADJUSTED_WINDOW_SECONDS( tw ) AdjustedWindowSeconds( tw )
Player::Player( bool bShowNoteField, bool bShowJudgment )
@@ -1246,14 +1244,6 @@ void Player::HandleStep( int col, const RageTimer &tm, bool bHeld )
if( score == TNS_W1 && !GAMESTATE->ShowW1() )
score = TNS_W2;
bool bSteppedEarly = -fNoteOffset < 0;
if( IsPlayingBeginner() && PREFSMAN->m_bMercifulBeginner && score==TNS_W5 && bSteppedEarly )
{
if( m_pJudgment )
m_pJudgment->SetJudgment( score, bSteppedEarly );
}
else
{
tn.result.tns = score;
if( score != TNS_None )
@@ -1297,7 +1287,6 @@ void Player::HandleStep( int col, const RageTimer &tm, bool bHeld )
m_LastTapNoteScore = score;
}
}