From e38749de1b9cbfaa43d348056a887c7017fc9b35 Mon Sep 17 00:00:00 2001 From: Josh Allen Date: Sat, 22 Jul 2006 03:28:45 +0000 Subject: [PATCH] Send note result offset into ReportScore --- stepmania/src/ScoreKeeperNormal.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/stepmania/src/ScoreKeeperNormal.cpp b/stepmania/src/ScoreKeeperNormal.cpp index 04710c30cb..d24d6de8c3 100644 --- a/stepmania/src/ScoreKeeperNormal.cpp +++ b/stepmania/src/ScoreKeeperNormal.cpp @@ -16,6 +16,7 @@ #include "PlayerState.h" #include "Style.h" #include "song.h" +#include "NoteDataWithScoring.h" ScoreKeeperNormal::ScoreKeeperNormal( PlayerState* pPlayerState, @@ -346,7 +347,8 @@ void ScoreKeeperNormal::HandleTapScore( const TapNote &tn ) NSMAN->ReportScore( m_pPlayerState->m_PlayerNumber, score, m_pPlayerStageStats->iScore, - m_pPlayerStageStats->iCurCombo ); + m_pPlayerStageStats->iCurCombo, + tn.result.fTapNoteOffset ); } } @@ -419,9 +421,10 @@ void ScoreKeeperNormal::HandleTapRowScore( const NoteData &nd, int iRow ) // TODO: Remove indexing with PlayerNumber PlayerNumber pn = m_pPlayerState->m_PlayerNumber; + float offset = NoteDataWithScoring::LastTapNoteWithResult( nd, iRow, pn ).result.fTapNoteOffset; NSMAN->ReportScore( pn, scoreOfLastTap, m_pPlayerStageStats->iScore, - m_pPlayerStageStats->iCurCombo ); + m_pPlayerStageStats->iCurCombo, offset ); } @@ -450,7 +453,8 @@ void ScoreKeeperNormal::HandleHoldScore( const TapNote &tn ) pn, holdScore+TNS_W1, m_pPlayerStageStats->iScore, - m_pPlayerStageStats->iCurCombo ); + m_pPlayerStageStats->iCurCombo, + tn.result.fTapNoteOffset ); }