ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PAD: fix quick setup and probably other issues

This commit is contained in:
Gauvain 'GovanifY' Roussel-Tarbouriech 2020-12-14 19:53:03 +01:00 committed by lightningterror
parent 02c028d14f
commit d3b120fafd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pcsx2/PAD/Windows/PADConfig.cpp
View File

@ -273,7 +273,7 @@ wchar_t* GetCommandStringW(u8 command, int port, int slot)
{ {
if (padtype == GuitarPad && (command == 0x20 || command == 0x22)) if (padtype == GuitarPad && (command == 0x20 || command == 0x22))
{ {
HWND hWnd = GetDlgItem(hWnds[port][slot][padtype], 0x10F0 + command); HWND hWnd = GetDlgItem(hWnds[port][slot][padtype], 0x40F0 + command);
int res = GetWindowTextW(hWnd, temp, 20); int res = GetWindowTextW(hWnd, temp, 20);
if ((unsigned int)res - 1 <= 18) if ((unsigned int)res - 1 <= 18)
return temp; return temp;
@ -288,7 +288,7 @@ wchar_t* GetCommandStringW(u8 command, int port, int slot)
/* Get text from the buttons. */ /* Get text from the buttons. */
if (command >= 0x0F && command <= 0x2D) if (command >= 0x0F && command <= 0x2D)
{ {
HWND hWnd = GetDlgItem(hWnds[port][slot][padtype], 0x10F0 + command); HWND hWnd = GetDlgItem(hWnds[port][slot][padtype], 0x40F0 + command);
if (!hWnd || ((padtype == Dualshock2Pad || padtype == neGconPad) && command >= 0x14 && command <= 0x17)) if (!hWnd || ((padtype == Dualshock2Pad || padtype == neGconPad) && command >= 0x14 && command <= 0x17))
{ {
wchar_t* strings[] = { wchar_t* strings[] = {
@ -1854,10 +1854,10 @@ INT_PTR CALLBACK DialogProc(HWND hWnd, unsigned int msg, WPARAM wParam, LPARAM l
if (quickSetup) if (quickSetup)
{ {
HWND hWndS = GetDlgItem(hWnds[port][slot][padtype], selected + 0x10F0); HWND hWndS = GetDlgItem(hWnds[port][slot][padtype], selected + 0x40F0);
for (selected++; selected <= (ID_ANALOG - (ID_SELECT - 0x10)); selected++) for (selected++; selected <= (ID_ANALOG - (ID_SELECT - 0x10)); selected++)
{ {
HWND hWndS = GetDlgItem(hWnds[port][slot][padtype], selected + 0x10F0); HWND hWndS = GetDlgItem(hWnds[port][slot][padtype], selected + 0x40F0);
if (hWndS) if (hWndS)
{ {
break; break;
@ -2240,7 +2240,7 @@ INT_PTR CALLBACK DialogProc(HWND hWnd, unsigned int msg, WPARAM wParam, LPARAM l
HWND hWndS; HWND hWndS;
for (selected = 0x10; selected <= (ID_ANALOG - (ID_SELECT - 0x10)); selected++) for (selected = 0x10; selected <= (ID_ANALOG - (ID_SELECT - 0x10)); selected++)
{ {
hWndS = GetDlgItem(hWnds[port][slot][padtype], selected + 0x10F0); hWndS = GetDlgItem(hWnds[port][slot][padtype], selected + 0x40F0);
if (hWndS) if (hWndS)
{ {
break; break;