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

Round 2 of this.

Browse Source
This commit is contained in:
Jason Felds
2013-04-15 23:26:05 -04:00
parent 26399964cb
commit 1d7b5fe852
10 changed files with 5 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GameState.cpp
+2 -14
View File
@@ -361,13 +361,7 @@ void GameState::Reset()
void GameState::JoinPlayer( PlayerNumber pn )
{
/* If joint premium and we're not taking away a credit for the 2nd join,
* give the new player the same number of stage tokens that the old player
* has. */
if( GetCoinMode() == CoinMode_Pay && GetPremium() == Premium_2PlayersFor1Credit && GetNumSidesJoined() == 1 )
m_iPlayerStageTokens[pn] = m_iPlayerStageTokens[this->GetMasterPlayerNumber()];
else
m_iPlayerStageTokens[pn] = PREFSMAN->m_iSongsPerPlay;
m_iPlayerStageTokens[pn] = PREFSMAN->m_iSongsPerPlay;
m_bSideIsJoined[pn] = true;
@@ -491,9 +485,6 @@ int GameState::GetCoinsNeededToJoin() const
{
int iCoinsToCharge = 0;
if( GetCoinMode() == CoinMode_Pay )
iCoinsToCharge = PREFSMAN->m_iCoinsPerCredit;
// If joint premium, don't take away a credit for the second join.
if( GetPremium() == Premium_2PlayersFor1Credit &&
GetNumSidesJoined() == 1 )
@@ -2055,10 +2046,7 @@ bool GameState::IsEventMode() const
CoinMode GameState::GetCoinMode() const
{
if( IsEventMode() && GamePreferences::m_CoinMode == CoinMode_Pay )
return CoinMode_Free;
else
return GamePreferences::m_CoinMode;
return GamePreferences::m_CoinMode;
}
ThemeMetric<bool> DISABLE_PREMIUM_IN_EVENT_MODE("GameState","DisablePremiumInEventMode");