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

check the button press in the caller of JoinInput (so we

Browse Source 
don't have to construct a fake input message in
ScreenSelectMaster::MenuStart)
This commit is contained in:
Glenn Maynard
2006-09-14 08:11:58 +00:00
parent aeb0c1be0b
commit 2b5cbe811f
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Screen.cpp
-3
View File
@@ -241,9 +241,6 @@ bool Screen::JoinInput( const InputEventPlus &input )
if( !GAMESTATE->PlayersCanJoin() ) if( !GAMESTATE->PlayersCanJoin() )
return false; return false;
if( input.MenuI != MENU_BUTTON_START )
return false;
/* If this side is already in, don't re-join (and re-pay!). */ /* If this side is already in, don't re-join (and re-pay!). */
if(GAMESTATE->m_bSideIsJoined[input.pn]) if(GAMESTATE->m_bSideIsJoined[input.pn])
return false; return false;
stepmania/src/ScreenSelect.cpp
+1 -1
View File
@@ -150,7 +150,7 @@ void ScreenSelect::Input( const InputEventPlus &input )
bool bAllowJoinInput = !ALLOW_DISABLED_PLAYER_INPUT; bool bAllowJoinInput = !ALLOW_DISABLED_PLAYER_INPUT;
if( input.MenuI == MENU_BUTTON_COIN || 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 ) if( input.type == IET_FIRST_PRESS )
this->UpdateSelectableChoices(); this->UpdateSelectableChoices();