The big NULL replacement party part 2.

This may take a bit. Trying to do this by operator/command.

extern/jsoncpp/src/lib_json/json_writer.cpp

@@ -111,7 +111,7 @@ std::string valueToString( bool value )
 std::string valueToQuotedString( const char *value )
 {
    // Not sure how to handle unicode...
-   if (strpbrk(value, "\"\\\b\f\n\r\t") == NULL && !containsControlCharacter( value ))
+   if (strpbrk(value, "\"\\\b\f\n\r\t") == nullptr && !containsControlCharacter( value ))
       return std::string("\"") + value + "\"";
    // We have to walk value and escape any special characters.
    // Appending to std::string is not efficient, but this should be rare.

src/Actor.cpp

@@ -175,7 +175,7 @@ Actor::Actor( const Actor &cpy ):
 	MessageSubscriber( cpy )
 {
 	/* Don't copy an Actor in the middle of rendering. */
-	ASSERT( cpy.m_pTempState == NULL );
+	ASSERT( cpy.m_pTempState == nullptr );
 	m_pTempState = NULL;
 
 #define CPY(x) x = cpy.x
@@ -1081,7 +1081,7 @@ void Actor::RunCommands( const LuaReference& cmds, const LuaReference *pParamTab
 	this->PushSelf( L );
 
 	// 2nd parameter
-	if( pParamTable == NULL )
+	if( pParamTable == nullptr )
 		lua_pushnil( L );
 	else
 		pParamTable->PushSelf( L );
@@ -1482,7 +1482,7 @@ public:
 	static int GetCommand( T* p, lua_State *L )
 	{
 		const apActorCommands *pCommand = p->GetCommand(SArg(1));
-		if( pCommand == NULL )
+		if( pCommand == nullptr )
 			lua_pushnil( L );
 		else
 			(*pCommand)->PushSelf(L);
@@ -1537,7 +1537,7 @@ public:
 	static int GetParent( T* p, lua_State *L )
 	{
 		Actor *pParent = p->GetParent();
-		if( pParent == NULL )
+		if( pParent == nullptr )
 			lua_pushnil( L );
 		else
 			pParent->PushSelf(L);

src/ActorFrame.cpp

@@ -118,7 +118,7 @@ void ActorFrame::LoadChildrenFromNode( const XNode* pNode )
 	// Load children
 	const XNode* pChildren = pNode->GetChild("children");
 	bool bArrayOnly = false;
-	if( pChildren == NULL )
+	if( pChildren == nullptr )
 	{
 		bArrayOnly = true;
 		pChildren = pNode;
@@ -544,7 +544,7 @@ public:
 	{
 		// this one is tricky, we need to get an Actor from Lua.
 		Actor *pActor = ActorUtil::MakeActor( SArg(1) );
-		if ( pActor == NULL )
+		if ( pActor == nullptr )
 		{
 			lua_pushboolean( L, 0 );
 			return 1;

src/ActorFrameTexture.cpp

@@ -34,7 +34,7 @@ ActorFrameTexture::~ActorFrameTexture()
 
 void ActorFrameTexture::Create()
 {
-	ASSERT( m_pRenderTarget == NULL );
+	ASSERT( m_pRenderTarget == nullptr );
 	RageTextureID id( m_sTextureName );
 	id.Policy = RageTextureID::TEX_VOLATILE;
 
@@ -54,7 +54,7 @@ void ActorFrameTexture::Create()
 
 void ActorFrameTexture::DrawPrimitives()
 {
-	if( m_pRenderTarget == NULL )
+	if( m_pRenderTarget == nullptr )
 		return;
 
 	m_pRenderTarget->BeginRenderingTo( m_bPreserveTexture );
@@ -80,7 +80,7 @@ public:
 	static int GetTexture( T* p, lua_State *L )
 	{
 		RageTexture *pTexture = p->GetTexture();
-		if( pTexture == NULL )
+		if( pTexture == nullptr )
 			return 0;
 		pTexture->PushSelf(L);
 		return 1;

src/ActorProxy.cpp

@@ -11,7 +11,7 @@ ActorProxy::ActorProxy()
 
 bool ActorProxy::EarlyAbortDraw() const
 {
-	return m_pActorTarget == NULL || Actor::EarlyAbortDraw();
+	return m_pActorTarget == nullptr || Actor::EarlyAbortDraw();
 }
 
 void ActorProxy::DrawPrimitives()

src/ActorUtil.cpp

@@ -23,7 +23,7 @@ static bool IsRegistered( const RString& sClassName )
 
 void ActorUtil::Register( const RString& sClassName, CreateActorFn pfn )
 {
-	if( g_pmapRegistrees == NULL )
+	if( g_pmapRegistrees == nullptr )
 		g_pmapRegistrees = new map<RString,CreateActorFn>;
 
 	map<RString,CreateActorFn>::iterator iter = g_pmapRegistrees->find( sClassName );
@@ -211,7 +211,7 @@ Actor* ActorUtil::MakeActor( const RString &sPath_, Actor *pParentActor )
 	case FT_Lua:
 		{
 			auto_ptr<XNode> pNode( LoadXNodeFromLuaShowErrors(sPath) );
-			if( pNode.get() == NULL )
+			if( pNode.get() == nullptr )
 			{
 				// XNode will warn about the error
 				return new Actor;

src/AutoActor.cpp

@@ -12,7 +12,7 @@ void AutoActor::Unload()
 
 AutoActor::AutoActor( const AutoActor &cpy )
 { 
-	if( cpy.m_pActor == NULL )
+	if( cpy.m_pActor == nullptr )
 		m_pActor = NULL;
 	else
 		m_pActor = cpy.m_pActor->Copy();
@@ -22,7 +22,7 @@ AutoActor &AutoActor::operator=( const AutoActor &cpy )
 {
 	Unload();
 
-	if( cpy.m_pActor == NULL )
+	if( cpy.m_pActor == nullptr )
 		m_pActor = NULL;
 	else
 		m_pActor = cpy.m_pActor->Copy();
@@ -41,7 +41,7 @@ void AutoActor::Load( const RString &sPath )
 	m_pActor = ActorUtil::MakeActor( sPath );
 
 	// If a Condition is false, MakeActor will return NULL.
-	if( m_pActor == NULL )
+	if( m_pActor == nullptr )
 		m_pActor = new Actor;
 }
 

src/BGAnimation.cpp

@@ -112,7 +112,7 @@ void BGAnimation::LoadFromAniDir( const RString &_sAniDir )
 			
 			XNode* pBGAnimation = ini.GetChild( "BGAnimation" );
 			XNode dummy( "BGAnimation" );
-			if( pBGAnimation == NULL )
+			if( pBGAnimation == nullptr )
 				pBGAnimation = &dummy;
 			
 			LoadFromNode( pBGAnimation );

src/BGAnimationLayer.cpp

@@ -482,7 +482,7 @@ void BGAnimationLayer::LoadFromNode( const XNode* pNode )
 			for( int i=0; i<iNumParticles; i++ )
 			{
 				Actor* pActor = ActorUtil::MakeActor( sFile, this );
-				if( pActor == NULL )
+				if( pActor == nullptr )
 					continue;
 				this->AddChild( pActor );
 				pActor->SetXY( randomf(float(FullScreenRectF.left),float(FullScreenRectF.right)),

src/BPMDisplay.cpp

@@ -259,7 +259,7 @@ void BPMDisplay::SetFromGameState()
 	}
 	if( GAMESTATE->m_pCurCourse.Get() )
 	{
-		if( GAMESTATE->GetCurrentStyle() == NULL )
+		if( GAMESTATE->GetCurrentStyle() == nullptr )
 			; // This is true when backing out from ScreenSelectCourse to ScreenTitleMenu.  So, don't call SetBpmFromCourse where an assert will fire.
 		else
 			SetBpmFromCourse( GAMESTATE->m_pCurCourse );

src/BackgroundUtil.cpp

@@ -255,7 +255,7 @@ static void GetFilterToFileNames( const RString sBaseDir, const Song *pSong, set
 	}
 
 	XNode *pSection = ini.GetChild( sSection );
-	if( pSection == NULL )
+	if( pSection == nullptr )
 	{
 		ASSERT_M( 0, ssprintf("File '%s' refers to a section '%s' that is missing.", sPath.c_str(), sSection.c_str()) );
 		return;

src/Banner.cpp

@@ -109,7 +109,7 @@ void Banner::SetScrolling( bool bScroll, float Percent)
 
 void Banner::LoadFromSong( Song* pSong ) // NULL means no song
 {
-	if( pSong == NULL )	LoadFallback();
+	if( pSong == nullptr )	LoadFallback();
 	else if( pSong->HasBanner() ) Load( pSong->GetBannerPath() );
 	else					LoadFallback();
 
@@ -132,7 +132,7 @@ void Banner::LoadFromSongGroup( RString sSongGroup )
 
 void Banner::LoadFromCourse( const Course *pCourse )		// NULL means no course
 {
-	if( pCourse == NULL )				LoadFallback();
+	if( pCourse == nullptr )				LoadFallback();
 	else if( pCourse->GetBannerPath() != "" )	Load( pCourse->GetBannerPath() );
 	else						LoadCourseFallback();
 
@@ -141,7 +141,7 @@ void Banner::LoadFromCourse( const Course *pCourse )		// NULL means no course
 
 void Banner::LoadCardFromCharacter( const Character *pCharacter )
 {
-	if( pCharacter == NULL )			LoadFallback();
+	if( pCharacter == nullptr )			LoadFallback();
 	else if( pCharacter->GetCardPath() != "" )	Load( pCharacter->GetCardPath() );
 	else						LoadFallback();
 
@@ -150,7 +150,7 @@ void Banner::LoadCardFromCharacter( const Character *pCharacter )
 
 void Banner::LoadIconFromCharacter( const Character *pCharacter )
 {
-	if( pCharacter == NULL )			LoadFallbackCharacterIcon();
+	if( pCharacter == nullptr )			LoadFallbackCharacterIcon();
 	else if( pCharacter->GetIconPath() != "" )	Load( pCharacter->GetIconPath(), false );
 	else						LoadFallbackCharacterIcon();
 
@@ -159,7 +159,7 @@ void Banner::LoadIconFromCharacter( const Character *pCharacter )
 
 void Banner::LoadBannerFromUnlockEntry( const UnlockEntry* pUE )
 {
-	if( pUE == NULL )
+	if( pUE == nullptr )
 		LoadFallback();
 	else 
 	{
@@ -171,7 +171,7 @@ void Banner::LoadBannerFromUnlockEntry( const UnlockEntry* pUE )
 
 void Banner::LoadBackgroundFromUnlockEntry( const UnlockEntry* pUE )
 {
-	if( pUE == NULL )
+	if( pUE == nullptr )
 		LoadFallback();
 	else 
 	{

src/BannerCache.cpp

@@ -79,7 +79,7 @@ void BannerCache::Demand()
 
 		const RString sCachePath = GetBannerCachePath(sBannerPath);
 		RageSurface *pImage = RageSurfaceUtils::LoadSurface( sCachePath );
-		if( pImage == NULL )
+		if( pImage == nullptr )
 		{
 			continue; /* doesn't exist */
 		}
@@ -123,7 +123,7 @@ void BannerCache::LoadBanner( RString sBannerPath )
 
 		CHECKPOINT_M( ssprintf( "BannerCache::LoadBanner: %s", sCachePath.c_str() ) );
 		RageSurface *pImage = RageSurfaceUtils::LoadSurface( sCachePath );
-		if( pImage == NULL )
+		if( pImage == nullptr )
 		{
 			if( tries == 0 )
 			{
@@ -368,7 +368,7 @@ void BannerCache::CacheBannerInternal( RString sBannerPath )
 {
 	RString sError;
 	RageSurface *pImage = RageSurfaceUtils::LoadFile( sBannerPath, sError );
-	if( pImage == NULL )
+	if( pImage == nullptr )
 	{
 		LOG->UserLog( "Cache file", sBannerPath, "couldn't be loaded: %s", sError.c_str() );
 		return;

src/BitmapText.cpp

@@ -175,7 +175,7 @@ bool BitmapText::LoadFromTextureAndChars( const RString& sTexturePath, const RSt
 void BitmapText::BuildChars()
 {
 	// If we don't have a font yet, we'll do this when it loads.
-	if( m_pFont == NULL )
+	if( m_pFont == nullptr )
 		return;
 
 	// calculate line lengths and widths

src/ComboGraph.cpp

@@ -39,7 +39,7 @@ void ComboGraph::Load( RString sMetricsGroup )
 
 	pActor = ActorUtil::MakeActor( THEME->GetPathG(sMetricsGroup,"ComboNumber") );
 	m_pComboNumber = dynamic_cast<BitmapText *>( pActor );
-	if( m_pComboNumber == NULL )
+	if( m_pComboNumber == nullptr )
 		RageException::Throw( "ComboGraph: \"sMetricsGroup\" \"ComboNumber\" must be a BitmapText" );
 	this->AddChild( m_pComboNumber );
 }	

src/Course.cpp

@@ -669,7 +669,7 @@ void Course::GetTrails( vector<Trail*> &AddTo, StepsType st ) const
 	FOREACH_ShownCourseDifficulty( cd )
 	{
 		Trail *pTrail = GetTrail( st, cd );
-		if( pTrail == NULL )
+		if( pTrail == nullptr )
 			continue;
 		AddTo.push_back( pTrail );
 	}
@@ -968,7 +968,7 @@ void Course::CalculateRadarValues()
 			if( AllSongsAreFixed() )
 			{
 				Trail *pTrail = GetTrail( st, cd );
-				if( pTrail == NULL )
+				if( pTrail == nullptr )
 					continue;
 				RadarValues rv = pTrail->GetRadarValues();
 				m_RadarCache[CacheEntry(st, cd)] = rv;

src/CourseContentsList.cpp

@@ -25,7 +25,7 @@ void CourseContentsList::LoadFromNode( const XNode* pNode )
 	pNode->GetAttrValue( "MaxSongs", iMaxSongs );
 
 	const XNode *pDisplayNode = pNode->GetChild( "Display" );
-	if( pDisplayNode == NULL )
+	if( pDisplayNode == nullptr )
 		RageException::Throw( "%s: CourseContentsList: missing the Display child", ActorUtil::GetWhere(pNode).c_str() );
 
 	for( int i=0; i<iMaxSongs; i++ )
@@ -45,7 +45,7 @@ void CourseContentsList::SetFromGameState()
 	if( GAMESTATE->GetMasterPlayerNumber() == PlayerNumber_Invalid )
 		return;
 	const Trail *pMasterTrail = GAMESTATE->m_pCurTrail[GAMESTATE->GetMasterPlayerNumber()];
-	if( pMasterTrail == NULL )
+	if( pMasterTrail == nullptr )
 		return;
 	unsigned uNumEntriesToShow = pMasterTrail->m_vEntries.size(); 
 	CLAMP( uNumEntriesToShow, 0, m_vpDisplay.size() );
@@ -78,21 +78,21 @@ void CourseContentsList::SetItemFromGameState( Actor *pActor, int iCourseEntryIn
 	FOREACH_HumanPlayer(pn)
 	{
 		const Trail *pTrail = GAMESTATE->m_pCurTrail[pn];
-		if( pTrail == NULL
+		if( pTrail == nullptr
 			|| iCourseEntryIndex >= (int) pTrail->m_vEntries.size()
 			|| iCourseEntryIndex >= (int) pCourse->m_vEntries.size() )
 			continue;
 
 		const TrailEntry *te = &pTrail->m_vEntries[iCourseEntryIndex];
 		const CourseEntry *ce = &pCourse->m_vEntries[iCourseEntryIndex];
-		if( te == NULL )
+		if( te == nullptr )
 			continue;
 
 		RString s;
 		Difficulty dc;
 		if( te->bSecret )
 		{
-			if( ce == NULL )
+			if( ce == nullptr )
 				continue;
 
 			int iLow = ce->stepsCriteria.m_iLowMeter;

src/CourseLoaderCRS.cpp

@@ -262,7 +262,7 @@ bool CourseLoaderCRS::LoadFromMsd( const RString &sPath, const MsdFile &msd, Cou
 				}
 				new_entry.songID.FromSong( pSong );
 
-				if( pSong == NULL )
+				if( pSong == nullptr )
 				{
 					LOG->UserLog( "Course file", sPath, "contains a fixed song entry \"%s\" that does not exist. "
 						      "This entry will be ignored.", sSong.c_str());

src/CourseUtil.cpp

@@ -110,7 +110,7 @@ void CourseUtil::SortCoursePointerArrayByTotalDifficulty( vector<Course*> &vpCou
 #if 0
 RString GetSectionNameFromCourseAndSort( const Course *pCourse, SortOrder so )
 {
-	if( pCourse == NULL )
+	if( pCourse == nullptr )
 		return RString();
 	// more code here
 }
@@ -552,10 +552,10 @@ Course *CourseID::ToCourse() const
 	Course *pCourse = NULL;
 	if( m_Cache.Get(&pCourse) )
 		return pCourse;
-	if( pCourse == NULL && !sPath2.empty() )
+	if( pCourse == nullptr && !sPath2.empty() )
 		pCourse = SONGMAN->GetCourseFromPath( sPath2 );
 
-	if( pCourse == NULL && !sFullTitle.empty() )
+	if( pCourse == nullptr && !sFullTitle.empty() )
 		pCourse = SONGMAN->GetCourseFromName( sFullTitle );
 	m_Cache.Set( pCourse );
 

src/Difficulty.cpp

@@ -24,7 +24,7 @@ LuaXType( Difficulty );
 const RString &CourseDifficultyToLocalizedString( CourseDifficulty x )
 {
 	static auto_ptr<LocalizedString> g_CourseDifficultyName[NUM_Difficulty];
-	if( g_CourseDifficultyName[0].get() == NULL )
+	if( g_CourseDifficultyName[0].get() == nullptr )
 	{
 		FOREACH_ENUM( Difficulty,i)
 		{

src/DifficultyIcon.cpp

@@ -61,7 +61,7 @@ void DifficultyIcon::SetPlayer( PlayerNumber pn )
 void DifficultyIcon::SetFromSteps( PlayerNumber pn, const Steps* pSteps )
 {
 	SetPlayer( pn );
-	if( pSteps == NULL )
+	if( pSteps == nullptr )
 		Unset();
 	else
 		SetFromDifficulty( pSteps->GetDifficulty() );
@@ -70,7 +70,7 @@ void DifficultyIcon::SetFromSteps( PlayerNumber pn, const Steps* pSteps )
 void DifficultyIcon::SetFromTrail( PlayerNumber pn, const Trail* pTrail )
 {
 	SetPlayer( pn );
-	if( pTrail == NULL )
+	if( pTrail == nullptr )
 		Unset();
 	else
 		SetFromDifficulty( pTrail->m_CourseDifficulty );

src/DifficultyList.cpp

@@ -50,7 +50,7 @@ void StepsDisplayList::LoadFromNode( const XNode* pNode )
 	FOREACH_ENUM( PlayerNumber, pn )
 	{
 		const XNode *pChild = pNode->GetChild( ssprintf("CursorP%i",pn+1) );
-		if( pChild == NULL )
+		if( pChild == nullptr )
 			RageException::Throw( "%s: StepsDisplayList: missing the node \"CursorP%d\"", ActorUtil::GetWhere(pNode).c_str(), pn+1 );
 		m_Cursors[pn].LoadActorFromNode( pChild, this );
 
@@ -61,7 +61,7 @@ void StepsDisplayList::LoadFromNode( const XNode* pNode )
 		 * in separate tweening stacks.  This means the Cursor command can't change diffuse
 		 * colors; I think we do need a diffuse color stack ... */
 		pChild = pNode->GetChild( ssprintf("CursorP%iFrame",pn+1) );
-		if( pChild == NULL )
+		if( pChild == nullptr )
 			RageException::Throw( "%s: StepsDisplayList: missing the node \"CursorP%dFrame\"", ActorUtil::GetWhere(pNode).c_str(), pn+1 );
 		m_CursorFrames[pn].LoadFromNode( pChild );
 		m_CursorFrames[pn].AddChild( m_Cursors[pn] );
@@ -88,7 +88,7 @@ int StepsDisplayList::GetCurrentRowIndex( PlayerNumber pn ) const
 	{
 		const Row &row = m_Rows[i];
 
-		if( GAMESTATE->m_pCurSteps[pn] == NULL )
+		if( GAMESTATE->m_pCurSteps[pn] == nullptr )
 		{
 			if( row.m_dc == ClosestDifficulty )
 				return i;
@@ -253,7 +253,7 @@ void StepsDisplayList::SetFromGameState()
 	const Song *pSong = GAMESTATE->m_pCurSong;
 	unsigned i = 0;
 
-	if( pSong == NULL )
+	if( pSong == nullptr )
 	{
 		// FIXME: This clamps to between the min and the max difficulty, but
 		// it really should round to the nearest difficulty that's in 

src/EnumHelper.cpp

@@ -53,7 +53,7 @@ int CheckEnum( lua_State *L, LuaReference &table, int iPos, int iInvalid, const
 // szNameArray is of size iMax; pNameCache is of size iMax+2.
 const RString &EnumToString( int iVal, int iMax, const char **szNameArray, auto_ptr<RString> *pNameCache )
 {
-	if( unlikely(pNameCache[0].get() == NULL) )
+	if( unlikely(pNameCache[0].get() == nullptr) )
 	{
 		for( int i = 0; i < iMax; ++i )
 		{

src/EnumHelper.h

@@ -81,7 +81,7 @@ const RString &X##ToLocalizedString(X x); \
 const RString &X##ToLocalizedString( X x ) \
 {       \
 	static auto_ptr<LocalizedString> g_##X##Name[NUM_##X]; \
-	if( g_##X##Name[0].get() == NULL ) { \
+	if( g_##X##Name[0].get() == nullptr ) { \
 		for( unsigned i = 0; i < NUM_##X; ++i ) \
 		{ \
 			auto_ptr<LocalizedString> ap( new LocalizedString(#X, X##ToString((X)i)) ); \

src/FadingBanner.cpp

@@ -166,7 +166,7 @@ bool FadingBanner::LoadFromCachedBanner( const RString &path )
 
 void FadingBanner::LoadFromSong( const Song* pSong )
 {
-	if( pSong == NULL )
+	if( pSong == nullptr )
 	{
 		LoadFallback();
 		return;
@@ -195,7 +195,7 @@ void FadingBanner::LoadFromSongGroup( RString sSongGroup )
 
 void FadingBanner::LoadFromCourse( const Course* pCourse )
 {
-	if( pCourse == NULL )
+	if( pCourse == nullptr )
 	{
 		LoadFallback();
 		return;

src/Font.cpp

@@ -269,7 +269,7 @@ void Font::MergeFont(Font &f)
 	 * page.  It'll usually be overridden later on by one of our own font
 	 * pages; this will be used only if we don't have any font pages at
 	 * all. */
-	if( m_pDefault == NULL )
+	if( m_pDefault == nullptr )
 		m_pDefault = f.m_pDefault;
 
 	for(map<wchar_t,glyph*>::iterator it = f.m_iCharToGlyph.begin();
@@ -605,7 +605,7 @@ RString FontPageSettings::MapRange( RString sMapping, int iMapOffset, int iGlyph
 	}
 
 	const wchar_t *pMapping = FontCharmaps::get_char_map( sMapping );
-	if( pMapping == NULL )
+	if( pMapping == nullptr )
 		return "Unknown mapping";
 
 	while( *pMapping != 0 && iMapOffset )

src/GameCommand.cpp

@@ -88,7 +88,7 @@ bool GameCommand::DescribesCurrentMode( PlayerNumber pn ) const
 	// HACK: don't compare m_dc if m_pSteps is set.  This causes problems 
 	// in ScreenSelectOptionsMaster::ImportOptions if m_PreferredDifficulty 
 	// doesn't match the difficulty of m_pCurSteps.
-	if( m_pSteps == NULL  &&  m_dc != Difficulty_Invalid )
+	if( m_pSteps == nullptr  &&  m_dc != Difficulty_Invalid )
 	{
 		// Why is this checking for all players?
 		FOREACH_HumanPlayer( human )
@@ -244,7 +244,7 @@ void GameCommand::LoadOne( const Command& cmd )
 	else if( sName == "song" )
 	{
 		m_pSong = SONGMAN->FindSong( sValue );
-		if( m_pSong == NULL )
+		if( m_pSong == nullptr )
 		{
 			m_sInvalidReason = ssprintf( "Song \"%s\" not found", sValue.c_str() );
 			m_bInvalid |= true;
@@ -260,7 +260,7 @@ void GameCommand::LoadOne( const Command& cmd )
 		{
 			Song *pSong = (m_pSong != nullptr)? m_pSong:GAMESTATE->m_pCurSong;
 			const Style *pStyle = m_pStyle ? m_pStyle : GAMESTATE->GetCurrentStyle();
-			if( pSong == NULL || pStyle == NULL )
+			if( pSong == nullptr || pStyle == nullptr )
 				RageException::Throw( "Must set Song and Style to set Steps." );
 
 			Difficulty dc = StringToDifficulty( sSteps );
@@ -268,7 +268,7 @@ void GameCommand::LoadOne( const Command& cmd )
 				m_pSteps = SongUtil::GetStepsByDifficulty( pSong, pStyle->m_StepsType, dc );
 			else
 				m_pSteps = SongUtil::GetStepsByDescription( pSong, pStyle->m_StepsType, sSteps );
-			if( m_pSteps == NULL )
+			if( m_pSteps == nullptr )
 			{
 				m_sInvalidReason = "steps not found";
 				m_bInvalid |= true;
@@ -279,7 +279,7 @@ void GameCommand::LoadOne( const Command& cmd )
 	else if( sName == "course" )
 	{
 		m_pCourse = SONGMAN->FindCourse( "", sValue );
-		if( m_pCourse == NULL )
+		if( m_pCourse == nullptr )
 		{
 			m_sInvalidReason = ssprintf( "Course \"%s\" not found", sValue.c_str() );
 			m_bInvalid |= true;
@@ -295,14 +295,14 @@ void GameCommand::LoadOne( const Command& cmd )
 		{
 			Course *pCourse = (m_pCourse != nullptr)? m_pCourse:GAMESTATE->m_pCurCourse;
 			const Style *pStyle = m_pStyle ? m_pStyle : GAMESTATE->GetCurrentStyle();
-			if( pCourse == NULL || pStyle == NULL )
+			if( pCourse == nullptr || pStyle == nullptr )
 				RageException::Throw( "Must set Course and Style to set Steps." );
 
 			const CourseDifficulty cd = StringToDifficulty( sTrail );
 			ASSERT_M( cd != Difficulty_Invalid, ssprintf("Invalid difficulty '%s'", sTrail.c_str()) );
 
 			m_pTrail = pCourse->GetTrail( pStyle->m_StepsType, cd );
-			if( m_pTrail == NULL )
+			if( m_pTrail == nullptr )
 			{
 				m_sInvalidReason = "trail not found";
 				m_bInvalid |= true;
@@ -389,7 +389,7 @@ void GameCommand::LoadOne( const Command& cmd )
 		if( cmd.m_vsArgs.size() == 3 )
 		{
 			IPreference *pPref = IPreference::GetPreferenceByName( cmd.m_vsArgs[1] );
-			if( pPref == NULL )
+			if( pPref == nullptr )
 			{
 				m_sInvalidReason = ssprintf("unknown preference \"%s\"", cmd.m_vsArgs[1].c_str() );
 				m_bInvalid |= true;
@@ -418,7 +418,7 @@ void GameCommand::LoadOne( const Command& cmd )
 
 static bool AreStyleAndPlayModeCompatible( const Style *style, PlayMode pm )
 {
-	if( style == NULL || pm == PlayMode_Invalid )
+	if( style == nullptr || pm == PlayMode_Invalid )
 		return true;
 
 	switch( pm )

src/GameLoop.cpp

@@ -338,7 +338,7 @@ int ConcurrentRenderer::StartRenderThread( void *p )
 
 void GameLoop::StartConcurrentRendering()
 {
-	if( g_pConcurrentRenderer == NULL )
+	if( g_pConcurrentRenderer == nullptr )
 		g_pConcurrentRenderer = new ConcurrentRenderer;
 	g_pConcurrentRenderer->Start();
 }

src/GameManager.cpp

@@ -3029,15 +3029,15 @@ void GameManager::GetEnabledGames( vector<const Game*>& aGamesOut )
 const Game* GameManager::GetDefaultGame()
 {
 	const Game *pDefault = NULL;
-	if( pDefault == NULL )
+	if( pDefault == nullptr )
 	{
-		for( size_t i=0; pDefault == NULL && i < ARRAYLEN(g_Games); ++i )
+		for( size_t i=0; pDefault == nullptr && i < ARRAYLEN(g_Games); ++i )
 		{
 			if( IsGameEnabled(g_Games[i]) )
 				pDefault = g_Games[i];
 		}
 
-		if( pDefault == NULL )
+		if( pDefault == nullptr )
 			RageException::Throw( "No NoteSkins found" );
 	}
 	

src/GameState.cpp

@@ -608,7 +608,7 @@ int GameState::GetNumStagesForCurrentSongAndStepsOrCourse() const
 	{
 		const Style *pStyle = m_pCurStyle;
 		int numSidesJoined = GetNumSidesJoined();
-		if( pStyle == NULL )
+		if( pStyle == nullptr )
 		{
 			const Steps *pSteps = NULL;
 			if( this->GetMasterPlayerNumber() != PlayerNumber_Invalid )
@@ -806,9 +806,9 @@ void GameState::LoadCurrentSettingsFromProfile( PlayerNumber pn )
 	// Only set the PreferredStepsType if it wasn't already set by a GameCommand (or by an earlier profile)
 	if( m_PreferredStepsType == StepsType_Invalid  &&  pProfile->m_LastStepsType != StepsType_Invalid )
 		m_PreferredStepsType.Set( pProfile->m_LastStepsType );
-	if( m_pPreferredSong == NULL )
+	if( m_pPreferredSong == nullptr )
 		m_pPreferredSong = pProfile->m_lastSong.ToSong();
-	if( m_pPreferredCourse == NULL )
+	if( m_pPreferredCourse == nullptr )
 		m_pPreferredCourse = pProfile->m_lastCourse.ToCourse();
 }
 
@@ -1094,7 +1094,7 @@ RString GameState::GetPlayerDisplayName( PlayerNumber pn ) const
 
 bool GameState::PlayersCanJoin() const
 {
-	bool b = GetNumSidesJoined() == 0 || GetCurrentStyle() == NULL;	// selecting a style finalizes the players
+	bool b = GetNumSidesJoined() == 0 || GetCurrentStyle() == nullptr;	// selecting a style finalizes the players
 	if( ALLOW_LATE_JOIN.IsLoaded()  &&  ALLOW_LATE_JOIN )
 	{
 		Screen *pScreen = SCREENMAN->GetTopScreen();
@@ -1176,7 +1176,7 @@ bool GameState::IsHumanPlayer( PlayerNumber pn ) const
 	if( pn == PLAYER_INVALID )
 		return false;
 
-	if( GetCurrentStyle() == NULL )	// no style chosen
+	if( GetCurrentStyle() == nullptr )	// no style chosen
 	{
 		if( PlayersCanJoin() )
 			return m_bSideIsJoined[pn];	// only allow input from sides that have already joined
@@ -1989,7 +1989,7 @@ Difficulty GameState::GetEasiestStepsDifficulty() const
 	Difficulty dc = Difficulty_Invalid;
 	FOREACH_HumanPlayer( p )
 	{
-		if( m_pCurSteps[p] == NULL )
+		if( m_pCurSteps[p] == nullptr )
 		{
 			LOG->Warn( "GetEasiestStepsDifficulty called but p%i hasn't chosen notes", p+1 );
 			continue;
@@ -2004,7 +2004,7 @@ Difficulty GameState::GetHardestStepsDifficulty() const
 	Difficulty dc = Difficulty_Beginner;
 	FOREACH_HumanPlayer( p )
 	{
-		if( m_pCurSteps[p] == NULL )
+		if( m_pCurSteps[p] == nullptr )
 		{
 			LOG->Warn( "GetHardestStepsDifficulty called but p%i hasn't chosen notes", p+1 );
 			continue;
@@ -2349,7 +2349,7 @@ public:
 	static int GetCurrentStepsCredits( T* t, lua_State *L )
 	{
 		const Song* pSong = t->m_pCurSong;
-		if( pSong == NULL )
+		if( pSong == nullptr )
 			return 0;
 
 		// use a vector and not a set so that ordering is maintained
@@ -2357,7 +2357,7 @@ public:
 		FOREACH_HumanPlayer( p )
 		{
 			const Steps* pSteps = GAMESTATE->m_pCurSteps[p];
-			if( pSteps == NULL )
+			if( pSteps == nullptr )
 				return 0;
 			bool bAlreadyAdded = find( vpStepsToShow.begin(), vpStepsToShow.end(), pSteps ) != vpStepsToShow.end();
 			if( !bAlreadyAdded )

src/GrooveRadar.cpp

@@ -68,7 +68,7 @@ void GrooveRadar::SetFromRadarValues( PlayerNumber pn, const RadarValues &rv )
 
 void GrooveRadar::SetFromSteps( PlayerNumber pn, Steps* pSteps ) // NULL means no Song
 {
-	if( pSteps == NULL )
+	if( pSteps == nullptr )
 	{
 		m_GrooveRadarValueMap[pn].SetEmpty();
 		return;

src/IniFile.cpp

@@ -148,7 +148,7 @@ bool IniFile::WriteFile( RageFileBasic &f ) const
 bool IniFile::DeleteValue(const RString &keyname, const RString &valuename)
 {
 	XNode* pNode = GetChild( keyname );
-	if( pNode == NULL )
+	if( pNode == nullptr )
 		return false;
 	return pNode->RemoveAttr( valuename );
 }
@@ -157,7 +157,7 @@ bool IniFile::DeleteValue(const RString &keyname, const RString &valuename)
 bool IniFile::DeleteKey(const RString &keyname)
 {
 	XNode* pNode = GetChild( keyname );
-	if( pNode == NULL )
+	if( pNode == nullptr )
 		return false;
 	return RemoveChild( pNode );
 }
@@ -169,7 +169,7 @@ bool IniFile::RenameKey(const RString &from, const RString &to)
 		return false;
 
 	XNode* pNode = GetChild( from );
-	if( pNode == NULL )
+	if( pNode == nullptr )
 		return false;
 
 	pNode->SetName( to );

src/IniFile.h

@@ -32,7 +32,7 @@ public:
 	bool GetValue( const RString &sKey, const RString &sValueName, T& value ) const
 	{
 		const XNode* pNode = GetChild( sKey );
-		if( pNode == NULL )
+		if( pNode == nullptr )
 			return false;
 		return pNode->GetAttrValue<T>( sValueName, value );
 	}
@@ -40,7 +40,7 @@ public:
 	void SetValue( const RString &sKey, const RString &sValueName, const T &value )
 	{
 		XNode* pNode = GetChild( sKey );
-		if( pNode == NULL )
+		if( pNode == nullptr )
 			pNode = AppendChild( sKey );
 		pNode->AppendAttr<T>( sValueName, value );
 	}

src/InputFilter.cpp

@@ -344,7 +344,7 @@ const T *FindItemBinarySearch( IT begin, IT end, const T &i )
 bool InputFilter::IsBeingPressed( const DeviceInput &di, const DeviceInputList *pButtonState ) const
 {
 	LockMut(*queuemutex);
-	if( pButtonState == NULL )
+	if( pButtonState == nullptr )
 		pButtonState = &g_CurrentState;
 	const DeviceInput *pDI = FindItemBinarySearch( pButtonState->begin(), pButtonState->end(), di );
 	return pDI != nullptr && pDI->bDown;
@@ -353,10 +353,10 @@ bool InputFilter::IsBeingPressed( const DeviceInput &di, const DeviceInputList *
 float InputFilter::GetSecsHeld( const DeviceInput &di, const DeviceInputList *pButtonState ) const
 {
 	LockMut(*queuemutex);
-	if( pButtonState == NULL )
+	if( pButtonState == nullptr )
 		pButtonState = &g_CurrentState;
 	const DeviceInput *pDI = FindItemBinarySearch( pButtonState->begin(), pButtonState->end(), di );
-	if( pDI == NULL )
+	if( pDI == nullptr )
 		return 0;
 	return pDI->ts.Ago();
 }
@@ -364,10 +364,10 @@ float InputFilter::GetSecsHeld( const DeviceInput &di, const DeviceInputList *pB
 float InputFilter::GetLevel( const DeviceInput &di, const DeviceInputList *pButtonState ) const
 {
 	LockMut(*queuemutex);
-	if( pButtonState == NULL )
+	if( pButtonState == nullptr )
 		pButtonState = &g_CurrentState;
 	const DeviceInput *pDI = FindItemBinarySearch( pButtonState->begin(), pButtonState->end(), di );
-	if( pDI == NULL )
+	if( pDI == nullptr )
 		return 0.0f;
 	return pDI->level;
 }

src/InputQueue.cpp

@@ -112,7 +112,7 @@ bool InputQueueCode::EnteredCode( GameController controller ) const
 					break;
 				}
 			}
-			if( pIEP == NULL )
+			if( pIEP == nullptr )
 				break;	// didn't find the button
 
 			// Check that m_aButtonsToHold were being held when the buttons were pressed.

src/LuaBinding.cpp

@@ -11,7 +11,7 @@ namespace
 {
 	void RegisterTypes( lua_State *L )
 	{
-		if( m_Subscribers.m_pSubscribers == NULL )
+		if( m_Subscribers.m_pSubscribers == nullptr )
 			return;
 
 		/* Register base classes first. */
@@ -358,7 +358,7 @@ LuaClass &LuaClass::operator=( const LuaClass &cpy )
 
 LuaClass::~LuaClass()
 {
-	if( LUA == NULL )
+	if( LUA == nullptr )
 		return;
 
 	Lua *L = LUA->Get();

src/LuaBinding.h

@@ -156,7 +156,7 @@ public:
 	void T::PushSelf( lua_State *L ) { Luna<B>::PushObject( L, Luna<T>::m_sClassName, this ); } \
 	static Luna##T registera##T; \
 	/* Call PushSelf, so we always call the derived Luna<T>::Push. */ \
-	namespace LuaHelpers { template<> void Push<T*>( lua_State *L, T *const &pObject ) { if( pObject == NULL ) lua_pushnil(L); else pObject->PushSelf( L ); } }
+	namespace LuaHelpers { template<> void Push<T*>( lua_State *L, T *const &pObject ) { if( pObject == nullptr ) lua_pushnil(L); else pObject->PushSelf( L ); } }
 
 #define DEFINE_METHOD( method_name, expr ) \
 	static int method_name( T* p, lua_State *L ) { LuaHelpers::Push( L, p->expr ); return 1; }

src/LuaManager.cpp

@@ -230,7 +230,7 @@ static vector<RegisterWithLuaFn>	*g_vRegisterActorTypes = NULL;
 
 void LuaManager::Register( RegisterWithLuaFn pfn )
 {
-	if( g_vRegisterActorTypes == NULL )
+	if( g_vRegisterActorTypes == nullptr )
 		g_vRegisterActorTypes = new vector<RegisterWithLuaFn>;
 
 	g_vRegisterActorTypes->push_back( pfn );

src/LuaReference.cpp

@@ -112,7 +112,7 @@ int LuaReference::GetLuaType() const
 
 void LuaReference::Unregister()
 {
-	if( LUA == NULL || m_iReference == LUA_NOREF )
+	if( LUA == nullptr || m_iReference == LUA_NOREF )
 		return; // nothing to do
 
 	Lua *L = LUA->Get();

src/LyricDisplay.cpp

@@ -45,7 +45,7 @@ void LyricDisplay::Update( float fDeltaTime )
 
 	ActorFrame::Update( fDeltaTime );
 
-	if( GAMESTATE->m_pCurSong == NULL )
+	if( GAMESTATE->m_pCurSong == nullptr )
 		return;
 
 	// If the song has changed (in a course), reset.

src/MemoryCardManager.cpp

@@ -257,7 +257,7 @@ static ThreadedMemoryCardWorker *g_pWorker = NULL;
 
 MemoryCardManager::MemoryCardManager()
 {
-	ASSERT( g_pWorker == NULL );
+	ASSERT( g_pWorker == nullptr );
 
 	// Register with Lua.
 	{
@@ -608,7 +608,7 @@ bool MemoryCardManager::MountCard( PlayerNumber pn, int iTimeout )
 	m_bMounted[pn] = true;
 
 	RageFileDriver *pDriver = FILEMAN->GetFileDriver( MEM_CARD_MOUNT_POINT_INTERNAL[pn] );
-	if( pDriver == NULL )
+	if( pDriver == nullptr )
 	{
 		LOG->Warn( "FILEMAN->GetFileDriver(%s) failed", MEM_CARD_MOUNT_POINT_INTERNAL[pn].c_str() );
 		return true;

src/MeterDisplay.cpp

@@ -32,7 +32,7 @@ void MeterDisplay::LoadFromNode( const XNode* pNode )
 	LOG->Trace( "MeterDisplay::LoadFromNode(%s)", ActorUtil::GetWhere(pNode).c_str() );
 
 	const XNode *pStream = pNode->GetChild( "Stream" );
-	if( pStream == NULL )
+	if( pStream == nullptr )
 		RageException::Throw( "%s: MeterDisplay: missing the \"Stream\" attribute", ActorUtil::GetWhere(pNode).c_str() );
 	m_sprStream.LoadActorFromNode( pStream, this );
 	this->AddChild( m_sprStream );

src/Model.cpp

@@ -79,7 +79,7 @@ void Model::LoadPieces( const RString &sMeshesPath, const RString &sMaterialsPat
 	// TRICKY: Load materials before geometry so we can figure out whether the materials require normals.
 	LoadMaterialsFromMilkshapeAscii( sMaterialsPath );
 
-	ASSERT( m_pGeometry == NULL );
+	ASSERT( m_pGeometry == nullptr );
 	m_pGeometry = MODELMAN->LoadMilkshapeAscii( sMeshesPath, this->MaterialsNeedNormals() );
 
 	// Validate material indices.
@@ -284,7 +284,7 @@ bool Model::LoadMilkshapeAsciiBones( const RString &sAniName, const RString &sPa
 
 bool Model::EarlyAbortDraw() const
 {
-	return m_pGeometry == NULL || m_pGeometry->m_Meshes.empty();
+	return m_pGeometry == nullptr || m_pGeometry->m_Meshes.empty();
 }
 
 void Model::DrawCelShaded()
@@ -567,7 +567,7 @@ void Model::SetPosition( float fSeconds )
 
 void Model::AdvanceFrame( float fDeltaTime )
 {
-	if( m_pGeometry == NULL || 
+	if( m_pGeometry == nullptr || 
 		m_pGeometry->m_Meshes.empty() || 
 		!m_pCurAnimation )
 	{
@@ -625,9 +625,9 @@ void Model::SetBones( const msAnimation* pAnimation, float fFrame, vector<myBone
 			const float s = SCALE( fFrame, pLastPositionKey->fTime, pThisPositionKey->fTime, 0, 1 );
 			vPos = pLastPositionKey->Position + (pThisPositionKey->Position - pLastPositionKey->Position) * s;
 		}
-		else if( pLastPositionKey == NULL )
+		else if( pLastPositionKey == nullptr )
 			vPos = pThisPositionKey->Position;
-		else if( pThisPositionKey == NULL )
+		else if( pThisPositionKey == nullptr )
 			vPos = pLastPositionKey->Position;
 
 		// search for the adjacent rotation keys
@@ -649,11 +649,11 @@ void Model::SetBones( const msAnimation* pAnimation, float fFrame, vector<myBone
 			const float s = SCALE( fFrame, pLastRotationKey->fTime, pThisRotationKey->fTime, 0, 1 );
 			RageQuatSlerp( &vRot, pLastRotationKey->Rotation, pThisRotationKey->Rotation, s );
 		}
-		else if( pLastRotationKey == NULL )
+		else if( pLastRotationKey == nullptr )
 		{
 			vRot = pThisRotationKey->Rotation;
 		}
-		else if( pThisRotationKey == NULL )
+		else if( pThisRotationKey == nullptr )
 		{
 			vRot = pLastRotationKey->Rotation;
 		}
@@ -678,7 +678,7 @@ void Model::SetBones( const msAnimation* pAnimation, float fFrame, vector<myBone
 
 void Model::UpdateTempGeometry()
 {
-	if( m_pGeometry == NULL || m_pTempGeometry == NULL )
+	if( m_pGeometry == nullptr || m_pTempGeometry == nullptr )
 		return;
 
 	for( unsigned i = 0; i < m_pGeometry->m_Meshes.size(); ++i )

src/ModelTypes.cpp

@@ -55,7 +55,7 @@ void AnimatedTexture::Load( const RString &sTexOrIniPath )
 			RageException::Throw( "Error reading \"%s\": %s", sTexOrIniPath.c_str(), ini.GetError().c_str() );
 
 		const XNode* pAnimatedTexture = ini.GetChild("AnimatedTexture");
-		if( pAnimatedTexture == NULL )
+		if( pAnimatedTexture == nullptr )
 			RageException::Throw( "The animated texture file \"%s\" doesn't contain a section called \"AnimatedTexture\".", sTexOrIniPath.c_str() );
 
 		pAnimatedTexture->GetAttrValue( "TexVelocityX", m_vTexVelocity.x );

src/MusicWheel.cpp

@@ -298,7 +298,7 @@ bool MusicWheel::SelectSection( const RString & SectionName )
 
 bool MusicWheel::SelectSong( const Song *p )
 {
-	if( p == NULL )
+	if( p == nullptr )
 		return false;
 
 	unsigned i;
@@ -326,7 +326,7 @@ bool MusicWheel::SelectSong( const Song *p )
 
 bool MusicWheel::SelectCourse( const Course *p )
 {
-	if( p == NULL )
+	if( p == nullptr )
 		return false;
 
 	unsigned i;

src/MusicWheelItem.cpp

@@ -145,7 +145,7 @@ MusicWheelItem::MusicWheelItem( const MusicWheelItem &cpy ):
 
 	FOREACH_ENUM( MusicWheelItemType, i )
 	{
-		if( cpy.m_pText[i] == NULL )
+		if( cpy.m_pText[i] == nullptr )
 		{
 			m_pText[i] = NULL;
 		}
@@ -307,13 +307,13 @@ void MusicWheelItem::RefreshGrades()
 {
 	const MusicWheelItemData *pWID = dynamic_cast<const MusicWheelItemData*>( m_pData );
 
-	if( pWID == NULL )
+	if( pWID == nullptr )
 		return; // LoadFromWheelItemData() hasn't been called yet.
 	FOREACH_HumanPlayer( p )
 	{
 		m_pGradeDisplay[p]->SetVisible( false );
 
-		if( pWID->m_pSong == NULL && pWID->m_pCourse == NULL )
+		if( pWID->m_pSong == nullptr && pWID->m_pCourse == nullptr )
 			continue;
 
 		Difficulty dc;

src/NoteData.cpp

@@ -366,7 +366,7 @@ bool NoteData::IsHoldHeadOrBodyAtRow( int iTrack, int iRow, int *pHeadRow ) cons
 bool NoteData::IsHoldNoteAtRow( int iTrack, int iRow, int *pHeadRow ) const
 {
 	int iDummy;
-	if( pHeadRow == NULL )
+	if( pHeadRow == nullptr )
 		pHeadRow = &iDummy;
 
 	/* Starting at iRow, search upwards. If we find a TapNote::hold_head, we're within

src/NoteDataUtil.cpp

@@ -453,7 +453,7 @@ void NoteDataUtil::SplitCompositeNoteData( const NoteData &in, vector<NoteData>
 			 Hopefully this hack can be removed soon. -- Jason "Wolfman2000" Felds
 			 */
 			const Style *curStyle = GAMESTATE->GetCurrentStyle();
-			if( (curStyle == NULL || curStyle->m_StyleType == StyleType_TwoPlayersSharedSides )
+			if( (curStyle == nullptr || curStyle->m_StyleType == StyleType_TwoPlayersSharedSides )
 				&& int( tn.pn ) > NUM_PlayerNumber )
 			{
 				tn.pn = PLAYER_1;

src/NoteField.cpp

@@ -368,7 +368,7 @@ void NoteField::DrawBoard( int iDrawDistanceAfterTargetsPixels, int iDrawDistanc
 
 	// todo: make this an AutoActor instead? -aj
 	Sprite *pSprite = dynamic_cast<Sprite *>( (Actor*)m_sprBoard );
-	if( pSprite == NULL )
+	if( pSprite == nullptr )
 		RageException::Throw( "Board must be a Sprite" );
 
 	RectF rect = *pSprite->GetCurrentTextureCoordRect();

src/NoteSkinManager.cpp

@@ -407,7 +407,7 @@ Actor *NoteSkinManager::LoadActor( const RString &sButton, const RString &sEleme
 	}
 
 	auto_ptr<XNode> pNode( XmlFileUtil::XNodeFromTable(L) );
-	if( pNode.get() == NULL )
+	if( pNode.get() == nullptr )
 	{
 		// XNode will warn about the error
 		return new Actor;
@@ -421,7 +421,7 @@ Actor *NoteSkinManager::LoadActor( const RString &sButton, const RString &sEleme
 	{
 		// Make sure pActor is a Sprite (or something derived from Sprite).
 		Sprite *pSprite = dynamic_cast<Sprite *>( pRet );
-		if( pSprite == NULL )
+		if( pSprite == nullptr )
 			LOG->Warn( "%s: %s %s must be a Sprite", m_sCurrentNoteSkin.c_str(), sButton.c_str(), sElement.c_str() );
 	}
 

src/NotesLoaderSM.cpp

@@ -992,7 +992,7 @@ bool SMLoader::LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePath
 			sSongFullTitle.Replace( '\\', '/' );
 
 			pSong = SONGMAN->FindSong( sSongFullTitle );
-			if( pSong == NULL )
+			if( pSong == nullptr )
 			{
 				LOG->UserLog( "Edit file", sEditFilePath, "requires a song \"%s\" that isn't present.", sSongFullTitle.c_str() );
 				return false;
@@ -1007,7 +1007,7 @@ bool SMLoader::LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePath
 
 		else if( sValueName=="NOTES" )
 		{
-			if( pSong == NULL )
+			if( pSong == nullptr )
 			{
 				LOG->UserLog( "Edit file", sEditFilePath, "doesn't have a #SONG tag preceeding the first #NOTES tag." );
 				return false;

src/NotesLoaderSSC.cpp

@@ -868,7 +868,7 @@ bool SSCLoader::LoadEditFromMsd(const MsdFile &msd,
 			sSongFullTitle.Replace( '\\', '/' );
 
 			pSong = SONGMAN->FindSong( sSongFullTitle );
-			if( pSong == NULL )
+			if( pSong == nullptr )
 			{
 				LOG->UserLog("Edit file",
 					     sEditFilePath,
@@ -1005,7 +1005,7 @@ bool SSCLoader::LoadEditFromMsd(const MsdFile &msd,
 		}
 		else if( sValueName=="NOTES" )
 		{
-			if( pSong == NULL )
+			if( pSong == nullptr )
 			{
 				LOG->UserLog("Edit file",
 					     sEditFilePath,

src/OptionRow.cpp

@@ -496,7 +496,7 @@ void OptionRow::PositionUnderlines( PlayerNumber pn )
 void OptionRow::PositionIcons( PlayerNumber pn )
 {
 	ModIcon *pIcon = m_ModIcons[pn];
-	if( pIcon == NULL )
+	if( pIcon == nullptr )
 		return;
 
 	pIcon->SetX( m_pParentType->MOD_ICON_X.GetValue(pn) );

src/OptionRowHandler.cpp

@@ -782,7 +782,7 @@ class OptionRowHandlerListSongsInCurrentSongGroup: public OptionRowHandlerList
 	{
 		const vector<Song*> &vpSongs = SONGMAN->GetSongs( GAMESTATE->m_sPreferredSongGroup );
 
-		if( GAMESTATE->m_pCurSong == NULL )
+		if( GAMESTATE->m_pCurSong == nullptr )
 			GAMESTATE->m_pCurSong.Set( vpSongs[0] );
 
 		m_Def.m_sName = "SongsInCurrentSongGroup";
@@ -873,7 +873,7 @@ public:
 		lua_pushstring( L, "Name" );
 		lua_gettable( L, -2 );
 		const char *pStr = lua_tostring( L, -1 );
-		if( pStr == NULL )
+		if( pStr == nullptr )
 			RageException::Throw( "\"%s\" \"Name\" entry is not a string.", sLuaFunction.c_str() );
 		m_Def.m_sName = pStr;
 		lua_pop( L, 1 );
@@ -891,7 +891,7 @@ public:
 		lua_pushstring( L, "LayoutType" );
 		lua_gettable( L, -2 );
 		pStr = lua_tostring( L, -1 );
-		if( pStr == NULL )
+		if( pStr == nullptr )
 			RageException::Throw( "\"%s\" \"LayoutType\" entry is not a string.", sLuaFunction.c_str() );
 		m_Def.m_layoutType = StringToLayoutType( pStr );
 		ASSERT( m_Def.m_layoutType != LayoutType_Invalid );
@@ -900,7 +900,7 @@ public:
 		lua_pushstring( L, "SelectType" );
 		lua_gettable( L, -2 );
 		pStr = lua_tostring( L, -1 );
-		if( pStr == NULL )
+		if( pStr == nullptr )
 			RageException::Throw( "\"%s\" \"SelectType\" entry is not a string.", sLuaFunction.c_str() );
 		m_Def.m_selectType = StringToSelectType( pStr );
 		ASSERT( m_Def.m_selectType != SelectType_Invalid );
@@ -917,7 +917,7 @@ public:
 		{
 			// `key' is at index -2 and `value' at index -1
 			const char *pValue = lua_tostring( L, -1 );
-			if( pValue == NULL )
+			if( pValue == nullptr )
 				RageException::Throw( "\"%s\" Column entry is not a string.", sLuaFunction.c_str() );
 //				LOG->Trace( "'%s'", pValue);
 
@@ -949,7 +949,7 @@ public:
 			{
 				// `key' is at index -2 and `value' at index -1
 				const char *pValue = lua_tostring( L, -1 );
-				if( pValue == NULL )
+				if( pValue == nullptr )
 					RageException::Throw( "\"%s\" Column entry is not a string.", sLuaFunction.c_str() );
 				LOG->Trace( "Found ReloadRowMessage '%s'", pValue);
 
@@ -1116,7 +1116,7 @@ public:
 		m_Def.m_bOneChoiceForAllPlayers = true;
 
 		ConfOption *pConfOption = ConfOption::Find( sParam );
-		if( pConfOption == NULL )
+		if( pConfOption == nullptr )
 		{
 			LOG->Warn( "Invalid Conf type \"%s\"", sParam.c_str() );
 			pConfOption = ConfOption::Find( "Invalid" );

src/OptionsList.cpp

@@ -47,7 +47,7 @@ void OptionListRow::SetFromHandler( const OptionRowHandler *pHandler )
 	this->FinishTweening();
 	this->RemoveAllChildren();
 
-	if( pHandler == NULL )
+	if( pHandler == nullptr )
 		return;
 
 	int iNum = max( pHandler->m_Def.m_vsChoices.size(), m_Text.size() )+1;
@@ -217,7 +217,7 @@ void OptionsList::Load( RString sType, PlayerNumber pn )
 		ParseCommands( sRowCommands, cmds );
 
 		OptionRowHandler *pHand = OptionRowHandlerUtil::Make( cmds );
-		if( pHand == NULL )
+		if( pHand == nullptr )
 			RageException::Throw( "Invalid OptionRowHandler '%s' in %s::Line%s", cmds.GetOriginalCommandString().c_str(), m_sName.c_str(), sLineName.c_str() );
 
 		m_Rows[sLineName] = pHand;

src/PercentageDisplay.cpp

@@ -41,7 +41,7 @@ void PercentageDisplay::LoadFromNode( const XNode* pNode )
 	}
 
 	const XNode *pChild = pNode->GetChild( "Percent" );
-	if( pChild == NULL )
+	if( pChild == nullptr )
 		RageException::Throw( "%s: PercentageDisplay: missing the node \"Percent\"", ActorUtil::GetWhere(pNode).c_str() );
 	m_textPercent.LoadFromNode( pChild );
 	this->AddChild( &m_textPercent );

src/Player.cpp

@@ -633,7 +633,7 @@ void Player::Load()
 	PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
 
 	bool bOniDead = GAMESTATE->m_SongOptions.GetStage().m_LifeType == SongOptions::LIFE_BATTERY  &&  
-		(m_pPlayerStageStats == NULL || m_pPlayerStageStats->m_bFailed);
+		(m_pPlayerStageStats == nullptr || m_pPlayerStageStats->m_bFailed);
 
 	/* The editor reuses Players ... so we really need to make sure everything
 	 * is reset and not tweening.  Perhaps ActorFrame should recurse to subactors;

src/PlayerAI.cpp

@@ -41,7 +41,7 @@ void PlayerAI::InitFromDisk()
 	{
 		RString sKey = ssprintf("Skill%d", i);
 		XNode* pNode = ini.GetChild(sKey);
-		if( pNode == NULL )
+		if( pNode == nullptr )
 			RageException::Throw( "AI.ini: \"%s\" doesn't exist.", sKey.c_str() );
 
 		TapScoreDistribution& dist = g_Distributions[i];

src/PlayerState.cpp

@@ -200,7 +200,7 @@ const SongPosition &PlayerState::GetDisplayedPosition() const
 const TimingData &PlayerState::GetDisplayedTiming() const
 {
 	Steps *steps = GAMESTATE->m_pCurSteps[m_PlayerNumber];
-	if( steps == NULL )
+	if( steps == nullptr )
 		return GAMESTATE->m_pCurSong->m_SongTiming;
 	return *steps->GetTimingData();
 }

src/Preference.cpp

@@ -53,7 +53,7 @@ void IPreference::SavePrefsToNode( XNode* pNode )
 
 void IPreference::ReadAllDefaultsFromNode( const XNode* pNode )
 {
-	if( pNode == NULL )
+	if( pNode == nullptr )
 		return;
 	for (IPreference *p : *m_Subscribers.m_pSubscribers)
 		p->ReadDefaultFrom( pNode );

src/PrefsManager.cpp

@@ -428,7 +428,7 @@ void PrefsManager::ReadPrefsFromIni( const IniFile &ini, const RString &sSection
 
 	/*
 	IPreference *pPref = PREFSMAN->GetPreferenceByName( *sName );
-	if( pPref == NULL )
+	if( pPref == nullptr )
 	{
 		LOG->Warn( "Unknown preference in [%s]: %s", sClassName.c_str(), sName->c_str() );
 		continue;
@@ -495,7 +495,7 @@ void PrefsManager::SavePrefsToIni( IniFile &ini )
 		StoreGamePrefs();
 
 	XNode* pNode = ini.GetChild( "Options" );
-	if( pNode == NULL )
+	if( pNode == nullptr )
 		pNode = ini.AppendChild( "Options" );
 	IPreference::SavePrefsToNode( pNode );
 
@@ -536,7 +536,7 @@ public:
 	{
 		RString sName = SArg(1);
 		IPreference *pPref = IPreference::GetPreferenceByName( sName );
-		if( pPref == NULL )
+		if( pPref == nullptr )
 		{
 			LOG->Warn( "GetPreference: unknown preference \"%s\"", sName.c_str() );
 			lua_pushnil( L );
@@ -551,7 +551,7 @@ public:
 		RString sName = SArg(1);
 
 		IPreference *pPref = IPreference::GetPreferenceByName( sName );
-		if( pPref == NULL )
+		if( pPref == nullptr )
 		{
 			LOG->Warn( "SetPreference: unknown preference \"%s\"", sName.c_str() );
 			return 0;
@@ -566,7 +566,7 @@ public:
 		RString sName = SArg(1);
 
 		IPreference *pPref = IPreference::GetPreferenceByName( sName );
-		if( pPref == NULL )
+		if( pPref == nullptr )
 		{
 			LOG->Warn( "SetPreferenceToDefault: unknown preference \"%s\"", sName.c_str() );
 			return 0;
@@ -581,7 +581,7 @@ public:
 		RString sName = SArg(1);
 
 		IPreference *pPref = IPreference::GetPreferenceByName( sName );
-		if( pPref == NULL )
+		if( pPref == nullptr )
 		{
 			lua_pushboolean( L, false );
 			return 1;

src/Profile.cpp

@@ -287,7 +287,7 @@ int Profile::GetTotalTrailsWithTopGrade( StepsType st, CourseDifficulty d, Grade
 
 		vector<Trail*> vTrails;
 		Trail* pTrail = pCourse->GetTrail( st, d );
-		if( pTrail == NULL )
+		if( pTrail == nullptr )
 			continue;
 
 		const HighScoreList &hsl = GetCourseHighScoreList( pCourse, pTrail );
@@ -347,7 +347,7 @@ float Profile::GetSongsActual( StepsType st, Difficulty dc ) const
 
 		// If the Song isn't loaded on the current machine, then we can't 
 		// get radar values to compute dance points.
-		if( pSong == NULL )
+		if( pSong == nullptr )
 			continue;
 
 		if( !pSong->NormallyDisplayed() )
@@ -364,7 +364,7 @@ float Profile::GetSongsActual( StepsType st, Difficulty dc ) const
 
 			// If the Steps isn't loaded on the current machine, then we can't 
 			// get radar values to compute dance points.
-			if( pSteps == NULL )
+			if( pSteps == nullptr )
 				continue;
 
 			if( pSteps->m_StepsType != st )
@@ -426,7 +426,7 @@ float Profile::GetCoursesActual( StepsType st, CourseDifficulty cd ) const
 	for (Course const *c : vpCourses)
 	{
 		Trail *pTrail = c->GetTrail( st, cd );
-		if( pTrail == NULL )
+		if( pTrail == nullptr )
 			continue;
 
 		const HighScoreList& hsl = GetCourseHighScoreList( c, pTrail );
@@ -468,7 +468,7 @@ int Profile::GetSongNumTimesPlayed( const Song* pSong ) const
 int Profile::GetSongNumTimesPlayed( const SongID& songID ) const
 {
 	const HighScoresForASong *hsSong = GetHighScoresForASong( songID );
-	if( hsSong == NULL )
+	if( hsSong == nullptr )
 		return 0;
 
 	int iTotalNumTimesPlayed = 0;
@@ -635,7 +635,7 @@ void Profile::GetGrades( const Song* pSong, StepsType st, int iCounts[NUM_Grade]
 
 	memset( iCounts, 0, sizeof(int)*NUM_Grade );
 	const HighScoresForASong *hsSong = GetHighScoresForASong( songID );
-	if( hsSong == NULL )
+	if( hsSong == nullptr )
 		return;
 
 	FOREACH_ENUM( Grade,g)
@@ -689,7 +689,7 @@ int Profile::GetCourseNumTimesPlayed( const Course* pCourse ) const
 int Profile::GetCourseNumTimesPlayed( const CourseID &courseID ) const
 {
 	const HighScoresForACourse *hsCourse = GetHighScoresForACourse( courseID );
-	if( hsCourse == NULL )
+	if( hsCourse == nullptr )
 		return 0;
 
 	int iTotalNumTimesPlayed = 0;
@@ -802,7 +802,7 @@ ProfileLoadResult Profile::LoadAllFromDir( RString sDir, bool bRequireSignature
 
 	int iError;
 	auto_ptr<RageFileBasic> pFile( FILEMAN->Open(fn, RageFile::READ, iError) );
-	if( pFile.get() == NULL )
+	if( pFile.get() == nullptr )
 	{
 		LOG->Trace( "Error opening %s: %s", fn.c_str(), strerror(iError) );
 		return ProfileLoadResult_FailedTampered;
@@ -813,7 +813,7 @@ ProfileLoadResult Profile::LoadAllFromDir( RString sDir, bool bRequireSignature
 		RString sError;
 		uint32_t iCRC32;
 		RageFileObjInflate *pInflate = GunzipFile( pFile.release(), sError, &iCRC32 );
-		if( pInflate == NULL )
+		if( pInflate == nullptr )
 		{
 			LOG->Trace( "Error opening %s: %s", fn.c_str(), sError.c_str() );
 			return ProfileLoadResult_FailedTampered;
@@ -1433,7 +1433,7 @@ void Profile::LoadSongScoresFromNode( const XNode* pSongScores )
 				WARN_AND_CONTINUE;
 
 			const XNode *pHighScoreListNode = pSteps->GetChild("HighScoreList");
-			if( pHighScoreListNode == NULL )
+			if( pHighScoreListNode == nullptr )
 				WARN_AND_CONTINUE;
 			
 			HighScoreList &hsl = m_SongHighScores[songID].m_StepsHighScores[stepsID].hsl;
@@ -1510,7 +1510,7 @@ void Profile::LoadCourseScoresFromNode( const XNode* pCourseScores )
 		// and search for matches of just the file name.
 		{
 			Course *pC = courseID.ToCourse();
-			if( pC == NULL )
+			if( pC == nullptr )
 			{
 				RString sDir, sFName, sExt;
 				splitpath( courseID.GetPath(), sDir, sFName, sExt );
@@ -1542,7 +1542,7 @@ void Profile::LoadCourseScoresFromNode( const XNode* pCourseScores )
 				WARN_AND_CONTINUE;
 
 			const XNode *pHighScoreListNode = pTrail->GetChild("HighScoreList");
-			if( pHighScoreListNode == NULL )
+			if( pHighScoreListNode == nullptr )
 				WARN_AND_CONTINUE;
 			
 			HighScoreList &hsl = m_CourseHighScores[courseID].m_TrailHighScores[trailID].hsl;
@@ -1617,7 +1617,7 @@ void Profile::LoadCategoryScoresFromNode( const XNode* pCategoryScores )
 				WARN_AND_CONTINUE_M( str );
 
 			const XNode *pHighScoreListNode = pRadarCategory->GetChild("HighScoreList");
-			if( pHighScoreListNode == NULL )
+			if( pHighScoreListNode == nullptr )
 				WARN_AND_CONTINUE;
 			
 			HighScoreList &hsl = this->GetCategoryHighScoreList( st, rc );

src/ProfileManager.cpp

@@ -195,7 +195,7 @@ bool ProfileManager::LoadLocalProfileFromMachine( PlayerNumber pn )
 	m_bWasLoadedFromMemoryCard[pn] = false;
 	m_bLastLoadWasFromLastGood[pn] = false;
 
-	if( GetLocalProfile(sProfileID) == NULL )
+	if( GetLocalProfile(sProfileID) == nullptr )
 	{
 		m_sProfileDir[pn] = "";
 		return false;
@@ -457,7 +457,7 @@ bool ProfileManager::CreateLocalProfile( RString sName, RString &sProfileIDOut )
 void ProfileManager::AddLocalProfileByID( Profile *pProfile, RString sProfileID )
 {
 	// make sure this id doesn't already exist
-	ASSERT_M( GetLocalProfile(sProfileID) == NULL,
+	ASSERT_M( GetLocalProfile(sProfileID) == nullptr,
 		ssprintf("creating \"%s\" \"%s\" that already exists",
 		pProfile->m_sDisplayName.c_str(), sProfileID.c_str()) );
 

src/RageBitmapTexture.cpp

@@ -68,7 +68,7 @@ void RageBitmapTexture::Create()
 	RageSurface *pImg = RageSurfaceUtils::LoadFile( actualID.filename, error );
 
 	/* Tolerate corrupt/unknown images. */
-	if( pImg == NULL )
+	if( pImg == nullptr )
 	{
 		RString sWarning = ssprintf( "RageBitmapTexture: Couldn't load %s: %s", actualID.filename.c_str(), error.c_str() );
 		Dialog::OK( sWarning );

src/RageDisplay_D3D.cpp

@@ -344,7 +344,7 @@ D3DFORMAT FindBackBufferType(bool bWindowed, int iBPP)
 
 RString SetD3DParams( bool &bNewDeviceOut )
 {
-	if( g_pd3dDevice == NULL ) // device is not yet created. We need to create it
+	if( g_pd3dDevice == nullptr ) // device is not yet created. We need to create it
 	{
 		bNewDeviceOut = true;
 		HRESULT hr = g_pd3d->CreateDevice(
@@ -704,7 +704,7 @@ void RageDisplay_D3D::SendCurrentMatrices()
 		// If no texture is set for this texture unit, don't bother setting it up.
 		IDirect3DBaseTexture9* pTexture = NULL;
 		g_pd3dDevice->GetTexture( tu, &pTexture );
-		if( pTexture == NULL )
+		if( pTexture == nullptr )
 			 continue;
 		pTexture->Release();
 

src/RageDisplay_OGL.cpp

@@ -2228,7 +2228,7 @@ public:
 	void Lock( unsigned iTexHandle, RageSurface *pSurface )
 	{
 		ASSERT( m_iTexHandle == 0 );
-		ASSERT( pSurface->pixels == NULL );
+		ASSERT( pSurface->pixels == nullptr );
 
 		CreateObject();
 

src/RageFile.cpp

@@ -67,7 +67,7 @@ bool RageFile::Open( const RString& path, int mode )
 	int error;
 	m_File = FILEMAN->Open( path, mode, error );
 
-	if( m_File == NULL )
+	if( m_File == nullptr )
 	{
 		SetError( strerror(error) );
 		return false;
@@ -78,7 +78,7 @@ bool RageFile::Open( const RString& path, int mode )
 
 void RageFile::Close()
 {
-	if( m_File == NULL )
+	if( m_File == nullptr )
 		return;
 	delete m_File;
 	if( m_Mode & WRITE )

src/RageFileBasic.cpp

@@ -129,7 +129,7 @@ int RageFileObj::Read( void *pBuffer, size_t iBytes )
 
 		/* If buffering is disabled, or the block is bigger than the buffer,
 		 * read the remainder of the data directly into the desteination buffer. */
-		if( m_pReadBuffer == NULL || iBytes >= BSIZE )
+		if( m_pReadBuffer == nullptr || iBytes >= BSIZE )
 		{
 			/* We have a lot more to read, so don't waste time copying it into the
 			 * buffer. */
@@ -204,7 +204,7 @@ int RageFileObj::Read( void *pBuffer, size_t iBytes, int iNmemb )
 /* Empty the write buffer to disk.  Return -1 on error, 0 on success. */
 int RageFileObj::EmptyWriteBuf()
 {
-	if( m_pWriteBuffer == NULL )
+	if( m_pWriteBuffer == nullptr )
 		return 0;
 
 	if( m_iWriteBufferUsed )
@@ -285,13 +285,13 @@ int RageFileObj::Flush()
 
 void RageFileObj::EnableReadBuffering()
 {
-	if( m_pReadBuffer == NULL )
+	if( m_pReadBuffer == nullptr )
 		m_pReadBuffer = new char[BSIZE];
 }
 
 void RageFileObj::EnableWriteBuffering( int iBytes )
 {
-	if( m_pWriteBuffer == NULL )
+	if( m_pWriteBuffer == nullptr )
 	{
 		m_pWriteBuffer = new char[iBytes];
 		m_iWriteBufferPos = m_iFilePos;
@@ -339,7 +339,7 @@ int RageFileObj::GetLine( RString &sOut )
 		/* Find the end of the block we'll move to out. */
 		char *p = (char *) memchr( m_pReadBuf, '\n', m_iReadBufAvail );
 		bool bReAddCR = false;
-		if( p == NULL )
+		if( p == nullptr )
 		{
 			/* Hack: If the last character of the buffer is \r, then it's likely that an
 			 * \r\n has been split across buffers.  Move everything else, then move the

src/RageFileDriverDeflate.cpp

@@ -522,7 +522,7 @@ bool GunzipString( const RString &sIn, RString &sOut, RString &sError )
 
 	uint32_t iCRC32;
 	RageFileBasic *pFile = GunzipFile( mem, sError, &iCRC32 );
-	if( pFile == NULL )
+	if( pFile == nullptr )
 		return false;
 
 	pFile->Read( sOut );

src/RageFileDriverDirect.cpp

@@ -180,7 +180,7 @@ RageFileObjDirect *RageFileObjDirect::Copy() const
 	int iErr;
 	RageFileObjDirect *ret = MakeFileObjDirect( m_sPath, m_iMode, iErr );
 
-	if( ret == NULL )
+	if( ret == nullptr )
 		RageException::Throw( "Couldn't reopen \"%s\": %s", m_sPath.c_str(), strerror(iErr) );
 
 	ret->Seek( (int)lseek( m_iFD, 0, SEEK_CUR ) );

src/RageFileDriverDirectHelpers.cpp

@@ -158,7 +158,7 @@ void DirectFilenameDB::CacheFile( const RString &sPath )
 	CHECKPOINT_M( root+sPath );
 	RString sDir = Dirname( sPath );
 	FileSet *pFileSet = GetFileSet( sDir, false );
-	if( pFileSet == NULL )
+	if( pFileSet == nullptr )
 	{
 		// This directory isn't cached so do nothing.
 		m_Mutex.Unlock(); // Locked by GetFileSet()
@@ -251,7 +251,7 @@ void DirectFilenameDB::PopulateFileSet( FileSet &fs, const RString &path )
 	 * scans are I/O-bound. */
 	 
 	DIR *pDir = opendir(root+sPath);
-	if( pDir == NULL )
+	if( pDir == nullptr )
 		return;
 
 	while( struct dirent *pEnt = readdir(pDir) )

src/RageFileDriverMemory.cpp

@@ -36,7 +36,7 @@ struct RageFileObjMemFile
 
 RageFileObjMem::RageFileObjMem( RageFileObjMemFile *pFile )
 {
-	if( pFile == NULL )
+	if( pFile == nullptr )
 		pFile = new RageFileObjMemFile;
 
 	m_pFile = pFile;
@@ -147,7 +147,7 @@ RageFileBasic *RageFileDriverMem::Open( const RString &sPath, int mode, int &err
 	}
 
 	RageFileObjMemFile *pFile = (RageFileObjMemFile *) FDB->GetFilePriv( sPath );
-	if( pFile == NULL )
+	if( pFile == nullptr )
 	{
 		err = ENOENT;
 		return NULL;
@@ -161,7 +161,7 @@ bool RageFileDriverMem::Remove( const RString &sPath )
 	LockMut(m_Mutex);
 
 	RageFileObjMemFile *pFile = (RageFileObjMemFile *) FDB->GetFilePriv( sPath );
-	if( pFile == NULL )
+	if( pFile == nullptr )
 		return false;
 
 	/* Unregister the file. */

src/RageFileDriverTimeout.cpp

@@ -158,7 +158,7 @@ ThreadedFileWorker::ThreadedFileWorker( RString sPath ):
 {
 	/* Grab a reference to the child driver.  We'll operate on it directly. */
 	m_pChildDriver = FILEMAN->GetFileDriver( sPath );
-	if( m_pChildDriver == NULL )
+	if( m_pChildDriver == nullptr )
 		WARN( ssprintf("ThreadedFileWorker: Mountpoint \"%s\" not found", sPath.c_str()) );
 
 	m_pResultFile = NULL;
@@ -209,7 +209,7 @@ void ThreadedFileWorker::HandleRequest( int iRequest )
 	switch( iRequest )
 	{
 	case REQ_OPEN:
-		ASSERT( m_pResultFile == NULL );
+		ASSERT( m_pResultFile == nullptr );
 		ASSERT( !m_sRequestPath.empty() );
 		m_iResultRequest = 0;
 		m_pResultFile = m_pChildDriver->Open( m_sRequestPath, m_iRequestMode, m_iResultRequest );
@@ -296,7 +296,7 @@ void ThreadedFileWorker::RequestTimedOut()
 
 RageFileBasic *ThreadedFileWorker::Open( const RString &sPath, int iMode, int &iErr )
 {
-	if( m_pChildDriver == NULL )
+	if( m_pChildDriver == nullptr )
 	{
 		iErr = ENODEV;
 		return NULL;
@@ -330,7 +330,7 @@ void ThreadedFileWorker::Close( RageFileBasic *pFile )
 {
 	ASSERT( m_pChildDriver != nullptr ); /* how did you get a file to begin with? */
 
-	if( pFile == NULL )
+	if( pFile == nullptr )
 		return;
 
 	if( !IsTimedOut() )
@@ -362,7 +362,7 @@ int ThreadedFileWorker::GetFileSize( RageFileBasic *&pFile )
 		pFile = NULL;
 	}
 
-	if( pFile == NULL )
+	if( pFile == nullptr )
 		return -1;
 
 	m_pRequestFile = pFile;
@@ -390,7 +390,7 @@ int ThreadedFileWorker::GetFD( RageFileBasic *&pFile )
 		pFile = NULL;
 	}
 
-	if( pFile == NULL )
+	if( pFile == nullptr )
 		return -1;
 
 	m_pRequestFile = pFile;
@@ -418,7 +418,7 @@ int ThreadedFileWorker::Seek( RageFileBasic *&pFile, int iPos, RString &sError )
 		pFile = NULL;
 	}
 
-	if( pFile == NULL )
+	if( pFile == nullptr )
 	{
 		sError = "Operation timed out";
 		return -1;
@@ -453,7 +453,7 @@ int ThreadedFileWorker::Read( RageFileBasic *&pFile, void *pBuf, int iSize, RStr
 		pFile = NULL;
 	}
 
-	if( pFile == NULL )
+	if( pFile == nullptr )
 	{
 		sError = "Operation timed out";
 		return -1;
@@ -495,7 +495,7 @@ int ThreadedFileWorker::Write( RageFileBasic *&pFile, const void *pBuf, int iSiz
 		pFile = NULL;
 	}
 
-	if( pFile == NULL )
+	if( pFile == nullptr )
 	{
 		sError = "Operation timed out";
 		return -1;
@@ -536,7 +536,7 @@ int ThreadedFileWorker::Flush( RageFileBasic *&pFile, RString &sError )
 		pFile = NULL;
 	}
 
-	if( pFile == NULL )
+	if( pFile == nullptr )
 	{
 		sError = "Operation timed out";
 		return -1;
@@ -571,7 +571,7 @@ RageFileBasic *ThreadedFileWorker::Copy( RageFileBasic *&pFile, RString &sError
 		pFile = NULL;
 	}
 
-	if( pFile == NULL )
+	if( pFile == nullptr )
 	{
 		sError = "Operation timed out";
 		return NULL;
@@ -596,7 +596,7 @@ RageFileBasic *ThreadedFileWorker::Copy( RageFileBasic *&pFile, RString &sError
 
 bool ThreadedFileWorker::PopulateFileSet( FileSet &fs, const RString &sPath )
 {
-	if( m_pChildDriver == NULL )
+	if( m_pChildDriver == nullptr )
 		return false;
 
 	/* If we're currently in a timed-out state, fail. */
@@ -664,7 +664,7 @@ bool ThreadedFileWorker::FlushDirCache( const RString &sPath )
 	if( !bTimeoutEnabled )
 		SetTimeout(1);
 
-	if( m_pChildDriver == NULL )
+	if( m_pChildDriver == nullptr )
 		return false;
 
 	/* If we're currently in a timed-out state, fail. */
@@ -727,7 +727,7 @@ public:
 		RString sError;
 		int iRet = m_pWorker->GetFD( m_pFile );
 
-		if( m_pFile == NULL )
+		if( m_pFile == nullptr )
 		{
 			SetError( "Operation timed out" );
 			return -1;
@@ -744,13 +744,13 @@ public:
 		RString sError;
 		RageFileBasic *pCopy = m_pWorker->Copy( m_pFile, sError );
 
-		if( m_pFile == NULL )
+		if( m_pFile == nullptr )
 		{
 //			SetError( "Operation timed out" );
 			return NULL;
 		}
 
-		if( pCopy == NULL )
+		if( pCopy == nullptr )
 		{
 //			SetError( sError );
 			return NULL;
@@ -765,7 +765,7 @@ protected:
 		RString sError;
 		int iRet = m_pWorker->Seek( m_pFile, iPos, sError );
 
-		if( m_pFile == NULL )
+		if( m_pFile == nullptr )
 		{
 			SetError( "Operation timed out" );
 			return -1;
@@ -783,7 +783,7 @@ protected:
 		RString sError;
 		int iRet = m_pWorker->Read( m_pFile, pBuffer, iBytes, sError );
 
-		if( m_pFile == NULL )
+		if( m_pFile == nullptr )
 		{
 			SetError( "Operation timed out" );
 			return -1;
@@ -800,7 +800,7 @@ protected:
 		RString sError;
 		int iRet = m_pWorker->Write( m_pFile, pBuffer, iBytes, sError );
 
-		if( m_pFile == NULL )
+		if( m_pFile == nullptr )
 		{
 			SetError( "Operation timed out" );
 			return -1;
@@ -817,7 +817,7 @@ protected:
 		RString sError;
 		int iRet = m_pWorker->Flush( m_pFile, sError );
 
-		if( m_pFile == NULL )
+		if( m_pFile == nullptr )
 		{
 			SetError( "Operation timed out" );
 			return -1;
@@ -878,7 +878,7 @@ RageFileDriverTimeout::RageFileDriverTimeout( const RString &sPath ):
 RageFileBasic *RageFileDriverTimeout::Open( const RString &sPath, int iMode, int &iErr )
 {
 	RageFileBasic *pChildFile = m_pWorker->Open( sPath, iMode, iErr );
-	if( pChildFile == NULL )
+	if( pChildFile == nullptr )
 		return NULL;
 
 	/* RageBasicFile::GetFileSize isn't allowed to fail, but we are; grab the file
@@ -890,7 +890,7 @@ RageFileBasic *RageFileDriverTimeout::Open( const RString &sPath, int iMode, int
 		if( iSize == -1 )
 		{
 			/* When m_pWorker->GetFileSize fails, it takes ownership of pChildFile. */
-			ASSERT( pChildFile == NULL );
+			ASSERT( pChildFile == nullptr );
 			iErr = EFAULT;
 			return NULL;
 		}

src/RageFileDriverZip.cpp

@@ -38,7 +38,7 @@ RageFileDriverZip::RageFileDriverZip( const RString &sPath ):
 
 bool RageFileDriverZip::Load( const RString &sPath )
 {
-	ASSERT( m_pZip == NULL ); /* don't load twice */
+	ASSERT( m_pZip == nullptr ); /* don't load twice */
 
 	m_bFileOwned = true;
 	m_sPath = sPath;
@@ -60,7 +60,7 @@ bool RageFileDriverZip::Load( const RString &sPath )
 
 bool RageFileDriverZip::Load( RageFileBasic *pFile )
 {
-	ASSERT( m_pZip == NULL ); /* don't load twice */
+	ASSERT( m_pZip == nullptr ); /* don't load twice */
 	m_sPath = ssprintf("%p", pFile);
 	m_Mutex.SetName( ssprintf("RageFileDriverZip(%p)", pFile) );
 
@@ -300,7 +300,7 @@ RageFileBasic *RageFileDriverZip::Open( const RString &sPath, int iMode, int &iE
 	}
 
 	FileInfo *info = (FileInfo *) FDB->GetFilePriv( sPath );
-	if( info == NULL )
+	if( info == nullptr )
 	{
 		iErr = ENOENT;
 		return NULL;

src/RageFileManager.cpp

@@ -502,7 +502,7 @@ bool RageFileManager::Mount( const RString &sType, const RString &sRoot_, const
 
 	CHECKPOINT;
 	RageFileDriver *pDriver = MakeFileDriver( sType, sRoot );
-	if( pDriver == NULL )
+	if( pDriver == nullptr )
 	{
 		CHECKPOINT;
 
@@ -595,7 +595,7 @@ void RageFileManager::Unmount( const RString &sType, const RString &sRoot_, cons
 void RageFileManager::Remount( RString sMountpoint, RString sPath )
 {
 	RageFileDriver *pDriver = GetFileDriver( sMountpoint );
-	if( pDriver == NULL )
+	if( pDriver == nullptr )
 	{
 		if( LOG )
 			LOG->Warn( "Remount(%s,%s): mountpoint not found", sMountpoint.c_str(), sPath.c_str() );

src/RageSound.cpp

@@ -160,7 +160,7 @@ bool RageSound::Load( RString sSoundFilePath, bool bPrecache, const RageSoundLoa
 {
 	LOG->Trace( "RageSound: Load \"%s\" (precache: %i)", sSoundFilePath.c_str(), bPrecache );
 
-	if( pParams == NULL )
+	if( pParams == nullptr )
 	{
 		static const RageSoundLoadParams Defaults;
 		pParams = &Defaults;
@@ -170,12 +170,12 @@ bool RageSound::Load( RString sSoundFilePath, bool bPrecache, const RageSoundLoa
 	 * of that.  Since RageSoundReader_Preload is refcounted, this is cheap. */
 	RageSoundReader *pSound = SOUNDMAN->GetLoadedSound( sSoundFilePath );
 	bool bNeedBuffer = true;
-	if( pSound == NULL )
+	if( pSound == nullptr )
 	{
 		RString error;
 		bool bPrebuffer;
 		pSound = RageSoundReader_FileReader::OpenFile( sSoundFilePath, error, &bPrebuffer );
-		if( pSound == NULL )
+		if( pSound == nullptr )
 		{
 			LOG->Warn( "RageSound::Load: error opening sound \"%s\": %s",
 				sSoundFilePath.c_str(), error.c_str() );
@@ -394,7 +394,7 @@ void RageSound::SoundIsFinishedPlaying()
 
 void RageSound::Play( const RageSoundParams *pParams )
 {
-	if( m_pSource == NULL )
+	if( m_pSource == nullptr )
 	{
 		LOG->Warn( "RageSound::Play: sound not loaded" );
 		return;
@@ -430,7 +430,7 @@ void RageSound::Stop()
 
 bool RageSound::Pause( bool bPause )
 {
-	if( m_pSource == NULL )
+	if( m_pSource == nullptr )
 	{
 		LOG->Warn( "RageSound::Pause: sound not loaded" );
 		return false;
@@ -441,7 +441,7 @@ bool RageSound::Pause( bool bPause )
 
 float RageSound::GetLengthSeconds()
 {
-	if( m_pSource == NULL )
+	if( m_pSource == nullptr )
 	{
 		LOG->Warn( "RageSound::GetLengthSeconds: sound not loaded" );
 		return -1;
@@ -515,7 +515,7 @@ bool RageSound::SetPositionFrames( int iFrames )
 {
 	LockMut( m_Mutex );
 
-	if( m_pSource == NULL )
+	if( m_pSource == nullptr )
 	{
 		LOG->Warn( "RageSound::SetPositionFrames(%d): sound not loaded", iFrames );
 		return false;
@@ -559,7 +559,7 @@ void RageSound::SetParams( const RageSoundParams &p )
 
 void RageSound::ApplyParams()
 {
-	if( m_pSource == NULL )
+	if( m_pSource == nullptr )
 		return;
 
 	m_pSource->SetProperty( "Pitch", m_Param.m_fPitch );

src/RageSoundManager.cpp

@@ -42,7 +42,7 @@ static LocalizedString COULDNT_FIND_SOUND_DRIVER( "RageSoundManager", "Couldn't
 void RageSoundManager::Init()
 {
 	m_pDriver = RageSoundDriver::Create( g_sSoundDrivers );
-	if( m_pDriver == NULL )
+	if( m_pDriver == nullptr )
 		RageException::Throw( "%s", COULDNT_FIND_SOUND_DRIVER.GetValue().c_str() );
 }
 
@@ -81,7 +81,7 @@ void RageSoundManager::StopMixing( RageSoundBase *pSound )
 
 bool RageSoundManager::Pause( RageSoundBase *pSound, bool bPause )
 {
-	if( m_pDriver == NULL )
+	if( m_pDriver == nullptr )
 		return false;
 	else
 		return m_pDriver->PauseMixing( pSound, bPause );
@@ -89,7 +89,7 @@ bool RageSoundManager::Pause( RageSoundBase *pSound, bool bPause )
 
 int64_t RageSoundManager::GetPosition( RageTimer *pTimer ) const
 {
-	if( m_pDriver == NULL )
+	if( m_pDriver == nullptr )
 		return 0;
 	return m_pDriver->GetHardwareFrame( pTimer );
 }
@@ -124,7 +124,7 @@ void RageSoundManager::Update()
 
 float RageSoundManager::GetPlayLatency() const
 {
-	if( m_pDriver == NULL )
+	if( m_pDriver == nullptr )
 		return 0;
 
 	return m_pDriver->GetPlayLatency();
@@ -132,7 +132,7 @@ float RageSoundManager::GetPlayLatency() const
 
 int RageSoundManager::GetDriverSampleRate() const
 {
-	if( m_pDriver == NULL )
+	if( m_pDriver == nullptr )
 		return 44100;
 
 	return m_pDriver->GetSampleRate();

src/RageSoundReader_Chain.cpp

@@ -77,7 +77,7 @@ int RageSoundReader_Chain::LoadSound( RString sPath )
 	RString sError;
 	bool bPrebuffer;
 	RageSoundReader *pReader = RageSoundReader_FileReader::OpenFile( sPath, sError, &bPrebuffer );
-	if( pReader == NULL )
+	if( pReader == nullptr )
 	{
 		LOG->Warn( "RageSoundReader_Chain: error opening sound \"%s\": %s",
 			sPath.c_str(), sError.c_str() );
@@ -140,7 +140,7 @@ void RageSoundReader_Chain::Finish()
 	{
 		Sound &sound = m_aSounds[i];
 
-		if( m_apLoadedSounds[sound.iIndex] == NULL )
+		if( m_apLoadedSounds[sound.iIndex] == nullptr )
 		{
 			m_aSounds.erase( m_aSounds.begin()+i );
 			continue;

src/RageSurfaceUtils_Palettize.cpp

@@ -223,7 +223,7 @@ void RageSurfaceUtils::Palettize( RageSurface *&pImg, int iColors, bool bDither
 			{
 				// No; search acolormap for closest match.
 				static int square_table[512], *pSquareTable = NULL;
-				if( pSquareTable == NULL )
+				if( pSquareTable == nullptr )
 				{
 					pSquareTable = square_table+256;
 					for( int c = -256; c < 256; ++c )

src/RageSurfaceUtils_Zoom.cpp

@@ -135,7 +135,7 @@ void RageSurfaceUtils::Zoom( RageSurface *&src, int dstwidth, int dstheight )
 {
 	ASSERT_M( dstwidth > 0, ssprintf("%i",dstwidth) );
 	ASSERT_M( dstheight > 0, ssprintf("%i",dstheight) );
-	if( src == NULL )
+	if( src == nullptr )
 		return;
 
 	if( src->w == dstwidth && src->h == dstheight )

src/RageSurface_Load_JPEG.cpp

@@ -214,7 +214,7 @@ RageSurfaceUtils::OpenResult RageSurface_Load_JPEG( const RString &sPath, RageSu
 
 	char errorbuf[1024];
 	ret = RageSurface_Load_JPEG( &f, sPath, errorbuf );
-	if( ret == NULL )
+	if( ret == nullptr )
 	{
 		error = errorbuf;
 		return RageSurfaceUtils::OPEN_UNKNOWN_FILE_FORMAT; // XXX

src/RageSurface_Load_PNG.cpp

@@ -71,14 +71,14 @@ static RageSurface *RageSurface_Load_PNG( RageFile *f, const char *fn, char erro
 
 	png_struct *png = png_create_read_struct( PNG_LIBPNG_VER_STRING, &error, PNG_Error, PNG_Warning );
 
-	if( png == NULL )
+	if( png == nullptr )
 	{
 		sprintf( errorbuf, "creating png_create_read_struct failed");
 		return NULL;
 	}
 
 	png_info *info_ptr = png_create_info_struct(png);
-	if( info_ptr == NULL )
+	if( info_ptr == nullptr )
 	{
 		png_destroy_read_struct( &png, NULL, NULL );
 		sprintf( errorbuf, "creating png_create_info_struct failed");
@@ -264,7 +264,7 @@ RageSurfaceUtils::OpenResult RageSurface_Load_PNG( const RString &sPath, RageSur
 
 	char errorbuf[1024];
 	ret = RageSurface_Load_PNG( &f, sPath, errorbuf, bHeaderOnly );
-	if( ret == NULL )
+	if( ret == nullptr )
 	{
 		error = errorbuf;
 		return RageSurfaceUtils::OPEN_UNKNOWN_FILE_FORMAT; // XXX

src/RageSurface_Load_XPM.cpp

@@ -9,7 +9,7 @@
 #include <map>
 
 #define CheckLine() \
-	if( xpm[line] == NULL ) { \
+	if( xpm[line] == nullptr ) { \
 		error = "short file"; \
 		return NULL; \
 	}

src/RageSurface_Save_JPEG.cpp

@@ -79,7 +79,7 @@ static void term_destination (jpeg::j_compress_ptr cinfo)
  */
 static void jpeg_RageFile_dest( jpeg::j_compress_ptr cinfo, RageFile &f )
 {
-	ASSERT( cinfo->dest == NULL );
+	ASSERT( cinfo->dest == nullptr );
 
 	cinfo->dest = (struct jpeg::jpeg_destination_mgr *)
 		(*cinfo->mem->alloc_small) ( (jpeg::j_common_ptr) cinfo, JPOOL_PERMANENT,

src/RageSurface_Save_PNG.cpp

@@ -81,14 +81,14 @@ static bool RageSurface_Save_PNG( RageFile &f, char szErrorbuf[1024], RageSurfac
 	error.szErr = szErrorbuf;
 
 	png_struct *pPng = png_create_write_struct( PNG_LIBPNG_VER_STRING, &error, PNG_Error, PNG_Warning );
-	if( pPng == NULL )
+	if( pPng == nullptr )
 	{
 		sprintf( szErrorbuf, "creating png_create_write_struct failed");
 		return false;
 	}
 
 	png_info *pInfo = png_create_info_struct(pPng);
-	if( pInfo == NULL )
+	if( pInfo == nullptr )
 	{
 		png_destroy_read_struct( &pPng, NULL, NULL );
 		if( bDeleteImg )

src/RageTextureManager.cpp

@@ -176,7 +176,7 @@ void RageTextureManager::VolatileTexture( RageTextureID ID )
 
 void RageTextureManager::UnloadTexture( RageTexture *t )
 {
-	if( t == NULL )
+	if( t == nullptr )
 		return;
 
 	t->m_iRefCount--;

src/RageTexturePreloader.cpp

@@ -35,7 +35,7 @@ void RageTexturePreloader::Load( const RageTextureID &ID )
 
 void RageTexturePreloader::UnloadAll()
 {
-	if( TEXTUREMAN == NULL )
+	if( TEXTUREMAN == nullptr )
 		return;
 
 	for( unsigned i = 0; i < m_apTextures.size(); ++i )

src/RageThreads.cpp

@@ -97,7 +97,7 @@ void ThreadSlot::ThreadCheckpoint::Set( const char *szFile, int iLine, const cha
 	if( m_szFile != nullptr )
 	{
 		const char *p = strrchr( m_szFile, '/' );
-		if( p == NULL )
+		if( p == nullptr )
 			p = strrchr( m_szFile, '\\' );
 		if( p != nullptr && p[1] != '\0' )
 			m_szFile = p+1;
@@ -108,7 +108,7 @@ void ThreadSlot::ThreadCheckpoint::Set( const char *szFile, int iLine, const cha
 
 const char *ThreadSlot::ThreadCheckpoint::GetFormattedCheckpoint()
 {
-	if( m_szFile == NULL )
+	if( m_szFile == nullptr )
 		return NULL;
 
 	/* Make sure it's terminated: */
@@ -231,7 +231,7 @@ const char *ThreadSlot::GetThreadName() const
 void RageThread::Create( int (*fn)(void *), void *data )
 {
 	/* Don't create a thread that's already running: */
-	ASSERT( m_pSlot == NULL );
+	ASSERT( m_pSlot == nullptr );
 
 	InitThreads();
 
@@ -286,7 +286,7 @@ const char *RageThread::GetCurrentThreadName()
 const char *RageThread::GetThreadNameByID( uint64_t iID )
 {
 	ThreadSlot *slot = GetThreadSlotFromID( iID );
-	if( slot == NULL )
+	if( slot == nullptr )
 		return "???";
 
 	return slot->GetThreadName();
@@ -341,7 +341,7 @@ void RageThread::HaltAllThreads( bool Kill )
 	{
 		if( !g_ThreadSlots[entry].m_bUsed )
 			continue;
-		if( ThisThreadID == g_ThreadSlots[entry].m_iID || g_ThreadSlots[entry].m_pImpl == NULL )
+		if( ThisThreadID == g_ThreadSlots[entry].m_iID || g_ThreadSlots[entry].m_pImpl == nullptr )
 			continue;
 		g_ThreadSlots[entry].m_pImpl->Halt( Kill );
 	}
@@ -354,7 +354,7 @@ void RageThread::ResumeAllThreads()
 	{
 		if( !g_ThreadSlots[entry].m_bUsed )
 			continue;
-		if( ThisThreadID == g_ThreadSlots[entry].m_iID || g_ThreadSlots[entry].m_pImpl == NULL )
+		if( ThisThreadID == g_ThreadSlots[entry].m_iID || g_ThreadSlots[entry].m_pImpl == nullptr )
 			continue;
 
 		g_ThreadSlots[entry].m_pImpl->Resume();
@@ -381,10 +381,10 @@ void Checkpoints::LogCheckpoints( bool on )
 void Checkpoints::SetCheckpoint( const char *file, int line, const char *message )
 {
 	ThreadSlot *slot = GetCurThreadSlot();
-	if( slot == NULL )
+	if( slot == nullptr )
 		slot = GetUnknownThreadSlot();
 	/* We can't ASSERT here, since that uses checkpoints. */
-	if( slot == NULL )
+	if( slot == nullptr )
 		sm_crash( "GetUnknownThreadSlot() returned NULL" );
 	
 	/* Ignore everything up to and including the first "src/". */
@@ -409,7 +409,7 @@ static const char *GetCheckpointLog( int slotno, int lineno )
 		return NULL;
 
 	/* Only show the "Unknown thread" entry if it has at least one checkpoint. */
-	if( &slot == g_pUnknownThreadSlot && slot.GetFormattedCheckpoint(0) == NULL )
+	if( &slot == g_pUnknownThreadSlot && slot.GetFormattedCheckpoint(0) == nullptr )
 		return NULL;
 
 	if( lineno != 0 )
@@ -427,7 +427,7 @@ void Checkpoints::GetLogs( char *pBuf, int iSize, const char *delim )
 	for( int slotno = 0; slotno < MAX_THREADS; ++slotno )
 	{
 		const char *buf = GetCheckpointLog( slotno, 0 );
-		if( buf == NULL )
+		if( buf == nullptr )
 			continue;
 		strcat( pBuf, buf );
 		strcat( pBuf, delim );
@@ -529,7 +529,7 @@ RageMutex::RageMutex( const RString &name ):
 	m_LockedBy(GetInvalidThreadId()), m_LockCnt(0)
 {
 
-/*	if( g_FreeMutexIDs == NULL )
+/*	if( g_FreeMutexIDs == nullptr )
 	{
 		g_FreeMutexIDs = new set<int>;
 		for( int i = 0; i < MAX_MUTEXES; ++i )
@@ -554,7 +554,7 @@ RageMutex::RageMutex( const RString &name ):
 
 	g_FreeMutexIDs->erase( g_FreeMutexIDs->begin() );
 
-	if( g_MutexList == NULL )
+	if( g_MutexList == nullptr )
 		g_MutexList = new vector<RageMutex*>;
 
 	g_MutexList->push_back( this );

src/RageUtil.cpp

@@ -1349,7 +1349,7 @@ void Regex::Compile()
 	int offset;
 	m_pReg = pcre_compile( m_sPattern.c_str(), PCRE_CASELESS, &error, &offset, NULL );
 
-	if( m_pReg == NULL )
+	if( m_pReg == nullptr )
 		RageException::Throw( "Invalid regex: \"%s\" (%s).", m_sPattern.c_str(), error );
 
 	int iRet = pcre_fullinfo( (pcre *) m_pReg, NULL, PCRE_INFO_CAPTURECOUNT, &m_iBackrefs );

src/RageUtil_AutoPtr.h

@@ -139,7 +139,7 @@ public:
 	template<class U>
 	HiddenPtr( const HiddenPtr<U> &cpy )
 	{
-		if( cpy.m_pPtr == NULL )
+		if( cpy.m_pPtr == nullptr )
 			m_pPtr = NULL;
 		else
 			m_pPtr = HiddenPtrTraits<U>::Copy( cpy.m_pPtr );

src/RageUtil_CachedObject.h

@@ -70,7 +70,7 @@ public:
 		CachedObjectHelpers::Lock();
 		for( typename set<ObjectPointer *>::iterator p = m_spObjectPointers.begin(); p != m_spObjectPointers.end(); ++p )
 		{
-			if( (*p)->m_pCache == NULL )
+			if( (*p)->m_pCache == nullptr )
 				(*p)->m_bCacheIsSet = false;
 		}
 		CachedObjectHelpers::Unlock();

src/RageUtil_CharConversions.cpp

@@ -96,7 +96,7 @@ static bool ConvertFromCP( RString &sText, int iCodePage )
 	
 	CFStringRef old = CFStringCreateWithCString( kCFAllocatorDefault, sText, encoding );
 	
-	if( old == NULL )
+	if( old == nullptr )
 		return false;
 	const size_t size = CFStringGetMaximumSizeForEncoding( CFStringGetLength(old), kCFStringEncodingUTF8 );
 	

src/RageUtil_FileDB.cpp

@@ -181,7 +181,7 @@ bool FilenameDB::ResolvePath( RString &sPath )
 		if( iBegin == (int) sPath.size() )
 			break;
 
-		if( fs == NULL )
+		if( fs == nullptr )
 			fs = GetFileSet( ret );
 		else
 			m_Mutex.Lock(); /* for access to fs */

src/ScreenDebugOverlay.cpp

@@ -58,7 +58,7 @@ class IDebugLine
 public:
 	IDebugLine()
 	{ 
-		if( g_pvpSubscribers == NULL )
+		if( g_pvpSubscribers == nullptr )
 			g_pvpSubscribers = new vector<IDebugLine*>;
 		g_pvpSubscribers->push_back( this );
 	}

src/ScreenDemonstration.cpp

@@ -57,7 +57,7 @@ void ScreenDemonstration::Init()
 
 	ScreenJukebox::Init();
 
-	if( GAMESTATE->m_pCurSong == NULL )	// we didn't find a song.
+	if( GAMESTATE->m_pCurSong == nullptr )	// we didn't find a song.
 	{
 		PostScreenMessage( SM_GoToNextScreen, 0 );	// Abort demonstration.
 		return;

src/ScreenEdit.cpp

@@ -1540,7 +1540,7 @@ static ThemeMetric<RString> PREVIEW_START_FORMAT("ScreenEdit", "PreviewStartForm
 static ThemeMetric<RString> PREVIEW_LENGTH_FORMAT("ScreenEdit", "PreviewLengthFormat");
 void ScreenEdit::UpdateTextInfo()
 {
-	if( m_pSteps == NULL )
+	if( m_pSteps == nullptr )
 		return;
 
 	// Don't update the text during playback or record.  It causes skips.
@@ -2509,7 +2509,7 @@ bool ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
 		{
 			// TODO: Give Song/Step Timing switches/functions here?
 			Course *pCourse = GAMESTATE->m_pCurCourse;
-			if( pCourse == NULL )
+			if( pCourse == nullptr )
 				return false;
 			CourseEntry &ce = pCourse->m_vEntries[GAMESTATE->m_iEditCourseEntryIndex];
 			float fStartTime = m_pSteps->GetTimingData()->GetElapsedTimeFromBeat( GAMESTATE->m_pPlayerState[PLAYER_1]->m_Position.m_fSongBeat );
@@ -2581,7 +2581,7 @@ bool ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
 			float fStart, fEnd;
 			PlayerOptions po;
 			const Course *pCourse = GAMESTATE->m_pCurCourse;
-			if( pCourse == NULL )
+			if( pCourse == nullptr )
 				return false;
 			const CourseEntry &ce = pCourse->m_vEntries[GAMESTATE->m_iEditCourseEntryIndex];
 
@@ -3232,7 +3232,7 @@ void ScreenEdit::HandleMessage( const Message &msg )
 		if( GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions.GetCurrent().m_bMuteOnError )
 		{
 			RageSoundReader *pSoundReader = m_AutoKeysounds.GetPlayerSound( pn );
-			if( pSoundReader == NULL )
+			if( pSoundReader == nullptr )
 				pSoundReader = m_AutoKeysounds.GetSharedSound();
 
 			HoldNoteScore hns;

src/ScreenGameplay.cpp

@@ -381,7 +381,7 @@ void ScreenGameplay::Init()
 
 	m_pCombinedLifeMeter = NULL;
 
-	if( GAMESTATE->m_pCurSong == NULL && GAMESTATE->m_pCurCourse == NULL )
+	if( GAMESTATE->m_pCurSong == nullptr && GAMESTATE->m_pCurCourse == nullptr )
 		return;	// ScreenDemonstration will move us to the next screen.  We just need to survive for one update without crashing.
 
 	/* Save settings to the profile now.  Don't do this on extra stages, since the
@@ -627,7 +627,7 @@ void ScreenGameplay::Init()
 	{
 		if( GAMESTATE->IsCourseMode() )
 		{
-			ASSERT( pi->m_ptextCourseSongNumber == NULL );
+			ASSERT( pi->m_ptextCourseSongNumber == nullptr );
 			SONG_NUMBER_FORMAT.Load( m_sName, "SongNumberFormat" );
 			pi->m_ptextCourseSongNumber = new BitmapText;
 			pi->m_ptextCourseSongNumber->LoadFromFont( THEME->GetPathF(m_sName,"SongNum") );
@@ -638,7 +638,7 @@ void ScreenGameplay::Init()
 			this->AddChild( pi->m_ptextCourseSongNumber );
 		}
 
-		ASSERT( pi->m_ptextStepsDescription == NULL );
+		ASSERT( pi->m_ptextStepsDescription == nullptr );
 		pi->m_ptextStepsDescription = new BitmapText;
 		pi->m_ptextStepsDescription->LoadFromFont( THEME->GetPathF(m_sName,"StepsDescription") );
 		pi->m_ptextStepsDescription->SetName( ssprintf("StepsDescription%s",pi->GetName().c_str()) );
@@ -646,7 +646,7 @@ void ScreenGameplay::Init()
 		this->AddChild( pi->m_ptextStepsDescription );
 
 		// Player/Song options
-		ASSERT( pi->m_ptextPlayerOptions == NULL );
+		ASSERT( pi->m_ptextPlayerOptions == nullptr );
 		pi->m_ptextPlayerOptions = new BitmapText;
 		pi->m_ptextPlayerOptions->LoadFromFont( THEME->GetPathF(m_sName,"player options") );
 		pi->m_ptextPlayerOptions->SetName( ssprintf("PlayerOptions%s",pi->GetName().c_str()) );
@@ -654,7 +654,7 @@ void ScreenGameplay::Init()
 		this->AddChild( pi->m_ptextPlayerOptions );
 
 		// Difficulty icon and meter
-		ASSERT( pi->m_pStepsDisplay == NULL );
+		ASSERT( pi->m_pStepsDisplay == nullptr );
 		pi->m_pStepsDisplay = new StepsDisplay;
 		pi->m_pStepsDisplay->Load("StepsDisplayGameplay", pi->GetPlayerState() );
 		pi->m_pStepsDisplay->SetName( ssprintf("StepsDisplay%s",pi->GetName().c_str()) );
@@ -685,7 +685,7 @@ void ScreenGameplay::Init()
 
 	FOREACH_VisiblePlayerInfo( m_vPlayerInfo, pi )
 	{
-		ASSERT( pi->m_pActiveAttackList == NULL );
+		ASSERT( pi->m_pActiveAttackList == nullptr );
 		pi->m_pActiveAttackList = new ActiveAttackList;
 		pi->m_pActiveAttackList->LoadFromFont( THEME->GetPathF(m_sName,"ActiveAttackList") );
 		pi->m_pActiveAttackList->Init( pi->GetPlayerState() );
@@ -1270,7 +1270,7 @@ void ScreenGameplay::LoadNextSong()
 	FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi )
 	{
 		RageSoundReader *pPlayerSound = m_AutoKeysounds.GetPlayerSound(pi->m_pn);
-		if( pPlayerSound == NULL && pi->m_pn == GAMESTATE->GetMasterPlayerNumber() )
+		if( pPlayerSound == nullptr && pi->m_pn == GAMESTATE->GetMasterPlayerNumber() )
 			pPlayerSound = m_AutoKeysounds.GetSharedSound();
 		pi->m_SoundEffectControl.SetSoundReader( pPlayerSound );
 	}
@@ -1327,7 +1327,7 @@ void ScreenGameplay::LoadLights()
 	pSteps = SongUtil::GetClosestNotes( GAMESTATE->m_pCurSong, st, d1 );
 
 	// If we can't find anything at all, stop.
-	if( pSteps == NULL )
+	if( pSteps == nullptr )
 		return;
 
 	NoteData TapNoteData1;
@@ -1430,7 +1430,7 @@ void ScreenGameplay::PlayAnnouncer( const RString &type, float fSeconds, float *
 	/* Don't play before the first beat, or after we're finished. */
 	if( m_DancingState != STATE_DANCING )
 		return;
-	if(GAMESTATE->m_pCurSong == NULL  ||	// this will be true on ScreenDemonstration sometimes
+	if(GAMESTATE->m_pCurSong == nullptr  ||	// this will be true on ScreenDemonstration sometimes
 	   GAMESTATE->m_Position.m_fSongBeat < GAMESTATE->m_pCurSong->GetFirstBeat())
 		return;
 
@@ -1454,7 +1454,7 @@ void ScreenGameplay::UpdateSongPosition( float fDeltaTime )
 
 void ScreenGameplay::BeginScreen()
 {
-	if( GAMESTATE->m_pCurSong == NULL  )
+	if( GAMESTATE->m_pCurSong == nullptr  )
 		return;
 
 	ScreenWithMenuElements::BeginScreen();
@@ -1535,7 +1535,7 @@ void ScreenGameplay::GetMusicEndTiming( float &fSecondsToStartFadingOutMusic, fl
 
 void ScreenGameplay::Update( float fDeltaTime )
 {
-	if( GAMESTATE->m_pCurSong == NULL  )
+	if( GAMESTATE->m_pCurSong == nullptr  )
 	{
 		/* ScreenDemonstration will move us to the next screen.  We just need to
 		 * survive for one update without crashing.  We need to call Screen::Update
@@ -1558,7 +1558,7 @@ void ScreenGameplay::Update( float fDeltaTime )
 
 	/* This happens if ScreenDemonstration::HandleScreenMessage sets a new screen when
 	 * PREFSMAN->m_bDelayedScreenLoad. */
-	if( GAMESTATE->m_pCurSong == NULL )
+	if( GAMESTATE->m_pCurSong == nullptr )
 		return;
 	/* This can happen if ScreenDemonstration::HandleScreenMessage sets a new screen when
 	 * !PREFSMAN->m_bDelayedScreenLoad.  (The new screen was loaded when we called Screen::Update,
@@ -1640,7 +1640,7 @@ void ScreenGameplay::Update( float fDeltaTime )
 					continue;
 
 				// check for individual fail
-				if( pi->m_pLifeMeter == NULL || !pi->m_pLifeMeter->IsFailing() )
+				if( pi->m_pLifeMeter == nullptr || !pi->m_pLifeMeter->IsFailing() )
 					continue; /* isn't failing */
 				if( pi->GetPlayerStageStats()->m_bFailed )
 					continue; /* failed and is already dead */
@@ -1685,7 +1685,7 @@ void ScreenGameplay::Update( float fDeltaTime )
 				switch( ft )
 				{
 				case PlayerOptions::FAIL_IMMEDIATE:
-					if( pi->m_pLifeMeter == NULL  ||  (pi->m_pLifeMeter && !pi->m_pLifeMeter->IsFailing()) )
+					if( pi->m_pLifeMeter == nullptr  ||  (pi->m_pLifeMeter && !pi->m_pLifeMeter->IsFailing()) )
 						bAllFailed = false;
 					break;
 				case PlayerOptions::FAIL_IMMEDIATE_CONTINUE:
@@ -2681,7 +2681,7 @@ void ScreenGameplay::HandleMessage( const Message &msg )
 				continue;
 
 			RageSoundReader *pSoundReader = m_AutoKeysounds.GetPlayerSound( pn );
-			if( pSoundReader == NULL )
+			if( pSoundReader == nullptr )
 				pSoundReader = m_AutoKeysounds.GetSharedSound();
 
 			HoldNoteScore hns;
@@ -2835,10 +2835,10 @@ public:
 		PlayerNumber pn = Enum::Check<PlayerNumber>( L, 1 );
 
 		PlayerInfo *pi = p->GetPlayerInfo(pn);
-		if( pi == NULL )
+		if( pi == nullptr )
 			return 0;
 		LifeMeter *pLM = pi->m_pLifeMeter;
-		if( pLM == NULL )
+		if( pLM == nullptr )
 			return 0;
 
 		pLM->PushSelf( L );
@@ -2849,7 +2849,7 @@ public:
 		PlayerNumber pn = Enum::Check<PlayerNumber>( L, 1 );
 
 		PlayerInfo *pi = p->GetPlayerInfo(pn);
-		if( pi == NULL )
+		if( pi == nullptr )
 			return 0;
 
 		pi->PushSelf( L );
@@ -2859,7 +2859,7 @@ public:
 	{
 		int iDummyIndex = IArg(1);
 		PlayerInfo *pi = p->GetDummyPlayerInfo(iDummyIndex);
-		if( pi == NULL )
+		if( pi == nullptr )
 			return 0;
 		pi->PushSelf( L );
 		return 1;

src/ScreenInstallOverlay.cpp

@@ -153,7 +153,7 @@ public:
 	}
 	RString GetStatus() const
 	{
-		if( m_pTransfer == NULL )
+		if( m_pTransfer == nullptr )
 			return "";
 		else
 			return m_pTransfer->GetStatus();
@@ -224,7 +224,7 @@ public:
 					RString sUrl = m_vsQueuedPackageUrls.back();
 					m_vsQueuedPackageUrls.pop_back();
 					m_sCurrentPackageTempFile = MakeTempFileName(sUrl);
-					ASSERT(m_pTransfer == NULL);
+					ASSERT(m_pTransfer == nullptr);
 					m_pTransfer = new FileTransfer();
 					m_pTransfer->StartDownload( sUrl, m_sCurrentPackageTempFile );
 				}
@@ -243,7 +243,7 @@ public:
 					RString sUrl = m_vsQueuedPackageUrls.back();
 					m_vsQueuedPackageUrls.pop_back();
 					m_sCurrentPackageTempFile = MakeTempFileName(sUrl);
-					ASSERT(m_pTransfer == NULL);
+					ASSERT(m_pTransfer == nullptr);
 					m_pTransfer = new FileTransfer();
 					m_pTransfer->StartDownload( sUrl, m_sCurrentPackageTempFile );
 				}
@@ -252,7 +252,7 @@ public:
 		}
 		bool bFinished = m_DownloadState == packages  &&  
 			m_vsQueuedPackageUrls.empty() && 
-			m_pTransfer == NULL;
+			m_pTransfer == nullptr;
 		if( bFinished )
 		{
 			Message msg( "DownloadFinished" );

src/ScreenJukebox.cpp

@@ -84,7 +84,7 @@ void ScreenJukebox::SetSong()
 		Difficulty dc = vDifficultiesToShow[ RandomInt(vDifficultiesToShow.size()) ];
 		Steps* pSteps = SongUtil::GetStepsByDifficulty( pSong, GAMESTATE->GetCurrentStyle()->m_StepsType, dc );
 
-		if( pSteps == NULL )
+		if( pSteps == nullptr )
 			continue;	// skip
 
 		if( !PREFSMAN->m_bAutogenSteps && pSteps->IsAutogen())
@@ -110,7 +110,7 @@ void ScreenJukebox::SetSong()
 			{
 				Course *lCourse = apCourses[j];
 				const CourseEntry *pEntry = lCourse->FindFixedSong( pSong );
-				if( pEntry == NULL || pEntry->attacks.size() == 0 )
+				if( pEntry == nullptr || pEntry->attacks.size() == 0 )
 					continue;
 
 				if( !ALLOW_ADVANCED_MODIFIERS )
@@ -226,7 +226,7 @@ void ScreenJukebox::Init()
 	// Now that we've set up, init the base class.
 	ScreenGameplay::Init();
 
-	if( GAMESTATE->m_pCurSong == NULL )	// we didn't find a song.
+	if( GAMESTATE->m_pCurSong == nullptr )	// we didn't find a song.
 	{
 		this->PostScreenMessage( SM_GoToNextScreen, 0 );	// Abort demonstration.
 		return;

src/ScreenManager.cpp

@@ -218,7 +218,7 @@ using namespace ScreenManagerUtil;
 
 RegisterScreenClass::RegisterScreenClass( const RString& sClassName, CreateScreenFn pfn )
 {
-	if( g_pmapRegistrees == NULL )
+	if( g_pmapRegistrees == nullptr )
 		g_pmapRegistrees = new map<RString,CreateScreenFn>;
 
 	map<RString,CreateScreenFn>::iterator iter = g_pmapRegistrees->find( sClassName );
@@ -573,7 +573,7 @@ void ScreenManager::PrepareScreen( const RString &sScreenName )
 
 		// Create the new background before deleting the previous so that we keep
 		// any common textures loaded.
-		if( pNewBGA == NULL )
+		if( pNewBGA == nullptr )
 		{
 			LOG->Trace( "Loading screen background \"%s\"", sNewBGA.c_str() );
 			Actor *pActor = ActorUtil::MakeActor( sNewBGA );
@@ -615,7 +615,7 @@ bool ScreenManager::ActivatePreparedScreenAndBackground( const RString &sScreenN
 	bool bLoadedBoth = true;
 
 	// Find the prepped screen.
-	if( GetTopScreen() == NULL || GetTopScreen()->GetName() != sScreenName )
+	if( GetTopScreen() == nullptr || GetTopScreen()->GetName() != sScreenName )
 	{
 		LoadedScreen ls;
 		if( !GetPreppedScreen(sScreenName, ls) )
@@ -652,7 +652,7 @@ bool ScreenManager::ActivatePreparedScreenAndBackground( const RString &sScreenN
 
 		/* If the BGA isn't loaded yet, load a dummy actor. If we're not going to use the same
 		 * BGA for the new screen, always move the old BGA back to g_vPreparedBackgrounds now. */
-		if( pNewBGA == NULL )
+		if( pNewBGA == nullptr )
 		{
 			bLoadedBoth = false;
 			pNewBGA = new Actor;