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

Merge pull request #7362 from geron-cn/chukongv3 

Chukongv3
This commit is contained in:
minggo 2014-07-10 21:17:19 +08:00
parent b30d758d09 1c4cb78745
commit 4895e6d54a
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cocos/editor-support/cocostudio/CocoLoader.cpp
View File

@ -132,8 +132,17 @@ char* stExpCocoNode::GetName(CocoLoader* pCoco)
char* stExpCocoNode::GetValue(CocoLoader* pCoco)
{
return ( pCoco->GetMemoryAddr_String() + m_szValue );
char* szValue = ( pCoco->GetMemoryAddr_String() + m_szValue );
if(GetType(pCoco) == kStringType )
{
if(szValue && 0==strcmp(szValue,"null"))
{
strcpy(szValue,"");
}
}
return szValue;
}
int stExpCocoNode::GetChildNum()
{

2
tests/cpp-tests/Resources/ccs-res

@ -1 +1 @@
Subproject commit 6b28e948482ca7ed44c31daf3fef2e42ad6b59fb
Subproject commit c307f62357e42d2e7e671f4741f855dc8a5fde3a