diff options
| author | bunnei <bunneidev@gmail.com> | 2022-01-08 22:41:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-08 22:41:39 +0100 |
| commit | acbfb0083a611a974b887f6a5d63b55e444b1e89 (patch) | |
| tree | 0fb8395bbe2a062295c3811931081af0c116e9cf /src/core | |
| parent | Merge pull request #7680 from german77/accel_mapping (diff) | |
| parent | yuzu: Use pad parameter to choose the correct controller (diff) | |
| download | yuzu-acbfb0083a611a974b887f6a5d63b55e444b1e89.tar yuzu-acbfb0083a611a974b887f6a5d63b55e444b1e89.tar.gz yuzu-acbfb0083a611a974b887f6a5d63b55e444b1e89.tar.bz2 yuzu-acbfb0083a611a974b887f6a5d63b55e444b1e89.tar.lz yuzu-acbfb0083a611a974b887f6a5d63b55e444b1e89.tar.xz yuzu-acbfb0083a611a974b887f6a5d63b55e444b1e89.tar.zst yuzu-acbfb0083a611a974b887f6a5d63b55e444b1e89.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hid/emulated_controller.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp index 71fc05807..52a56ef1a 100644 --- a/src/core/hid/emulated_controller.cpp +++ b/src/core/hid/emulated_controller.cpp @@ -389,7 +389,8 @@ std::vector<Common::ParamPackage> EmulatedController::GetMappedDevices( devices.begin(), devices.end(), [param](const Common::ParamPackage param_) { return param.Get("engine", "") == param_.Get("engine", "") && param.Get("guid", "") == param_.Get("guid", "") && - param.Get("port", 0) == param_.Get("port", 0); + param.Get("port", 0) == param_.Get("port", 0) && + param.Get("pad", 0) == param_.Get("pad", 0); }); if (devices_it != devices.end()) { continue; @@ -398,6 +399,7 @@ std::vector<Common::ParamPackage> EmulatedController::GetMappedDevices( device.Set("engine", param.Get("engine", "")); device.Set("guid", param.Get("guid", "")); device.Set("port", param.Get("port", 0)); + device.Set("pad", param.Get("pad", 0)); devices.push_back(device); } @@ -412,7 +414,8 @@ std::vector<Common::ParamPackage> EmulatedController::GetMappedDevices( devices.begin(), devices.end(), [param](const Common::ParamPackage param_) { return param.Get("engine", "") == param_.Get("engine", "") && param.Get("guid", "") == param_.Get("guid", "") && - param.Get("port", 0) == param_.Get("port", 0); + param.Get("port", 0) == param_.Get("port", 0) && + param.Get("pad", 0) == param_.Get("pad", 0); }); if (devices_it != devices.end()) { continue; @@ -421,6 +424,7 @@ std::vector<Common::ParamPackage> EmulatedController::GetMappedDevices( device.Set("engine", param.Get("engine", "")); device.Set("guid", param.Get("guid", "")); device.Set("port", param.Get("port", 0)); + device.Set("pad", param.Get("pad", 0)); devices.push_back(device); } return devices; |