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

no message

Browse Source
This commit is contained in:
Chris Danford
2001-12-20 21:08:45 +00:00
parent 7884f8391a
commit 43fb348d2c
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Player.cpp
+14 -6
View File
@@ -455,9 +455,9 @@ void Player::Update( float fDeltaTime, float fSongBeat, float fMaxBeatDifference
float fStartBeat = StepIndexToBeat( hs.m_iStartIndex ); float fStartBeat = StepIndexToBeat( hs.m_iStartIndex );
float fEndBeat = StepIndexToBeat( hs.m_iEndIndex ); float fEndBeat = StepIndexToBeat( hs.m_iEndIndex );
if( fStartBeat+fMaxBeatDifference*2 < m_fSongBeat && m_fSongBeat < fEndBeat-fMaxBeatDifference*2 && // if the song beat is in the range of this hold // update the "electric arrow"
m_HoldStepScores[i] == HOLD_SCORE_NONE || if( m_HoldStepScores[i] == HOLD_STEPPED_ON && // this hold doesn't already have a score
m_HoldStepScores[i] == HOLD_STEPPED_ON ) // this hold doesn't already have a score fStartBeat < m_fSongBeat && m_fSongBeat < fEndBeat ) // if the song beat is in the range of this hold
{ {
PlayerInput PlayerI = { m_PlayerNumber, hs.m_Step }; PlayerInput PlayerI = { m_PlayerNumber, hs.m_Step };
if( GAMEINFO->IsButtonDown( PlayerI ) ) // they're holding the button down if( GAMEINFO->IsButtonDown( PlayerI ) ) // they're holding the button down
@@ -465,7 +465,14 @@ void Player::Update( float fDeltaTime, float fSongBeat, float fMaxBeatDifference
int iCol = m_StepToColumnNumber[ hs.m_Step ]; int iCol = m_StepToColumnNumber[ hs.m_Step ];
m_HoldGhostArrow[iCol].Step(); m_HoldGhostArrow[iCol].Step();
} }
else // they're not holding the button down }
// update the logic
if( (m_HoldStepScores[i] == HOLD_SCORE_NONE || m_HoldStepScores[i] == HOLD_STEPPED_ON) && // this hold doesn't already have a score
fStartBeat+fMaxBeatDifference/2 < m_fSongBeat && m_fSongBeat < fEndBeat-fMaxBeatDifference/2 ) // if the song beat is in the range of this hold
{
PlayerInput PlayerI = { m_PlayerNumber, hs.m_Step };
if( !GAMEINFO->IsButtonDown( PlayerI ) ) // they're not holding the button down
{ {
m_HoldStepScores[i] = HOLD_SCORE_NG; m_HoldStepScores[i] = HOLD_SCORE_NG;
int iCol = m_StepToColumnNumber[ hs.m_Step ]; int iCol = m_StepToColumnNumber[ hs.m_Step ];
@@ -480,7 +487,7 @@ void Player::Update( float fDeltaTime, float fSongBeat, float fMaxBeatDifference
HoldStep &hs = m_HoldSteps[i]; HoldStep &hs = m_HoldSteps[i];
float fEndBeat = StepIndexToBeat( hs.m_iEndIndex ); float fEndBeat = StepIndexToBeat( hs.m_iEndIndex );
if( fEndBeat < m_fSongBeat && // if this hold step is in the past if( m_fSongBeat > fEndBeat && // if this hold step is in the past
m_HoldStepScores[i] == HOLD_STEPPED_ON ) // and it doesn't yet have a score m_HoldStepScores[i] == HOLD_STEPPED_ON ) // and it doesn't yet have a score
{ {
m_HoldStepScores[i] = HOLD_SCORE_OK; m_HoldStepScores[i] = HOLD_SCORE_OK;
@@ -800,7 +807,8 @@ void Player::DrawColorArrows()
for( int i=iIndexFirstArrowToDraw; i<=iIndexLastArrowToDraw; i++ ) // for each row for( int i=iIndexFirstArrowToDraw; i<=iIndexLastArrowToDraw; i++ ) // for each row
{ {
if( m_LeftToStepOn[i] != 0 ) // this step is not yet complete if( m_LeftToStepOn[i] != 0 || // this step is not yet complete
m_StepScore[i] == good || m_StepScore[i] == boo || m_StepScore[i] == miss )
{ {
float fYOffset = GetColorArrowYOffset( i, m_fSongBeat ); float fYOffset = GetColorArrowYOffset( i, m_fSongBeat );
float fYPos = GetColorArrowYPos( i, m_fSongBeat ); float fYPos = GetColorArrowYPos( i, m_fSongBeat );