Merge branch 'refactor' of github.com:smealum/ctrulib into refactor

This commit is contained in:
fincs 2014-08-28 00:02:56 +02:00
commit b41f1ca796

View File

@ -53,11 +53,13 @@ void hidScanInput()
{
kOld = kHeld;
int padId = hidSharedMem[4];
u32 padId = hidSharedMem[4];
if(padId>7)padId=7;
kHeld = hidSharedMem[10 + padId*4];
cPos = *(circlePosition*)&hidSharedMem[10 + padId*4 + 3];
int touchId = hidSharedMem[42 + 4];
u32 touchId = hidSharedMem[42 + 4];
if(touchId>7)touchId=7;
tPos = *(touchPosition*)&hidSharedMem[42 + 8 + touchId*2];
if (hidSharedMem[42 + 8 + touchId*2 + 1])
kHeld |= KEY_TOUCH;