diff --git a/stepmania/src/Preference.cpp b/stepmania/src/Preference.cpp index f0ba528202..89737f6025 100644 --- a/stepmania/src/Preference.cpp +++ b/stepmania/src/Preference.cpp @@ -66,7 +66,7 @@ READFROM_AND_WRITETO( PrefsManager::Maybe, int& ) READFROM_AND_WRITETO( PrefsManager::ShowDancingCharacters, int& ) READFROM_AND_WRITETO( PrefsManager::CourseSortOrders, int& ) READFROM_AND_WRITETO( PrefsManager::GetRankingName, int& ) -READFROM_AND_WRITETO( PrefsManager::ScoringTypes, int& ) +READFROM_AND_WRITETO( PrefsManager::ScoringType, int& ) READFROM_AND_WRITETO( PrefsManager::BoostAppPriority, int& ) READFROM_AND_WRITETO( PrefsManager::AttractSoundFrequency, int& ) READFROM_AND_WRITETO( PlayerController, int& ) diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index db0e3c92ba..3768b88c98 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -261,7 +261,7 @@ PrefsManager::PrefsManager() : m_bMoveRandomToEnd ( "MoveRandomToEnd", false ), m_bSubSortByNumSteps ( "SubSortByNumSteps", false ), m_GetRankingName ( "GetRankingName", RANKING_ON ), - m_ScoringType ( "ScoringType", SCORING_MAX2 ), + m_ScoringType ( "ScoringType", SCORING_NEW ), m_BoostAppPriority ( "BoostAppPriority", BOOST_AUTO ), m_sAdditionalSongFolders ( "AdditionalSongFolders", "" ), m_sAdditionalFolders ( "AdditionalFolders", "" ), diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index fa49539ea8..1ba1156fd4 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -267,9 +267,8 @@ public: enum GetRankingName { RANKING_OFF, RANKING_ON, RANKING_LIST }; Preference m_GetRankingName; - // scoring type; SCORING_MAX2 should always be first - enum ScoringTypes { SCORING_MAX2, SCORING_5TH }; - Preference m_ScoringType; + enum ScoringType { SCORING_NEW, SCORING_OLD }; + Preference m_ScoringType; enum BoostAppPriority { BOOST_NO, BOOST_YES, BOOST_AUTO }; /* auto = do whatever is appropriate for the arch. */ Preference m_BoostAppPriority; diff --git a/stepmania/src/ScoreKeeperNormal.cpp b/stepmania/src/ScoreKeeperNormal.cpp index 13b65ff6b9..382ee30b80 100644 --- a/stepmania/src/ScoreKeeperNormal.cpp +++ b/stepmania/src/ScoreKeeperNormal.cpp @@ -96,10 +96,10 @@ void ScoreKeeperNormal::Load( memset( m_ComboBonusFactor, 0, sizeof(m_ComboBonusFactor) ); switch( PREFSMAN->m_ScoringType ) { - case PrefsManager::SCORING_MAX2: + case PrefsManager::SCORING_NEW: m_iRoundTo = 1; break; - case PrefsManager::SCORING_5TH: + case PrefsManager::SCORING_OLD: m_iRoundTo = 5; if (!GAMESTATE->IsCourseMode()) { @@ -170,10 +170,10 @@ void ScoreKeeperNormal::OnNextSong( int iSongInCourseIndex, const Steps* pSteps, int iLengthMultiplier = SongManager::GetNumStagesForSong( GAMESTATE->m_pCurSong ); switch( PREFSMAN->m_ScoringType ) { - case PrefsManager::SCORING_MAX2: + case PrefsManager::SCORING_NEW: m_iMaxPossiblePoints = iMeter * 10000000 * iLengthMultiplier; break; - case PrefsManager::SCORING_5TH: + case PrefsManager::SCORING_OLD: m_iMaxPossiblePoints = (iMeter * iLengthMultiplier + 1) * 5000000; break; default: diff --git a/stepmania/src/ScoreKeeperNormal.h b/stepmania/src/ScoreKeeperNormal.h index 786b0f11b7..b8976c4782 100644 --- a/stepmania/src/ScoreKeeperNormal.h +++ b/stepmania/src/ScoreKeeperNormal.h @@ -1,7 +1,7 @@ -/* ScoreKeeperNormal - MAX2-style scorekeeping. */ +/* ScoreKeeperNormal - */ -#ifndef SCORE_KEEPER_MAX2_H -#define SCORE_KEEPER_MAX2_H +#ifndef ScoreKeeperNormal_H +#define ScoreKeeperNormal_H #include "ScoreKeeper.h" #include "Attack.h" diff --git a/stepmania/src/ScreenDimensions.h b/stepmania/src/ScreenDimensions.h index 412a7299e2..ac5673189e 100644 --- a/stepmania/src/ScreenDimensions.h +++ b/stepmania/src/ScreenDimensions.h @@ -1,4 +1,4 @@ -/* ScoreKeeperNormal - MAX2-style scorekeeping. */ +/* ScreenDimensions - defines for screen resolutions. */ #ifndef SCREEN_DIMENSIONS_H #define SCREEN_DIMENSIONS_H diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 60b8936678..0ac8c8c30e 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -210,7 +210,7 @@ void ScreenEvaluation::Init() } */ - if( PREFSMAN->m_ScoringType == PrefsManager::SCORING_5TH ) + if( PREFSMAN->m_ScoringType == PrefsManager::SCORING_OLD ) { FOREACH_PlayerNumber( p ) { diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 1c91a41aa9..848460910c 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -162,8 +162,8 @@ void PlayerInfo::Load( PlayerNumber pn, MultiPlayer mp, bool bShowNoteField ) switch( PREFSMAN->m_ScoringType ) { default: ASSERT(0); - case PrefsManager::SCORING_MAX2: - case PrefsManager::SCORING_5TH: + case PrefsManager::SCORING_NEW: + case PrefsManager::SCORING_OLD: m_pPrimaryScoreKeeper = new ScoreKeeperNormal( GetPlayerState(), GetPlayerStageStats() ); diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp index f62ebe3f3b..b0406585c7 100644 --- a/stepmania/src/ScreenOptionsMasterPrefs.cpp +++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp @@ -582,7 +582,7 @@ static void InitializeConfOptions() ADD( ConfOption( "SongsPerPlay", SongsPerPlay, "1","2","3","4","5" ) ); ADD( ConfOption( "SongsPerPlayOrEvent", SongsPerPlayOrEventMode, "1","2","3","4","5","EVENT" ) ); ADD( ConfOption( "EventMode", MovePref, "OFF","ON" ) ); - ADD( ConfOption( "ScoringType", ScoringType, "MAX2","5TH" ) ); + ADD( ConfOption( "ScoringType", ScoringType, "NEW","OLD" ) ); ADD( ConfOption( "JudgeDifficulty", JudgeDifficulty, "1","2","3","4","5","6","7","8","JUSTICE" ) ); ADD( ConfOption( "LifeDifficulty", LifeDifficulty, "1","2","3","4","5","6","7" ) ); ADD( ConfOption( "ProgressiveLifebar", ProgressiveLifebar, "OFF","1","2","3","4","5","6","7","8") ); diff --git a/stepmania/src/ScreenUnlock.cpp b/stepmania/src/ScreenUnlock.cpp index 49f0ae372a..e02787e855 100644 --- a/stepmania/src/ScreenUnlock.cpp +++ b/stepmania/src/ScreenUnlock.cpp @@ -153,7 +153,7 @@ void ScreenUnlock::Init() text->SetXY( ScrollingTextX, ScrollingTextStartY ); if (UNLOCK_TEXT_SCROLL == 3 && UNLOCK_TEXT_SCROLL_ROWS + i > NumUnlocks) - { // special command for last unlocks when extreme-style scrolling is in effect + { // special command for last unlocks when scrolling is in effect float TargetRow = -0.5f + i + UNLOCK_TEXT_SCROLL_ROWS - NumUnlocks; float StopOffPoint = ScrollingTextEndY - TargetRow / UNLOCK_TEXT_SCROLL_ROWS * (ScrollingTextEndY - ScrollingTextStartY); float FirstCycleTime = (UNLOCK_TEXT_SCROLL_ROWS - TargetRow) * SECS_PER_CYCLE;