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

simplify GameToMenu

Browse Source
This commit is contained in:
Glenn Maynard
2006-09-14 20:37:41 +00:00
parent af00ab413c
commit a05fe7e8ab
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/InputMapper.cpp
+2 -2
View File
@@ -769,10 +769,10 @@ PlayerNumber InputMapper::ControllerToPlayerNumber( GameController controller )
return (PlayerNumber) controller;
}
void InputMapper::GameToMenu( const GameInput &GameI, MenuInput &MenuI )
MenuButton InputMapper::GameToMenu( const GameInput &GameI )
{
const Game* pGame = GAMESTATE->GetCurrentGame();
MenuI.button = pGame->GameInputToMenuButton( GameI );
return pGame->GameInputToMenuButton( GameI );
}
void InputMapper::MenuToGame( const MenuInput &MenuI, PlayerNumber pn, GameInput GameIout[4] )
stepmania/src/InputMapper.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
bool DeviceToGame( const DeviceInput &DeviceI, GameInput& GameI ); // return true if there is a mapping from device to pad
bool GameToDevice( const GameInput &GameI, int iSlotNum, DeviceInput& DeviceI ); // return true if there is a mapping from pad to device
void GameToMenu( const GameInput &GameI, MenuInput &MenuI );
MenuButton GameToMenu( const GameInput &GameI );
void MenuToGame( const MenuInput &MenuI, PlayerNumber pn, GameInput GameIout[4] );
PlayerNumber ControllerToPlayerNumber( GameController controller );
stepmania/src/StepMania.cpp
+1 -1
View File
@@ -1431,7 +1431,7 @@ void HandleInputEvents(float fDeltaTime)
if( input.GameI.IsValid() )
{
INPUTMAPPER->GameToMenu( input.GameI, input.MenuI );
input.MenuI = INPUTMAPPER->GameToMenu( input.GameI );
input.pn = INPUTMAPPER->ControllerToPlayerNumber( input.GameI.controller );
}