swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-08-02 03:16:11 -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-15 00:07:31 -06:00
parent 6bb5137dc4
commit 03dc62efba
937 changed files with 14983 additions and 14983 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverPathfinding/src/shared/PathAutoGenerator.cpp
+7 -7
View File
@@ -48,14 +48,14 @@ Region const * PathAutoGenerator::findPathRegion(Vector const & pos_w)
for (RegionMaster::RegionVector::const_iterator it = rv.begin(); it != rv.end(); ++it)
{
Region const * const r = *it;
if (NULL != r)
if (nullptr != r)
{
if (r->getGeography() == RegionNamespace::RG_pathfind)
return r;
}
}
return NULL;
return nullptr;
}
//----------------------------------------------------------------------
@@ -63,7 +63,7 @@ Region const * PathAutoGenerator::findPathRegion(Vector const & pos_w)
void PathAutoGenerator::pathAutoGenerate(Vector const & pos_w, float nodeDistance, float obstacleDistance, Unicode::String & result)
{
Region const * region = findPathRegion(pos_w);
if (NULL == region)
if (nullptr == region)
{
result += Unicode::narrowToWide("No pathfinding region at position");
return;
@@ -144,7 +144,7 @@ void PathAutoGenerator::pathAutoGenerate(Vector const & pos_w, float nodeDistanc
++obstacleNearbySkipped;
#if USE_OBSTACLE_TEMPLATE
if (NULL != PathAutoGeneratorNamespace::s_pathObstacleTemplate)
if (nullptr != PathAutoGeneratorNamespace::s_pathObstacleTemplate)
{
Transform transform_w;
transform_w.setPosition_p(testPos_w);
@@ -164,7 +164,7 @@ void PathAutoGenerator::pathAutoGenerate(Vector const & pos_w, float nodeDistanc
transform_w.setPosition_p(testPos_w);
ServerObject * newObject = ServerWorld::createNewObject(s_pathWaypointTemplate, transform_w, 0, false);
if (NULL != newObject)
if (nullptr != newObject)
{
newObject->addToWorld();
newObject->persist();
@@ -189,7 +189,7 @@ void PathAutoGenerator::pathAutoGenerate(Vector const & pos_w, float nodeDistanc
void PathAutoGenerator::pathAutoCleanup(Vector const & pos_w, Unicode::String & result)
{
Region const * region = findPathRegion(pos_w);
if (NULL == region)
if (nullptr == region)
{
result += Unicode::narrowToWide("No pathfinding region at position");
return;
@@ -236,7 +236,7 @@ void PathAutoGenerator::pathAutoCleanup(Vector const & pos_w, Unicode::String &
}
#if USE_OBSTACLE_TEMPLATE
if (NULL != s_pathObstacleTemplate && !strcmp(so->getTemplateName(), s_pathObstacleTemplate))
if (nullptr != s_pathObstacleTemplate && !strcmp(so->getTemplateName(), s_pathObstacleTemplate))
{
so->permanentlyDestroy(DeleteReasons::Script);
++obstacleDestroyCount;