move Premium into GameState

stepmania/src/GameState.cpp

@@ -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 Preference<Premium> g_Premium( "Premium", PREMIUM_NONE );
 
 GameState::GameState() :
 	m_pCurGame(			Message_CurrentGameChanged ),
@@ -1770,7 +1771,7 @@ Premium	GameState::GetPremium() const
 	if( IsEventMode() ) 
 		return PREMIUM_NONE; 
 	else 
-		return PREFSMAN->m_Premium; 
+		return g_Premium; 
 }
 
 float GameState::GetGoalPercentComplete( PlayerNumber pn )

stepmania/src/PrefsManager.cpp

@@ -196,7 +196,6 @@ PrefsManager::PrefsManager() :
 	m_iSongsPerPlay			( "SongsPerPlay",		3, ValidateSongsPerPlay ),
 
 	m_CoinMode			( "CoinMode",			COIN_MODE_HOME ),
-	m_Premium			( "Premium",			PREMIUM_NONE ),
 	m_bDelayedCreditsReconcile	( "DelayedCreditsReconcile",	false ),
 	m_bPickExtraStage		( "PickExtraStage",		false ),
 

stepmania/src/PrefsManager.h

@@ -158,7 +158,6 @@ public:
 	// These options have weird interactions depending on m_bEventMode, 
 	// so wrap them in GameState.
 	Preference<CoinMode>	m_CoinMode;
-	Preference<Premium>	m_Premium;
 
 	Preference<bool>	m_bDelayedCreditsReconcile;
 	Preference<bool>	m_bPickExtraStage;