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

Merge pull request #988 from dumganhar/gles20 

issue #1310: fixed a bug in CCSpriteFrameCache.cpp. Disabled retina mode for tests project.
This commit is contained in:
James Chen 2012-06-08 03:03:06 -07:00
parent 57b5c0bcf3 c9dc60b0f7
commit 72c3c2cc0b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/sprite_nodes/CCSpriteFrameCache.cpp
View File

@ -229,7 +229,7 @@ void CCSpriteFrameCache::addSpriteFramesWithFile(const char *pszPlist)
{ {
CCAssert(pszPlist, "plist filename should not be NULL"); CCAssert(pszPlist, "plist filename should not be NULL");
if (m_pLoadedFileNames->find(pszPlist) != m_pLoadedFileNames->end()) if (m_pLoadedFileNames->find(pszPlist) == m_pLoadedFileNames->end())
{ {
const char *pszPath = CCFileUtils::sharedFileUtils()->fullPathFromRelativePath(pszPlist); const char *pszPath = CCFileUtils::sharedFileUtils()->fullPathFromRelativePath(pszPlist);
CCDictionary *dict = CCDictionary::dictionaryWithContentsOfFileThreadSafe(pszPath); CCDictionary *dict = CCDictionary::dictionaryWithContentsOfFileThreadSafe(pszPath);

2
tests/AppDelegate.cpp
View File

@ -23,7 +23,7 @@ bool AppDelegate::applicationDidFinishLaunching()
pDirector->setOpenGLView(&CCEGLView::sharedOpenGLView()); pDirector->setOpenGLView(&CCEGLView::sharedOpenGLView());
// enable High Resource Mode(2x, such as iphone4) and maintains low resource on other devices. // enable High Resource Mode(2x, such as iphone4) and maintains low resource on other devices.
pDirector->enableRetinaDisplay(true); // pDirector->enableRetinaDisplay(true);
// turn on display FPS // turn on display FPS
pDirector->setDisplayStats(true); pDirector->setDisplayStats(true);