Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop_FixTestCase_RenderTexture 

* develop:
  Some warning fixes.
This commit is contained in:
Huabing.Xu 2013-12-25 16:20:40 +08:00
parent 218dc7c115 00d16aadc5
commit 18a168a528
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/2d/CCActionInterval.cpp
View File

@ -2053,7 +2053,7 @@ void Animate::startWithTarget(Node *target)
if (_animation->getRestoreOriginalFrame()) if (_animation->getRestoreOriginalFrame())
{ {
_origFrame = sprite->getDisplayFrame(); _origFrame = sprite->getSpriteFrame();
_origFrame->retain(); _origFrame->retain();
} }
_nextFrame = 0; _nextFrame = 0;
@ -2064,7 +2064,7 @@ void Animate::stop(void)
{ {
if (_animation->getRestoreOriginalFrame() && _target) if (_animation->getRestoreOriginalFrame() && _target)
{ {
static_cast<Sprite*>(_target)->setDisplayFrame(_origFrame); static_cast<Sprite*>(_target)->setSpriteFrame(_origFrame);
} }
ActionInterval::stop(); ActionInterval::stop();
@ -2097,7 +2097,7 @@ void Animate::update(float t)
if( splitTime <= t ) { if( splitTime <= t ) {
AnimationFrame* frame = frames.at(i); AnimationFrame* frame = frames.at(i);
frameToDisplay = frame->getSpriteFrame(); frameToDisplay = frame->getSpriteFrame();
static_cast<Sprite*>(_target)->setDisplayFrame(frameToDisplay); static_cast<Sprite*>(_target)->setSpriteFrame(frameToDisplay);
const ValueMap& dict = frame->getUserInfo(); const ValueMap& dict = frame->getUserInfo();
if ( !dict.empty() ) if ( !dict.empty() )

2
cocos/editor-support/spine/CCSkeleton.cpp
View File

@ -168,7 +168,7 @@ void Skeleton::draw () {
textureAtlas = regionTextureAtlas; textureAtlas = regionTextureAtlas;
setFittedBlendingFunc(textureAtlas); setFittedBlendingFunc(textureAtlas);
int quadCount = textureAtlas->getTotalQuads(); ssize_t quadCount = textureAtlas->getTotalQuads();
if (textureAtlas->getCapacity() == quadCount) { if (textureAtlas->getCapacity() == quadCount) {
textureAtlas->drawQuads(); textureAtlas->drawQuads();
textureAtlas->removeAllQuads(); textureAtlas->removeAllQuads();

2
cocos/editor-support/spine/SkeletonJson.cpp
View File

@ -65,7 +65,7 @@ void spSkeletonJson_dispose (spSkeletonJson* self) {
void _spSkeletonJson_setError (spSkeletonJson* self, Json* root, const char* value1, const char* value2) { void _spSkeletonJson_setError (spSkeletonJson* self, Json* root, const char* value1, const char* value2) {
char message[256]; char message[256];
int length; size_t length = 0;
FREE(self->error); FREE(self->error);
strcpy(message, value1); strcpy(message, value1);
length = strlen(value1); length = strlen(value1);

2
cocos/editor-support/spine/extension.cpp
View File

@ -62,7 +62,7 @@ char* _readFile (const char* path, int* length) {
if (!file) return 0; if (!file) return 0;
fseek(file, 0, SEEK_END); fseek(file, 0, SEEK_END);
*length = ftell(file); *length = (int)ftell(file);
fseek(file, 0, SEEK_SET); fseek(file, 0, SEEK_SET);
data = MALLOC(char, *length); data = MALLOC(char, *length);

2
cocos/editor-support/spine/spine-cocos2dx.h
View File

@ -39,6 +39,6 @@
#include <spine/CCSkeleton.h> #include <spine/CCSkeleton.h>
#include <spine/CCSkeletonAnimation.h> #include <spine/CCSkeletonAnimation.h>
void spRegionAttachment_updateQuad (spRegionAttachment* self, spSlot* slot, cocos2d::ccV3F_C4B_T2F_Quad* quad, bool premultiplied = false); void spRegionAttachment_updateQuad (spRegionAttachment* self, spSlot* slot, cocos2d::V3F_C4B_T2F_Quad* quad, bool premultiplied = false);
#endif /* SPINE_COCOS2DX_H_ */ #endif /* SPINE_COCOS2DX_H_ */