diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index f1c3c5061e..77b6b8642d 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -112,10 +112,10 @@ NextScreen2=ScreenSelectDifficulty NextScreen3=ScreenSelectDifficulty NextScreen4=ScreenSelectDifficulty NextScreen5=ScreenSelectDifficulty -JointPremiumX=550 -JointPremiumY=84 -JointPremiumOnCommand=addx,400;bounceend,0.5;addx,-400;glowshift;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.3 -JointPremiumOffCommand=bouncebegin,0.5;addx,400 +PremiumX=550 +PremiumY=84 +PremiumOnCommand=addx,400;bounceend,0.5;addx,-400;glowshift;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.3 +PremiumOffCommand=bouncebegin,0.5;addx,400 Icon1X=60 Icon1Y=84 Icon1OnCommand=addx,-640;sleep,0.20;decelerate,0.3;addx,640 diff --git a/stepmania/src/ModeChoice.cpp b/stepmania/src/ModeChoice.cpp index dda3b0c3b5..a6a8030705 100644 --- a/stepmania/src/ModeChoice.cpp +++ b/stepmania/src/ModeChoice.cpp @@ -170,7 +170,7 @@ int GetSidesRequiredToPlayStyle( Style style ) case StyleDef::TWO_PLAYERS_TWO_CREDITS: return 2; case StyleDef::ONE_PLAYER_TWO_CREDITS: - return (PREFSMAN->m_Premium == PrefsManager::DOUBLE_FOR_1CREDIT) ? 1 : 2; + return (PREFSMAN->m_Premium == PrefsManager::DOUBLES_PREMIUM) ? 1 : 2; default: ASSERT(0); return 1; diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 9db3ddbf45..85e4ab62e1 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -72,7 +72,7 @@ public: int m_iMarvelousTiming; int m_iCoinMode; int m_iCoinsPerCredit; - enum Premium { NO_PREMIUM, DOUBLE_FOR_1CREDIT, JOINT_PREMIUM }; + enum Premium { NO_PREMIUM, DOUBLES_PREMIUM, JOINT_PREMIUM }; Premium m_Premium; bool m_bPickExtraStage; bool m_bComboContinuesBetweenSongs; diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp index c65c9100a5..b1061dce9a 100644 --- a/stepmania/src/ScreenOptionsMasterPrefs.cpp +++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp @@ -265,7 +265,7 @@ static void CoinsPerCredit( int &sel, bool ToSel, const CStringArray &choices ) static void Premium( int &sel, bool ToSel, const CStringArray &choices ) { - const PrefsManager::Premium mapping[] = { PrefsManager::NO_PREMIUM,PrefsManager::DOUBLE_FOR_1CREDIT,PrefsManager::JOINT_PREMIUM }; + const PrefsManager::Premium mapping[] = { PrefsManager::NO_PREMIUM,PrefsManager::DOUBLES_PREMIUM,PrefsManager::JOINT_PREMIUM }; MoveMap( sel, PREFSMAN->m_Premium, ToSel, mapping, ARRAYSIZE(mapping) ); } diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp index 5e6307922f..2b4363530e 100644 --- a/stepmania/src/ScreenSelectStyle.cpp +++ b/stepmania/src/ScreenSelectStyle.cpp @@ -106,12 +106,18 @@ ScreenSelectStyle::ScreenSelectStyle( CString sClassName ) : ScreenSelect( sClas this->UpdateSelectableChoices(); - m_sprJointPremium.SetName( "JointPremium" ); + m_sprPremium.SetName( "Premium" ); - if( PREFSMAN->m_Premium==PrefsManager::JOINT_PREMIUM ) + switch( PREFSMAN->m_Premium ) { - m_sprJointPremium.Load( THEME->GetPathToG(m_sName + " joint premium") ); - this->AddChild( &m_sprJointPremium ); + case PrefsManager::DOUBLES_PREMIUM: + m_sprPremium.Load( THEME->GetPathToG(m_sName + " doubles premium") ); + this->AddChild( &m_sprPremium ); + break; + case PrefsManager::JOINT_PREMIUM: + m_sprPremium.Load( THEME->GetPathToG(m_sName + " joint premium") ); + this->AddChild( &m_sprPremium ); + break; } @@ -129,7 +135,7 @@ ScreenSelectStyle::ScreenSelectStyle( CString sClassName ) : ScreenSelect( sClas } SET_XY_AND_ON_COMMAND( m_sprExplanation ); SET_XY_AND_ON_COMMAND( m_sprWarning ); - SET_XY_AND_ON_COMMAND( m_sprJointPremium ); + SET_XY_AND_ON_COMMAND( m_sprPremium ); // let AfterChange tween Picture and Info } @@ -203,7 +209,7 @@ void ScreenSelectStyle::MenuStart( PlayerNumber pn ) OFF_COMMAND( m_sprWarning ); OFF_COMMAND( m_sprPicture[m_iSelection] ); OFF_COMMAND( m_sprInfo[m_iSelection] ); - OFF_COMMAND( m_sprJointPremium ); + OFF_COMMAND( m_sprPremium ); } int ScreenSelectStyle::GetSelectionIndex( PlayerNumber pn ) diff --git a/stepmania/src/ScreenSelectStyle.h b/stepmania/src/ScreenSelectStyle.h index bd82b2b816..e60fbd1b7f 100644 --- a/stepmania/src/ScreenSelectStyle.h +++ b/stepmania/src/ScreenSelectStyle.h @@ -43,7 +43,7 @@ protected: Sprite m_sprInfo[MAX_MODE_CHOICES]; Sprite m_sprExplanation; Sprite m_sprWarning; - Sprite m_sprJointPremium; + Sprite m_sprPremium; RageSound m_soundChange; RageSound m_soundSelect; diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp index 0d54328295..1e978122fe 100644 --- a/stepmania/src/ScreenTitleMenu.cpp +++ b/stepmania/src/ScreenTitleMenu.cpp @@ -72,10 +72,19 @@ ScreenTitleMenu::ScreenTitleMenu( CString sClassName ) : ScreenSelect( sClassNam CodeDetector::RefreshCacheItems(); - if( PREFSMAN->m_Premium==PrefsManager::JOINT_PREMIUM ) - { - m_JointPremium.LoadFromAniDir( THEME->GetPathToB("ScreenTitleMenu joint premium") ); - this->AddChild( &m_JointPremium ); + if( PREFSMAN->m_iCoinMode != COIN_HOME ) + { + switch( PREFSMAN->m_Premium ) + { + case PrefsManager::DOUBLES_PREMIUM: + m_Premium.LoadFromAniDir( THEME->GetPathToB("ScreenTitleMenu doubles premium") ); + this->AddChild( &m_Premium ); + break; + case PrefsManager::JOINT_PREMIUM: + m_Premium.LoadFromAniDir( THEME->GetPathToB("ScreenTitleMenu joint premium") ); + this->AddChild( &m_Premium ); + break; + } } m_sprLogo.Load( THEME->GetPathToG(ssprintf("ScreenLogo %s",GAMESTATE->GetCurrentGameDef()->m_szName)) ); diff --git a/stepmania/src/ScreenTitleMenu.h b/stepmania/src/ScreenTitleMenu.h index 887cc1bd02..2f8a017b85 100644 --- a/stepmania/src/ScreenTitleMenu.h +++ b/stepmania/src/ScreenTitleMenu.h @@ -52,7 +52,7 @@ private: RageTimer TimeToDemonstration; BGAnimation m_CoinMode; - BGAnimation m_JointPremium; + BGAnimation m_Premium; Transition m_AttractOut; };