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

issue #1056: modify code according new code after pull

This commit is contained in:
minggo 2012-03-20 17:27:06 +08:00
parent 7ccb38556e
commit 382e4e7eb8
6 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cocos2dx/Android.mk
View File

@ -28,6 +28,7 @@ cocoa/CCAffineTransform.cpp \
cocoa/CCGeometry.cpp \ cocoa/CCGeometry.cpp \
cocoa/CCAutoreleasePool.cpp \ cocoa/CCAutoreleasePool.cpp \
cocoa/CCData.cpp \ cocoa/CCData.cpp \
cocoa/CCDictionary.cpp \
cocoa/CCNS.cpp \ cocoa/CCNS.cpp \
cocoa/CCObject.cpp \ cocoa/CCObject.cpp \
cocoa/CCSet.cpp \ cocoa/CCSet.cpp \
@ -37,9 +38,6 @@ CCDirector.cpp \
effects/CCGrabber.cpp \ effects/CCGrabber.cpp \
effects/CCGrid.cpp \ effects/CCGrid.cpp \
extensions/CCNotificationCenter.cpp \ extensions/CCNotificationCenter.cpp \
gles2/CCGLProgram.cpp \
gles2/ccGLStateCache.cpp \
gles2/CCShaderCache.cpp \
kazmath/src/aabb.c \ kazmath/src/aabb.c \
kazmath/src/mat3.c \ kazmath/src/mat3.c \
kazmath/src/mat4.c \ kazmath/src/mat4.c \
@ -90,6 +88,9 @@ platform/android/jni/SystemInfoJni.cpp \
platform/android/jni/TouchesJni.cpp \ platform/android/jni/TouchesJni.cpp \
script_support/CCScriptSupport.cpp \ script_support/CCScriptSupport.cpp \
shaders/ccShaders.cpp \ shaders/ccShaders.cpp \
shaders/CCGLProgram.cpp \
shaders/ccGLStateCache.cpp \
shaders/CCShaderCache.cpp \
sprite_nodes/CCAnimation.cpp \ sprite_nodes/CCAnimation.cpp \
sprite_nodes/CCAnimationCache.cpp \ sprite_nodes/CCAnimationCache.cpp \
sprite_nodes/CCSprite.cpp \ sprite_nodes/CCSprite.cpp \

4
cocos2dx/include/CCDictionary.h
View File

@ -89,8 +89,8 @@ public:
// pElement = (CCDictElement*)pElement->hh.next) // pElement = (CCDictElement*)pElement->hh.next)
#define CCDICT_FOREACH(__dict__, __el__) \ #define CCDICT_FOREACH(__dict__, __el__) \
CCDictElement* ##__dict__##__el__##tmp = NULL; \ CCDictElement* tmp##__dict____el__ = NULL; \
HASH_ITER(hh, (__dict__)->m_pElements, __el__, ##__dict__##__el__##tmp) HASH_ITER(hh, (__dict__)->m_pElements, __el__, tmp##__dict____el__)
class CC_DLL CCDictionary : public CCObject class CC_DLL CCDictionary : public CCObject

2
cocos2dx/include/CCTMXXMLParser.h
View File

@ -33,6 +33,8 @@ THE SOFTWARE.
#include "../platform/CCSAXParser.h" #include "../platform/CCSAXParser.h"
#include <string>
NS_CC_BEGIN NS_CC_BEGIN
class CCTMXObjectGroup; class CCTMXObjectGroup;

2
cocos2dx/platform/android/CCFileUtils_android.cpp
View File

@ -27,6 +27,8 @@ NS_CC_BEGIN;
#include "CCCommon.h" #include "CCCommon.h"
#include "jni/SystemInfoJni.h" #include "jni/SystemInfoJni.h"
using namespace std;
// record the resource path // record the resource path
static string s_strResourcePath = ""; static string s_strResourcePath = "";

6
cocos2dx/support/data_support/uthash.h
View File

@ -45,6 +45,12 @@ namespace cocos2d {
#define DECLTYPE(x) (__typeof(x)) #define DECLTYPE(x) (__typeof(x))
#endif #endif
#ifdef ANDROID
#define NO_DECLTYPE
#undef DECLTYPE
#define DECLTYPE(x)
#endif
#ifdef NO_DECLTYPE #ifdef NO_DECLTYPE
#define DECLTYPE_ASSIGN(dst,src) \ #define DECLTYPE_ASSIGN(dst,src) \
do { \ do { \

4
cocos2dx/textures/CCTextureAtlas.cpp
View File

@ -268,7 +268,7 @@ void CCTextureAtlas::updateQuad(ccV3F_C4B_T2F_Quad *quad, unsigned int index)
{ {
CCAssert( index >= 0 && index < m_uCapacity, "updateQuadWithTexture: Invalid index"); CCAssert( index >= 0 && index < m_uCapacity, "updateQuadWithTexture: Invalid index");
m_uTotalQuads = max( index+1, m_uTotalQuads); m_uTotalQuads = MAX( index+1, m_uTotalQuads);
m_pQuads[index] = *quad; m_pQuads[index] = *quad;
@ -404,7 +404,7 @@ bool CCTextureAtlas::resizeCapacity(unsigned int newCapacity)
return true; return true;
// update capacity and totolQuads // update capacity and totolQuads
m_uTotalQuads = min(m_uTotalQuads, newCapacity); m_uTotalQuads = MIN(m_uTotalQuads, newCapacity);
m_uCapacity = newCapacity; m_uCapacity = newCapacity;
void * tmpQuads = NULL; void * tmpQuads = NULL;