The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-11 16:49:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

GCPad/New Wiimote: Fixed issue 2848 (profiles not saving). Renamed DInput mouse axes to "Axis [XYZ][-+]" from "Mouse XYZ...". Minor cleanup/warning removal.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5767 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak
2010-06-22 08:30:33 +00:00
parent 1b670a9825
commit 25aca8cc4a
5 changed files with 38 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
View File

@ -327,11 +327,11 @@ void ControllerInterface::DeviceQualifier::FromDevice(const ControllerInterface:
source= dev->GetSource();
}
bool ControllerInterface::Device::operator==(const ControllerInterface::DeviceQualifier& devq) const
bool ControllerInterface::DeviceQualifier::operator==(const ControllerInterface::Device* const dev) const
{
if (GetId() == devq.cid)
if (GetName() == devq.name)
if (GetSource() == devq.source)
if (dev->GetId() == cid)
if (dev->GetName() == name)
if (dev->GetSource() == source)
return true;
return false;
}
@ -390,11 +390,7 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference*
devq.FromString(dev_str);
// find device
std::vector<Device*>::const_iterator di = FindDevice(m_devices, devq);
if (m_devices.end() != di)
devc.device = *di;
devc.device = FindDevice(devq);
if (devc.device)
{
@ -407,10 +403,9 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference*
// FIXME: Use std::find instead of a for loop
// i = std::find(devc.device->Inputs().begin(), devc.device->Inputs().end(), ctrl_str);
for(i = devc.device->Inputs().begin(); i < devc.device->Inputs().end(); ++i) {
for(i = devc.device->Inputs().begin(); i < devc.device->Inputs().end(); ++i)
if(*(*i) == ctrl_str)
break;
}
if (devc.device->Inputs().end() != i)
{
@ -424,11 +419,9 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference*
// FIXME: Use std::find instead of a for loop
// i = std::find(devc.device->Outputs().begin(), devc.device->Outputs().end(), ctrl_str);
for(i = devc.device->Outputs().begin(); i < devc.device->Outputs().end(); ++i) {
for(i = devc.device->Outputs().begin(); i < devc.device->Outputs().end(); ++i)
if(*(*i) == ctrl_str)
break;
}
if (devc.device->Outputs().end() != i)
{
@ -455,19 +448,16 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference*
}
}
std::vector<ControllerInterface::Device*>::const_iterator FindDevice(
const std::vector<ControllerInterface::Device*>& devices, const ControllerInterface::DeviceQualifier& devq) {
std::vector<ControllerInterface::Device*>::const_iterator di;
ControllerInterface::Device* ControllerInterface::FindDevice(const ControllerInterface::DeviceQualifier& devq) const
{
std::vector<ControllerInterface::Device*>::const_iterator
di = m_devices.begin(),
de = m_devices.end();
for (; di!=de; ++di)
if (devq == *di)
return *di;
// FIXME: Use std::find instead of a for loop
// di = std::find(m_devices.begin(), m_devices.end(), devq);
for(di = devices.begin(); di < devices.end(); ++di) {
if(*(*di) == devq)
break;
}
return di;
return NULL;
}
//