swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-10-19 09:02:53 -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/serverGame/src/shared/controller/ServerController.cpp
+12 -12
View File
@@ -55,7 +55,7 @@
CellProperty const * getCell(Object const * obj)
{
if(obj == NULL) return NULL;
if(obj == nullptr) return nullptr;
return obj->getCellProperty();
}
@@ -74,7 +74,7 @@ Vector movePointBetweenCells ( Object const * oldCellObject, Object const * new
Transform toWorld = Transform::identity;
Transform toCell = Transform::identity;
if(oldCellObject != NULL)
if(oldCellObject != nullptr)
{
CellProperty const * oldCell = getCell(oldCellObject);
@@ -84,7 +84,7 @@ Vector movePointBetweenCells ( Object const * oldCellObject, Object const * new
}
}
if(newCellObject != NULL)
if(newCellObject != nullptr)
{
CellProperty const * newCell = getCell(newCellObject);
@@ -115,7 +115,7 @@ Transform moveTransformBetweenCells ( Object const * oldCellObject, Object const
Transform toWorld = Transform::identity;
Transform toCell = Transform::identity;
if(oldCellObject != NULL)
if(oldCellObject != nullptr)
{
CellProperty const * oldCell = getCell(oldCellObject);
@@ -125,7 +125,7 @@ Transform moveTransformBetweenCells ( Object const * oldCellObject, Object const
}
}
if(newCellObject != NULL)
if(newCellObject != nullptr)
{
CellProperty const * newCell = getCell(newCellObject);
@@ -220,7 +220,7 @@ void ServerController::setAuthoritative(bool newAuthoritative)
{
if (!newAuthoritative && m_bHasGoal && m_goalCellObject)
{
m_goalCellObject = NULL;
m_goalCellObject = nullptr;
m_bHasGoal = false;
m_bAtGoal = true;
}
@@ -420,7 +420,7 @@ bool changeCells(ServerObject &object, ServerObject *newCellObject)
// ----------
if (newCellObject == NULL)
if (newCellObject == nullptr)
{
// Object was in a cell and is moving to the world, transfer from cell container to world
@@ -428,7 +428,7 @@ bool changeCells(ServerObject &object, ServerObject *newCellObject)
Transform const &newTransform = oldCellObject->getTransform_o2w().rotateTranslate_l2p(objectTransform);
Container::ContainerErrorCode tmp = Container::CEC_Success;
result = ContainerInterface::transferItemToWorld(object, newTransform, NULL, tmp);
result = ContainerInterface::transferItemToWorld(object, newTransform, nullptr, tmp);
if (!result)
{
@@ -444,13 +444,13 @@ bool changeCells(ServerObject &object, ServerObject *newCellObject)
CellProperty * const pCell = ContainerInterface::getCell(*newCellObject);
DEBUG_REPORT_LOG(pCell == NULL, ("changeCells - Received transform with parent to a non-cell object. This should only happen from the DB\n"));
DEBUG_REPORT_LOG(pCell == nullptr, ("changeCells - Received transform with parent to a non-cell object. This should only happen from the DB\n"));
if (pCell)
{
Transform objectTransform = object.getTransform_o2p();
Container::ContainerErrorCode tmp = Container::CEC_Success;
result = ContainerInterface::transferItemToCell(*newCellObject, object, NULL, tmp);
result = ContainerInterface::transferItemToCell(*newCellObject, object, nullptr, tmp);
if (!result)
{
@@ -537,7 +537,7 @@ void ServerController::handleNetUpdateTransform(const MessageQueueDataTransform&
return;
}
setGoal( message.getTransform(), NULL );
setGoal( message.getTransform(), nullptr );
}
//-----------------------------------------------------------------------
@@ -566,7 +566,7 @@ void ServerController::handleNetUpdateTransformWithParent(const MessageQueueData
#if 1
Transform start = Transform::identity;
start.setPosition_p(ConfigServerGame::getStartingPosition());
setGoal( start, NULL );
setGoal( start, nullptr );
#endif
return;
}