Browse Source
Merge pull request #6215 from lioncash/duplicate
npad: Remove duplicated class member variable
pull/15/merge
bunnei
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
1 additions and
2 deletions
-
src/core/hle/service/hid/controllers/npad.cpp
-
src/core/hle/service/hid/controllers/npad.h
|
|
|
@ -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}); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -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 |