Change GetDevicesAndDescriptions to fill in one vector instead of 2

Ignore changes in non-joystick devices when automapping
This commit is contained in:
Chris Danford
2006-02-27 17:51:27 +00:00
parent 0ac58078b4
commit bf0cc13a47
37 changed files with 148 additions and 124 deletions
@@ -192,12 +192,11 @@ int JoystickDevice::AssignIDs( InputDevice startID )
return m_vSticks.size();
}
void JoystickDevice::GetDevicesAndDescriptions( vector<InputDevice>& dev, vector<RString>& desc ) const
void JoystickDevice::GetDevicesAndDescriptions( vector<InputDeviceInfo>& vDevices ) const
{
FOREACH_CONST( Joystick, m_vSticks, i )
{
dev.push_back( i->id );
desc.push_back( GetDescription() );
vDevices.push_back( InputDeviceInfo(i->id,GetDescription()) );
}
}