diff options
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index ed31b3bad..27fc7a79b 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp | |||
| @@ -629,25 +629,24 @@ void Controller_NPad::ClearAllConnectedControllers() { | |||
| 629 | } | 629 | } |
| 630 | 630 | ||
| 631 | void Controller_NPad::DisconnectAllConnectedControllers() { | 631 | void Controller_NPad::DisconnectAllConnectedControllers() { |
| 632 | std::for_each(connected_controllers.begin(), connected_controllers.end(), | 632 | for (ControllerHolder& controller : connected_controllers) { |
| 633 | [](ControllerHolder& controller) { controller.is_connected = false; }); | 633 | controller.is_connected = false; |
| 634 | } | ||
| 634 | } | 635 | } |
| 635 | 636 | ||
| 636 | void Controller_NPad::ConnectAllDisconnectedControllers() { | 637 | void Controller_NPad::ConnectAllDisconnectedControllers() { |
| 637 | std::for_each(connected_controllers.begin(), connected_controllers.end(), | 638 | for (ControllerHolder& controller : connected_controllers) { |
| 638 | [](ControllerHolder& controller) { | 639 | if (controller.type != NPadControllerType::None && !controller.is_connected) { |
| 639 | if (controller.type != NPadControllerType::None && !controller.is_connected) { | 640 | controller.is_connected = false; |
| 640 | controller.is_connected = false; | 641 | } |
| 641 | } | 642 | } |
| 642 | }); | ||
| 643 | } | 643 | } |
| 644 | 644 | ||
| 645 | void Controller_NPad::ClearAllControllers() { | 645 | void Controller_NPad::ClearAllControllers() { |
| 646 | std::for_each(connected_controllers.begin(), connected_controllers.end(), | 646 | for (ControllerHolder& controller : connected_controllers) { |
| 647 | [](ControllerHolder& controller) { | 647 | controller.type = NPadControllerType::None; |
| 648 | controller.type = NPadControllerType::None; | 648 | controller.is_connected = false; |
| 649 | controller.is_connected = false; | 649 | } |
| 650 | }); | ||
| 651 | } | 650 | } |
| 652 | 651 | ||
| 653 | u32 Controller_NPad::GetAndResetPressState() { | 652 | u32 Controller_NPad::GetAndResetPressState() { |