diff options
| author | 2021-04-19 18:12:48 -0700 | |
|---|---|---|
| committer | 2021-04-19 18:12:48 -0700 | |
| commit | e5e9bee1cc682a81e38b0e431aa273e2d43110f3 (patch) | |
| tree | 32490e7a18dbacae989b2733e2fc3621adf4bb70 /src | |
| parent | Merge pull request #6216 from lioncash/uninit-read (diff) | |
| parent | npad: Remove duplicated class member variable (diff) | |
| download | yuzu-e5e9bee1cc682a81e38b0e431aa273e2d43110f3.tar.gz yuzu-e5e9bee1cc682a81e38b0e431aa273e2d43110f3.tar.xz yuzu-e5e9bee1cc682a81e38b0e431aa273e2d43110f3.zip | |
Merge pull request #6215 from lioncash/duplicate
npad: Remove duplicated class member variable
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) { | |||
| 147 | device_handle.device_index < DeviceIndex::MaxDeviceIndex; | 147 | device_handle.device_index < DeviceIndex::MaxDeviceIndex; |
| 148 | } | 148 | } |
| 149 | 149 | ||
| 150 | Controller_NPad::Controller_NPad(Core::System& system) : ControllerBase(system), system(system) { | 150 | Controller_NPad::Controller_NPad(Core::System& system) : ControllerBase(system) { |
| 151 | latest_vibration_values.fill({DEFAULT_VIBRATION_VALUE, DEFAULT_VIBRATION_VALUE}); | 151 | latest_vibration_values.fill({DEFAULT_VIBRATION_VALUE, DEFAULT_VIBRATION_VALUE}); |
| 152 | } | 152 | } |
| 153 | 153 | ||
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: | |||
| 587 | std::array<ControllerPad, 10> npad_pad_states{}; | 587 | std::array<ControllerPad, 10> npad_pad_states{}; |
| 588 | std::array<TriggerState, 10> npad_trigger_states{}; | 588 | std::array<TriggerState, 10> npad_trigger_states{}; |
| 589 | bool is_in_lr_assignment_mode{false}; | 589 | bool is_in_lr_assignment_mode{false}; |
| 590 | Core::System& system; | ||
| 591 | }; | 590 | }; |
| 592 | } // namespace Service::HID | 591 | } // namespace Service::HID |