From 2c3ea735a85660e9c522795ad19a6c756a09ea17 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 14 Sep 2006 03:45:52 +0000 Subject: [PATCH] remove transition --- stepmania/src/InputMapper.cpp | 2 -- stepmania/src/InputMapper.h | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp index 2a7d5b2203..e45e7c042b 100644 --- a/stepmania/src/InputMapper.cpp +++ b/stepmania/src/InputMapper.cpp @@ -778,8 +778,6 @@ void InputMapper::GameToMenu( const GameInput &GameI, MenuInput &MenuI ) void InputMapper::MenuToGame( const MenuInput &MenuI, PlayerNumber pn, GameInput GameIout[4] ) { const Game* pGame = GAMESTATE->GetCurrentGame(); - if( pn == PLAYER_INVALID ) - pn = MenuI.button; pGame->MenuInputToGameInput( MenuI, pn, GameIout ); } diff --git a/stepmania/src/InputMapper.h b/stepmania/src/InputMapper.h index b0fef936fa..dcca0d2111 100644 --- a/stepmania/src/InputMapper.h +++ b/stepmania/src/InputMapper.h @@ -41,13 +41,13 @@ public: PlayerNumber ControllerToPlayerNumber( GameController controller ); float GetSecsHeld( const GameInput &GameI, MultiPlayer mp = MultiPlayer_INVALID ); - float GetSecsHeld( const MenuInput &MenuI, PlayerNumber pn = PLAYER_INVALID ); + float GetSecsHeld( const MenuInput &MenuI, PlayerNumber pn ); bool IsBeingPressed( const GameInput &GameI, MultiPlayer mp = MultiPlayer_INVALID, const DeviceInputList *pButtonState = NULL ); - bool IsBeingPressed( const MenuInput &MenuI, PlayerNumber pn = PLAYER_INVALID ); + bool IsBeingPressed( const MenuInput &MenuI, PlayerNumber pn ); void ResetKeyRepeat( const GameInput &GameI ); - void ResetKeyRepeat( const MenuInput &MenuI, PlayerNumber pn = PLAYER_INVALID ); + void ResetKeyRepeat( const MenuInput &MenuI, PlayerNumber pn ); struct Mapping {