diff --git a/cocos2dx/CCDirector.h b/cocos2dx/CCDirector.h index 9978ac9d14..66724729a3 100644 --- a/cocos2dx/CCDirector.h +++ b/cocos2dx/CCDirector.h @@ -440,12 +440,18 @@ protected: void mainLoop(void); void setNextScene(void); + // shows the FPS in the screen +#if CC_DIRECTOR_FAST_FPS void showFPS(void); +#else + void showFPS(void) {} +#endif // CC_DIRECTOR_FAST_FPS + // calculates delta time since last time it was called void calculateDeltaTime(void); -#if defined CC_ENABLE_PROFILERS +#if CC_ENABLE_PROFILERS void showProfilers(void); #endif // CC_ENABLE_PROFILERS diff --git a/cocos2dx/base_nodes/CCAtlasNode.cpp b/cocos2dx/base_nodes/CCAtlasNode.cpp index 44837d0cc7..2597f73d43 100644 --- a/cocos2dx/base_nodes/CCAtlasNode.cpp +++ b/cocos2dx/base_nodes/CCAtlasNode.cpp @@ -65,7 +65,7 @@ CCAtlasNode * CCAtlasNode::initWithTileFile(const char *tile, int tileWidth, int // also, using: self.textureAtlas supports re-initialization without leaking this->m_pTextureAtlas = new CCTextureAtlas(); m_pTextureAtlas->initWithFile(tile, itemsToRender); - m_pTextureAtlas->release(); +// m_pTextureAtlas->release(); this->updateBlendFunc(); this->updateOpacityModifyRGB();