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

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AutoActor.cpp
+8 -8
View File
@@ -6,17 +6,17 @@
void AutoActor::Unload()
{
if(m_pActor != NULL)
if(m_pActor != nullptr)
{
delete m_pActor;
}
m_pActor=NULL;
m_pActor=nullptr;
}
AutoActor::AutoActor( const AutoActor &cpy )
{
if( cpy.m_pActor == NULL )
m_pActor = NULL;
if( cpy.m_pActor == nullptr )
m_pActor = nullptr;
else
m_pActor = cpy.m_pActor->Copy();
}
@@ -25,8 +25,8 @@ AutoActor &AutoActor::operator=( const AutoActor &cpy )
{
Unload();
if( cpy.m_pActor == NULL )
m_pActor = NULL;
if( cpy.m_pActor == nullptr )
m_pActor = nullptr;
else
m_pActor = cpy.m_pActor->Copy();
return *this;
@@ -43,8 +43,8 @@ void AutoActor::Load( const RString &sPath )
Unload();
m_pActor = ActorUtil::MakeActor( sPath );
// If a Condition is false, MakeActor will return NULL.
if( m_pActor == NULL )
// If a Condition is false, MakeActor will return nullptr.
if( m_pActor == nullptr )
m_pActor = new Actor;
}