diff --git a/spine-cocos2dx/example/Classes/ExampleLayer.cpp b/spine-cocos2dx/example/Classes/ExampleLayer.cpp index e0ab4c134..649778c7c 100644 --- a/spine-cocos2dx/example/Classes/ExampleLayer.cpp +++ b/spine-cocos2dx/example/Classes/ExampleLayer.cpp @@ -22,7 +22,7 @@ bool ExampleLayer::init () { skeletonNode->setMix("walk", "jump", 0.2f); skeletonNode->setMix("jump", "walk", 0.4f); - skeletonNode->setListener(this, animationStateEvent_selector(ExampleLayer::animationStateEvent)); + skeletonNode->setAnimationListener(this, animationStateEvent_selector(ExampleLayer::animationStateEvent)); skeletonNode->setAnimation(0, "walk", true); // This shows how to setup animations to play back to back. //skeletonNode->addAnimation(0, "jump", false); diff --git a/spine-cocos2dx/src/spine/CCSkeletonAnimation.cpp b/spine-cocos2dx/src/spine/CCSkeletonAnimation.cpp index 9816754a3..1df696cb3 100644 --- a/spine-cocos2dx/src/spine/CCSkeletonAnimation.cpp +++ b/spine-cocos2dx/src/spine/CCSkeletonAnimation.cpp @@ -122,7 +122,7 @@ void CCSkeletonAnimation::setMix (const char* fromAnimation, const char* toAnima AnimationStateData_setMixByName(state->data, fromAnimation, toAnimation, duration); } -void CCSkeletonAnimation::setListener (CCObject* instance, SEL_AnimationStateEvent method) { +void CCSkeletonAnimation::setAnimationListener (CCObject* instance, SEL_AnimationStateEvent method) { listenerInstance = instance; listenerMethod = method; } diff --git a/spine-cocos2dx/src/spine/CCSkeletonAnimation.h b/spine-cocos2dx/src/spine/CCSkeletonAnimation.h index 75aaf98c5..bfa6d9a6f 100644 --- a/spine-cocos2dx/src/spine/CCSkeletonAnimation.h +++ b/spine-cocos2dx/src/spine/CCSkeletonAnimation.h @@ -65,7 +65,7 @@ public: void setAnimationStateData (AnimationStateData* stateData); void setMix (const char* fromAnimation, const char* toAnimation, float duration); - void setListener (CCObject* instance, SEL_AnimationStateEvent method); + void setAnimationListener (CCObject* instance, SEL_AnimationStateEvent method); TrackEntry* setAnimation (int trackIndex, const char* name, bool loop); TrackEntry* addAnimation (int trackIndex, const char* name, bool loop, float delay = 0); TrackEntry* getCurrent (int trackIndex = 0); diff --git a/spine-cocos2dx/src/spine/spine-cocos2dx.cpp b/spine-cocos2dx/src/spine/spine-cocos2dx.cpp index 7cbe3886d..ed5af2c5b 100644 --- a/spine-cocos2dx/src/spine/spine-cocos2dx.cpp +++ b/spine-cocos2dx/src/spine/spine-cocos2dx.cpp @@ -51,7 +51,7 @@ void _AtlasPage_disposeTexture (AtlasPage* self) { char* _Util_readFile (const char* path, int* length) { unsigned long size; - char* data = reinterpret_cast(CCFileUtils::sharedFileUtils()->getFileData( + char* data = reinterpret_cast(CCFileUtils::sharedFileUtils()->getFileData( CCFileUtils::sharedFileUtils()->fullPathForFilename(path).c_str(), "r", &size)); *length = size; return data;