diff options
author | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-10-21 08:34:06 +0200 |
---|---|---|
committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-10-22 21:02:04 +0200 |
commit | e6ab1f673b88b1af6bd966886249c7824ec5dbd4 (patch) | |
tree | 045b57ae71c4b8efe34be8504d86638f13cf61ac /src/core/hle/service | |
parent | CMakeLists: Remove all redundant warnings (diff) | |
download | yuzu-e6ab1f673b88b1af6bd966886249c7824ec5dbd4.tar yuzu-e6ab1f673b88b1af6bd966886249c7824ec5dbd4.tar.gz yuzu-e6ab1f673b88b1af6bd966886249c7824ec5dbd4.tar.bz2 yuzu-e6ab1f673b88b1af6bd966886249c7824ec5dbd4.tar.lz yuzu-e6ab1f673b88b1af6bd966886249c7824ec5dbd4.tar.xz yuzu-e6ab1f673b88b1af6bd966886249c7824ec5dbd4.tar.zst yuzu-e6ab1f673b88b1af6bd966886249c7824ec5dbd4.zip |
Diffstat (limited to 'src/core/hle/service')
-rw-r--r-- | src/core/hle/service/am/applets/applets.h | 2 | ||||
-rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/core/hle/service/am/applets/applets.h b/src/core/hle/service/am/applets/applets.h index e78a57657..12c6a5b1a 100644 --- a/src/core/hle/service/am/applets/applets.h +++ b/src/core/hle/service/am/applets/applets.h @@ -164,7 +164,7 @@ protected: u32_le size; u32_le library_version; u32_le theme_color; - u8 play_startup_sound; + bool play_startup_sound; u64_le system_tick; }; static_assert(sizeof(CommonArguments) == 0x20, "CommonArguments has incorrect size."); diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index ba8a1f786..3b26e96de 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -1502,25 +1502,25 @@ bool Controller_NPad::IsControllerSupported(Core::HID::NpadStyleIndex controller Core::HID::NpadStyleTag style = GetSupportedStyleSet(); switch (controller) { case Core::HID::NpadStyleIndex::ProController: - return style.fullkey; + return style.fullkey.As<bool>(); case Core::HID::NpadStyleIndex::JoyconDual: - return style.joycon_dual; + return style.joycon_dual.As<bool>(); case Core::HID::NpadStyleIndex::JoyconLeft: - return style.joycon_left; + return style.joycon_left.As<bool>(); case Core::HID::NpadStyleIndex::JoyconRight: - return style.joycon_right; + return style.joycon_right.As<bool>(); case Core::HID::NpadStyleIndex::GameCube: - return style.gamecube; + return style.gamecube.As<bool>(); case Core::HID::NpadStyleIndex::Pokeball: - return style.palma; + return style.palma.As<bool>(); case Core::HID::NpadStyleIndex::NES: - return style.lark; + return style.lark.As<bool>(); case Core::HID::NpadStyleIndex::SNES: - return style.lucia; + return style.lucia.As<bool>(); case Core::HID::NpadStyleIndex::N64: - return style.lagoon; + return style.lagoon.As<bool>(); case Core::HID::NpadStyleIndex::SegaGenesis: - return style.lager; + return style.lager.As<bool>(); default: return false; } |