summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-04-20 03:12:48 +0200
committerGitHub <noreply@github.com>2021-04-20 03:12:48 +0200
commite5e9bee1cc682a81e38b0e431aa273e2d43110f3 (patch)
tree32490e7a18dbacae989b2733e2fc3621adf4bb70 /src/core/hle
parentMerge pull request #6216 from lioncash/uninit-read (diff)
parentnpad: Remove duplicated class member variable (diff)
downloadyuzu-e5e9bee1cc682a81e38b0e431aa273e2d43110f3.tar
yuzu-e5e9bee1cc682a81e38b0e431aa273e2d43110f3.tar.gz
yuzu-e5e9bee1cc682a81e38b0e431aa273e2d43110f3.tar.bz2
yuzu-e5e9bee1cc682a81e38b0e431aa273e2d43110f3.tar.lz
yuzu-e5e9bee1cc682a81e38b0e431aa273e2d43110f3.tar.xz
yuzu-e5e9bee1cc682a81e38b0e431aa273e2d43110f3.tar.zst
yuzu-e5e9bee1cc682a81e38b0e431aa273e2d43110f3.zip
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/service/hid/controllers/npad.cpp2
-rw-r--r--src/core/hle/service/hid/controllers/npad.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp
index 783386fcf..113a41254 100644
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@@ -147,7 +147,7 @@ bool Controller_NPad::IsDeviceHandleValid(const DeviceHandle& device_handle) {
device_handle.device_index < DeviceIndex::MaxDeviceIndex;
}
-Controller_NPad::Controller_NPad(Core::System& system) : ControllerBase(system), system(system) {
+Controller_NPad::Controller_NPad(Core::System& system) : ControllerBase(system) {
latest_vibration_values.fill({DEFAULT_VIBRATION_VALUE, DEFAULT_VIBRATION_VALUE});
}
diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h
index 14d0ac067..c3b07bd41 100644
--- a/src/core/hle/service/hid/controllers/npad.h
+++ b/src/core/hle/service/hid/controllers/npad.h
@@ -587,6 +587,5 @@ private:
std::array<ControllerPad, 10> npad_pad_states{};
std::array<TriggerState, 10> npad_trigger_states{};
bool is_in_lr_assignment_mode{false};
- Core::System& system;
};
} // namespace Service::HID