vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restore pointer action checks

Browse source
This commit is contained in:
mittorn 2017-03-31 18:34:08 +00:00
parent 8fcb6ca128
commit 17ce269513
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jni/src/Xash3D/xash3d

@ -1 +1 @@
Subproject commit 00801a7d1b918ff1829e1392c77da6d2fa012ebb Subproject commit 5c455714a5bc60f4fa05a826e7d2f8e18e403f2d

5
src/in/celest/xash3d/XashActivity.java
View file

@ -1265,8 +1265,6 @@ class EngineTouchListener_v5 implements View.OnTouchListener{
XashActivity.nativeTouch(pointerFingerId, 2, x, y); XashActivity.nativeTouch(pointerFingerId, 2, x, y);
} }
break; break;
case MotionEvent.ACTION_POINTER_UP:
case MotionEvent.ACTION_POINTER_DOWN:
case MotionEvent.ACTION_UP: case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
if( !XashActivity.fMouseShown && (XashActivity.handler.getSource(event) & InputDevice.SOURCE_MOUSE) != 0 ) if( !XashActivity.fMouseShown && (XashActivity.handler.getSource(event) & InputDevice.SOURCE_MOUSE) != 0 )
@ -1292,6 +1290,9 @@ class EngineTouchListener_v5 implements View.OnTouchListener{
} }
i = 0; i = 0;
case MotionEvent.ACTION_POINTER_UP:
case MotionEvent.ACTION_POINTER_DOWN:
// Non primary pointer up/down // Non primary pointer up/down
if (i == -1) { if (i == -1) {
i = event.getActionIndex(); i = event.getActionIndex();