From 64772d09b01261c6d98250a6afa9372c8c3d3aad Mon Sep 17 00:00:00 2001 From: Lu Guanqun Date: Sat, 8 Dec 2012 20:23:30 +0800 Subject: [PATCH 1/2] fix the doxygen output of CCAtlasNode --- cocos2dx/base_nodes/CCAtlasNode.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cocos2dx/base_nodes/CCAtlasNode.h b/cocos2dx/base_nodes/CCAtlasNode.h index fe1bb53384..d7cfb0674d 100644 --- a/cocos2dx/base_nodes/CCAtlasNode.h +++ b/cocos2dx/base_nodes/CCAtlasNode.h @@ -40,8 +40,7 @@ NS_CC_BEGIN class CCTextureAtlas; -/** @brief CCAtlasNode is a subclass of CCNode that implements the CCRGBAProtocol and -CCTextureProtocol protocol +/** @brief CCAtlasNode is a subclass of CCNode that implements the CCRGBAProtocol and CCTextureProtocol protocol It knows how to render a TextureAtlas object. If you are going to render a TextureAtlas consider subclassing CCAtlasNode (or a subclass of CCAtlasNode) From 497ae7c33f710f5bcfc7788b32ac95acdc126437 Mon Sep 17 00:00:00 2001 From: Lu Guanqun Date: Mon, 10 Dec 2012 16:05:17 +0800 Subject: [PATCH 2/2] fix the reorder warning of class CCCallFunc ../actions/CCActionInstant.h: In constructor 'cocos2d::CCCallFunc::CCCallFunc()': ../actions/CCActionInstant.h:240:25: warning: 'cocos2d::CCCallFunc::::m_pCallFunc' will be initialized after [-Wreorder] ../actions/CCActionInstant.h:236:6: warning: 'int cocos2d::CCCallFunc::m_nScriptHandler' [-Wreorder] ../actions/CCActionInstant.h:188:5: warning: when initialized here [-Wreorder] --- cocos2dx/actions/CCActionInstant.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2dx/actions/CCActionInstant.h b/cocos2dx/actions/CCActionInstant.h index 97ebd62d09..ad22f77233 100644 --- a/cocos2dx/actions/CCActionInstant.h +++ b/cocos2dx/actions/CCActionInstant.h @@ -187,8 +187,8 @@ class CC_DLL CCCallFunc : public CCActionInstant // public: CCCallFunc() : m_pSelectorTarget(NULL) - , m_pCallFunc(NULL) , m_nScriptHandler(0) + , m_pCallFunc(NULL) { } virtual ~CCCallFunc();