Joystick code un-stupid-ed.

This commit is contained in:
Scott Duensing 2020-08-10 19:22:30 -05:00
parent bb9f633379
commit 14866e93ee

View file

@ -124,7 +124,7 @@ static byte crateInitialCount;
static byte cratesOnTarget; static byte cratesOnTarget;
static byte cratesInitiallyOnTarget; static byte cratesInitiallyOnTarget;
static char puzzleChars[] = { "_# .$@+*" }; //static char puzzleChars[] = { "_# .$@+*" };
static CoordT tileLookup[TILE_COUNT] = { static CoordT tileLookup[TILE_COUNT] = {
{ 10 * 8, 0 }, { 10 * 8, 0 },
@ -367,7 +367,7 @@ void imageShow(jlImgT *image) {
bool inputRead(byte *key) { bool inputRead(byte *key) {
//static bool debounceController = false; static bool debounceController = false;
*key = 0; *key = 0;
@ -379,47 +379,25 @@ bool inputRead(byte *key) {
return true; return true;
} }
/*
// Joystick // Joystick
if (jlGameGetAxis(0) < -50) { if (jlGameGetAxis(0) < -50) *key = 'J';
if (debounceController) return false; if (jlGameGetAxis(0) > 50) *key = 'K';
*key = 'J'; if (jlGameGetAxis(1) < -50) *key = 'I';
debounceController = true; if (jlGameGetAxis(1) > 50) *key = 'M';
return true; if (jlGameGetButton(0)) *key = 13;
} if (jlGameGetButton(1)) *key = 27;
if (jlGameGetAxis(0) > 50) {
if (debounceController) return false;
*key = 'K';
debounceController = true;
return true;
}
if (jlGameGetAxis(1) < -50) {
if (debounceController) return false;
*key = 'I';
debounceController = true;
return true;
}
if (jlGameGetAxis(1) > 50) {
if (debounceController) return false;
*key = 'M';
debounceController = true;
return true;
}
if (jlGameGetButton(0)) {
if (debounceController) return false;
*key = 13;
debounceController = true;
return true;
}
if (jlGameGetButton(1)) {
if (debounceController) return false;
*key = 27;
debounceController = true;
return true;
}
// Debounce Joystick Input
if (debounceController) {
*key = 0;
return false;
} else {
if (*key != 0) {
debounceController = true;
return true;
}
}
debounceController = false; debounceController = false;
*/
return false; return false;
} }
@ -602,7 +580,7 @@ bool menuMain(void) {
break; break;
case 5: // Exit case 5: // Exit
running = (0 == menuHandle("Exit Game?", menuYesNo, 0)); running = (bool)(0 == menuHandle("Exit Game?", menuYesNo, 0));
break; break;
} }
} }