actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 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/ScreenManager.cpp
+5 -5
View File
@@ -73,13 +73,13 @@
#include "ActorUtil.h"
ScreenManager* SCREENMAN = NULL; // global and accessable from anywhere in our program
ScreenManager* SCREENMAN = nullptr; // global and accessable from anywhere in our program
static Preference<bool> g_bDelayedScreenLoad( "DelayedScreenLoad", false );
//static Preference<bool> g_bPruneFonts( "PruneFonts", true );
// Screen registration
static map<RString,CreateScreenFn> *g_pmapRegistrees = NULL;
static map<RString,CreateScreenFn> *g_pmapRegistrees = nullptr;
/** @brief Utility functions for the ScreenManager. */
namespace ScreenManagerUtil
@@ -97,7 +97,7 @@ namespace ScreenManagerUtil
LoadedScreen()
{
m_pScreen = NULL;
m_pScreen = nullptr;
m_bDeleteWhenDone = true;
m_SendOnPop = SM_None;
}
@@ -561,7 +561,7 @@ void ScreenManager::PrepareScreen( const RString &sScreenName )
if( !sNewBGA.empty() && sNewBGA != g_pSharedBGA->GetName() )
{
Actor *pNewBGA = NULL;
Actor *pNewBGA = nullptr;
for (Actor *a : g_vPreparedBackgrounds)
{
if( a->GetName() == sNewBGA )
@@ -632,7 +632,7 @@ bool ScreenManager::ActivatePreparedScreenAndBackground( const RString &sScreenN
RString sNewBGA = THEME->GetPathB(sScreenName,"background");
if( sNewBGA != g_pSharedBGA->GetName() )
{
Actor *pNewBGA = NULL;
Actor *pNewBGA = nullptr;
if( sNewBGA.empty() )
{
pNewBGA = new Actor;