From 6160f61f170844f710a4712018531bf008762bf4 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 18 Aug 2008 12:07:04 +0000 Subject: [PATCH] ProfileHighScore -> PersonalHighScore, move ItsARecord decorations to Lua --- stepmania/src/PlayerStageStats.cpp | 4 ++-- stepmania/src/PlayerStageStats.h | 2 +- stepmania/src/ScreenEvaluation.cpp | 28 ++++------------------------ stepmania/src/ScreenEvaluation.h | 2 -- stepmania/src/StageStats.cpp | 8 ++++---- 5 files changed, 11 insertions(+), 33 deletions(-) diff --git a/stepmania/src/PlayerStageStats.cpp b/stepmania/src/PlayerStageStats.cpp index e2ee3f20bd..7ff0245152 100644 --- a/stepmania/src/PlayerStageStats.cpp +++ b/stepmania/src/PlayerStageStats.cpp @@ -57,7 +57,7 @@ void PlayerStageStats::Init() m_pdaToShow = PerDifficultyAward_Invalid; m_pcaToShow = PeakComboAward_Invalid; - m_iProfileHighScoreIndex = -1; + m_iPersonalHighScoreIndex = -1; m_iMachineHighScoreIndex = -1; m_bDisqualified = false; m_rc = RankingCategory_Invalid; @@ -673,7 +673,7 @@ public: DEFINE_METHOD( GetPercentDancePoints, GetPercentDancePoints() ) DEFINE_METHOD( GetLessonScoreActual, GetLessonScoreActual() ) DEFINE_METHOD( GetLessonScoreNeeded, GetLessonScoreNeeded() ) - DEFINE_METHOD( GetPersonalHighScoreIndex, m_iProfileHighScoreIndex ) + DEFINE_METHOD( GetPersonalHighScoreIndex, m_iPersonalHighScoreIndex ) DEFINE_METHOD( GetMachineHighScoreIndex, m_iMachineHighScoreIndex ) DEFINE_METHOD( GetPerDifficultyAward, m_pdaToShow ) DEFINE_METHOD( GetPeakComboAward, m_pcaToShow ) diff --git a/stepmania/src/PlayerStageStats.h b/stepmania/src/PlayerStageStats.h index 18fff03c10..41b0c82bb5 100644 --- a/stepmania/src/PlayerStageStats.h +++ b/stepmania/src/PlayerStageStats.h @@ -110,7 +110,7 @@ public: PerDifficultyAward m_pdaToShow; PeakComboAward m_pcaToShow; - int m_iProfileHighScoreIndex; + int m_iPersonalHighScoreIndex; int m_iMachineHighScoreIndex; bool m_bDisqualified; bool IsDisqualified() const; diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index ee4d450149..9770cbf183 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -171,7 +171,9 @@ void ScreenEvaluation::Init() ss.m_player[p].m_iTapNoteScores[TNS_W3] = RandomInt( 3 ); ss.m_player[p].m_iPossibleGradePoints = 4*ScoreKeeperNormal::TapNoteScoreToGradePoints(TNS_W1, false); ss.m_player[p].m_fLifeRemainingSeconds = randomf( 90, 580 ); - ss.m_player[p].m_iScore = rand() % (90*1000*1000); + ss.m_player[p].m_iScore = rand() % (900*1000*1000); + ss.m_player[p].m_iPersonalHighScoreIndex = (rand() % 3) - 1; + ss.m_player[p].m_iMachineHighScoreIndex = (rand() % 3) - 1; FOREACH_ENUM( RadarCategory, rc ) { switch( rc ) @@ -612,31 +614,9 @@ void ScreenEvaluation::Init() // // init records area // - FOREACH_EnabledPlayer( p ) - { - if( m_pStageStats->m_player[p].m_iMachineHighScoreIndex != -1 ) - { - LuaThreadVariable var( "MachineHighScoreNumber", LuaReference::Create(m_pStageStats->m_player[p].m_iMachineHighScoreIndex+1) ); - m_sprMachineRecord[p].Load( THEME->GetPathG( m_sName, ssprintf("MachineRecord",m_pStageStats->m_player[p].m_iMachineHighScoreIndex+1) ) ); - m_sprMachineRecord[p]->SetName( ssprintf("MachineRecordP%d",p+1) ); - ActorUtil::LoadAllCommands( *m_sprMachineRecord[p], m_sName ); - SET_XY( m_sprMachineRecord[p] ); - this->AddChild( m_sprMachineRecord[p] ); - } - if( m_pStageStats->m_player[p].m_iProfileHighScoreIndex != -1 ) - { - LuaThreadVariable var( "ProfileHighScoreNumber", LuaReference::Create(m_pStageStats->m_player[p].m_iProfileHighScoreIndex+1) ); - m_sprProfileRecord[p].Load( THEME->GetPathG( m_sName, ssprintf("ProfileRecord",m_pStageStats->m_player[p].m_iProfileHighScoreIndex+1) ) ); - m_sprProfileRecord[p]->SetName( ssprintf("ProfileRecordP%d",p+1) ); - ActorUtil::LoadAllCommands( *m_sprProfileRecord[p], m_sName ); - SET_XY( m_sprProfileRecord[p] ); - this->AddChild( m_sprProfileRecord[p] ); - } - } - bool bOneHasNewTopRecord = false; FOREACH_PlayerNumber( p ) - if( GAMESTATE->IsPlayerEnabled(p) && (m_pStageStats->m_player[p].m_iMachineHighScoreIndex != -1 || m_pStageStats->m_player[p].m_iProfileHighScoreIndex != -1) ) + if( GAMESTATE->IsPlayerEnabled(p) && (m_pStageStats->m_player[p].m_iMachineHighScoreIndex == 0 || m_pStageStats->m_player[p].m_iPersonalHighScoreIndex == 0) ) bOneHasNewTopRecord = true; Grade best_grade = Grade_NoData; diff --git a/stepmania/src/ScreenEvaluation.h b/stepmania/src/ScreenEvaluation.h index d782fee134..8a07d4e301 100644 --- a/stepmania/src/ScreenEvaluation.h +++ b/stepmania/src/ScreenEvaluation.h @@ -108,8 +108,6 @@ protected: BitmapText m_textTime[NUM_PLAYERS]; // extra area - AutoActor m_sprMachineRecord[NUM_PLAYERS]; - AutoActor m_sprProfileRecord[NUM_PLAYERS]; AutoActor m_sprTryExtraStage; bool m_bFailed; diff --git a/stepmania/src/StageStats.cpp b/stepmania/src/StageStats.cpp index bd69a4e494..0871ccc201 100644 --- a/stepmania/src/StageStats.cpp +++ b/stepmania/src/StageStats.cpp @@ -141,7 +141,7 @@ void StageStats::CommitScores( bool bSummary ) { FOREACH_PlayerNumber( pn ) { - m_player[pn].m_iProfileHighScoreIndex = 0; + m_player[pn].m_iPersonalHighScoreIndex = 0; m_player[pn].m_iMachineHighScoreIndex = 0; } } @@ -209,7 +209,7 @@ void StageStats::CommitScores( bool bSummary ) int iAverageMeter = GetAverageMeter(p); m_player[p].m_rc = AverageMeterToRankingCategory( iAverageMeter ); - PROFILEMAN->AddCategoryScore( st, m_player[p].m_rc, p, hs, m_player[p].m_iProfileHighScoreIndex, m_player[p].m_iMachineHighScoreIndex ); + PROFILEMAN->AddCategoryScore( st, m_player[p].m_rc, p, hs, m_player[p].m_iPersonalHighScoreIndex, m_player[p].m_iMachineHighScoreIndex ); // TRICKY: Increment play count here, and not on ScreenGameplay like the others. PROFILEMAN->IncrementCategoryPlayCount( st, m_player[p].m_rc, p ); @@ -220,13 +220,13 @@ void StageStats::CommitScores( bool bSummary ) ASSERT( pCourse ); Trail* pTrail = GAMESTATE->m_pCurTrail[p]; - PROFILEMAN->AddCourseScore( pCourse, pTrail, p, hs, m_player[p].m_iProfileHighScoreIndex, m_player[p].m_iMachineHighScoreIndex ); + PROFILEMAN->AddCourseScore( pCourse, pTrail, p, hs, m_player[p].m_iPersonalHighScoreIndex, m_player[p].m_iMachineHighScoreIndex ); } else { ASSERT( pSteps ); - PROFILEMAN->AddStepsScore( pSong, pSteps, p, hs, m_player[p].m_iProfileHighScoreIndex, m_player[p].m_iMachineHighScoreIndex ); + PROFILEMAN->AddStepsScore( pSong, pSteps, p, hs, m_player[p].m_iPersonalHighScoreIndex, m_player[p].m_iMachineHighScoreIndex ); } }