From d591926ff759c59bd836673238eb7f760014a786 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 21 Nov 2006 19:52:18 +0000 Subject: [PATCH] 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. --- stepmania/src/Screen.cpp | 6 ------ stepmania/src/ScreenSelect.cpp | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp index 0864984419..ccaa5508a2 100644 --- a/stepmania/src/Screen.cpp +++ b/stepmania/src/Screen.cpp @@ -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; diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp index b3555ad547..f03aeca5ba 100644 --- a/stepmania/src/ScreenSelect.cpp +++ b/stepmania/src/ScreenSelect.cpp @@ -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 )