alice.mosphere.at / TIC-80
this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #2234 from blind/music-edit-fix

Run key processing even when ctrl key is pressed

authored by

Vadim Grigoruk and committed by
GitHub 47a779dd 48d8a584

+14 -11
+14 -11
src/studio/editors/music.c
··· 1442 1442 { 1443 1443 tic_mem* tic = music->tic; 1444 1444 1445 + if(tic_api_key(tic, tic_key_ctrl) || tic_api_key(tic, tic_key_alt)) 1446 + return; 1447 + 1445 1448 if(keyWasPressed(music->studio, tic_key_up)) music->piano.edit.y--; 1446 1449 else if(keyWasPressed(music->studio, tic_key_down)) music->piano.edit.y++; 1447 1450 else if(keyWasPressed(music->studio, tic_key_left)) music->piano.edit.x--; ··· 1547 1550 : playFrame(music)) 1548 1551 : stopTrack(music); 1549 1552 } 1553 + } 1550 1554 1551 - switch (music->tab) 1552 - { 1553 - case MUSIC_TRACKER_TAB: 1554 - music->tracker.edit.y >= 0 1555 - ? processTrackerKeyboard(music) 1556 - : processPatternKeyboard(music); 1557 - break; 1558 - case MUSIC_PIANO_TAB: 1559 - processPianoKeyboard(music); 1560 - break; 1561 - } 1555 + switch (music->tab) 1556 + { 1557 + case MUSIC_TRACKER_TAB: 1558 + music->tracker.edit.y >= 0 1559 + ? processTrackerKeyboard(music) 1560 + : processPatternKeyboard(music); 1561 + break; 1562 + case MUSIC_PIANO_TAB: 1563 + processPianoKeyboard(music); 1564 + break; 1562 1565 } 1563 1566 } 1564 1567