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

Merge pull request #1325 from walzer/gles20 

bug fix: CCString::stringWithContentsOfFile should call CCString::createWithContentsOfFile, but not CCString::create
This commit is contained in:
Walzer 2012-09-16 01:27:20 -07:00
parent 4374695210 f475bcf102
commit 4673977c31
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/cocoa/CCString.cpp
View File

@ -219,7 +219,7 @@ CCString* CCString::createWithFormat(const char* format, ...)
CCString* CCString::stringWithContentsOfFile(const char* pszFileName) CCString* CCString::stringWithContentsOfFile(const char* pszFileName)
{ {
return CCString::create(pszFileName); return CCString::createWithContentsOfFile(pszFileName);
} }
CCString* CCString::createWithContentsOfFile(const char* pszFileName) CCString* CCString::createWithContentsOfFile(const char* pszFileName)