From 556a814f7c460dc758ad5037c14a8966de6a975e Mon Sep 17 00:00:00 2001 From: mittorn Date: Sun, 6 Sep 2015 05:15:06 +0700 Subject: [PATCH] Disable wheapon wheel, enable mouse buttons --- src/com/beloko/touchcontrols/TouchControlsSettings.java | 2 +- src/org/libsdl/app/SDLActivity.java | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/com/beloko/touchcontrols/TouchControlsSettings.java b/src/com/beloko/touchcontrols/TouchControlsSettings.java index 2d420337..01d78ca9 100644 --- a/src/com/beloko/touchcontrols/TouchControlsSettings.java +++ b/src/com/beloko/touchcontrols/TouchControlsSettings.java @@ -244,7 +244,7 @@ public class TouchControlsSettings { invertLook = Settings.getBoolOption(ctx, "invert_look", false); precisionShoot = Settings.getBoolOption(ctx, "precision_shoot", false); showSticks = Settings.getBoolOption(ctx, "show_sticks", false); - enableWeaponWheel = Settings.getBoolOption(ctx, "enable_ww", true); + enableWeaponWheel = Settings.getBoolOption(ctx, "enable_ww", false); doubleTapMove = Settings.getIntOption(ctx, "double_tap_move", 0); doubleTapLook = Settings.getIntOption(ctx, "double_tap_look", 0); diff --git a/src/org/libsdl/app/SDLActivity.java b/src/org/libsdl/app/SDLActivity.java index 434a1815..af6d71fc 100644 --- a/src/org/libsdl/app/SDLActivity.java +++ b/src/org/libsdl/app/SDLActivity.java @@ -336,14 +336,6 @@ public class SDLActivity extends Activity { int keyCode = event.getKeyCode(); // Ignore certain special keys so they're handled by Android - if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN || - keyCode == KeyEvent.KEYCODE_VOLUME_UP || - keyCode == KeyEvent.KEYCODE_CAMERA || - keyCode == 168 || /* API 11: KeyEvent.KEYCODE_ZOOM_IN */ - keyCode == 169 /* API 11: KeyEvent.KEYCODE_ZOOM_OUT */ - ) { - return false; - } return super.dispatchKeyEvent(event); }