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

move Premium into GameState

Browse Source
This commit is contained in:
Glenn Maynard
2006-11-21 03:35:43 +00:00
parent 1869848121
commit 8ab6be7bde
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+2 -1
View File
@@ -97,6 +97,7 @@ static const ThemeMetric<Grade> GRADE_TIER_FOR_EXTRA_2 ("GameState","GradeTierFo
static DynamicThemeMetric<bool> ARE_STAGE_MODS_FORCED( "GameState","AreStageModsForced" ); static DynamicThemeMetric<bool> ARE_STAGE_MODS_FORCED( "GameState","AreStageModsForced" );
static Preference<Premium> g_Premium( "Premium", PREMIUM_NONE );
GameState::GameState() : GameState::GameState() :
m_pCurGame( Message_CurrentGameChanged ), m_pCurGame( Message_CurrentGameChanged ),
@@ -1770,7 +1771,7 @@ Premium GameState::GetPremium() const
if( IsEventMode() ) if( IsEventMode() )
return PREMIUM_NONE; return PREMIUM_NONE;
else else
return PREFSMAN->m_Premium; return g_Premium;
} }
float GameState::GetGoalPercentComplete( PlayerNumber pn ) float GameState::GetGoalPercentComplete( PlayerNumber pn )
stepmania/src/PrefsManager.cpp
-1
View File
@@ -196,7 +196,6 @@ PrefsManager::PrefsManager() :
m_iSongsPerPlay ( "SongsPerPlay", 3, ValidateSongsPerPlay ), m_iSongsPerPlay ( "SongsPerPlay", 3, ValidateSongsPerPlay ),
m_CoinMode ( "CoinMode", COIN_MODE_HOME ), m_CoinMode ( "CoinMode", COIN_MODE_HOME ),
m_Premium ( "Premium", PREMIUM_NONE ),
m_bDelayedCreditsReconcile ( "DelayedCreditsReconcile", false ), m_bDelayedCreditsReconcile ( "DelayedCreditsReconcile", false ),
m_bPickExtraStage ( "PickExtraStage", false ), m_bPickExtraStage ( "PickExtraStage", false ),
stepmania/src/PrefsManager.h
-1
View File
@@ -158,7 +158,6 @@ public:
// These options have weird interactions depending on m_bEventMode, // These options have weird interactions depending on m_bEventMode,
// so wrap them in GameState. // so wrap them in GameState.
Preference<CoinMode> m_CoinMode; Preference<CoinMode> m_CoinMode;
Preference<Premium> m_Premium;
Preference<bool> m_bDelayedCreditsReconcile; Preference<bool> m_bDelayedCreditsReconcile;
Preference<bool> m_bPickExtraStage; Preference<bool> m_bPickExtraStage;