remove old "bonus" code; not very well integrated and very niche
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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. */
|
||||
|
||||
@@ -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. */
|
||||
|
||||
@@ -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 );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user