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

[iOS] fixed #668: CCLabelBMFont looks ok in retina mode

This commit is contained in:
minggo 2011-08-10 15:07:34 +08:00
parent 1ed6a4422c
commit 9a884ffda6
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cocos2dx/label_nodes/CCLabelBMFont.cpp
View File

@ -442,18 +442,18 @@ namespace cocos2d{
CCSize tmpSize = CCSizeZero;
int longestLine = 0;
int totalHeight = 0;
unsigned int totalHeight = 0;
int quantityOfLines = 1;
unsigned int quantityOfLines = 1;
int len = m_sString.length();
unsigned int stringLen = m_sString.length();
if (0 == len)
if (0 == stringLen)
{
return;
}
for (int i = 0; i < len - 1; ++i)
for (unsigned int i = 0; i < stringLen - 1; ++i)
{
unsigned short c = m_sString[i];
if (c == '\n')
@ -463,9 +463,9 @@ namespace cocos2d{
}
totalHeight = m_pConfiguration->m_uCommonHeight * quantityOfLines;
nextFontPositionY = m_pConfiguration->m_uCommonHeight * (quantityOfLines - 1);
nextFontPositionY = -(m_pConfiguration->m_uCommonHeight - m_pConfiguration->m_uCommonHeight * quantityOfLines);
for(int i=0; i<len; i++)
for (unsigned int i= 0; i < stringLen; i++)
{
unsigned short c = m_sString[i];
CCAssert( c < kCCBMFontMaxChars, "LabelBMFont: character outside bounds");
@ -489,7 +489,7 @@ namespace cocos2d{
if( ! fontChar )
{
fontChar = new CCSprite();
fontChar->initWithBatchNode(this, rect);
fontChar->initWithBatchNodeRectInPixels(this, rect);
this->addChild(fontChar, 0, i);
fontChar->release();
}

1
tests/Res/fonts/tuffy_bold_italic-charmap-hd.png.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
8167faf6c40ffd95a03028f1dcee1abdaa48b222