Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Only use a separate btnmake.

Browse source
This commit is contained in:
shenweip 2013-09-29 16:21:30 +08:00
parent 43654e2a61
commit 3e5b6e6200
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Core/HLE/sceCtrl.cpp
View file

@ -74,7 +74,7 @@ static _ctrl_data ctrlCurrent;
static u32 ctrlBuf = 0; static u32 ctrlBuf = 0;
static u32 ctrlBufRead = 0; static u32 ctrlBufRead = 0;
static CtrlLatch latch; static CtrlLatch latch;
static CtrlLatch sepLatch; // a separate latch for osk dialog static u32 dialogBtnMake = 0;
static int ctrlIdleReset = -1; static int ctrlIdleReset = -1;
static int ctrlIdleBack = -1; static int ctrlIdleBack = -1;
@ -115,7 +115,7 @@ void __CtrlUpdateLatch()
latch.btnBreak |= ctrlOldButtons & changed; latch.btnBreak |= ctrlOldButtons & changed;
latch.btnPress |= buttons; latch.btnPress |= buttons;
latch.btnRelease |= (ctrlOldButtons & ~buttons) & changed; latch.btnRelease |= (ctrlOldButtons & ~buttons) & changed;
sepLatch = latch; dialogBtnMake |= buttons & changed;
ctrlLatchBufs++; ctrlLatchBufs++;
ctrlOldButtons = buttons; ctrlOldButtons = buttons;
@ -158,9 +158,8 @@ void __CtrlPeekAnalog(int stick, float *x, float *y)
u32 __CtrlReadLatch() u32 __CtrlReadLatch()
{ {
u32 ret = sepLatch.btnMake; u32 ret = dialogBtnMake;
memset(&sepLatch, 0, sizeof(CtrlLatch)); dialogBtnMake = 0;
__CtrlResetLatch();
return ret; return ret;
} }
@ -308,6 +307,7 @@ void __CtrlInit()
ctrlBufRead = 0; ctrlBufRead = 0;
ctrlOldButtons = 0; ctrlOldButtons = 0;
ctrlLatchBufs = 0; ctrlLatchBufs = 0;
dialogBtnMake = 0;
memset(&latch, 0, sizeof(latch)); memset(&latch, 0, sizeof(latch));
// Start with everything released. // Start with everything released.
@ -338,6 +338,7 @@ void __CtrlDoState(PointerWrap &p)
p.Do(ctrlBuf); p.Do(ctrlBuf);
p.Do(ctrlBufRead); p.Do(ctrlBufRead);
p.Do(latch); p.Do(latch);
p.Do(dialogBtnMake);
p.Do(ctrlIdleReset); p.Do(ctrlIdleReset);
p.Do(ctrlIdleBack); p.Do(ctrlIdleBack);