diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d index 00801a7d..5c455714 160000 --- a/jni/src/Xash3D/xash3d +++ b/jni/src/Xash3D/xash3d @@ -1 +1 @@ -Subproject commit 00801a7d1b918ff1829e1392c77da6d2fa012ebb +Subproject commit 5c455714a5bc60f4fa05a826e7d2f8e18e403f2d diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java index ece432cf..f2fc398c 100644 --- a/src/in/celest/xash3d/XashActivity.java +++ b/src/in/celest/xash3d/XashActivity.java @@ -1265,8 +1265,6 @@ class EngineTouchListener_v5 implements View.OnTouchListener{ XashActivity.nativeTouch(pointerFingerId, 2, x, y); } break; - case MotionEvent.ACTION_POINTER_UP: - case MotionEvent.ACTION_POINTER_DOWN: case MotionEvent.ACTION_UP: case MotionEvent.ACTION_DOWN: if( !XashActivity.fMouseShown && (XashActivity.handler.getSource(event) & InputDevice.SOURCE_MOUSE) != 0 ) @@ -1292,6 +1290,9 @@ class EngineTouchListener_v5 implements View.OnTouchListener{ } i = 0; + case MotionEvent.ACTION_POINTER_UP: + case MotionEvent.ACTION_POINTER_DOWN: + // Non primary pointer up/down if (i == -1) { i = event.getActionIndex();