diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-02-16 17:08:19 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-02-16 17:08:19 +0100 |
| commit | e38467ef3affef25b83daf0c0c3b8a61f04e8a65 (patch) | |
| tree | 3628aed1314f21147e7a46f3095fa341088d8044 /src/core/Pad.cpp | |
| parent | fix mailbox particle (diff) | |
| parent | PR rules (diff) | |
| download | re3-e38467ef3affef25b83daf0c0c3b8a61f04e8a65.tar re3-e38467ef3affef25b83daf0c0c3b8a61f04e8a65.tar.gz re3-e38467ef3affef25b83daf0c0c3b8a61f04e8a65.tar.bz2 re3-e38467ef3affef25b83daf0c0c3b8a61f04e8a65.tar.lz re3-e38467ef3affef25b83daf0c0c3b8a61f04e8a65.tar.xz re3-e38467ef3affef25b83daf0c0c3b8a61f04e8a65.tar.zst re3-e38467ef3affef25b83daf0c0c3b8a61f04e8a65.zip | |
Diffstat (limited to 'src/core/Pad.cpp')
| -rw-r--r-- | src/core/Pad.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp index 5c4ffbf8..86c218fa 100644 --- a/src/core/Pad.cpp +++ b/src/core/Pad.cpp @@ -1594,8 +1594,14 @@ void CPad::AddToPCCheatString(char c) } #ifdef XINPUT +int CPad::XInputJoy1 = 0; +int CPad::XInputJoy2 = 1; void CPad::AffectFromXinput(uint32 pad) { + pad = pad == 0 ? XInputJoy1 : XInputJoy2; + if (pad == -1) // LoadINIControllerSettings can set it to -1 + return; + XINPUT_STATE xstate; memset(&xstate, 0, sizeof(XINPUT_STATE)); if (XInputGetState(pad, &xstate) == ERROR_SUCCESS) |