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

remove unused data, fix warning

Browse Source
This commit is contained in:
Glenn Maynard
2003-01-10 02:54:07 +00:00
parent f0d662b1b2
commit 5d5ac4e52c
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BitmapText.cpp
+2 -4
View File
@@ -135,7 +135,7 @@ void BitmapText::BuildChars()
switch( m_VertAlign ) switch( m_VertAlign )
{ {
case align_top: iY = 0; break; case align_top: iY = 0; break;
case align_middle: iY = -roundf(TotalHeight/2.0f); break; case align_middle: iY = -(int)roundf(TotalHeight/2.0f); break;
case align_bottom: iY = -TotalHeight; break; case align_bottom: iY = -TotalHeight; break;
default: ASSERT( false ); return; default: ASSERT( false ); return;
} }
@@ -150,7 +150,7 @@ void BitmapText::BuildChars()
switch( m_HorizAlign ) switch( m_HorizAlign )
{ {
case align_left: iX = 0; break; case align_left: iX = 0; break;
case align_center: iX = -roundf(iLineWidth/2.0f); break; case align_center: iX = -(int)roundf(iLineWidth/2.0f); break;
case align_right: iX = -iLineWidth; break; case align_right: iX = -iLineWidth; break;
default: ASSERT( false ); return; default: ASSERT( false ); return;
} }
@@ -221,7 +221,6 @@ void BitmapText::SetText( CString sText, bool DoSubst )
/* Break the string into lines. */ /* Break the string into lines. */
m_szTextLines.clear(); m_szTextLines.clear();
m_iLineWidths.clear(); m_iLineWidths.clear();
m_iLineHeights.clear();
lstring s; s+='\n'; lstring s; s+='\n';
split(CStringToLstring(sText), s, m_szTextLines, false); split(CStringToLstring(sText), s, m_szTextLines, false);
@@ -232,7 +231,6 @@ void BitmapText::SetText( CString sText, bool DoSubst )
for( unsigned l=0; l<m_szTextLines.size(); l++ ) // for each line for( unsigned l=0; l<m_szTextLines.size(); l++ ) // for each line
{ {
m_iLineWidths.push_back(m_pFont->GetLineWidthInSourcePixels( m_szTextLines[l] )); m_iLineWidths.push_back(m_pFont->GetLineWidthInSourcePixels( m_szTextLines[l] ));
m_iLineHeights.push_back(m_pFont->GetLineHeightInSourcePixels( m_szTextLines[l] ));
m_iWidestLineWidth = max(m_iWidestLineWidth, m_iLineWidths.back()); m_iWidestLineWidth = max(m_iWidestLineWidth, m_iLineWidths.back());
} }
stepmania/src/BitmapText.h
+1 -1
View File
@@ -49,9 +49,9 @@ protected:
CString m_szText; CString m_szText;
vector<lstring> m_szTextLines; vector<lstring> m_szTextLines;
vector<int> m_iLineWidths; // in source pixels vector<int> m_iLineWidths; // in source pixels
vector<int> m_iLineHeights; // in source pixels
int m_iWidestLineWidth; // in source pixels int m_iWidestLineWidth; // in source pixels
bool m_bRainbow; bool m_bRainbow;
vector<RageVertex> verts; vector<RageVertex> verts;