diff options
author | Lioncash <mathew1800@gmail.com> | 2021-04-19 12:23:26 -0400 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2021-04-19 12:23:28 -0400 |
commit | 39497183a65a1257ffc71639a360aa76236e78f0 (patch) | |
tree | 2d1f357f3e28dca69bb3a12822e09c7aa7148f1e /src | |
parent | 9e7713c150d4d0596ef60ec005fecb4544314c1f (diff) |
npad: Remove duplicated class member variable
ControllerBase already has a System reference that can be accessed from
this class, so we can get rid of this to make the class layout a little
more straightforward.
Diffstat (limited to 'src')
-rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/service/hid/controllers/npad.h | 1 |
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 |