ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure them menu button gets passed to OSD menus

This commit is contained in:
TwistedUmbrella 2014-02-09 01:16:29 -05:00
parent 66d0312f37
commit 153af36869
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
shell/android/src/com/reicast/emulator/GL2JNIActivity.java
View File

@ -356,7 +356,6 @@ public class GL2JNIActivity extends Activity {
OuyaController.BUTTON_DPAD_LEFT, key_CONT_DPAD_LEFT,
OuyaController.BUTTON_DPAD_RIGHT, key_CONT_DPAD_RIGHT,
OuyaController.BUTTON_MENU, key_CONT_START,
OuyaController.BUTTON_R1, key_CONT_START
};
@ -373,7 +372,6 @@ public class GL2JNIActivity extends Activity {
OuyaController.BUTTON_DPAD_LEFT, key_CONT_DPAD_LEFT,
OuyaController.BUTTON_DPAD_RIGHT, key_CONT_DPAD_RIGHT,
OuyaController.BUTTON_MENU, key_CONT_START,
OuyaController.BUTTON_R1, key_CONT_START
};
@ -394,7 +392,6 @@ public class GL2JNIActivity extends Activity {
OuyaController.BUTTON_DPAD_LEFT, key_CONT_DPAD_LEFT,
OuyaController.BUTTON_DPAD_RIGHT, key_CONT_DPAD_RIGHT,
OuyaController.BUTTON_MENU, key_CONT_START,
KeyEvent.KEYCODE_BUTTON_START, key_CONT_START
};
nVidia[playerNum] = true;
@ -414,7 +411,6 @@ public class GL2JNIActivity extends Activity {
OuyaController.BUTTON_DPAD_LEFT, key_CONT_DPAD_LEFT,
OuyaController.BUTTON_DPAD_RIGHT, key_CONT_DPAD_RIGHT,
OuyaController.BUTTON_MENU, key_CONT_START,
KeyEvent.KEYCODE_BUTTON_START, key_CONT_START
};
} else if (!moga.isActive[playerNum]) { // Ouya controller
@ -429,7 +425,6 @@ public class GL2JNIActivity extends Activity {
OuyaController.BUTTON_DPAD_LEFT, key_CONT_DPAD_LEFT,
OuyaController.BUTTON_DPAD_RIGHT, key_CONT_DPAD_RIGHT,
OuyaController.BUTTON_MENU, key_CONT_START,
KeyEvent.KEYCODE_BUTTON_START, key_CONT_START
};
}
@ -744,8 +739,8 @@ public class GL2JNIActivity extends Activity {
return showMenu();
}
} else {
if (keyCode == KeyEvent.KEYCODE_MENU
|| (keyCode == KeyEvent.KEYCODE_BACK)) {
if (keyCode == OuyaController.BUTTON_MENU
|| keyCode == KeyEvent.KEYCODE_BACK) {
return showMenu();
}
}