swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-10-15 05:13:17 -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/CityPathNode.cpp
+14 -14
View File
@@ -46,7 +46,7 @@ CityPathNode::CityPathNode ( Vector const & position_w, NetworkId const & source
m_source(sourceId),
m_creator(),
m_relativePosition_o(Vector::zero),
m_spatialHandle(NULL),
m_spatialHandle(nullptr),
m_debugId( gs_debugIdCounter++ )
{
snapToTerrain();
@@ -59,7 +59,7 @@ CityPathNode::CityPathNode ( Vector const & position_w, NetworkId const & source
m_source(sourceId),
m_creator(creatorId),
m_relativePosition_o(Vector::zero),
m_spatialHandle(NULL),
m_spatialHandle(nullptr),
m_debugId( gs_debugIdCounter++ )
{
updateRelativePosition();
@@ -158,7 +158,7 @@ void CityPathNode::loadInfoFromObjvars ( void )
{
ServerObject const * sourceObject = getSourceObject();
if(sourceObject == NULL) return;
if(sourceObject == nullptr) return;
const DynamicVariableList & objvars = sourceObject->getObjVars();
@@ -188,7 +188,7 @@ void CityPathNode::loadEdgesFromObjvars ( void )
{
ServerObject const * sourceObject = getSourceObject();
if(sourceObject == NULL) return;
if(sourceObject == nullptr) return;
DynamicVariableList const & objvars = sourceObject->getObjVars();
@@ -203,11 +203,11 @@ void CityPathNode::loadEdgesFromObjvars ( void )
{
ServerObject * serverObject = ServerWorld::findObjectByNetworkId( idList[i] );
if(serverObject == NULL) continue;
if(serverObject == nullptr) continue;
CityPathNode * otherNode = _getGraph()->findNodeForObject(*serverObject);
if(otherNode == NULL) continue;
if(otherNode == nullptr) continue;
addEdge(otherNode->getIndex());
otherNode->addEdge(getIndex());
@@ -233,7 +233,7 @@ void CityPathNode::saveInfoToObjvars ( void )
{
ServerObject * sourceObject = getSourceObject();
if(sourceObject == NULL) return;
if(sourceObject == nullptr) return;
// ----------
@@ -294,7 +294,7 @@ void CityPathNode::saveEdgesToObjvars ( void )
CityPathNode * neighborNode = _getGraph()->_getNode(neighborIndex);
if(neighborNode == NULL) continue;
if(neighborNode == nullptr) continue;
NetworkId const & neighborSourceId = neighborNode->getSourceId();
@@ -327,7 +327,7 @@ void CityPathNode::saveNeighbors ( void )
CityPathNode * neighborNode = _getGraph()->_getNode(neighborIndex);
if(neighborNode == NULL) continue;
if(neighborNode == nullptr) continue;
neighborNode->saveToObjvars();
}
@@ -420,7 +420,7 @@ bool CityPathNode::sanityCheck ( bool doWarnings ) const
CityPathNode const * neighborNode = _getGraph()->_getNode(neighborIndex);
if(neighborNode == NULL)
if(neighborNode == nullptr)
{
DEBUG_WARNING(doWarnings,("CityPathNode::sanityCheck - Node has an edge to a non-existent node\n"));
insaneCount++;
@@ -458,7 +458,7 @@ bool CityPathNode::sanityCheck ( bool doWarnings ) const
CityPathNode const * nodeA = this;
CityPathNode const * nodeB = _getGraph()->_getNode(getNeighbor(i));
if(nodeB == NULL) continue;
if(nodeB == nullptr) continue;
if(nodeB->getType() == PNT_CityBuilding) continue;
@@ -493,7 +493,7 @@ void CityPathNode::reload ( void )
{
ServerObject const * sourceObject = getSourceObject();
if(sourceObject == NULL) return;
if(sourceObject == nullptr) return;
// ----------
@@ -521,7 +521,7 @@ bool CityPathNode::hasEdgeTo ( NetworkId const & neighborId ) const
CityPathNode const * neighborNode = _getGraph()->_getNode(neighborIndex);
if(neighborNode == NULL) continue;
if(neighborNode == nullptr) continue;
if(neighborNode->getSourceId() == neighborId) return true;
}
@@ -535,7 +535,7 @@ void CityPathNode::snapToTerrain ( void )
{
CellProperty const * cell = getCell();
if((cell == NULL) || (cell == CellProperty::getWorldCellProperty()))
if((cell == nullptr) || (cell == CellProperty::getWorldCellProperty()))
{
Vector pos_w = getPosition_w();