ZL switching wasn't working fixed, also made pause/play with L+R work if R pressed first, resolving: https://github.com/deltabeard/ctrmus/issues/78
This commit is contained in:
@@ -288,6 +288,10 @@ err:
|
|||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void pausePlay() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
PrintConsole topScreenLog, topScreenInfo, bottomScreen;
|
PrintConsole topScreenLog, topScreenInfo, bottomScreen;
|
||||||
@@ -433,6 +437,22 @@ int main(int argc, char **argv)
|
|||||||
// continue;
|
// continue;
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
|
// if R is pressed first
|
||||||
|
if ((kHeld & KEY_R) && (kDown & KEY_L))
|
||||||
|
{
|
||||||
|
if(isPlaying() == false)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
consoleSelect(&topScreenLog);
|
||||||
|
if(togglePlayback() == true)
|
||||||
|
puts("Paused");
|
||||||
|
else
|
||||||
|
puts("Playing");
|
||||||
|
|
||||||
|
keyLComboPressed = true;
|
||||||
|
keyRComboPressed = true;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if((kDown & KEY_UP ||
|
if((kDown & KEY_UP ||
|
||||||
((kHeld & KEY_UP) && (osGetTime() - mill > 500))) &&
|
((kHeld & KEY_UP) && (osGetTime() - mill > 500))) &&
|
||||||
@@ -588,7 +608,7 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
keyLComboPressed = false;
|
keyLComboPressed = false;
|
||||||
}
|
}
|
||||||
bool goToPrevFile = (kDown & KEY_ZR) || keyLActivation;
|
bool goToPrevFile = (kDown & KEY_ZL) || keyLActivation;
|
||||||
// don't go to ../
|
// don't go to ../
|
||||||
if (goToPrevFile && fileNum > 1) {
|
if (goToPrevFile && fileNum > 1) {
|
||||||
fileNum -= 1;
|
fileNum -= 1;
|
||||||
|
|||||||
Reference in New Issue
Block a user