Joystick code un-stupid-ed.
This commit is contained in:
parent
bb9f633379
commit
14866e93ee
1 changed files with 19 additions and 41 deletions
|
@ -124,7 +124,7 @@ static byte crateInitialCount;
|
|||
static byte cratesOnTarget;
|
||||
static byte cratesInitiallyOnTarget;
|
||||
|
||||
static char puzzleChars[] = { "_# .$@+*" };
|
||||
//static char puzzleChars[] = { "_# .$@+*" };
|
||||
|
||||
static CoordT tileLookup[TILE_COUNT] = {
|
||||
{ 10 * 8, 0 },
|
||||
|
@ -367,7 +367,7 @@ void imageShow(jlImgT *image) {
|
|||
|
||||
bool inputRead(byte *key) {
|
||||
|
||||
//static bool debounceController = false;
|
||||
static bool debounceController = false;
|
||||
|
||||
*key = 0;
|
||||
|
||||
|
@ -379,47 +379,25 @@ bool inputRead(byte *key) {
|
|||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
// Joystick
|
||||
if (jlGameGetAxis(0) < -50) {
|
||||
if (debounceController) return false;
|
||||
*key = 'J';
|
||||
debounceController = true;
|
||||
return true;
|
||||
}
|
||||
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;
|
||||
}
|
||||
if (jlGameGetAxis(0) < -50) *key = 'J';
|
||||
if (jlGameGetAxis(0) > 50) *key = 'K';
|
||||
if (jlGameGetAxis(1) < -50) *key = 'I';
|
||||
if (jlGameGetAxis(1) > 50) *key = 'M';
|
||||
if (jlGameGetButton(0)) *key = 13;
|
||||
if (jlGameGetButton(1)) *key = 27;
|
||||
|
||||
// Debounce Joystick Input
|
||||
if (debounceController) {
|
||||
*key = 0;
|
||||
return false;
|
||||
} else {
|
||||
if (*key != 0) {
|
||||
debounceController = true;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
debounceController = false;
|
||||
*/
|
||||
|
||||
return false;
|
||||
}
|
||||
|
@ -602,7 +580,7 @@ bool menuMain(void) {
|
|||
break;
|
||||
|
||||
case 5: // Exit
|
||||
running = (0 == menuHandle("Exit Game?", menuYesNo, 0));
|
||||
running = (bool)(0 == menuHandle("Exit Game?", menuYesNo, 0));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue