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

The big NULL replacement party part 2.

Browse Source 
This may take a bit. Trying to do this by operator/command.
This commit is contained in:
Jason Felds
2013-05-03 23:11:42 -04:00
parent 9f24627bf9
commit ba59dd1656
174 changed files with 6644 additions and 6644 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenWithMenuElements.cpp
+3 -3
View File
@@ -43,7 +43,7 @@ void ScreenWithMenuElements::Init()
{
FOREACH_PlayerNumber( p )
{
ASSERT( m_MemoryCardDisplay[p] == NULL );
ASSERT( m_MemoryCardDisplay[p] == nullptr );
m_MemoryCardDisplay[p] = new MemoryCardDisplay;
m_MemoryCardDisplay[p]->Load( p );
m_MemoryCardDisplay[p]->SetName( ssprintf("MemoryCardDisplayP%d",p+1) );
@@ -54,7 +54,7 @@ void ScreenWithMenuElements::Init()
if( TIMER_SECONDS != -1 )
{
ASSERT( m_MenuTimer == NULL ); // don't load twice
ASSERT( m_MenuTimer == nullptr ); // don't load twice
m_MenuTimer = new MenuTimer;
m_MenuTimer->Load( TIMER_METRICS_GROUP.GetValue() );
m_MenuTimer->SetName( "Timer" );
@@ -251,7 +251,7 @@ void ScreenWithMenuElements::Update( float fDeltaTime )
void ScreenWithMenuElements::ResetTimer()
{
if( m_MenuTimer == NULL )
if( m_MenuTimer == nullptr )
return;
if( TIMER_SECONDS > 0.0f && (PREFSMAN->m_bMenuTimer || FORCE_TIMER) )