diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2020-08-27 19:27:03 +0200 |
|---|---|---|
| committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2020-09-04 21:38:33 +0200 |
| commit | 0e33b19ae0292dd7b99241bc4e6fc8936bd89e5c (patch) | |
| tree | 4d335edb664e7d53a818ccd575aa495f807e6921 /src/core/hle/service/hid/controllers/npad.h | |
| parent | Merge pull request #4596 from FearlessTobi/port-5495 (diff) | |
| download | yuzu-0e33b19ae0292dd7b99241bc4e6fc8936bd89e5c.tar yuzu-0e33b19ae0292dd7b99241bc4e6fc8936bd89e5c.tar.gz yuzu-0e33b19ae0292dd7b99241bc4e6fc8936bd89e5c.tar.bz2 yuzu-0e33b19ae0292dd7b99241bc4e6fc8936bd89e5c.tar.lz yuzu-0e33b19ae0292dd7b99241bc4e6fc8936bd89e5c.tar.xz yuzu-0e33b19ae0292dd7b99241bc4e6fc8936bd89e5c.tar.zst yuzu-0e33b19ae0292dd7b99241bc4e6fc8936bd89e5c.zip | |
Diffstat (limited to 'src/core/hle/service/hid/controllers/npad.h')
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h index 75ce5b731..ad25c6fbf 100644 --- a/src/core/hle/service/hid/controllers/npad.h +++ b/src/core/hle/service/hid/controllers/npad.h @@ -134,6 +134,7 @@ public: void ConnectAllDisconnectedControllers(); void ClearAllControllers(); + void MergeSingleJoyAsDualJoy(u32 npad_id_1, u32 npad_id_2); void StartLRAssignmentMode(); void StopLRAssignmentMode(); bool SwapNpadAssignment(u32 npad_id_1, u32 npad_id_2); |