actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enum name cleanup to reflect the generic calculations

Browse Source
This commit is contained in:
Chris Danford
2005-10-08 04:50:28 +00:00
parent d2fd0c5ed2
commit 32464990af
10 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Preference.cpp
+1 -1
View File
@@ -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& )
stepmania/src/PrefsManager.cpp
+1 -1
View File
@@ -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", "" ),
stepmania/src/PrefsManager.h
+2 -3
View File
@@ -267,9 +267,8 @@ public:
enum GetRankingName { RANKING_OFF, RANKING_ON, RANKING_LIST };
Preference<GetRankingName> m_GetRankingName;
// scoring type; SCORING_MAX2 should always be first
enum ScoringTypes { SCORING_MAX2, SCORING_5TH };
Preference<ScoringTypes> m_ScoringType;
enum ScoringType { SCORING_NEW, SCORING_OLD };
Preference<ScoringType> m_ScoringType;
enum BoostAppPriority { BOOST_NO, BOOST_YES, BOOST_AUTO }; /* auto = do whatever is appropriate for the arch. */
Preference<BoostAppPriority> m_BoostAppPriority;
stepmania/src/ScoreKeeperNormal.cpp
+4 -4
View File
@@ -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:
stepmania/src/ScoreKeeperNormal.h
+3 -3
View File
@@ -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"
stepmania/src/ScreenDimensions.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* ScoreKeeperNormal - MAX2-style scorekeeping. */
/* ScreenDimensions - defines for screen resolutions. */
#ifndef SCREEN_DIMENSIONS_H
#define SCREEN_DIMENSIONS_H
stepmania/src/ScreenEvaluation.cpp
+1 -1
View File
@@ -210,7 +210,7 @@ void ScreenEvaluation::Init()
}
*/
if( PREFSMAN->m_ScoringType == PrefsManager::SCORING_5TH )
if( PREFSMAN->m_ScoringType == PrefsManager::SCORING_OLD )
{
FOREACH_PlayerNumber( p )
{
stepmania/src/ScreenGameplay.cpp
+2 -2
View File
@@ -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() );
stepmania/src/ScreenOptionsMasterPrefs.cpp
+1 -1
View File
@@ -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") );
stepmania/src/ScreenUnlock.cpp
+1 -1
View File
@@ -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;