Merge remote-tracking branch 'upstream/tic_0.47.0' into tic_0.47.0

This commit is contained in:
Matheus Lessa
2017-10-16 15:34:36 -02:00
4 changed files with 5 additions and 16 deletions

View File

@@ -200,7 +200,7 @@ static duk_ret_t duk_btn(duk_context* duk)
else
{
s32 index = duk_to_int(duk, 0) & 0xf;
duk_push_uint(duk, machine->memory.ram.vram.input.gamepad.data & (1 << index));
duk_push_boolean(duk, machine->memory.ram.vram.input.gamepad.data & (1 << index));
}
return 1;