Don't play sounds in JoinInput; let the caller do that.

Localize "only play start sound for the 2nd player who joins"
hack into ScreenSelect.
This commit is contained in:
Glenn Maynard
2006-11-21 19:52:18 +00:00
parent 9195740ded
commit d591926ff7
2 changed files with 6 additions and 6 deletions
-6
View File
@@ -237,12 +237,6 @@ bool Screen::JoinInput( PlayerNumber pn )
GAMESTATE->m_iCoins -= iCoinsNeededToJoin;
// HACK: Only play start sound for the 2nd player who joins. The
// start sound for the 1st player will be played by ScreenTitleMenu
// when the player makes a selection on the screen.
if( GAMESTATE->GetNumSidesJoined() > 0 )
SCREENMAN->PlayStartSound();
GAMESTATE->JoinPlayer( pn );
return true;
+6
View File
@@ -144,6 +144,12 @@ void ScreenSelect::Input( const InputEventPlus &input )
if( input.MenuI == MENU_BUTTON_START && input.type == IET_FIRST_PRESS && JoinInput(input.pn) )
{
// HACK: Only play start sound for the 2nd player who joins. The
// start sound for the 1st player will be played by ScreenTitleMenu
// when the player makes a selection on the screen.
if( GAMESTATE->GetNumSidesJoined() > 1 )
SCREENMAN->PlayStartSound();
this->UpdateSelectableChoices();
if( !ALLOW_DISABLED_PLAYER_INPUT )