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

fixed freeze arrows for previous commit (after failing a song perfects/marv is worth 10 points, great 5)

Browse Source
This commit is contained in:
Andrew Wong
2003-07-08 10:26:27 +00:00
parent 856b8e48b1
commit 6fdfd55dba
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Player.cpp
+2 -2
View File
@@ -698,9 +698,9 @@ void Player::HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tapScore )
return; return;
if(m_pPrimaryScoreKeeper) if(m_pPrimaryScoreKeeper)
m_pPrimaryScoreKeeper->HandleHoldScore(holdScore, tapScore); m_pPrimaryScoreKeeper->HandleHoldScore(holdScore, tapScore, m_pLifeMeter->FailedEarlier());
if(m_pSecondaryScoreKeeper) if(m_pSecondaryScoreKeeper)
m_pSecondaryScoreKeeper->HandleHoldScore(holdScore, tapScore); m_pSecondaryScoreKeeper->HandleHoldScore(holdScore, tapScore, m_pLifeMeter->FailedEarlier());
if (m_pScore) if (m_pScore)
m_pScore->SetScore(GAMESTATE->m_CurStageStats.iScore[m_PlayerNumber]); m_pScore->SetScore(GAMESTATE->m_CurStageStats.iScore[m_PlayerNumber]);
stepmania/src/ScoreKeeper.h
+1 -1
View File
@@ -45,7 +45,7 @@ public:
virtual void OnNextSong( int iSongInCourseIndex, Notes* pNotes ) = 0; // before a song plays (called multiple times if course) virtual void OnNextSong( int iSongInCourseIndex, Notes* pNotes ) = 0; // before a song plays (called multiple times if course)
virtual void HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTapsInRow, bool failed) = 0; virtual void HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTapsInRow, bool failed) = 0;
virtual void HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tapScore ) = 0; virtual void HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tapScore, bool failed ) = 0;
virtual int TapNoteScoreToDancePoints( TapNoteScore tns ) = 0; virtual int TapNoteScoreToDancePoints( TapNoteScore tns ) = 0;
virtual int HoldNoteScoreToDancePoints( HoldNoteScore hns ) = 0; virtual int HoldNoteScoreToDancePoints( HoldNoteScore hns ) = 0;
stepmania/src/ScoreKeeperMAX2.cpp
+2 -2
View File
@@ -392,14 +392,14 @@ void ScoreKeeperMAX2::HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTa
} }
void ScoreKeeperMAX2::HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tapScore ) void ScoreKeeperMAX2::HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tapScore, bool failed)
{ {
// update dance points totals // update dance points totals
GAMESTATE->m_CurStageStats.iHoldNoteScores[m_PlayerNumber][holdScore] ++; GAMESTATE->m_CurStageStats.iHoldNoteScores[m_PlayerNumber][holdScore] ++;
GAMESTATE->m_CurStageStats.iActualDancePoints[m_PlayerNumber] += HoldNoteScoreToDancePoints( holdScore ); GAMESTATE->m_CurStageStats.iActualDancePoints[m_PlayerNumber] += HoldNoteScoreToDancePoints( holdScore );
if( holdScore == HNS_OK ) if( holdScore == HNS_OK )
AddScore( TNS_MARVELOUS , false); AddScore( TNS_MARVELOUS , failed);
} }
stepmania/src/ScoreKeeperMAX2.h
+1 -1
View File
@@ -38,7 +38,7 @@ public:
void OnNextSong( int iSongInCourseIndex, Notes* pNotes ); // before a song plays (called multiple times if course) void OnNextSong( int iSongInCourseIndex, Notes* pNotes ); // before a song plays (called multiple times if course)
void HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTapsInRow, bool failed ); void HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTapsInRow, bool failed );
void HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tapScore ); void HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tapScore, bool failed );
int TapNoteScoreToDancePoints( TapNoteScore tns ); int TapNoteScoreToDancePoints( TapNoteScore tns );
int HoldNoteScoreToDancePoints( HoldNoteScore hns ); int HoldNoteScoreToDancePoints( HoldNoteScore hns );
stepmania/src/ScoreKeeperRave.cpp
+1 -1
View File
@@ -65,7 +65,7 @@ void ScoreKeeperRave::HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTa
} }
} }
void ScoreKeeperRave::HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tapScore ) void ScoreKeeperRave::HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tapScore, bool failed )
{ {
} }
stepmania/src/ScoreKeeperRave.h
+1 -1
View File
@@ -24,7 +24,7 @@ public:
virtual void Update( float fDelta ); virtual void Update( float fDelta );
virtual void OnNextSong( int iSongInCourseIndex, Notes* pNotes ); // before a song plays (called multiple times if course) virtual void OnNextSong( int iSongInCourseIndex, Notes* pNotes ); // before a song plays (called multiple times if course)
virtual void HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTapsInRow, bool failed); virtual void HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTapsInRow, bool failed);
virtual void HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tapScore ); virtual void HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tapScore, bool failed );
virtual int TapNoteScoreToDancePoints( TapNoteScore tns ) { return 0; }; virtual int TapNoteScoreToDancePoints( TapNoteScore tns ) { return 0; };
virtual int HoldNoteScoreToDancePoints( HoldNoteScore hns ) { return 0; }; virtual int HoldNoteScoreToDancePoints( HoldNoteScore hns ) { return 0; };
virtual int GetPossibleDancePoints( const NoteData* pNoteData ) { return 0; }; virtual int GetPossibleDancePoints( const NoteData* pNoteData ) { return 0; };