mirror of https://github.com/axmolengine/axmol.git
fixed #1292: Renamed CCFileUtils::popupNotify to CCFileUtils::setPopupNotify
This commit is contained in:
parent
24e3ec7499
commit
f8ebbccb98
|
@ -289,11 +289,11 @@ bool CCParticleSystem::initWithDictionary(CCDictionary *dictionary)
|
||||||
{
|
{
|
||||||
// set not pop-up message box when load image failed
|
// set not pop-up message box when load image failed
|
||||||
bool bNotify = CCFileUtils::sharedFileUtils()->isPopupNotify();
|
bool bNotify = CCFileUtils::sharedFileUtils()->isPopupNotify();
|
||||||
CCFileUtils::sharedFileUtils()->popupNotify(false);
|
CCFileUtils::sharedFileUtils()->setPopupNotify(false);
|
||||||
tex = CCTextureCache::sharedTextureCache()->addImage(fullpath.c_str());
|
tex = CCTextureCache::sharedTextureCache()->addImage(fullpath.c_str());
|
||||||
|
|
||||||
// reset the value of UIImage notify
|
// reset the value of UIImage notify
|
||||||
CCFileUtils::sharedFileUtils()->popupNotify(bNotify);
|
CCFileUtils::sharedFileUtils()->setPopupNotify(bNotify);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (tex)
|
if (tex)
|
||||||
|
|
|
@ -157,7 +157,7 @@ public:
|
||||||
/**
|
/**
|
||||||
@brief Set/Get whether pop-up a message box when the image load failed
|
@brief Set/Get whether pop-up a message box when the image load failed
|
||||||
*/
|
*/
|
||||||
void popupNotify(bool bNotify);
|
void setPopupNotify(bool bNotify);
|
||||||
bool isPopupNotify();
|
bool isPopupNotify();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -443,7 +443,7 @@ bool CCFileUtils::iPhoneRetinaDisplayFileExistsAtPath(const char *filename)
|
||||||
//////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////
|
||||||
static bool s_bPopupNotify = true;
|
static bool s_bPopupNotify = true;
|
||||||
|
|
||||||
void CCFileUtils::popupNotify(bool bNotify)
|
void CCFileUtils::setPopupNotify(bool bNotify)
|
||||||
{
|
{
|
||||||
s_bPopupNotify = bNotify;
|
s_bPopupNotify = bNotify;
|
||||||
}
|
}
|
||||||
|
|
|
@ -477,7 +477,7 @@ unsigned char* CCFileUtils::getFileData(const char* pszFileName, const char* psz
|
||||||
// notification support when getFileData from a invalid file
|
// notification support when getFileData from a invalid file
|
||||||
static bool s_bPopupNotify = true;
|
static bool s_bPopupNotify = true;
|
||||||
|
|
||||||
void CCFileUtils::popupNotify(bool bNotify)
|
void CCFileUtils::setPopupNotify(bool bNotify)
|
||||||
{
|
{
|
||||||
s_bPopupNotify = bNotify;
|
s_bPopupNotify = bNotify;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue