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

use unix text format

This commit is contained in:
dumganhar 2011-11-08 18:11:43 +08:00
parent a81b078286
commit 33db1c7951
1 changed files with 171 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cocos2dx/label_nodes/CCLabelBMFont.cpp
View File

@ -147,7 +147,8 @@ namespace cocos2d{
// parse spacing / padding // parse spacing / padding
std::string line; std::string line;
std::string strLeft(pBuffer, nBufSize); std::string strLeft(pBuffer, nBufSize);
while (strLeft.length() > 0) { while (strLeft.length() > 0)
{
int pos = strLeft.find('\n'); int pos = strLeft.find('\n');
if (pos != (int)std::string::npos) if (pos != (int)std::string::npos)
@ -553,7 +554,8 @@ namespace cocos2d{
{ {
pNode->setIsVisible(false); pNode->setIsVisible(false);
} }
} } }
}
this->createFontChars(); this->createFontChars();
} }
@ -581,7 +583,8 @@ namespace cocos2d{
{ {
pNode->setColor(m_tColor); pNode->setColor(m_tColor);
} }
} } }
}
} }
const ccColor3B& CCLabelBMFont::getColor() const ccColor3B& CCLabelBMFont::getColor()
{ {
@ -605,7 +608,8 @@ namespace cocos2d{
pRGBAProtocol->setOpacity(m_cOpacity); pRGBAProtocol->setOpacity(m_cOpacity);
} }
} }
} } }
}
} }
GLubyte CCLabelBMFont::getOpacity() GLubyte CCLabelBMFont::getOpacity()
{ {
@ -628,7 +632,8 @@ namespace cocos2d{
pRGBAProtocol->setIsOpacityModifyRGB(m_bIsOpacityModifyRGB); pRGBAProtocol->setIsOpacityModifyRGB(m_bIsOpacityModifyRGB);
} }
} }
} } }
}
} }
bool CCLabelBMFont::getIsOpacityModifyRGB() bool CCLabelBMFont::getIsOpacityModifyRGB()
{ {