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

add doubles premium messages

Browse Source
This commit is contained in:
Chris Danford
2003-11-09 08:55:21 +00:00
parent 21738b9cbe
commit a35e97b88e
8 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+4 -4
View File
@@ -112,10 +112,10 @@ NextScreen2=ScreenSelectDifficulty
NextScreen3=ScreenSelectDifficulty NextScreen3=ScreenSelectDifficulty
NextScreen4=ScreenSelectDifficulty NextScreen4=ScreenSelectDifficulty
NextScreen5=ScreenSelectDifficulty NextScreen5=ScreenSelectDifficulty
JointPremiumX=550 PremiumX=550
JointPremiumY=84 PremiumY=84
JointPremiumOnCommand=addx,400;bounceend,0.5;addx,-400;glowshift;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.3 PremiumOnCommand=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 PremiumOffCommand=bouncebegin,0.5;addx,400
Icon1X=60 Icon1X=60
Icon1Y=84 Icon1Y=84
Icon1OnCommand=addx,-640;sleep,0.20;decelerate,0.3;addx,640 Icon1OnCommand=addx,-640;sleep,0.20;decelerate,0.3;addx,640
stepmania/src/ModeChoice.cpp
+1 -1
View File
@@ -170,7 +170,7 @@ int GetSidesRequiredToPlayStyle( Style style )
case StyleDef::TWO_PLAYERS_TWO_CREDITS: case StyleDef::TWO_PLAYERS_TWO_CREDITS:
return 2; return 2;
case StyleDef::ONE_PLAYER_TWO_CREDITS: 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: default:
ASSERT(0); ASSERT(0);
return 1; return 1;
stepmania/src/PrefsManager.h
+1 -1
View File
@@ -72,7 +72,7 @@ public:
int m_iMarvelousTiming; int m_iMarvelousTiming;
int m_iCoinMode; int m_iCoinMode;
int m_iCoinsPerCredit; int m_iCoinsPerCredit;
enum Premium { NO_PREMIUM, DOUBLE_FOR_1CREDIT, JOINT_PREMIUM }; enum Premium { NO_PREMIUM, DOUBLES_PREMIUM, JOINT_PREMIUM };
Premium m_Premium; Premium m_Premium;
bool m_bPickExtraStage; bool m_bPickExtraStage;
bool m_bComboContinuesBetweenSongs; bool m_bComboContinuesBetweenSongs;
stepmania/src/ScreenOptionsMasterPrefs.cpp
+1 -1
View File
@@ -265,7 +265,7 @@ static void CoinsPerCredit( int &sel, bool ToSel, const CStringArray &choices )
static void Premium( 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) ); MoveMap( sel, PREFSMAN->m_Premium, ToSel, mapping, ARRAYSIZE(mapping) );
} }
stepmania/src/ScreenSelectStyle.cpp
+12 -6
View File
@@ -106,12 +106,18 @@ ScreenSelectStyle::ScreenSelectStyle( CString sClassName ) : ScreenSelect( sClas
this->UpdateSelectableChoices(); 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") ); case PrefsManager::DOUBLES_PREMIUM:
this->AddChild( &m_sprJointPremium ); 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_sprExplanation );
SET_XY_AND_ON_COMMAND( m_sprWarning ); 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 // let AfterChange tween Picture and Info
} }
@@ -203,7 +209,7 @@ void ScreenSelectStyle::MenuStart( PlayerNumber pn )
OFF_COMMAND( m_sprWarning ); OFF_COMMAND( m_sprWarning );
OFF_COMMAND( m_sprPicture[m_iSelection] ); OFF_COMMAND( m_sprPicture[m_iSelection] );
OFF_COMMAND( m_sprInfo[m_iSelection] ); OFF_COMMAND( m_sprInfo[m_iSelection] );
OFF_COMMAND( m_sprJointPremium ); OFF_COMMAND( m_sprPremium );
} }
int ScreenSelectStyle::GetSelectionIndex( PlayerNumber pn ) int ScreenSelectStyle::GetSelectionIndex( PlayerNumber pn )
stepmania/src/ScreenSelectStyle.h
+1 -1
View File
@@ -43,7 +43,7 @@ protected:
Sprite m_sprInfo[MAX_MODE_CHOICES]; Sprite m_sprInfo[MAX_MODE_CHOICES];
Sprite m_sprExplanation; Sprite m_sprExplanation;
Sprite m_sprWarning; Sprite m_sprWarning;
Sprite m_sprJointPremium; Sprite m_sprPremium;
RageSound m_soundChange; RageSound m_soundChange;
RageSound m_soundSelect; RageSound m_soundSelect;
stepmania/src/ScreenTitleMenu.cpp
+12 -3
View File
@@ -72,10 +72,19 @@ ScreenTitleMenu::ScreenTitleMenu( CString sClassName ) : ScreenSelect( sClassNam
CodeDetector::RefreshCacheItems(); CodeDetector::RefreshCacheItems();
if( PREFSMAN->m_Premium==PrefsManager::JOINT_PREMIUM ) if( PREFSMAN->m_iCoinMode != COIN_HOME )
{ {
m_JointPremium.LoadFromAniDir( THEME->GetPathToB("ScreenTitleMenu joint premium") ); switch( PREFSMAN->m_Premium )
this->AddChild( &m_JointPremium ); {
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)) ); m_sprLogo.Load( THEME->GetPathToG(ssprintf("ScreenLogo %s",GAMESTATE->GetCurrentGameDef()->m_szName)) );
stepmania/src/ScreenTitleMenu.h
+1 -1
View File
@@ -52,7 +52,7 @@ private:
RageTimer TimeToDemonstration; RageTimer TimeToDemonstration;
BGAnimation m_CoinMode; BGAnimation m_CoinMode;
BGAnimation m_JointPremium; BGAnimation m_Premium;
Transition m_AttractOut; Transition m_AttractOut;
}; };