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

Cleanup formatting lost during merge of controller changes

This commit is contained in:
LoungeKatt 2013-12-29 22:40:42 -05:00 committed by ptitSeb
parent c5527aeb3b
commit 999f15907c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,7 +162,8 @@ public class GL2JNIActivity extends Activity {
};
} else if (InputDevice.getDevice(joys[i]).getName()
.contains("NVIDIA Corporation NVIDIA Controller")) {
map = new int[] { OuyaController.BUTTON_O, key_CONT_A,
map = new int[] {
OuyaController.BUTTON_O, key_CONT_A,
OuyaController.BUTTON_A, key_CONT_B,
OuyaController.BUTTON_Y, key_CONT_Y,
OuyaController.BUTTON_U, key_CONT_X,
@ -179,7 +180,8 @@ public class GL2JNIActivity extends Activity {
OuyaController.BUTTON_R1, key_CONT_START };
nVidia = true;
} else if (!moga.isActive) { // Ouya controller
map = new int[] { OuyaController.BUTTON_O, key_CONT_A,
map = new int[] {
OuyaController.BUTTON_O, key_CONT_A,
OuyaController.BUTTON_A, key_CONT_B,
OuyaController.BUTTON_Y, key_CONT_Y,
OuyaController.BUTTON_U, key_CONT_X,