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

on dealloc, log "this" with %p, not %x. 

Also adds %p where it was missing.
And make a few fixes on the iOS project
This commit is contained in:
Ricardo Quesada 2013-06-05 18:21:05 -07:00
parent 8a54af1699
commit 479062fdb7
12 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/base_nodes/CCNode.cpp
View File

@ -103,7 +103,7 @@ CCNode::CCNode(void)
CCNode::~CCNode(void) CCNode::~CCNode(void)
{ {
CCLOGINFO( "cocos2d: deallocing" ); CCLOGINFO( "cocos2d: deallocing: %p", this );
unregisterScriptHandler(); unregisterScriptHandler();
if (m_nUpdateScriptHandler) if (m_nUpdateScriptHandler)

2
cocos2dx/label_nodes/CCLabelBMFont.cpp
View File

@ -142,7 +142,7 @@ CCBMFontConfiguration::CCBMFontConfiguration()
CCBMFontConfiguration::~CCBMFontConfiguration() CCBMFontConfiguration::~CCBMFontConfiguration()
{ {
CCLOGINFO( "cocos2d: deallocing CCBMFontConfiguration" ); CCLOGINFO( "cocos2d: deallocing CCBMFontConfiguration %p", this );
this->purgeFontDefDictionary(); this->purgeFontDefDictionary();
this->purgeKerningDictionary(); this->purgeKerningDictionary();
m_sAtlasName.clear(); m_sAtlasName.clear();

2
cocos2dx/platform/mac/CCDirectorCaller.mm
View File

@ -59,7 +59,7 @@ static id s_sharedDirectorCaller;
-(void) dealloc -(void) dealloc
{ {
s_sharedDirectorCaller = nil; s_sharedDirectorCaller = nil;
CCLOG("cocos2d: deallocing CCDirectorCaller %x", self); CCLOG("cocos2d: deallocing CCDirectorCaller %p", self);
if (displayLink) { if (displayLink) {
CVDisplayLinkRelease(displayLink); CVDisplayLinkRelease(displayLink);
} }

2
cocos2dx/platform/mac/CCEGLView.mm
View File

@ -47,7 +47,7 @@ CCEGLView::CCEGLView(void)
CCEGLView::~CCEGLView(void) CCEGLView::~CCEGLView(void)
{ {
CCLOG("cocos2d: deallocing CCEGLView %0x", this); CCLOG("cocos2d: deallocing CCEGLView %p", this);
s_sharedView = NULL; s_sharedView = NULL;
} }

2
cocos2dx/shaders/CCGLProgram.cpp
View File

@ -57,7 +57,7 @@ CCGLProgram::CCGLProgram()
CCGLProgram::~CCGLProgram() CCGLProgram::~CCGLProgram()
{ {
CCLOGINFO("cocos2d: %s %d deallocing 0x%X", __FUNCTION__, __LINE__, this); CCLOGINFO("cocos2d: %s %d deallocing %p", __FUNCTION__, __LINE__, this);
// there is no need to delete the shaders. They should have been already deleted. // there is no need to delete the shaders. They should have been already deleted.
CCAssert(m_uVertShader == 0, "Vertex Shaders should have been already deleted"); CCAssert(m_uVertShader == 0, "Vertex Shaders should have been already deleted");

2
cocos2dx/shaders/CCShaderCache.cpp
View File

@ -71,7 +71,7 @@ CCShaderCache::CCShaderCache()
CCShaderCache::~CCShaderCache() CCShaderCache::~CCShaderCache()
{ {
CCLOGINFO("cocos2d deallocing 0x%X", this); CCLOGINFO("cocos2d deallocing %p", this);
m_pPrograms->release(); m_pPrograms->release();
} }

2
cocos2dx/sprite_nodes/CCAnimation.cpp
View File

@ -51,7 +51,7 @@ bool CCAnimationFrame::initWithSpriteFrame(CCSpriteFrame* spriteFrame, float del
CCAnimationFrame::~CCAnimationFrame() CCAnimationFrame::~CCAnimationFrame()
{ {
CCLOGINFO( "cocos2d: deallocing %s", this); CCLOGINFO( "cocos2d: deallocing %p", this);
CC_SAFE_RELEASE(m_pSpriteFrame); CC_SAFE_RELEASE(m_pSpriteFrame);
CC_SAFE_RELEASE(m_pUserInfo); CC_SAFE_RELEASE(m_pUserInfo);

2
cocos2dx/textures/CCTextureCache.cpp
View File

@ -207,7 +207,7 @@ CCTextureCache::CCTextureCache()
CCTextureCache::~CCTextureCache() CCTextureCache::~CCTextureCache()
{ {
CCLOGINFO("cocos2d: deallocing CCTextureCache."); CCLOGINFO("cocos2d: deallocing CCTextureCache: %p", this);
need_quit = true; need_quit = true;
pthread_cond_signal(&s_SleepCondition); pthread_cond_signal(&s_SleepCondition);

2
cocos2dx/textures/CCTexturePVR.cpp
View File

@ -242,7 +242,7 @@ CCTexturePVR::CCTexturePVR()
CCTexturePVR::~CCTexturePVR() CCTexturePVR::~CCTexturePVR()
{ {
CCLOGINFO( "cocos2d: deallocing CCTexturePVR" ); CCLOGINFO( "cocos2d: deallocing CCTexturePVR: %p", this );
if (m_uName != 0 && ! m_bRetainName) if (m_uName != 0 && ! m_bRetainName)
{ {

2
cocos2dx/tilemap_parallax_nodes/CCTMXObjectGroup.cpp
View File

@ -41,7 +41,7 @@ CCTMXObjectGroup::CCTMXObjectGroup()
} }
CCTMXObjectGroup::~CCTMXObjectGroup() CCTMXObjectGroup::~CCTMXObjectGroup()
{ {
CCLOGINFO( "cocos2d: deallocing."); CCLOGINFO( "cocos2d: deallocing: %p", this);
CC_SAFE_RELEASE(m_pObjects); CC_SAFE_RELEASE(m_pObjects);
CC_SAFE_RELEASE(m_pProperties); CC_SAFE_RELEASE(m_pProperties);
} }

6
cocos2dx/tilemap_parallax_nodes/CCTMXXMLParser.cpp
View File

@ -78,7 +78,7 @@ CCTMXLayerInfo::CCTMXLayerInfo()
CCTMXLayerInfo::~CCTMXLayerInfo() CCTMXLayerInfo::~CCTMXLayerInfo()
{ {
CCLOGINFO("cocos2d: deallocing."); CCLOGINFO("cocos2d: deallocing: %p", this);
CC_SAFE_RELEASE(m_pProperties); CC_SAFE_RELEASE(m_pProperties);
if( m_bOwnTiles && m_pTiles ) if( m_bOwnTiles && m_pTiles )
{ {
@ -108,7 +108,7 @@ CCTMXTilesetInfo::CCTMXTilesetInfo()
} }
CCTMXTilesetInfo::~CCTMXTilesetInfo() CCTMXTilesetInfo::~CCTMXTilesetInfo()
{ {
CCLOGINFO("cocos2d: deallocing."); CCLOGINFO("cocos2d: deallocing: %p", this);
} }
CCRect CCTMXTilesetInfo::rectForGID(unsigned int gid) CCRect CCTMXTilesetInfo::rectForGID(unsigned int gid)
{ {
@ -208,7 +208,7 @@ CCTMXMapInfo::CCTMXMapInfo()
CCTMXMapInfo::~CCTMXMapInfo() CCTMXMapInfo::~CCTMXMapInfo()
{ {
CCLOGINFO("cocos2d: deallocing."); CCLOGINFO("cocos2d: deallocing: %p", this);
CC_SAFE_RELEASE(m_pTilesets); CC_SAFE_RELEASE(m_pTilesets);
CC_SAFE_RELEASE(m_pLayers); CC_SAFE_RELEASE(m_pLayers);
CC_SAFE_RELEASE(m_pProperties); CC_SAFE_RELEASE(m_pProperties);

2
samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
98559cffb0522f553d9f6cf6a4d990b1b9fb2e83 8922f463911cface3b01435714d824c97adf5948