From 3f96734e6c4e1c99260cea2c61408c4d54a70249 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 14 Sep 2006 21:18:39 +0000 Subject: [PATCH] MenuX(PlayerNumber) -> MenuX(InputEventPlus) --- stepmania/src/ScreenEditMenu.cpp | 8 +++---- stepmania/src/ScreenEditMenu.h | 8 +++---- stepmania/src/ScreenSelectCharacter.cpp | 28 ++++++++++++++---------- stepmania/src/ScreenSelectCharacter.h | 13 ++++++----- stepmania/src/ScreenSelectDifficulty.cpp | 18 ++++++++++----- stepmania/src/ScreenSelectDifficulty.h | 9 ++++---- stepmania/src/ScreenSelectGroup.cpp | 16 +++++++------- stepmania/src/ScreenSelectGroup.h | 12 +++++----- stepmania/src/ScreenSelectMode.cpp | 13 ++++++----- stepmania/src/ScreenSelectMode.h | 10 ++++----- stepmania/src/ScreenSetTime.cpp | 18 +++++++-------- stepmania/src/ScreenSetTime.h | 14 ++++++------ 12 files changed, 92 insertions(+), 75 deletions(-) diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp index 378d3c7108..c4730ea7ce 100644 --- a/stepmania/src/ScreenEditMenu.cpp +++ b/stepmania/src/ScreenEditMenu.cpp @@ -100,7 +100,7 @@ void ScreenEditMenu::HandleScreenMessage( const ScreenMessage SM ) ScreenWithMenuElements::HandleScreenMessage( SM ); } -void ScreenEditMenu::MenuUp( PlayerNumber pn ) +void ScreenEditMenu::MenuUp( const InputEventPlus &input ) { if( m_Selector.CanGoUp() ) { @@ -109,7 +109,7 @@ void ScreenEditMenu::MenuUp( PlayerNumber pn ) } } -void ScreenEditMenu::MenuDown( PlayerNumber pn ) +void ScreenEditMenu::MenuDown( const InputEventPlus &input ) { if( m_Selector.CanGoDown() ) { @@ -161,7 +161,7 @@ static LocalizedString STEPS_WILL_BE_LOST ( "ScreenEditMenu", "These steps will static LocalizedString CONTINUE_WITH_DELETE ( "ScreenEditMenu", "Continue with delete?" ); static LocalizedString BLANK ( "ScreenEditMenu", "Blank" ); static LocalizedString ENTER_EDIT_DESCRIPTION ( "ScreenEditMenu", "Enter a description for this edit."); -void ScreenEditMenu::MenuStart( PlayerNumber pn ) +void ScreenEditMenu::MenuStart( const InputEventPlus &input ) { if( IsTransitioning() ) return; @@ -316,7 +316,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn ) } } -void ScreenEditMenu::MenuBack( PlayerNumber pn ) +void ScreenEditMenu::MenuBack( const InputEventPlus &input ) { Cancel( SM_GoToPrevScreen ); diff --git a/stepmania/src/ScreenEditMenu.h b/stepmania/src/ScreenEditMenu.h index 39717d20fe..5124677022 100644 --- a/stepmania/src/ScreenEditMenu.h +++ b/stepmania/src/ScreenEditMenu.h @@ -14,12 +14,12 @@ public: private: - void MenuUp( PlayerNumber pn ); - void MenuDown( PlayerNumber pn ); + void MenuUp( const InputEventPlus &input ); + void MenuDown( const InputEventPlus &input ); void MenuLeft( const InputEventPlus &input ); void MenuRight( const InputEventPlus &input ); - void MenuBack( PlayerNumber pn ); - void MenuStart( PlayerNumber pn ); + void MenuBack( const InputEventPlus &input ); + void MenuStart( const InputEventPlus &input ); void RefreshExplanationText(); void RefreshNumStepsLoadedFromProfile(); diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp index a0db46341c..d625ecf86c 100644 --- a/stepmania/src/ScreenSelectCharacter.cpp +++ b/stepmania/src/ScreenSelectCharacter.cpp @@ -11,6 +11,7 @@ #include "PrefsManager.h" #include "RageTextureManager.h" #include "CharacterManager.h" +#include "InputEventPlus.h" #define TITLE_ON_COMMAND( p ) THEME->GetMetricA("ScreenSelectCharacter",ssprintf("TitleP%dOnCommand",p+1)) @@ -177,7 +178,7 @@ void ScreenSelectCharacter::HandleScreenMessage( const ScreenMessage SM ) } else if( SM == SM_MenuTimer ) { - MenuStart(PLAYER_1); + MakeSelection(PLAYER_1); if( !AllAreFinishedChoosing() ) ResetTimer(); } @@ -273,25 +274,25 @@ void ScreenSelectCharacter::AfterValueChange( PlayerNumber pn ) } -void ScreenSelectCharacter::MenuLeft( PlayerNumber pn ) +void ScreenSelectCharacter::MenuLeft( const InputEventPlus &input ) { - MenuUp( pn ); + MenuUp( input ); } -void ScreenSelectCharacter::MenuRight( PlayerNumber pn ) +void ScreenSelectCharacter::MenuRight( const InputEventPlus &input ) { - MenuDown( pn ); + MenuDown( input ); } -void ScreenSelectCharacter::MenuUp( PlayerNumber pn ) +void ScreenSelectCharacter::MenuUp( const InputEventPlus &input ) { - Move( pn, -1 ); + Move( input.pn, -1 ); } -void ScreenSelectCharacter::MenuDown( PlayerNumber pn ) +void ScreenSelectCharacter::MenuDown( const InputEventPlus &input ) { - Move( pn, +1 ); + Move( input.pn, +1 ); } void ScreenSelectCharacter::Move( PlayerNumber pn, int deltaValue ) @@ -319,7 +320,12 @@ bool ScreenSelectCharacter::AllAreFinishedChoosing() const return true; } -void ScreenSelectCharacter::MenuStart( PlayerNumber pn ) +void ScreenSelectCharacter::MenuStart( const InputEventPlus &input ) +{ + MakeSelection( input.pn ); +} + +void ScreenSelectCharacter::MakeSelection( PlayerNumber pn ) { if( m_SelectionRow[pn] == FINISHED_CHOOSING ) return; @@ -355,7 +361,7 @@ void ScreenSelectCharacter::MenuStart( PlayerNumber pn ) } } -void ScreenSelectCharacter::MenuBack( PlayerNumber pn ) +void ScreenSelectCharacter::MenuBack( const InputEventPlus &input ) { Cancel( SM_GoToPrevScreen ); } diff --git a/stepmania/src/ScreenSelectCharacter.h b/stepmania/src/ScreenSelectCharacter.h index 24a82e2706..b3d467608c 100644 --- a/stepmania/src/ScreenSelectCharacter.h +++ b/stepmania/src/ScreenSelectCharacter.h @@ -22,12 +22,12 @@ public: virtual void Input( const InputEventPlus &input ); virtual void HandleScreenMessage( const ScreenMessage SM ); - void MenuLeft( PlayerNumber pn ); - void MenuRight( PlayerNumber pn ); - void MenuUp( PlayerNumber pn ); - void MenuDown( PlayerNumber pn ); - void MenuStart( PlayerNumber pn ); - void MenuBack( PlayerNumber pn ); + void MenuLeft( const InputEventPlus &input ); + void MenuRight( const InputEventPlus &input ); + void MenuUp( const InputEventPlus &input ); + void MenuDown( const InputEventPlus &input ); + void MenuStart( const InputEventPlus &input ); + void MenuBack( const InputEventPlus &input ); void TweenOffScreen(); @@ -41,6 +41,7 @@ private: void AfterValueChange( PlayerNumber pn ); void Move( PlayerNumber pn, int deltaValue ); bool AllAreFinishedChoosing() const; + void MakeSelection( PlayerNumber pn ); int m_iSelectedCharacter[NUM_PLAYERS]; enum { diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp index c0886ee4ac..803f84599d 100644 --- a/stepmania/src/ScreenSelectDifficulty.cpp +++ b/stepmania/src/ScreenSelectDifficulty.cpp @@ -9,6 +9,7 @@ #include "GameCommand.h" #include "ActorUtil.h" #include "ScreenDimensions.h" +#include "InputEventPlus.h" #define NUM_CHOICES_ON_PAGE_1 THEME->GetMetricI(m_sName,"NumChoicesOnPage1") #define LOCK_INPUT_SECONDS THEME->GetMetricF(m_sName,"LockInputSeconds") @@ -211,8 +212,9 @@ static bool BothPlayersGameCommand( const GameCommand &mc ) return false; } -void ScreenSelectDifficulty::MenuLeft( PlayerNumber pn ) +void ScreenSelectDifficulty::MenuLeft( const InputEventPlus &input ) { + PlayerNumber pn = input.pn; // if( m_fLockInputTime > 0 ) // return; if( m_bChosen[pn] ) @@ -247,8 +249,9 @@ void ScreenSelectDifficulty::MenuLeft( PlayerNumber pn ) } -void ScreenSelectDifficulty::MenuRight( PlayerNumber pn ) +void ScreenSelectDifficulty::MenuRight( const InputEventPlus &input ) { + PlayerNumber pn = input.pn; // if( m_fLockInputTime > 0 ) // return; if( m_bChosen[pn] ) @@ -377,7 +380,12 @@ bool ScreenSelectDifficulty::ChangeWithinPage( PlayerNumber pn, int iNewChoice, return bAnyChanged; } -void ScreenSelectDifficulty::MenuStart( PlayerNumber pn ) +void ScreenSelectDifficulty::MenuStart( const InputEventPlus &input ) +{ + MakeSelection( input.pn ); +} + +void ScreenSelectDifficulty::MakeSelection( PlayerNumber pn ) { if( m_fLockInputTime > 0 ) return; @@ -409,7 +417,7 @@ void ScreenSelectDifficulty::MenuStart( PlayerNumber pn ) // move all cursors to the oni/nonstop selection so it graphically looks as if all players selected the same option. ChangeWithinPage( p, m_iChoiceOnPage[pn], false ); bPlaySelect = false; - MenuStart( p ); // agree everyone + MakeSelection( p ); // agree everyone bPlaySelect = true; } } @@ -485,7 +493,7 @@ void ScreenSelectDifficulty::MenuStart( PlayerNumber pn ) continue; bPlaySelect = false; - MenuStart( p ); + MakeSelection( p ); bPlaySelect = true; } } diff --git a/stepmania/src/ScreenSelectDifficulty.h b/stepmania/src/ScreenSelectDifficulty.h index 1e0bf6e4c1..95749f15c3 100644 --- a/stepmania/src/ScreenSelectDifficulty.h +++ b/stepmania/src/ScreenSelectDifficulty.h @@ -19,11 +19,9 @@ public: virtual void Update( float fDelta ); - virtual void MenuLeft( PlayerNumber pn ); - virtual void MenuRight( PlayerNumber pn ); - virtual void MenuUp( PlayerNumber pn ) {}; - virtual void MenuDown( PlayerNumber pn ) {}; - virtual void MenuStart( PlayerNumber pn ); + virtual void MenuLeft( const InputEventPlus &input ); + virtual void MenuRight( const InputEventPlus &input ); + virtual void MenuStart( const InputEventPlus &input ); // virtual void MenuBack( PlayerNumber pn ); virtual void TweenOffScreen(); @@ -37,6 +35,7 @@ protected: float GetCursorY( PlayerNumber pn ); bool ChangeWithinPage( PlayerNumber pn, int iNewChoice, bool bChangingPages ); void ChangePage( Page newPage ); + void MakeSelection( PlayerNumber pn ); ActorFrame m_framePages; // to hold the 2 pages diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp index acc582a73f..884053b720 100644 --- a/stepmania/src/ScreenSelectGroup.cpp +++ b/stepmania/src/ScreenSelectGroup.cpp @@ -163,17 +163,17 @@ void ScreenSelectGroup::AfterChange() } -void ScreenSelectGroup::MenuLeft( PlayerNumber pn ) +void ScreenSelectGroup::MenuLeft( const InputEventPlus &input ) { - MenuUp( pn ); + MenuUp( input ); } -void ScreenSelectGroup::MenuRight( PlayerNumber pn ) +void ScreenSelectGroup::MenuRight( const InputEventPlus &input ) { - MenuDown( pn ); + MenuDown( input ); } -void ScreenSelectGroup::MenuUp( PlayerNumber pn ) +void ScreenSelectGroup::MenuUp( const InputEventPlus &input ) { if( m_bChosen ) return; @@ -186,7 +186,7 @@ void ScreenSelectGroup::MenuUp( PlayerNumber pn ) } -void ScreenSelectGroup::MenuDown( PlayerNumber pn ) +void ScreenSelectGroup::MenuDown( const InputEventPlus &input ) { if( m_bChosen ) return; @@ -198,7 +198,7 @@ void ScreenSelectGroup::MenuDown( PlayerNumber pn ) m_soundChange.Play(); } -void ScreenSelectGroup::MenuStart( PlayerNumber pn ) +void ScreenSelectGroup::MenuStart( const InputEventPlus &input ) { if( m_bChosen ) return; @@ -218,7 +218,7 @@ void ScreenSelectGroup::MenuStart( PlayerNumber pn ) this->PostScreenMessage( SM_BeginFadingOut, 0 ); } -void ScreenSelectGroup::MenuBack( PlayerNumber pn ) +void ScreenSelectGroup::MenuBack( const InputEventPlus &input ) { Cancel( SM_GoToPrevScreen ); } diff --git a/stepmania/src/ScreenSelectGroup.h b/stepmania/src/ScreenSelectGroup.h index 0a972064ac..6ea3052d83 100644 --- a/stepmania/src/ScreenSelectGroup.h +++ b/stepmania/src/ScreenSelectGroup.h @@ -21,12 +21,12 @@ public: void AfterChange(); - void MenuLeft( PlayerNumber pn ); - void MenuRight( PlayerNumber pn ); - void MenuUp( PlayerNumber pn ); - void MenuDown( PlayerNumber pn ); - void MenuStart( PlayerNumber pn ); - void MenuBack( PlayerNumber pn ); + void MenuLeft( const InputEventPlus &input ); + void MenuRight( const InputEventPlus &input ); + void MenuUp( const InputEventPlus &input ); + void MenuDown( const InputEventPlus &input ); + void MenuStart( const InputEventPlus &input ); + void MenuBack( const InputEventPlus &input ); void TweenOnScreen(); void TweenOffScreen(); diff --git a/stepmania/src/ScreenSelectMode.cpp b/stepmania/src/ScreenSelectMode.cpp index da7bad10f0..fecf0043ae 100644 --- a/stepmania/src/ScreenSelectMode.cpp +++ b/stepmania/src/ScreenSelectMode.cpp @@ -12,6 +12,7 @@ #include "ThemeManager.h" #include "ActorUtil.h" #include "CharacterManager.h" +#include "InputEventPlus.h" /* Constants */ @@ -134,7 +135,7 @@ ScreenSelectMode::~ScreenSelectMode() LOG->Trace( "ScreenSelectMode::~ScreenSelectMode()" ); } -void ScreenSelectMode::MenuLeft( PlayerNumber pn ) +void ScreenSelectMode::MenuLeft( const InputEventPlus &input ) { if(m_bSelected && USECONFIRM == 1) { @@ -167,7 +168,7 @@ void ScreenSelectMode::ChangeBGA() }*/ } -void ScreenSelectMode::MenuRight( PlayerNumber pn ) +void ScreenSelectMode::MenuRight( const InputEventPlus &input ) { if(m_bSelected && USECONFIRM == 1) { @@ -286,7 +287,7 @@ void ScreenSelectMode::SetCharacters() } } -void ScreenSelectMode::MenuStart( PlayerNumber pn ) +void ScreenSelectMode::MenuStart( const InputEventPlus &input ) { if(!m_bSelected && USECONFIRM == 1) { @@ -351,7 +352,7 @@ void ScreenSelectMode::DrawPrimitives() // todo: optimize the following - Frieza -void ScreenSelectMode::MenuUp(PlayerNumber pn) +void ScreenSelectMode::MenuUp(const InputEventPlus &input) { vector vpCharactersToUse; if(ENABLE_CHAR_SELECT && m_bCharsAvailable) @@ -377,6 +378,7 @@ void ScreenSelectMode::MenuUp(PlayerNumber pn) } } + PlayerNumber pn = input.pn; m_CurChar[pn].UnloadTexture(); if(ENABLE_CHAR_SELECT && m_bCharsAvailable) { @@ -397,7 +399,7 @@ void ScreenSelectMode::MenuUp(PlayerNumber pn) } } -void ScreenSelectMode::MenuDown(PlayerNumber pn) +void ScreenSelectMode::MenuDown(const InputEventPlus &input) { vector vpCharactersToUse; if(ENABLE_CHAR_SELECT && m_bCharsAvailable) @@ -423,6 +425,7 @@ void ScreenSelectMode::MenuDown(PlayerNumber pn) } } + PlayerNumber pn = input.pn; m_CurChar[pn].UnloadTexture(); if(ENABLE_CHAR_SELECT && m_bCharsAvailable) { diff --git a/stepmania/src/ScreenSelectMode.h b/stepmania/src/ScreenSelectMode.h index 8ad024e944..4906a59ac2 100644 --- a/stepmania/src/ScreenSelectMode.h +++ b/stepmania/src/ScreenSelectMode.h @@ -24,11 +24,11 @@ class ScreenSelectMode : public ScreenSelect public: virtual void Init(); virtual ~ScreenSelectMode(); // Destructor - virtual void MenuLeft( PlayerNumber pn ); - virtual void MenuRight( PlayerNumber pn ); - virtual void MenuUp(PlayerNumber pn ); - virtual void MenuDown(PlayerNumber pn); - virtual void MenuStart( PlayerNumber pn ); + virtual void MenuLeft( const InputEventPlus &input ); + virtual void MenuRight( const InputEventPlus &input ); + virtual void MenuUp(const InputEventPlus &input ); + virtual void MenuDown(const InputEventPlus &input); + virtual void MenuStart( const InputEventPlus &input ); virtual void Update( float fDelta ); virtual void DrawPrimitives(); virtual void HandleScreenMessage( const ScreenMessage SM ); diff --git a/stepmania/src/ScreenSetTime.cpp b/stepmania/src/ScreenSetTime.cpp index da1182bb79..bc3f17b42c 100644 --- a/stepmania/src/ScreenSetTime.cpp +++ b/stepmania/src/ScreenSetTime.cpp @@ -161,31 +161,31 @@ void ScreenSetTime::ChangeSelection( int iDirection ) SOUND->PlayOnce( THEME->GetPathS("ScreenSetTime","ChangeSelection") ); } -void ScreenSetTime::MenuUp( PlayerNumber pn ) +void ScreenSetTime::MenuUp( const InputEventPlus &input ) { ChangeSelection( -1 ); } -void ScreenSetTime::MenuDown( PlayerNumber pn ) +void ScreenSetTime::MenuDown( const InputEventPlus &input ) { ChangeSelection( +1 ); } -void ScreenSetTime::MenuLeft( PlayerNumber pn ) +void ScreenSetTime::MenuLeft( const InputEventPlus &input ) { ChangeValue( -1 ); } -void ScreenSetTime::MenuRight( PlayerNumber pn ) +void ScreenSetTime::MenuRight( const InputEventPlus &input ) { ChangeValue( +1 ); } -void ScreenSetTime::MenuStart( PlayerNumber pn ) +void ScreenSetTime::MenuStart( const InputEventPlus &input ) { bool bHoldingLeftAndRight = - INPUTMAPPER->IsBeingPressed( MENU_BUTTON_RIGHT, pn ) && - INPUTMAPPER->IsBeingPressed( MENU_BUTTON_LEFT, pn ); + INPUTMAPPER->IsBeingPressed( MENU_BUTTON_RIGHT, input.pn ) && + INPUTMAPPER->IsBeingPressed( MENU_BUTTON_LEFT, input.pn ); if( bHoldingLeftAndRight ) ChangeSelection( -1 ); @@ -222,12 +222,12 @@ void ScreenSetTime::MenuStart( PlayerNumber pn ) ChangeSelection( +1 ); } -void ScreenSetTime::MenuSelect( PlayerNumber pn ) +void ScreenSetTime::MenuSelect( const InputEventPlus &input ) { ChangeSelection( -1 ); } -void ScreenSetTime::MenuBack( PlayerNumber pn ) +void ScreenSetTime::MenuBack( const InputEventPlus &input ) { StartTransitioningScreen( SM_GoToPrevScreen ); } diff --git a/stepmania/src/ScreenSetTime.h b/stepmania/src/ScreenSetTime.h index 80a8bed785..f35ae3afdc 100644 --- a/stepmania/src/ScreenSetTime.h +++ b/stepmania/src/ScreenSetTime.h @@ -23,13 +23,13 @@ public: virtual void Update( float fDelta ); virtual void Input( const InputEventPlus &input ); - virtual void MenuUp( PlayerNumber pn ); - virtual void MenuDown( PlayerNumber pn ); - virtual void MenuLeft( PlayerNumber pn ); - virtual void MenuRight( PlayerNumber pn ); - virtual void MenuStart( PlayerNumber pn ); - virtual void MenuSelect( PlayerNumber pn ); - virtual void MenuBack( PlayerNumber pn ); + virtual void MenuUp( const InputEventPlus &input ); + virtual void MenuDown( const InputEventPlus &input ); + virtual void MenuLeft( const InputEventPlus &input ); + virtual void MenuRight( const InputEventPlus &input ); + virtual void MenuStart( const InputEventPlus &input ); + virtual void MenuSelect( const InputEventPlus &input ); + virtual void MenuBack( const InputEventPlus &input ); private: SetTimeSelection m_Selection;