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

CCLabelBMFont: Now using std::string to store internal data instead of just storing a 'foreign' const char *.

This commit is contained in:
Nicolas Gramlich 2012-06-05 17:11:50 -07:00
parent 0702becaf5
commit 2d86a4089c
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos2dx/label_nodes/CCLabelBMFont.cpp
View File

@ -807,7 +807,7 @@ bool CCLabelBMFont::initWithString(const char *theString, const char *fntFile, f
m_pConfiguration = FNTConfigLoadFile(fntFile);
m_pConfiguration->retain();
m_pFntFile = fntFile;
m_sFntFile = fntFile;
CCAssert( m_pConfiguration, "Error creating config for LabelBMFont");
texture = CCTextureCache::sharedTextureCache()->addImage(this->m_pConfiguration->m_sAtlasName.c_str());
@ -856,7 +856,6 @@ CCLabelBMFont::~CCLabelBMFont()
{
CC_SAFE_DELETE(this->m_sString);
CC_SAFE_RELEASE(this->m_pConfiguration);
CC_SAFE_DELETE(this->m_pFntFile);
}
// LabelBMFont - Atlas generation
@ -1355,8 +1354,7 @@ void CCLabelBMFont::setWidth(float width)
void CCLabelBMFont::setFntFile(const char *fntFile)
{
CC_SAFE_DELETE(m_pFntFile);
this->m_pFntFile = fntFile;
this->m_sFntFile = fntFile;
CCBMFontConfiguration * newConfiguration = FNTConfigLoadFile(fntFile);
CCAssert(newConfiguration, printf("CCLabelBMFont: Impossible to create font. Please check file: '%@'", fntFile) );
@ -1402,7 +1400,7 @@ float CCLabelBMFont::getLetterPosXRight( CCSprite* sp )
}
const char * CCLabelBMFont::getFntFile()
{
return this->m_pFntFile;
return this->m_sFntFile.c_str();
}
//LabelBMFont - Debug draw
#if CC_LABELBMFONT_DEBUG_DRAW

2
cocos2dx/label_nodes/CCLabelBMFont.h
View File

@ -167,7 +167,7 @@ protected:
bool m_bLineBreakWithoutSpaces;
// offset of the texture atlas
CCPoint m_tImageOffset;
const char * m_pFntFile;
std::string m_sFntFile;
public:
CCLabelBMFont();