Move Player-specific preferences to Player.cpp.

This commit is contained in:
Steve Checkoway
2008-05-15 10:05:48 +00:00
parent fe07a07fa3
commit 67ebd51321
3 changed files with 6 additions and 13 deletions
+6 -6
View File
@@ -121,6 +121,9 @@ static Preference<float> m_fTimingWindowAdd ( "TimingWindowAdd", 0 );
static Preference1D<float> m_fTimingWindowSeconds( TimingWindowSecondsInit, NUM_TimingWindow );
static Preference<float> m_fTimingWindowJump ( "TimingWindowJump", 0.25 );
static Preference<float> m_fMaxInputLatencySeconds ( "MaxInputLatencySeconds", 0.0 );
static Preference<bool> g_bEnableAttackSoundPlayback ( "EnableAttackSounds", true );
static Preference<bool> g_bEnableMineSoundPlayback ( "EnableMineHitSound", true );
Preference<float> g_fTimingWindowHopo ( "TimingWindowHopo", 0.25 ); // max time between notes in a hopo chain
Preference<float> g_fTimingWindowStrum ( "TimingWindowStrum", 0.1f ); // max time between strum and when the frets must match
ThemeMetric<float> INITIAL_HOLD_LIFE ( "Player", "InitialHoldLife" );
@@ -593,7 +596,7 @@ void Player::Update( float fDeltaTime )
// if the Player doesn't show anything on the screen.
if( HasVisibleParts() )
{
if( PREFSMAN->m_bEnableAttackSoundPlayback )
if( g_bEnableAttackSoundPlayback )
{
if( m_pPlayerState->m_bAttackBeganThisUpdate )
m_soundAttackLaunch.Play();
@@ -2290,11 +2293,8 @@ void Player::UpdateJudgedRows()
continue;
if( tn.iKeysoundIndex >= 0 && tn.iKeysoundIndex < (int) m_vKeysounds.size() )
setSounds.insert( &m_vKeysounds[tn.iKeysoundIndex] );
else
{
if( PREFSMAN->m_bEnableMineSoundPlayback )
setSounds.insert( &m_soundMine );
}
else if( g_bEnableMineSoundPlayback )
setSounds.insert( &m_soundMine );
ChangeLife( tn.result.tns );
if( m_pScoreDisplay )
-3
View File
@@ -229,9 +229,6 @@ PrefsManager::PrefsManager() :
m_bTrilinearFiltering ( "TrilinearFiltering", false ),
m_bAnisotropicFiltering ( "AnisotropicFiltering", false ),
m_bEnableAttackSoundPlayback ( "EnableAttackSounds", true ),
m_bEnableMineSoundPlayback ( "EnableMineHitSound", true ),
m_bSignProfileData ( "SignProfileData", false ),
m_CourseSortOrder ( "CourseSortOrder", COURSE_SORT_SONGS ),
m_bSubSortByNumSteps ( "SubSortByNumSteps", false ),
-4
View File
@@ -186,10 +186,6 @@ public:
Preference<bool> m_bCelShadeModels;
Preference<bool> m_bPreferredSortUsesGroups;
// Options to enable/disable the playback of attack start/end sounds, and mine hit sounds
Preference<bool> m_bEnableAttackSoundPlayback;
Preference<bool> m_bEnableMineSoundPlayback;
// Number of seconds it takes for a button on the controller to release
// after pressed.
Preference<float> m_fPadStickSeconds;