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

War on -Werror, part 14: More hodgepodge.

Browse Source
This commit is contained in:
Jason Felds
2012-12-27 12:45:04 -05:00
parent 52df8ea981
commit a15cbc431d
36 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BitmapText.cpp
+3 -3
View File
@@ -363,7 +363,7 @@ void BitmapText::DrawChars( bool bUseStrokeTexture )
* in sAlternateText, too, just use sText. */
void BitmapText::SetText( const RString& _sText, const RString& _sAlternateText, int iWrapWidthPixels )
{
ASSERT( m_pFont );
ASSERT( m_pFont != NULL );
RString sNewText = StringWillUseAlternate(_sText,_sAlternateText) ? _sAlternateText : _sText;
@@ -505,7 +505,7 @@ void BitmapText::UpdateBaseZoom()
bool BitmapText::StringWillUseAlternate( const RString& sText, const RString& sAlternateText ) const
{
ASSERT( m_pFont );
ASSERT( m_pFont != NULL );
// Can't use the alternate if there isn't one.
if( !sAlternateText.size() )
@@ -711,7 +711,7 @@ void BitmapText::SetHorizAlign( float f )
void BitmapText::SetWrapWidthPixels( int iWrapWidthPixels )
{
ASSERT( m_pFont ); // always load a font first
ASSERT( m_pFont != NULL ); // always load a font first
if( m_iWrapWidthPixels == iWrapWidthPixels )
return;
m_iWrapWidthPixels = iWrapWidthPixels;