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

Simplify.

Browse Source
This commit is contained in:
Steve Checkoway
2006-08-10 06:39:08 +00:00
parent c82810b12b
commit 547920b6cd
7 changed files with 24 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenNetSelectMusic.cpp
+14 -20
View File
@@ -318,34 +318,28 @@ done:
ScreenNetSelectBase::HandleScreenMessage( SM );
}
void ScreenNetSelectMusic::MenuLeft( const InputEventPlus &input )
void ScreenNetSelectMusic::MenuLeft( PlayerNumber pn )
{
bool bLeftPressed = INPUTMAPPER->IsButtonDown( MenuInput(input.MenuI.player, MENU_BUTTON_LEFT) );
bool bRightPressed = INPUTMAPPER->IsButtonDown( MenuInput(input.MenuI.player, MENU_BUTTON_RIGHT) );
bool bLeftPressed = INPUTMAPPER->IsButtonDown( MenuInput(pn, MENU_BUTTON_LEFT) );
bool bRightPressed = INPUTMAPPER->IsButtonDown( MenuInput(pn, MENU_BUTTON_RIGHT) );
bool bLeftAndRightPressed = bLeftPressed && bRightPressed;
if( input.type == IET_FIRST_PRESS )
{
if ( bLeftAndRightPressed )
m_MusicWheel.ChangeSort( SORT_MODE_MENU );
else
m_MusicWheel.Move( -1 );
}
if ( bLeftAndRightPressed )
m_MusicWheel.ChangeSort( SORT_MODE_MENU );
else
m_MusicWheel.Move( -1 );
}
void ScreenNetSelectMusic::MenuRight( const InputEventPlus &input )
void ScreenNetSelectMusic::MenuRight( PlayerNumber pn )
{
bool bLeftPressed = INPUTMAPPER->IsButtonDown( MenuInput (input.MenuI.player, MENU_BUTTON_LEFT) );
bool bRightPressed = INPUTMAPPER->IsButtonDown( MenuInput(input.MenuI.player, MENU_BUTTON_RIGHT) ) ;
bool bLeftPressed = INPUTMAPPER->IsButtonDown( MenuInput (pn, MENU_BUTTON_LEFT) );
bool bRightPressed = INPUTMAPPER->IsButtonDown( MenuInput(pn, MENU_BUTTON_RIGHT) ) ;
bool bLeftAndRightPressed = bLeftPressed && bRightPressed;
if( input.type == IET_FIRST_PRESS )
{
if ( bLeftAndRightPressed )
m_MusicWheel.ChangeSort( SORT_MODE_MENU );
else
m_MusicWheel.Move( +1 );
}
if ( bLeftAndRightPressed )
m_MusicWheel.ChangeSort( SORT_MODE_MENU );
else
m_MusicWheel.Move( +1 );
}
void ScreenNetSelectMusic::MenuUp( const InputEventPlus &input )