From 08ae11469297fab3afbe354b27db2986b5a90d0a Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Tue, 20 Apr 2010 23:04:43 -0500 Subject: [PATCH] add lifts to a few things. (but not ScreenEvaluation DetailLines (yet). I may flip the switch on that before beta 3) Profile:GetTotalLifts() Lua binding added. --- src/ScoreKeeperNormal.cpp | 12 ++++++++---- src/ScreenEvaluation.cpp | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/ScoreKeeperNormal.cpp b/src/ScoreKeeperNormal.cpp index 9cf9591044..8509538ae2 100644 --- a/src/ScoreKeeperNormal.cpp +++ b/src/ScoreKeeperNormal.cpp @@ -792,10 +792,12 @@ int ScoreKeeperNormal::GetPossibleDancePoints( const RadarValues& radars ) * W2 will be used instead. */ int NumTaps = int(radars[RadarCategory_TapsAndHolds]); - int NumHolds = int(radars[RadarCategory_Holds]); - int NumRolls = int(radars[RadarCategory_Rolls]); + int NumLifts = int(radars[RadarCategory_Lifts]); + int NumHolds = int(radars[RadarCategory_Holds]); + int NumRolls = int(radars[RadarCategory_Rolls]); return NumTaps*TapNoteScoreToDancePoints(TNS_W1, false) + + NumLifts*TapNoteScoreToDancePoints(TNS_W1, false) + NumHolds*HoldNoteScoreToDancePoints(HNS_Held, false) + NumRolls*HoldNoteScoreToDancePoints(HNS_Held, false); } @@ -816,10 +818,12 @@ int ScoreKeeperNormal::GetPossibleGradePoints( const RadarValues& radars ) * W2 will be used instead. */ int NumTaps = int(radars[RadarCategory_TapsAndHolds]); - int NumHolds = int(radars[RadarCategory_Holds]); - int NumRolls = int(radars[RadarCategory_Rolls]); + int NumLifts = int(radars[RadarCategory_Lifts]); + int NumHolds = int(radars[RadarCategory_Holds]); + int NumRolls = int(radars[RadarCategory_Rolls]); return NumTaps*TapNoteScoreToGradePoints(TNS_W1, false) + + NumLifts*TapNoteScoreToGradePoints(TNS_W1, false) + NumHolds*HoldNoteScoreToGradePoints(HNS_Held, false) + NumRolls*HoldNoteScoreToGradePoints(HNS_Held, false); } diff --git a/src/ScreenEvaluation.cpp b/src/ScreenEvaluation.cpp index 82e0c7b516..3f0cacd0ee 100644 --- a/src/ScreenEvaluation.cpp +++ b/src/ScreenEvaluation.cpp @@ -197,6 +197,7 @@ void ScreenEvaluation::Init() case RadarCategory_Mines: case RadarCategory_Hands: case RadarCategory_Rolls: + case RadarCategory_Lifts: ss.m_player[p].m_radarPossible[rc] = 1 + (rand() % 200); ss.m_player[p].m_radarActual[rc] = rand() % (int)(ss.m_player[p].m_radarPossible[rc]); break; @@ -546,6 +547,7 @@ void ScreenEvaluation::Init() static const int indeces[NUM_DetailLine] = { RadarCategory_TapsAndHolds, RadarCategory_Jumps, RadarCategory_Holds, RadarCategory_Mines, RadarCategory_Hands, RadarCategory_Rolls + //, RadarCategory_Lifts }; const int ind = indeces[l]; const int iActual = lrintf(m_pStageStats->m_player[p].m_radarActual[ind]);