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

Clean up as for code review

This commit is contained in:
carlo morgantini 2013-08-14 12:37:59 -07:00
parent 47be4ff58a
commit afd0e88284
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/label_nodes/CCFont.cpp
View File

@ -88,7 +88,9 @@ void Font::setCurrentGlyphCollection(GlyphCollection glyphs, const char *customG
const char * Font::getCurrentGlyphCollection() const char * Font::getCurrentGlyphCollection()
{ {
if (_customGlyphs) if (_customGlyphs)
{
return _customGlyphs; return _customGlyphs;
}
else else
{ {
return getGlyphCollection(_usedGlyphs); return getGlyphCollection(_usedGlyphs);