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

fix coin/join logic

Browse Source
This commit is contained in:
Chris Danford
2003-11-07 20:14:29 +00:00
parent 884488732d
commit ec3324f6e9
6 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+7
View File
@@ -1012,3 +1012,10 @@ void GameState::StoreRankingName( PlayerNumber pn, CString name )
*aFeats[i].pStringToFill = name; *aFeats[i].pStringToFill = name;
} }
} }
bool GameState::UsingPremiumAndPaying()
{
return
(PREFSMAN->m_bVersusForOneCredit || PREFSMAN->m_bDoubleForOneCredit) &&
PREFSMAN->m_iCoinMode == COIN_PAY;
}
stepmania/src/GameState.h
+1
View File
@@ -66,6 +66,7 @@ public:
iNumSidesJoined++; // left side, and right side iNumSidesJoined++; // left side, and right side
return iNumSidesJoined; return iNumSidesJoined;
}; };
bool UsingPremiumAndPaying();
GameDef* GetCurrentGameDef(); GameDef* GetCurrentGameDef();
const StyleDef* GetCurrentStyleDef(); const StyleDef* GetCurrentStyleDef();
stepmania/src/ModeChoice.cpp
+22 -8
View File
@@ -161,7 +161,7 @@ void ModeChoice::Load( int iIndex, CString sChoice )
} }
} }
int GetCreditsToPlayStyle( Style style ) int GetCreditsRequiredToPlayStyle( Style style )
{ {
switch( GAMEMAN->GetStyleDefForStyle(style)->m_StyleType ) switch( GAMEMAN->GetStyleDefForStyle(style)->m_StyleType )
{ {
@@ -177,6 +177,21 @@ int GetCreditsToPlayStyle( Style style )
} }
} }
int GetSidesRequiredToPlayStyle( Style style )
{
switch( GAMEMAN->GetStyleDefForStyle(style)->m_StyleType )
{
case StyleDef::ONE_PLAYER_ONE_CREDIT:
return 1;
case StyleDef::TWO_PLAYERS_TWO_CREDITS:
case StyleDef::ONE_PLAYER_TWO_CREDITS:
return 2;
default:
ASSERT(0);
return 1;
}
}
bool ModeChoice::IsPlayable( CString *why ) const bool ModeChoice::IsPlayable( CString *why ) const
{ {
if( m_bInvalid ) if( m_bInvalid )
@@ -184,19 +199,19 @@ bool ModeChoice::IsPlayable( CString *why ) const
if ( m_style != STYLE_INVALID ) if ( m_style != STYLE_INVALID )
{ {
bool bUsingPremium = PREFSMAN->m_bVersusForOneCredit || PREFSMAN->m_bDoubleForOneCredit;
int iNumCreditsInserted = GAMESTATE->m_iCoins/PREFSMAN->m_iCoinsPerCredit; int iNumCreditsInserted = GAMESTATE->m_iCoins/PREFSMAN->m_iCoinsPerCredit;
int iNumCreditsRequired = GetCreditsToPlayStyle(m_style); int iNumCreditsRequired = GetCreditsRequiredToPlayStyle(m_style);
int iNumSidesJoined = GAMESTATE->GetNumSidesJoined(); int iNumSidesJoined = GAMESTATE->GetNumSidesJoined();
int iNumSidesRequired = GetSidesRequiredToPlayStyle(m_style);
if( bUsingPremium ) if( GAMESTATE->UsingPremiumAndPaying() )
{ {
if( iNumCreditsInserted < iNumCreditsRequired ) if( iNumCreditsInserted < iNumCreditsRequired )
return false; return false;
} }
else else
{ {
if( iNumCreditsRequired != iNumSidesJoined ) if( iNumSidesRequired != iNumSidesJoined )
return false; return false;
} }
} }
@@ -281,10 +296,9 @@ void ModeChoice::Apply( PlayerNumber pn ) const
} }
// If using a premium setting, subtract coins only after choosing a style. // If using a premium setting, subtract coins only after choosing a style.
bool bUsingPremium = PREFSMAN->m_bVersusForOneCredit || PREFSMAN->m_bDoubleForOneCredit;
int iNumCoinsInserted = GAMESTATE->m_iCoins; int iNumCoinsInserted = GAMESTATE->m_iCoins;
int iNumCoinsRequired = PREFSMAN->m_iCoinsPerCredit*GetCreditsToPlayStyle(m_style); int iNumCoinsRequired = PREFSMAN->m_iCoinsPerCredit*GetCreditsRequiredToPlayStyle(m_style);
if( bUsingPremium ) if( GAMESTATE->UsingPremiumAndPaying() )
{ {
ASSERT( iNumCoinsInserted >= iNumCoinsRequired ); ASSERT( iNumCoinsInserted >= iNumCoinsRequired );
GAMESTATE->m_iCoins -= iNumCoinsRequired; GAMESTATE->m_iCoins -= iNumCoinsRequired;
stepmania/src/ScreenSelect.cpp
+2 -2
View File
@@ -94,12 +94,12 @@ void ScreenSelect::Input( const DeviceInput& DeviceI, const InputEventType type,
// LOG->Trace( "ScreenSelect::Input()" ); // LOG->Trace( "ScreenSelect::Input()" );
bool bUsingPremium = PREFSMAN->m_bVersusForOneCredit || PREFSMAN->m_bDoubleForOneCredit; bool bUsingPremium = PREFSMAN->m_bVersusForOneCredit || PREFSMAN->m_bDoubleForOneCredit;
if( bUsingPremium ) if( GAMESTATE->UsingPremiumAndPaying() )
{ {
if( MenuI.IsValid() && MenuI.button==MENU_BUTTON_COIN && GAMESTATE->m_iCoins==PREFSMAN->m_iCoinsPerCredit*2 ) if( MenuI.IsValid() && MenuI.button==MENU_BUTTON_COIN && GAMESTATE->m_iCoins==PREFSMAN->m_iCoinsPerCredit*2 )
this->UpdateSelectableChoices(); this->UpdateSelectableChoices();
} }
else // !bUsingPremium else
{ {
if( Screen::JoinInput(DeviceI, type, GameI, MenuI, StyleI) ) if( Screen::JoinInput(DeviceI, type, GameI, MenuI, StyleI) )
{ {
stepmania/src/ScreenSelectStyle.cpp
+1 -1
View File
@@ -108,7 +108,7 @@ ScreenSelectStyle::ScreenSelectStyle( CString sClassName ) : ScreenSelect( sClas
m_sprJointPremium.SetName( "JointPremium" ); m_sprJointPremium.SetName( "JointPremium" );
if( PREFSMAN->m_bVersusForOneCredit||PREFSMAN->m_bDoubleForOneCredit ) if( GAMESTATE->UsingPremiumAndPaying() )
{ {
m_sprJointPremium.Load( THEME->GetPathToG(m_sName + " joint premium") ); m_sprJointPremium.Load( THEME->GetPathToG(m_sName + " joint premium") );
this->AddChild( &m_sprJointPremium ); this->AddChild( &m_sprJointPremium );
stepmania/src/ScreenTitleMenu.cpp
+1 -1
View File
@@ -71,7 +71,7 @@ ScreenTitleMenu::ScreenTitleMenu( CString sClassName ) : ScreenSelect( sClassNam
CodeDetector::RefreshCacheItems(); CodeDetector::RefreshCacheItems();
if( PREFSMAN->m_iCoinMode!=COIN_HOME && (PREFSMAN->m_bVersusForOneCredit||PREFSMAN->m_bDoubleForOneCredit) ) if( GAMESTATE->UsingPremiumAndPaying() )
{ {
m_JointPremium.LoadFromAniDir( THEME->GetPathToB("ScreenTitleMenu joint premium") ); m_JointPremium.LoadFromAniDir( THEME->GetPathToB("ScreenTitleMenu joint premium") );
this->AddChild( &m_JointPremium ); this->AddChild( &m_JointPremium );