From 9030c1c63a285c60611a6b044eb5fba4f05d629f Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 18 Mar 2008 15:27:26 +0000 Subject: [PATCH] remove old "bonus" code; not very well integrated and very niche --- stepmania/src/PlayerStageStats.cpp | 1 - stepmania/src/PlayerStageStats.h | 1 - stepmania/src/ScoreKeeperNormal.cpp | 2 +- stepmania/src/ScreenEvaluation.cpp | 39 ----------------------------- 4 files changed, 1 insertion(+), 42 deletions(-) diff --git a/stepmania/src/PlayerStageStats.cpp b/stepmania/src/PlayerStageStats.cpp index 8ce3010c49..bfc6c44388 100644 --- a/stepmania/src/PlayerStageStats.cpp +++ b/stepmania/src/PlayerStageStats.cpp @@ -39,7 +39,6 @@ void PlayerStageStats::Init() m_iCurMissCombo = 0; m_iCurScoreMultiplier = 1; m_iScore = 0; - m_iBonus = 0; m_iMaxScore = 0; m_iCurMaxScore = 0; m_iSongsPassed = 0; diff --git a/stepmania/src/PlayerStageStats.h b/stepmania/src/PlayerStageStats.h index 3b8b6d7d89..41b0c82bb5 100644 --- a/stepmania/src/PlayerStageStats.h +++ b/stepmania/src/PlayerStageStats.h @@ -52,7 +52,6 @@ public: int m_iScore; int m_iCurMaxScore; int m_iMaxScore; - int m_iBonus; // bonus to be added on screeneval RadarValues m_radarPossible; // filled in by ScreenGameplay on start of notes RadarValues m_radarActual; /* The number of songs played and passed, respectively. */ diff --git a/stepmania/src/ScoreKeeperNormal.cpp b/stepmania/src/ScoreKeeperNormal.cpp index cf92861baf..20e7c7f72f 100644 --- a/stepmania/src/ScoreKeeperNormal.cpp +++ b/stepmania/src/ScoreKeeperNormal.cpp @@ -380,7 +380,7 @@ void ScoreKeeperNormal::AddScoreInternal( TapNoteScore score ) { iScore += GetScore(p, Z, sum, m_iTapNotesHit); const int &iCurrentCombo = m_pPlayerStageStats->m_iCurCombo; - m_pPlayerStageStats->m_iBonus += m_ComboBonusFactor[score] * iCurrentCombo; + iScore += m_ComboBonusFactor[score] * iCurrentCombo; } /* Subtract the maximum this step could have been worth from the bonus. */ diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 0052670eb6..7e9ed0281a 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -76,7 +76,6 @@ XToString( StatLine ); static const int NUM_SHOWN_RADAR_CATEGORIES = 5; AutoScreenMessage( SM_PlayCheer ) -AutoScreenMessage( SM_AddBonus ) REGISTER_SCREEN_CLASS( ScreenEvaluation ); ScreenEvaluation::ScreenEvaluation() @@ -215,21 +214,6 @@ void ScreenEvaluation::Init() } */ - if( PREFSMAN->m_ScoringType == SCORING_OLD ) - { - FOREACH_PlayerNumber( p ) - { - const int ScoreBonuses[] = { 10000000, 10000000, 1000000, 100000, 10000, 1000, 100 }; - Grade g = m_pStageStats->m_player[p].GetGrade(); - if( g < (int) ARRAYLEN(ScoreBonuses) ) - { - m_pStageStats->m_player[p].m_iBonus += ScoreBonuses[(int)g]; - m_pStageStats->m_player[p].m_iBonus += ScoreBonuses[(int)g]; - } - } - } - - // // update persistent statistics // @@ -707,8 +691,6 @@ void ScreenEvaluation::Init() this->PostScreenMessage( SM_PlayCheer, CHEER_DELAY_SECONDS ); break; } - - this->PostScreenMessage( SM_AddBonus, 1.5f ); } void ScreenEvaluation::Input( const InputEventPlus &input ) @@ -763,27 +745,6 @@ void ScreenEvaluation::HandleScreenMessage( const ScreenMessage SM ) { SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation cheer") ); } - else if( SM == SM_AddBonus ) - { - FOREACH_EnabledPlayer( p ) - { - if( m_pStageStats->m_player[p].m_iBonus == 0 ) - continue; - - if( GAMESTATE->IsCourseMode() ) - continue; - - int increment = m_pStageStats->m_player[p].m_iBonus/10; - if( increment < 1 ) - increment = min( 1024, m_pStageStats->m_player[p].m_iBonus ); - - m_pStageStats->m_player[p].m_iBonus -= increment; - m_pStageStats->m_player[p].m_iScore += increment; - - if( SHOW_SCORE_AREA ) - m_textScore[p].SetText( ssprintf("%*.0i", NUM_SCORE_DIGITS, m_pStageStats->m_player[p].m_iScore) ); - } - } ScreenWithMenuElements::HandleScreenMessage( SM ); }