From 951701fbb5107bcc05b4a53d8de9ba5cfbaa2ca3 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Tue, 8 Feb 2011 01:55:28 -0600 Subject: [PATCH] simplify --- src/ScreenNetSelectMusic.cpp | 18 ++++++++---------- src/ScreenNetSelectMusic.h | 1 + 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/ScreenNetSelectMusic.cpp b/src/ScreenNetSelectMusic.cpp index c73e78d990..766301e292 100644 --- a/src/ScreenNetSelectMusic.cpp +++ b/src/ScreenNetSelectMusic.cpp @@ -309,15 +309,17 @@ done: 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 ) { PlayerNumber pn = input.pn; - bool bLeftPressed = INPUTMAPPER->IsBeingPressed( GAME_BUTTON_LEFT, pn ); - bool bRightPressed = INPUTMAPPER->IsBeingPressed( GAME_BUTTON_RIGHT, pn ); - bool bLeftAndRightPressed = bLeftPressed && bRightPressed; - - if( bLeftAndRightPressed ) + if( LeftAndRightPressed(pn) ) m_MusicWheel.ChangeSort( SORT_MODE_MENU ); else m_MusicWheel.Move( -1 ); @@ -327,11 +329,7 @@ void ScreenNetSelectMusic::MenuRight( const InputEventPlus &input ) { PlayerNumber pn = input.pn; - bool bLeftPressed = INPUTMAPPER->IsBeingPressed( GAME_BUTTON_LEFT, pn ); - bool bRightPressed = INPUTMAPPER->IsBeingPressed( GAME_BUTTON_RIGHT, pn ); - bool bLeftAndRightPressed = bLeftPressed && bRightPressed; - - if( bLeftAndRightPressed ) + if( LeftAndRightPressed(pn) ) m_MusicWheel.ChangeSort( SORT_MODE_MENU ); else m_MusicWheel.Move( +1 ); diff --git a/src/ScreenNetSelectMusic.h b/src/ScreenNetSelectMusic.h index 57140f9801..7c8051a6ab 100644 --- a/src/ScreenNetSelectMusic.h +++ b/src/ScreenNetSelectMusic.h @@ -30,6 +30,7 @@ protected: virtual void MenuDown( const InputEventPlus &input ); virtual void MenuRight( const InputEventPlus &input ); virtual void MenuBack( const InputEventPlus &input ); + bool LeftAndRightPressed( const PlayerNumber pn ); virtual void Update( float fDeltaTime );