summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/hid/controllers
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2021-04-19 18:23:26 +0200
committerLioncash <mathew1800@gmail.com>2021-04-19 18:23:28 +0200
commit39497183a65a1257ffc71639a360aa76236e78f0 (patch)
tree2d1f357f3e28dca69bb3a12822e09c7aa7148f1e /src/core/hle/service/hid/controllers
parentMerge pull request #6208 from lat9nq/boost-static (diff)
downloadyuzu-39497183a65a1257ffc71639a360aa76236e78f0.tar
yuzu-39497183a65a1257ffc71639a360aa76236e78f0.tar.gz
yuzu-39497183a65a1257ffc71639a360aa76236e78f0.tar.bz2
yuzu-39497183a65a1257ffc71639a360aa76236e78f0.tar.lz
yuzu-39497183a65a1257ffc71639a360aa76236e78f0.tar.xz
yuzu-39497183a65a1257ffc71639a360aa76236e78f0.tar.zst
yuzu-39497183a65a1257ffc71639a360aa76236e78f0.zip
Diffstat (limited to 'src/core/hle/service/hid/controllers')
-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