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

The big NULL replacement party part 5.

Browse Source 
Right. ' = NULL' would get a lot of these.
This commit is contained in:
Jason Felds
2013-05-03 23:39:52 -04:00
parent 328c41eec0
commit 28e5148dec
233 changed files with 7448 additions and 7447 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Sprite.cpp
+4 -4
View File
@@ -20,7 +20,7 @@ REGISTER_ACTOR_CLASS( Sprite );
Sprite::Sprite()
{
m_pTexture = NULL;
m_pTexture = nullptr;
m_iCurState = 0;
m_fSecsIntoState = 0.0f;
m_bUsingCustomTexCoords = false;
@@ -60,7 +60,7 @@ Sprite::Sprite( const Sprite &cpy ):
if( cpy.m_pTexture != nullptr )
m_pTexture = TEXTUREMAN->CopyTexture( cpy.m_pTexture );
else
m_pTexture = NULL;
m_pTexture = nullptr;
}
void Sprite::InitState()
@@ -235,7 +235,7 @@ void Sprite::UnloadTexture()
if( m_pTexture != nullptr ) // If there was a previous bitmap...
{
TEXTUREMAN->UnloadTexture( m_pTexture ); // Unload it.
m_pTexture = NULL;
m_pTexture = nullptr;
/* Make sure we're reset to frame 0, so if we're reused, we aren't left
* on a frame number that may be greater than the number of frames in
@@ -301,7 +301,7 @@ void Sprite::LoadFromTexture( RageTextureID ID )
{
// LOG->Trace( "Sprite::LoadFromTexture( %s )", ID.filename.c_str() );
RageTexture *pTexture = NULL;
RageTexture *pTexture = nullptr;
if( m_pTexture && m_pTexture->GetID() == ID )
pTexture = m_pTexture;
else