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

The big NULL replacement party part 1.

Browse Source 
This is meant to be a safer alternative since
NULL can often be 0. Let's not rely on that.

And yes, I know this is a lot of files. This is
a safer thing to do in big commits vs for loops.
This commit is contained in:
Jason Felds
2013-05-03 23:01:54 -04:00
parent b22a3bd3c4
commit 9f24627bf9
167 changed files with 31932 additions and 31932 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BitmapText.cpp
+4 -4
View File
@@ -95,7 +95,7 @@ BitmapText & BitmapText::operator=(const BitmapText &cpy)
if( m_pFont )
FONT->UnloadFont( m_pFont );
if( cpy.m_pFont != NULL )
if( cpy.m_pFont != nullptr )
m_pFont = FONT->CopyFont( cpy.m_pFont );
else
m_pFont = NULL;
@@ -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 != NULL );
ASSERT( m_pFont != nullptr );
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 != NULL );
ASSERT( m_pFont != nullptr );
// 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 != NULL ); // always load a font first
ASSERT( m_pFont != nullptr ); // always load a font first
if( m_iWrapWidthPixels == iWrapWidthPixels )
return;
m_iWrapWidthPixels = iWrapWidthPixels;