From 0ef65d1ed50d4ec72bc2ab9e275a5edec31a619f Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 23 Mar 2012 10:26:36 +0800 Subject: [PATCH] issue #1056: Renamed CC_COCOSNODE_RENDER_SUBPIXEL to CC_NODE_RENDER_SUBPIXEL in CCNode.cpp --- cocos2dx/base_nodes/CCNode.cpp | 2 +- tests/tests/TileMapTest/TileMapTest.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cocos2dx/base_nodes/CCNode.cpp b/cocos2dx/base_nodes/CCNode.cpp index 7309b27594..b7970dca2e 100644 --- a/cocos2dx/base_nodes/CCNode.cpp +++ b/cocos2dx/base_nodes/CCNode.cpp @@ -39,7 +39,7 @@ THE SOFTWARE. // externals #include "kazmath/GL/matrix.h" -#if CC_COCOSNODE_RENDER_SUBPIXEL +#if CC_NODE_RENDER_SUBPIXEL #define RENDER_IN_SUBPIXEL #else #define RENDER_IN_SUBPIXEL (int) diff --git a/tests/tests/TileMapTest/TileMapTest.cpp b/tests/tests/TileMapTest/TileMapTest.cpp index bc180e1e87..1f16689a5c 100644 --- a/tests/tests/TileMapTest/TileMapTest.cpp +++ b/tests/tests/TileMapTest/TileMapTest.cpp @@ -805,7 +805,7 @@ TMXIsoZorder::TMXIsoZorder() addChild(map, 0, kTagTileMap); CCSize s = map->getContentSize(); - ////----UXLOG("ContentSize: %f, %f", s.width,s.height); + CCLOG("ContentSize: %f, %f", s.width,s.height); map->setPosition(ccp(-s.width/2,0)); m_tamara = CCSprite::spriteWithFile(s_pPathSister1); @@ -1011,7 +1011,7 @@ TMXOrthoVertexZ::TMXOrthoVertexZ() // can use any CCSprite and it will work OK. CCTMXLayer* layer = map->layerNamed("trees"); m_tamara = layer->tileAt(ccp(0,11)); - CCLOG("%@ vertexZ: %f", m_tamara, m_tamara->getVertexZ()); + CCLOG("%p vertexZ: %f", m_tamara, m_tamara->getVertexZ()); m_tamara->retain(); CCActionInterval* move = CCMoveBy::actionWithDuration(10, ccpMult( ccp(400,450), 1/CC_CONTENT_SCALE_FACTOR()));