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

cleanup

Browse Source
This commit is contained in:
AJ Kelly
2010-07-03 21:57:01 -05:00
parent 4c8cec8489
commit a1cd8501b9
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/InputMapper.cpp
+1 -7
View File
@@ -603,10 +603,7 @@ void InputMapper::AutoMapJoysticksForCurrentGame()
} }
//
// apply auto mappings // apply auto mappings
//
int iNumJoysticksMapped = 0; int iNumJoysticksMapped = 0;
FOREACH_CONST( InputDeviceInfo, vDevices, device ) FOREACH_CONST( InputDeviceInfo, vDevices, device )
{ {
@@ -618,9 +615,7 @@ void InputMapper::AutoMapJoysticksForCurrentGame()
if( !regex.Compare(sDescription) ) if( !regex.Compare(sDescription) )
continue; // driver names don't match continue; // driver names don't match
//
// We have a mapping for this joystick // We have a mapping for this joystick
//
GameController gc = (GameController)iNumJoysticksMapped; GameController gc = (GameController)iNumJoysticksMapped;
if( gc >= NUM_GameController ) if( gc >= NUM_GameController )
break; // stop mapping. We already mapped one device for each game controller. break; // stop mapping. We already mapped one device for each game controller.
@@ -695,7 +690,6 @@ bool InputMapper::CheckForChangedInputDevicesAndRemap( RString &sMessageOut )
} }
} }
bool bJoysticksChanged = vsCurrentJoysticks != vsLastSeenJoysticks; bool bJoysticksChanged = vsCurrentJoysticks != vsLastSeenJoysticks;
if( !bJoysticksChanged ) if( !bJoysticksChanged )
return false; return false;
@@ -803,7 +797,7 @@ GameButton InputMapper::GameButtonToMenuButton( GameButton gb ) const
} }
/* If set (not PLAYER_INVALID), inputs from both GameControllers will be mapped /* If set (not PLAYER_INVALID), inputs from both GameControllers will be mapped
* to the specified player. If PLAYER_INVALID, GameControllers will be mapped * to the specified player. If PLAYER_INVALID, GameControllers will be mapped
* individually. */ * individually. */
void InputMapper::SetJoinControllers( PlayerNumber pn ) void InputMapper::SetJoinControllers( PlayerNumber pn )
{ {