dan/TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't use ESC and F1-F12 buttons in keyboard input #492

Browse Source
This commit is contained in:
BADIM-PC\Vadim
2018-01-03 15:52:12 +03:00
parent 1e09c653ec
commit 1f7823ea6e
6 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tic.c
+3 -3
View File
@@ -1286,7 +1286,7 @@ static void api_tick_start(tic_mem* memory, const tic_sfx* sfxsrc, const tic_mus
}
// process keyboard
for(s32 i = TIC_KEY_START_INDEX; i < TIC_KEYS_COUNT; i++)
for(s32 i = 0; i < tic_keys_count; i++)
{
bool prevDown = isKeyPressed(&machine->state.keyboard.previous, i);
bool down = isKeyPressed(&memory->ram.input.keyboard, i);
@@ -1650,7 +1650,7 @@ static u32 api_btnp(tic_mem* tic, s32 index, s32 hold, s32 period)
static bool api_key(tic_mem* tic, tic_key key)
{
return key >= TIC_KEY_START_INDEX
return key > tic_key_unknown
? isKeyPressed(&tic->ram.input.keyboard, key)
: tic->ram.input.keyboard.data;
}
@@ -1659,7 +1659,7 @@ static bool api_keyp(tic_mem* tic, tic_key key, s32 hold, s32 period)
{
tic_machine* machine = (tic_machine*)tic;
if(key >= TIC_KEY_START_INDEX)
if(key > tic_key_unknown)
{
bool prevDown = hold >= 0 && period >= 0 && machine->state.keyboard.holds[key] >= hold
? period && machine->state.keyboard.holds[key] % period