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

closed #3597: Uses !xxx.empty() instead of xxx.size() > 0.

This commit is contained in:
James Chen 2014-01-08 10:47:27 +08:00
parent 685b80796b
commit eb8f621ab0
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cocos/2d/CCParticleSystem.cpp
View File

@ -351,13 +351,13 @@ bool ParticleSystem::initWithDictionary(ValueMap& dictionary, const std::string&
{
string textureDir = textureName.substr(0, rPos + 1);
if (dirname.size()>0 && textureDir != dirname)
if (!dirname.empty() && textureDir != dirname)
{
textureName = textureName.substr(rPos+1);
textureName = dirname + textureName;
}
}
else if ( dirname.size()>0 && textureName.empty() == false)
else if (!dirname.empty() && !textureName.empty())
{
textureName = dirname + textureName;
}
@ -369,7 +369,7 @@ bool ParticleSystem::initWithDictionary(ValueMap& dictionary, const std::string&
// set not pop-up message box when load image failed
bool notify = FileUtils::getInstance()->isPopupNotify();
FileUtils::getInstance()->setPopupNotify(false);
tex = Director::getInstance()->getTextureCache()->addImage(textureName.c_str());
tex = Director::getInstance()->getTextureCache()->addImage(textureName);
// reset the value of UIImage notify
FileUtils::getInstance()->setPopupNotify(notify);
}
@ -406,10 +406,12 @@ bool ParticleSystem::initWithDictionary(ValueMap& dictionary, const std::string&
image->release();
}
}
if (_configName.length()>0)
if (!_configName.empty())
{
_yCoordFlipped = dictionary["yCoordFlipped"].asInt();
_yCoordFlipped = dictionary["yCoordFlipped"].asInt();
}
CCASSERT( this->_texture != nullptr, "CCParticleSystem: error loading the texture");
}
ret = true;