diff options
| author | Kostadin Damyanov <maxmight@gmail.com> | 2015-06-18 22:48:29 +0300 |
|---|---|---|
| committer | Kostadin Damyanov <maxmight@gmail.com> | 2015-06-18 22:48:29 +0300 |
| commit | 0038e27fc39a422601bc220d8359ff9d98fd604d (patch) | |
| tree | 75e24e1959184e3dae79d73947bc615090b8b0af /platform/android/java | |
| parent | f10eb8ffa1a7f6bee9b5228ea1204fd93844e4cc (diff) | |
| parent | 37af8b413674936518a2ebe180f9e7bfcd5795bb (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'platform/android/java')
| -rw-r--r-- | platform/android/java/src/com/android/godot/Godot.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/android/java/src/com/android/godot/Godot.java b/platform/android/java/src/com/android/godot/Godot.java index 4f42a1a82b..9b9b1ab2ad 100644 --- a/platform/android/java/src/com/android/godot/Godot.java +++ b/platform/android/java/src/com/android/godot/Godot.java @@ -747,7 +747,7 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC //} } break; case MotionEvent.ACTION_POINTER_UP: { - final int indexPointUp = event.getAction() >> MotionEvent.ACTION_POINTER_INDEX_SHIFT; + final int indexPointUp = event.getActionIndex(); final int pointer_idx = event.getPointerId(indexPointUp); GodotLib.touch(4,pointer_idx,evcount,arr); //System.out.printf("%d - s.up at: %f,%f\n",pointer_idx, event.getX(pointer_idx),event.getY(pointer_idx)); |