From 2b5cbe811f127067c20c78fb0a622c7e1897729e Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 14 Sep 2006 08:11:58 +0000 Subject: [PATCH] check the button press in the caller of JoinInput (so we don't have to construct a fake input message in ScreenSelectMaster::MenuStart) --- stepmania/src/Screen.cpp | 3 --- stepmania/src/ScreenSelect.cpp | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp index b21784d8bc..4d40aa60c4 100644 --- a/stepmania/src/Screen.cpp +++ b/stepmania/src/Screen.cpp @@ -241,9 +241,6 @@ bool Screen::JoinInput( const InputEventPlus &input ) if( !GAMESTATE->PlayersCanJoin() ) return false; - if( input.MenuI != MENU_BUTTON_START ) - return false; - /* If this side is already in, don't re-join (and re-pay!). */ if(GAMESTATE->m_bSideIsJoined[input.pn]) return false; diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp index 1817a8d722..4566d064f9 100644 --- a/stepmania/src/ScreenSelect.cpp +++ b/stepmania/src/ScreenSelect.cpp @@ -150,7 +150,7 @@ void ScreenSelect::Input( const InputEventPlus &input ) bool bAllowJoinInput = !ALLOW_DISABLED_PLAYER_INPUT; if( input.MenuI == MENU_BUTTON_COIN || - (bAllowJoinInput && Screen::JoinInput(input)) ) + (bAllowJoinInput && input.MenuI == MENU_BUTTON_START && Screen::JoinInput(input)) ) { if( input.type == IET_FIRST_PRESS ) this->UpdateSelectableChoices();