summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2020-12-08 13:48:45 +0100
committerGitHub <noreply@github.com>2020-12-08 13:48:45 +0100
commit51e6f8271a322532911013bd93b5a3230e7e3f36 (patch)
tree4eeff5c0c5d25e3bcfffee86be0ff4035429363c /src/core/hle
parentMerge pull request #5020 from german77/AnalogfromButtonFix (diff)
parentcontroller: Use std::move within ConvertToFrontendParameters() (diff)
downloadyuzu-51e6f8271a322532911013bd93b5a3230e7e3f36.tar
yuzu-51e6f8271a322532911013bd93b5a3230e7e3f36.tar.gz
yuzu-51e6f8271a322532911013bd93b5a3230e7e3f36.tar.bz2
yuzu-51e6f8271a322532911013bd93b5a3230e7e3f36.tar.lz
yuzu-51e6f8271a322532911013bd93b5a3230e7e3f36.tar.xz
yuzu-51e6f8271a322532911013bd93b5a3230e7e3f36.tar.zst
yuzu-51e6f8271a322532911013bd93b5a3230e7e3f36.zip
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/service/am/applets/controller.cpp23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/core/hle/service/am/applets/controller.cpp b/src/core/hle/service/am/applets/controller.cpp
index e8ea4248b..7edfca64e 100644
--- a/src/core/hle/service/am/applets/controller.cpp
+++ b/src/core/hle/service/am/applets/controller.cpp
@@ -29,14 +29,14 @@ static Core::Frontend::ControllerParameters ConvertToFrontendParameters(
npad_style_set.raw = private_arg.style_set;
return {
- .min_players = std::max(s8(1), header.player_count_min),
+ .min_players = std::max(s8{1}, header.player_count_min),
.max_players = header.player_count_max,
.keep_controllers_connected = header.enable_take_over_connection,
.enable_single_mode = header.enable_single_mode,
.enable_border_color = header.enable_identification_color,
- .border_colors = identification_colors,
+ .border_colors = std::move(identification_colors),
.enable_explain_text = enable_text,
- .explain_text = text,
+ .explain_text = std::move(text),
.allow_pro_controller = npad_style_set.pro_controller == 1,
.allow_handheld = npad_style_set.handheld == 1,
.allow_dual_joycons = npad_style_set.joycon_dual == 1,
@@ -227,15 +227,14 @@ void Controller::ConfigurationComplete() {
// If enable_single_mode is enabled, player_count is 1 regardless of any other parameters.
// Otherwise, only count connected players from P1-P8.
result_info.player_count =
- is_single_mode ? 1
- : static_cast<s8>(std::count_if(
- players.begin(), players.end() - 2,
- [](Settings::PlayerInput player) { return player.connected; }));
-
- result_info.selected_id = HID::Controller_NPad::IndexToNPad(
- std::distance(players.begin(),
- std::find_if(players.begin(), players.end(),
- [](Settings::PlayerInput player) { return player.connected; })));
+ is_single_mode
+ ? 1
+ : static_cast<s8>(std::count_if(players.begin(), players.end() - 2,
+ [](const auto& player) { return player.connected; }));
+
+ result_info.selected_id = HID::Controller_NPad::IndexToNPad(std::distance(
+ players.begin(), std::find_if(players.begin(), players.end(),
+ [](const auto& player) { return player.connected; })));
result_info.result = 0;