1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-03 06:24:32 +00:00

wip, temp commit

This commit is contained in:
fgenesis 2016-07-03 18:07:13 +02:00
parent 4e37abd0f5
commit d1778a97b8
7 changed files with 141 additions and 100 deletions

View file

@ -200,8 +200,10 @@ bool ActionMapper::getKeyState(int k)
int v = k - JOY_BUTTON_0;
for(size_t i = 0; i < core->joysticks.size(); ++i)
if( ((keyState = core->joysticks[i]->getButton(v))) )
break;
if(Joystick *j = core->joysticks[i])
if(j->isEnabled())
if( ((keyState = j->getButton(v))) )
break;
}
return keyState;