actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Chris Danford
2005-01-16 07:08:58 +00:00
parent 8f524bd0f5
commit f1dbeb2334
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BitmapText.cpp
+9 -10
View File
@@ -72,7 +72,7 @@ BitmapText::~BitmapText()
FONT->UnloadFont( m_pFont ); FONT->UnloadFont( m_pFont );
} }
bool BitmapText::LoadFromFont( CString sFontFilePath ) bool BitmapText::LoadFromFont( const CString& sFontFilePath )
{ {
CHECKPOINT_M( ssprintf("BitmapText::LoadFromFont(%s)", sFontFilePath.c_str()) ); CHECKPOINT_M( ssprintf("BitmapText::LoadFromFont(%s)", sFontFilePath.c_str()) );
@@ -89,7 +89,7 @@ bool BitmapText::LoadFromFont( CString sFontFilePath )
} }
bool BitmapText::LoadFromTextureAndChars( CString sTexturePath, CString sChars ) bool BitmapText::LoadFromTextureAndChars( const CString& sTexturePath, const CString& sChars )
{ {
CHECKPOINT_M( ssprintf("BitmapText::LoadFromTextureAndChars(\"%s\",\"%s\")", sTexturePath.c_str(), sChars.c_str()) ); CHECKPOINT_M( ssprintf("BitmapText::LoadFromTextureAndChars(\"%s\",\"%s\")", sTexturePath.c_str(), sChars.c_str()) );
@@ -280,19 +280,18 @@ void BitmapText::DrawChars()
/* sText is UTF-8. If not all of the characters in sText are available in the /* sText is UTF-8. If not all of the characters in sText are available in the
* font, sAlternateText will be used instead. If there are unavailable characters * font, sAlternateText will be used instead. If there are unavailable characters
* in sAlternateText, too, just use sText. */ * in sAlternateText, too, just use sText. */
void BitmapText::SetText( CString sText, CString sAlternateText, int iWrapWidthPixels ) void BitmapText::SetText( const CString& _sText, const CString& _sAlternateText, int iWrapWidthPixels )
{ {
ASSERT( m_pFont ); ASSERT( m_pFont );
if(StringWillUseAlternate(sText, sAlternateText)) CString sNewText = StringWillUseAlternate(_sText,_sAlternateText) ? _sAlternateText : _sText;
sText = sAlternateText;
if( iWrapWidthPixels == -1 ) // wrap not specified if( iWrapWidthPixels == -1 ) // wrap not specified
iWrapWidthPixels = m_iWrapWidthPixels; iWrapWidthPixels = m_iWrapWidthPixels;
if(m_sText == sText && iWrapWidthPixels==m_iWrapWidthPixels) if(m_sText == sNewText && iWrapWidthPixels==m_iWrapWidthPixels)
return; return;
m_sText = sText; m_sText = sNewText;
m_iWrapWidthPixels = iWrapWidthPixels; m_iWrapWidthPixels = iWrapWidthPixels;
@@ -302,7 +301,7 @@ void BitmapText::SetText( CString sText, CString sAlternateText, int iWrapWidthP
if( iWrapWidthPixels == -1 ) if( iWrapWidthPixels == -1 )
{ {
split( CStringToWstring(sText), L"\n", m_wTextLines, false ); split( CStringToWstring(m_sText), L"\n", m_wTextLines, false );
} }
else else
{ {
@@ -315,7 +314,7 @@ void BitmapText::SetText( CString sText, CString sAlternateText, int iWrapWidthP
* and soft hyphens and pretty easily, too. -glenn */ * and soft hyphens and pretty easily, too. -glenn */
// TODO: Move this wrapping logic into Font // TODO: Move this wrapping logic into Font
CStringArray asLines; CStringArray asLines;
split( sText, "\n", asLines ); split( m_sText, "\n", asLines );
for( unsigned line = 0; line < asLines.size(); ++line ) for( unsigned line = 0; line < asLines.size(); ++line )
{ {
@@ -386,7 +385,7 @@ void BitmapText::UpdateBaseZoom()
this->SetBaseZoomX( Zoom ); this->SetBaseZoomX( Zoom );
} }
bool BitmapText::StringWillUseAlternate(CString sText, CString sAlternateText) const bool BitmapText::StringWillUseAlternate(const CString& sText, const CString& sAlternateText) const
{ {
ASSERT( m_pFont ); ASSERT( m_pFont );
stepmania/src/BitmapText.h
+4 -4
View File
@@ -14,9 +14,9 @@ public:
virtual ~BitmapText(); virtual ~BitmapText();
bool LoadFromFont( CString sFontName ); bool LoadFromFont( const CString& sFontName );
bool LoadFromTextureAndChars( CString sTexturePath, CString sChars ); bool LoadFromTextureAndChars( const CString& sTexturePath, const CString& sChars );
void SetText( CString sText, CString sAlternateText = "", int iWrapWidthPixels = -1 ); void SetText( const CString& sText, const CString& sAlternateText = "", int iWrapWidthPixels = -1 );
void SetMaxWidth( float MaxWidth ); void SetMaxWidth( float MaxWidth );
void SetWrapWidthPixels( int iWrapWidthPixels ); void SetWrapWidthPixels( int iWrapWidthPixels );
@@ -35,7 +35,7 @@ public:
CString GetText() const { return m_sText; } CString GetText() const { return m_sText; }
/* Return true if the string 's' will use an alternate string, if available. */ /* Return true if the string 's' will use an alternate string, if available. */
bool StringWillUseAlternate(CString sText, CString sAlternateText) const; bool StringWillUseAlternate(const CString& sText, const CString& sAlternateText) const;
virtual void HandleCommand( const Command &command ); virtual void HandleCommand( const Command &command );