From 471dd07f3b33074755807a3b95e29f0497523975 Mon Sep 17 00:00:00 2001
From: Chris Hannon <himynameschris@gmail.com>
Date: Tue, 5 Nov 2013 15:54:31 -0500
Subject: [PATCH] [android] update nativeactivity.cpp to work with changes made
 in commit 0220f27 (AMD support), changing int to long int for the second
 argument in most touch callbacks

---
 cocos/2d/platform/android/nativeactivity.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/cocos/2d/platform/android/nativeactivity.cpp b/cocos/2d/platform/android/nativeactivity.cpp
index 5ac17a5ee5..12e25d597d 100644
--- a/cocos/2d/platform/android/nativeactivity.cpp
+++ b/cocos/2d/platform/android/nativeactivity.cpp
@@ -292,7 +292,7 @@ static void engine_term_display(struct engine* engine) {
 /*
  * Get X, Y positions and ID's for all pointers
  */
-static void getTouchPos(AInputEvent *event, int ids[], float xs[], float ys[]) {
+static void getTouchPos(AInputEvent *event, long ids[], float xs[], float ys[]) {
     int pointerCount = AMotionEvent_getPointerCount(event);
     for(int i = 0; i < pointerCount; ++i) {
         ids[i] = AMotionEvent_getPointerId(event, i);
@@ -321,7 +321,7 @@ static int32_t handle_touch_input(AInputEvent *event) {
 
             LOG_EVENTS_DEBUG("Event: Action DOWN x=%f y=%f pointerID=%d\n",
                  xP, yP, pointerId);
-            int pId = pointerId;
+            long pId = pointerId;
             float x = xP;
             float y = yP;
 
@@ -340,7 +340,7 @@ static int32_t handle_touch_input(AInputEvent *event) {
 
             LOG_EVENTS_DEBUG("Event: Action POINTER DOWN x=%f y=%f pointerID=%d\n",
                  xP, yP, pointerId);
-            int pId = pointerId;
+            long pId = pointerId;
             float x = xP;
             float y = yP;
 
@@ -353,10 +353,10 @@ static int32_t handle_touch_input(AInputEvent *event) {
         {
             LOG_EVENTS_DEBUG("AMOTION_EVENT_ACTION_MOVE");
             int pointerCount = AMotionEvent_getPointerCount(event);
-            int ids[pointerCount];
+            long ids[pointerCount];
             float xs[pointerCount], ys[pointerCount];
             getTouchPos(event, ids, xs, ys);
-            cocos2d::Director::getInstance()->getOpenGLView()->handleTouchesMove(pointerCount, ids, xs, ys);
+			cocos2d::Director::getInstance()->getOpenGLView()->handleTouchesMove(pointerCount, ids, xs, ys);
             return 1;
         }
         break;
@@ -369,7 +369,7 @@ static int32_t handle_touch_input(AInputEvent *event) {
             float yP = AMotionEvent_getY(event,0);
             LOG_EVENTS_DEBUG("Event: Action UP x=%f y=%f pointerID=%d\n",
                  xP, yP, pointerId);
-            int pId = pointerId;
+            long pId = pointerId;
             float x = xP;
             float y = yP;
 
@@ -387,7 +387,7 @@ static int32_t handle_touch_input(AInputEvent *event) {
             float yP = AMotionEvent_getY(event,pointerIndex);
             LOG_EVENTS_DEBUG("Event: Action POINTER UP x=%f y=%f pointerID=%d\n",
                  xP, yP, pointerIndex);
-            int pId = pointerId;
+            long pId = pointerId;
             float x = xP;
             float y = yP;
 
@@ -400,10 +400,10 @@ static int32_t handle_touch_input(AInputEvent *event) {
         {
             LOG_EVENTS_DEBUG("AMOTION_EVENT_ACTION_CANCEL");
             int pointerCount = AMotionEvent_getPointerCount(event);
-            int ids[pointerCount];
+            long ids[pointerCount];
             float xs[pointerCount], ys[pointerCount];
             getTouchPos(event, ids, xs, ys);
-            cocos2d::Director::getInstance()->getOpenGLView()->handleTouchesCancel(pointerCount, ids, xs, ys);
+			cocos2d::Director::getInstance()->getOpenGLView()->handleTouchesCancel(pointerCount, ids, xs, ys);
             return 1;
         }
         break;