diff options
| author | Lioncash <mathew1800@gmail.com> | 2020-12-08 04:04:14 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2020-12-08 04:04:16 +0100 |
| commit | 215cfbb757c13a96c53b9b9e24f68817a12fdfeb (patch) | |
| tree | 3cbeaf6754298021105841fae557d018034352eb /src/core/hle | |
| parent | controller: Avoid unnecessary copies in ConfigurationComplete() (diff) | |
| download | yuzu-215cfbb757c13a96c53b9b9e24f68817a12fdfeb.tar yuzu-215cfbb757c13a96c53b9b9e24f68817a12fdfeb.tar.gz yuzu-215cfbb757c13a96c53b9b9e24f68817a12fdfeb.tar.bz2 yuzu-215cfbb757c13a96c53b9b9e24f68817a12fdfeb.tar.lz yuzu-215cfbb757c13a96c53b9b9e24f68817a12fdfeb.tar.xz yuzu-215cfbb757c13a96c53b9b9e24f68817a12fdfeb.tar.zst yuzu-215cfbb757c13a96c53b9b9e24f68817a12fdfeb.zip | |
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/service/am/applets/controller.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/service/am/applets/controller.cpp b/src/core/hle/service/am/applets/controller.cpp index 2504cac32..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, |