From d3e1018abd6270896a012ffaa9cb7326b988403a Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 6 May 2007 00:26:07 +0000 Subject: [PATCH] fix 2PlayersFor1Credit and late join --- stepmania/src/GameState.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 6a7d75419d..fe9105ff08 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -319,8 +319,15 @@ 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[m_MasterPlayerNumber]; + else + m_iPlayerStageTokens[pn] = PREFSMAN->m_iSongsPerPlay; + m_bSideIsJoined[pn] = true; - m_iPlayerStageTokens[pn] = PREFSMAN->m_iSongsPerPlay; if( m_MasterPlayerNumber == PLAYER_INVALID ) m_MasterPlayerNumber = pn;