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

use enum for attract sound frequency

Browse Source
This commit is contained in:
Chris Danford
2005-06-11 10:53:16 +00:00
parent b45f4c0d5a
commit 386de4e74c
5 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+2 -8
View File
@@ -1720,17 +1720,11 @@ bool GameState::OneIsHot() const
bool GameState::IsTimeToPlayAttractSounds() bool GameState::IsTimeToPlayAttractSounds()
{ {
// if m_iNumTimesThroughAttract is negative, play attract sounds regardless if( PREFSMAN->m_AttractSoundFrequency == PrefsManager::ASF_NEVER )
// of m_iAttractSoundFrequency.
if( m_iNumTimesThroughAttract<0 )
return true;
// 0 means "never play sound". Avoid a divide by 0 below.
if( PREFSMAN->m_iAttractSoundFrequency == 0 )
return false; return false;
// play attract sounds once every m_iAttractSoundFrequency times through // play attract sounds once every m_iAttractSoundFrequency times through
if( (m_iNumTimesThroughAttract % PREFSMAN->m_iAttractSoundFrequency)==0 ) if( (m_iNumTimesThroughAttract % PREFSMAN->m_AttractSoundFrequency)==0 )
return true; return true;
return false; return false;
stepmania/src/Preference.cpp
+1
View File
@@ -68,6 +68,7 @@ READFROM_AND_WRITETO( PrefsManager::CourseSortOrders, int& )
READFROM_AND_WRITETO( PrefsManager::GetRankingName, int& ) READFROM_AND_WRITETO( PrefsManager::GetRankingName, int& )
READFROM_AND_WRITETO( PrefsManager::ScoringTypes, int& ) READFROM_AND_WRITETO( PrefsManager::ScoringTypes, int& )
READFROM_AND_WRITETO( PrefsManager::BoostAppPriority, int& ) READFROM_AND_WRITETO( PrefsManager::BoostAppPriority, int& )
READFROM_AND_WRITETO( PrefsManager::AttractSoundFrequency, int& )
READFROM_AND_WRITETO( PlayerController, int& ) READFROM_AND_WRITETO( PlayerController, int& )
READFROM_AND_WRITETO( RageSoundReader_Resample::ResampleQuality, int& ) READFROM_AND_WRITETO( RageSoundReader_Resample::ResampleQuality, int& )
stepmania/src/PrefsManager.cpp
+1 -1
View File
@@ -241,7 +241,7 @@ PrefsManager::PrefsManager() :
m_iCenterImageTranslateY ( "CenterImageTranslateY", 0 ), m_iCenterImageTranslateY ( "CenterImageTranslateY", 0 ),
m_fCenterImageAddWidth ( "CenterImageAddWidth", 0 ), m_fCenterImageAddWidth ( "CenterImageAddWidth", 0 ),
m_fCenterImageAddHeight ( "CenterImageAddHeight", 0 ), m_fCenterImageAddHeight ( "CenterImageAddHeight", 0 ),
m_iAttractSoundFrequency ( "AttractSoundFrequency", 1 ), m_AttractSoundFrequency ( "AttractSoundFrequency", ASF_EVERY_TIME ),
m_bAllowExtraStage ( "AllowExtraStage", true ), m_bAllowExtraStage ( "AllowExtraStage", true ),
m_bHideDefaultNoteSkin ( "HideDefaultNoteSkin", false ), m_bHideDefaultNoteSkin ( "HideDefaultNoteSkin", false ),
m_iMaxHighScoresPerListForMachine ( "MaxHighScoresPerListForMachine", 10 ), m_iMaxHighScoresPerListForMachine ( "MaxHighScoresPerListForMachine", 10 ),
stepmania/src/PrefsManager.h
+2 -1
View File
@@ -226,7 +226,8 @@ public:
Preference<int> m_iCenterImageTranslateY; Preference<int> m_iCenterImageTranslateY;
Preference<int> m_fCenterImageAddWidth; Preference<int> m_fCenterImageAddWidth;
Preference<int> m_fCenterImageAddHeight; Preference<int> m_fCenterImageAddHeight;
Preference<int> m_iAttractSoundFrequency; // 0 = never, 1 = every time enum AttractSoundFrequency { ASF_NEVER, ASF_EVERY_TIME, ASF_EVERY_2_TIMES, ASF_EVERY_3_TIMES, ASF_EVERY_4_TIMES, ASF_EVERY_5_TIMES };
Preference<AttractSoundFrequency> m_AttractSoundFrequency;
Preference<bool> m_bAllowExtraStage; Preference<bool> m_bAllowExtraStage;
Preference<bool> m_bHideDefaultNoteSkin; Preference<bool> m_bHideDefaultNoteSkin;
Preference<int> m_iMaxHighScoresPerListForMachine; Preference<int> m_iMaxHighScoresPerListForMachine;
stepmania/src/ScreenOptionsMasterPrefs.cpp
+1 -1
View File
@@ -495,7 +495,7 @@ static void AspectRatio( int &sel, bool ToSel, const ConfOption *pConfOption )
/* Sound options */ /* Sound options */
MOVE( ResamplingQuality, PREFSMAN->m_SoundResampleQuality ); MOVE( ResamplingQuality, PREFSMAN->m_SoundResampleQuality );
MOVE( AttractSoundFrequency,PREFSMAN->m_iAttractSoundFrequency ); MOVE( AttractSoundFrequency,PREFSMAN->m_AttractSoundFrequency );
static void SoundVolume( int &sel, bool ToSel, const ConfOption *pConfOption ) static void SoundVolume( int &sel, bool ToSel, const ConfOption *pConfOption )
{ {