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

simplify

Browse Source
This commit is contained in:
AJ Kelly
2011-02-08 01:55:28 -06:00
parent 9106ad7cf4
commit 951701fbb5
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenNetSelectMusic.cpp
+8 -10
View File
@@ -309,15 +309,17 @@ done:
ScreenNetSelectBase::HandleScreenMessage( SM ); ScreenNetSelectBase::HandleScreenMessage( SM );
} }
bool ScreenNetSelectMusic::LeftAndRightPressed( const PlayerNumber pn )
{
return INPUTMAPPER->IsBeingPressed( GAME_BUTTON_LEFT, pn )
&& INPUTMAPPER->IsBeingPressed( GAME_BUTTON_RIGHT, pn );
}
void ScreenNetSelectMusic::MenuLeft( const InputEventPlus &input ) void ScreenNetSelectMusic::MenuLeft( const InputEventPlus &input )
{ {
PlayerNumber pn = input.pn; PlayerNumber pn = input.pn;
bool bLeftPressed = INPUTMAPPER->IsBeingPressed( GAME_BUTTON_LEFT, pn ); if( LeftAndRightPressed(pn) )
bool bRightPressed = INPUTMAPPER->IsBeingPressed( GAME_BUTTON_RIGHT, pn );
bool bLeftAndRightPressed = bLeftPressed && bRightPressed;
if( bLeftAndRightPressed )
m_MusicWheel.ChangeSort( SORT_MODE_MENU ); m_MusicWheel.ChangeSort( SORT_MODE_MENU );
else else
m_MusicWheel.Move( -1 ); m_MusicWheel.Move( -1 );
@@ -327,11 +329,7 @@ void ScreenNetSelectMusic::MenuRight( const InputEventPlus &input )
{ {
PlayerNumber pn = input.pn; PlayerNumber pn = input.pn;
bool bLeftPressed = INPUTMAPPER->IsBeingPressed( GAME_BUTTON_LEFT, pn ); if( LeftAndRightPressed(pn) )
bool bRightPressed = INPUTMAPPER->IsBeingPressed( GAME_BUTTON_RIGHT, pn );
bool bLeftAndRightPressed = bLeftPressed && bRightPressed;
if( bLeftAndRightPressed )
m_MusicWheel.ChangeSort( SORT_MODE_MENU ); m_MusicWheel.ChangeSort( SORT_MODE_MENU );
else else
m_MusicWheel.Move( +1 ); m_MusicWheel.Move( +1 );
src/ScreenNetSelectMusic.h
+1
View File
@@ -30,6 +30,7 @@ protected:
virtual void MenuDown( const InputEventPlus &input ); virtual void MenuDown( const InputEventPlus &input );
virtual void MenuRight( const InputEventPlus &input ); virtual void MenuRight( const InputEventPlus &input );
virtual void MenuBack( const InputEventPlus &input ); virtual void MenuBack( const InputEventPlus &input );
bool LeftAndRightPressed( const PlayerNumber pn );
virtual void Update( float fDeltaTime ); virtual void Update( float fDeltaTime );