Steve: fix warnings in /spine/

Author: stevetranby

cocos/editor-support/spine/Animation.c

@@ -604,20 +604,21 @@ void spColorTimeline_setFrame (spColorTimeline* self, int frameIndex, float time
 
 void _spAttachmentTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton, float lastTime, float time,
 		spEvent** firedEvents, int* eventsCount, float alpha, int setupPose, int mixingOut) {
-	const char* attachmentName;
+
 	spAttachmentTimeline* self = (spAttachmentTimeline*)timeline;
 	int frameIndex;
 	spSlot* slot = skeleton->slots[self->slotIndex];
 
 	if (mixingOut && setupPose) {
-		const char* attachmentName = slot->data->attachmentName;
-        spSlot_setAttachment(slot, attachmentName ? spSkeleton_getAttachmentForSlotIndex(skeleton, self->slotIndex, attachmentName) : 0);
+        const char* attachmentName = slot->data->attachmentName;
+        spSlot_setAttachment(slot,
+                             attachmentName ? spSkeleton_getAttachmentForSlotIndex(skeleton, self->slotIndex, attachmentName) : 0);
 		return;
 	}
 
 	if (time < self->frames[0]) {
 		if (setupPose) {
-			attachmentName = slot->data->attachmentName;
+            const char* attachmentName = slot->data->attachmentName;
 			spSlot_setAttachment(skeleton->slots[self->slotIndex],
 								 attachmentName ? spSkeleton_getAttachmentForSlotIndex(skeleton, self->slotIndex, attachmentName) : 0);
 		}
@@ -629,7 +630,7 @@ void _spAttachmentTimeline_apply (const spTimeline* timeline, spSkeleton* skelet
 	else
 		frameIndex = binarySearch1(self->frames, self->framesCount, time) - 1;
 
-	attachmentName = self->attachmentNames[frameIndex];
+	const char* attachmentName = self->attachmentNames[frameIndex];
 	spSlot_setAttachment(skeleton->slots[self->slotIndex],
 			attachmentName ? spSkeleton_getAttachmentForSlotIndex(skeleton, self->slotIndex, attachmentName) : 0);
 

cocos/editor-support/spine/IkConstraint.c

@@ -152,7 +152,11 @@ void spIkConstraint_apply2 (spBone* parent, spBone* child, float targetX, float
 		float d = c1 * c1 - 4 * c2 * c0;
 		float minAngle = 0, minDist = FLT_MAX, minX = 0, minY = 0;
 		float maxAngle = 0, maxDist = 0, maxX = 0, maxY = 0;
-		float x = l1 + a, dist = x * x, angle, y;
+        //STEVE:
+        x = l1 + a;
+        float dist = x * x;
+        float angle;
+        //STEVE:float y;
 		if (d >= 0) {
 			float q = SQRT(d), r0, r1;
 			if (c1 < 0) q = -q;

cocos/editor-support/spine/SkeletonBinary.c

@@ -290,7 +290,6 @@ static spAnimation* _spSkeletonBinary_readAnimation (spSkeletonBinary* self, con
 					break;
 				}
 				default: {
-					int i;
 					for (i = 0; i < kv_size(timelines); ++i)
 						spTimeline_dispose(kv_A(timelines, i));
 					kv_destroy(timelines);

cocos/editor-support/spine/SkeletonJson.c

@@ -389,33 +389,33 @@ static spAnimation* _spSkeletonJson_readAnimation (spSkeletonJson* self, Json* r
 
 				for (valueMap = timelineMap->child, frameIndex = 0; valueMap; valueMap = valueMap->next, ++frameIndex) {
 					Json* vertices = Json_getItem(valueMap, "vertices");
-					float* deform;
+					float* deform2;
 					if (!vertices) {
 						if (weighted) {
-							deform = tempDeform;
-							memset(deform, 0, sizeof(float) * deformLength);
+							deform2 = tempDeform;
+							memset(deform2, 0, sizeof(float) * deformLength);
 						} else
-							deform = attachment->vertices;
+							deform2 = attachment->vertices;
 					} else {
 						int v, start = Json_getInt(valueMap, "offset", 0);
 						Json* vertex;
-						deform = tempDeform;
-						memset(deform, 0, sizeof(float) * start);
+						deform2 = tempDeform;
+						memset(deform2, 0, sizeof(float) * start);
 						if (self->scale == 1) {
 							for (vertex = vertices->child, v = start; vertex; vertex = vertex->next, ++v)
-								deform[v] = vertex->valueFloat;
+								deform2[v] = vertex->valueFloat;
 						} else {
 							for (vertex = vertices->child, v = start; vertex; vertex = vertex->next, ++v)
-								deform[v] = vertex->valueFloat * self->scale;
+								deform2[v] = vertex->valueFloat * self->scale;
 						}
-						memset(deform + v, 0, sizeof(float) * (deformLength - v));
+						memset(deform2 + v, 0, sizeof(float) * (deformLength - v));
 						if (!weighted) {
 							float* vertices = attachment->vertices;
 							for (v = 0; v < deformLength; ++v)
-								deform[v] += vertices[v];
+								deform2[v] += vertices[v];
 						}
 					}
-					spDeformTimeline_setFrame(timeline, frameIndex, Json_getFloat(valueMap, "time", 0), deform);
+					spDeformTimeline_setFrame(timeline, frameIndex, Json_getFloat(valueMap, "time", 0), deform2);
 					readCurve(valueMap, SUPER(timeline), frameIndex);
 				}
 				FREE(tempDeform);