This commit is contained in:
Steve Checkoway
2006-08-05 01:27:21 +00:00
parent b95f8b15e7
commit 13be8ec089
@@ -1,7 +1,5 @@
#include "global.h" #include "global.h"
#include "JoystickDevice.h" #include "JoystickDevice.h"
#include "Foreach.h"
#include "EnumHelper.h"
#include "RageUtil.h" #include "RageUtil.h"
using namespace std; using namespace std;
@@ -77,8 +75,6 @@ void JoystickDevice::AddElement( int usagePage, int usage, int cookie, const CFD
case kHIDUsage_GD_DPadLeft: case kHIDUsage_GD_DPadLeft:
js.mapping[cookie] = JOY_LEFT; js.mapping[cookie] = JOY_LEFT;
break; break;
default:
return;
} }
break; break;
} }
@@ -92,8 +88,6 @@ void JoystickDevice::AddElement( int usagePage, int usage, int cookie, const CFD
js.mapping[cookie] = buttonID; js.mapping[cookie] = buttonID;
break; break;
} }
default:
return;
} // end switch (usagePage) } // end switch (usagePage)
} }
@@ -195,9 +189,7 @@ int JoystickDevice::AssignIDs( InputDevice startID )
void JoystickDevice::GetDevicesAndDescriptions( vector<InputDeviceInfo>& vDevices ) const void JoystickDevice::GetDevicesAndDescriptions( vector<InputDeviceInfo>& vDevices ) const
{ {
FOREACH_CONST( Joystick, m_vSticks, i ) FOREACH_CONST( Joystick, m_vSticks, i )
{
vDevices.push_back( InputDeviceInfo(i->id,GetDescription()) ); vDevices.push_back( InputDeviceInfo(i->id,GetDescription()) );
}
} }
/* /*