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

fix calories too generous - count as a jump only if the buttons are pressed near-simultaneously

Browse Source
This commit is contained in:
Chris Danford
2006-03-01 17:41:29 +00:00
parent 20909ff1dc
commit 6d3a5a4b0a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Player.cpp
+4 -3
View File
@@ -50,6 +50,7 @@ RString ATTACK_DISPLAY_X_NAME( size_t p, size_t both_sides ){ return "AttackDisp
/* Distance to search for a note in Step(), in seconds. */ /* Distance to search for a note in Step(), in seconds. */
static const float StepSearchDistance = 1.0f; static const float StepSearchDistance = 1.0f;
static const float JUMP_WINDOW_SECONDS = 0.25f;
float AdjustedWindowSeconds( TimingWindow tw, bool bIsPlayingBeginner ) float AdjustedWindowSeconds( TimingWindow tw, bool bIsPlayingBeginner )
{ {
@@ -1027,7 +1028,7 @@ void Player::HandleStep( int col, const RageTimer &tm, bool bHeld )
const StyleInput StyleI( pn, t ); const StyleInput StyleI( pn, t );
const GameInput GameI = GAMESTATE->GetCurrentStyle()->StyleInputToGameInput( StyleI ); const GameInput GameI = GAMESTATE->GetCurrentStyle()->StyleInputToGameInput( StyleI );
float fSecsHeld = INPUTMAPPER->GetSecsHeld( GameI ); float fSecsHeld = INPUTMAPPER->GetSecsHeld( GameI );
if( fSecsHeld > 0 ) if( fSecsHeld > 0 && fSecsHeld < JUMP_WINDOW_SECONDS )
iNumTracksHeld++; iNumTracksHeld++;
} }
@@ -1040,8 +1041,8 @@ void Player::HandleStep( int col, const RageTimer &tm, bool bHeld )
// fall through // fall through
default: default:
{ {
float fCalsFor100Lbs = SCALE( iNumTracksHeld, 1, 2, 0.029f, 0.193f ); float fCalsFor100Lbs = SCALE( iNumTracksHeld, 1, 2, 0.029f, 0.097f );
float fCalsFor200Lbs = SCALE( iNumTracksHeld, 1, 2, 0.052f, 0.334f ); float fCalsFor200Lbs = SCALE( iNumTracksHeld, 1, 2, 0.052f, 0.167f );
fCals = SCALE( pProfile->GetCalculatedWeightPounds(), 100.f, 200.f, fCalsFor100Lbs, fCalsFor200Lbs ); fCals = SCALE( pProfile->GetCalculatedWeightPounds(), 100.f, 200.f, fCalsFor100Lbs, fCalsFor200Lbs );
} }
break; break;