swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-10-01 16:13:19 -04:00
Code Issues Projects Releases Wiki Activity

newer standards prefer nullptr over NULL - this is most of them but there are others too

Browse Source
This commit is contained in:
DarthArgus
2016-02-11 15:16:14 -06:00
parent a7f2d0ea6a
commit 3e4cc36e7e
937 changed files with 14983 additions and 14983 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/ai/AiMovementTarget.cpp
+5 -5
View File
@@ -69,7 +69,7 @@ bool AiMovementTarget::getHibernateOk( void ) const
{
static const int MAX_RECURSION = 50;
static int recursionCount = 0;
static const AiMovementTarget * preventRecurse = NULL;
static const AiMovementTarget * preventRecurse = nullptr;
// prevent recursing too many times
if (++recursionCount == MAX_RECURSION)
@@ -90,20 +90,20 @@ static const AiMovementTarget * preventRecurse = NULL;
--recursionCount;
return true;
}
if (preventRecurse == NULL)
if (preventRecurse == nullptr)
preventRecurse = this;
bool hibernate = true;
if (m_target.isValid() && m_target.getObjectId() != NetworkId::cms_invalid)
{
const Object * o = m_target.getObject();
if (o != NULL && o->asServerObject() != NULL)
if (o != nullptr && o->asServerObject() != nullptr)
{
// if the target is a player, don't hibernate
if (o->asServerObject()->isPlayerControlled())
hibernate = false;
// hibernate if who we're following is hibernating
else if (o->asServerObject()->asCreatureObject() != NULL)
else if (o->asServerObject()->asCreatureObject() != nullptr)
hibernate = (safe_cast<const CreatureController *>(o->getController()))->getHibernate();
}
else
@@ -114,7 +114,7 @@ static const AiMovementTarget * preventRecurse = NULL;
// clean up recusion checkers
if (preventRecurse == this)
preventRecurse = NULL;
preventRecurse = nullptr;
--recursionCount;
return hibernate;
}