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

remove transition

Browse Source
This commit is contained in:
Glenn Maynard
2006-09-14 03:45:52 +00:00
parent 284ce54a76
commit 2c3ea735a8
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/InputMapper.cpp
-2
View File
@@ -778,8 +778,6 @@ void InputMapper::GameToMenu( const GameInput &GameI, MenuInput &MenuI )
void InputMapper::MenuToGame( const MenuInput &MenuI, PlayerNumber pn, GameInput GameIout[4] ) void InputMapper::MenuToGame( const MenuInput &MenuI, PlayerNumber pn, GameInput GameIout[4] )
{ {
const Game* pGame = GAMESTATE->GetCurrentGame(); const Game* pGame = GAMESTATE->GetCurrentGame();
if( pn == PLAYER_INVALID )
pn = MenuI.button;
pGame->MenuInputToGameInput( MenuI, pn, GameIout ); pGame->MenuInputToGameInput( MenuI, pn, GameIout );
} }
stepmania/src/InputMapper.h
+3 -3
View File
@@ -41,13 +41,13 @@ public:
PlayerNumber ControllerToPlayerNumber( GameController controller ); PlayerNumber ControllerToPlayerNumber( GameController controller );
float GetSecsHeld( const GameInput &GameI, MultiPlayer mp = MultiPlayer_INVALID ); 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 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 GameInput &GameI );
void ResetKeyRepeat( const MenuInput &MenuI, PlayerNumber pn = PLAYER_INVALID ); void ResetKeyRepeat( const MenuInput &MenuI, PlayerNumber pn );
struct Mapping struct Mapping
{ {