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/collision/CollisionCallbacks.cpp
+6 -6
View File
@@ -86,7 +86,7 @@ void CollisionCallbacksNamespace::remove()
int CollisionCallbacksNamespace::convertObjectToIndex(Object * const object)
{
FATAL(!object, ("CollisionCallbacksNamespace::convertObjectToIndex: object == NULL."));
FATAL(!object, ("CollisionCallbacksNamespace::convertObjectToIndex: object == nullptr."));
ServerObject const * serverObject = object->asServerObject();
if (serverObject)
@@ -99,11 +99,11 @@ int CollisionCallbacksNamespace::convertObjectToIndex(Object * const object)
bool CollisionCallbacksNamespace::onHitDoCollisionWith(Object * const object, Object * const wasHitByThisObject)
{
DEBUG_WARNING(!object, ("CollisionCallbacksNamespace::onHitDoCollisionWith: Object == NULL"));
DEBUG_WARNING(!wasHitByThisObject, ("CollisionCallbacksNamespace::onHitDoCollisionWith: wasHitByThisObject == NULL"));
DEBUG_WARNING(!object, ("CollisionCallbacksNamespace::onHitDoCollisionWith: Object == nullptr"));
DEBUG_WARNING(!wasHitByThisObject, ("CollisionCallbacksNamespace::onHitDoCollisionWith: wasHitByThisObject == nullptr"));
ShipObject * shipObject = safe_cast<ShipObject *>(object);
DEBUG_WARNING(!shipObject, ("CollisionCallbacksNamespace::onHitDoCollisionWith: shipObject == NULL"));
DEBUG_WARNING(!shipObject, ("CollisionCallbacksNamespace::onHitDoCollisionWith: shipObject == nullptr"));
CollisionCallbackManager::Result result;
if (CollisionCallbackManager::intersectAndReflect(object, wasHitByThisObject, result))
@@ -123,10 +123,10 @@ bool CollisionCallbacksNamespace::onHitDoCollisionWith(Object * const object, Ob
bool CollisionCallbacksNamespace::onDoCollisionWithTerrain(Object * const object)
{
DEBUG_FATAL (!object, ("CollisionCallbacksNamespace::onDoCollisionWithTerrain: Object == NULL"));
DEBUG_FATAL (!object, ("CollisionCallbacksNamespace::onDoCollisionWithTerrain: Object == nullptr"));
ShipObject * shipObject = safe_cast<ShipObject *>(object);
DEBUG_FATAL (!shipObject, ("CollisionCallbacksNamespace::onDoCollisionWithTerrain: shipObject == NULL"));
DEBUG_FATAL (!shipObject, ("CollisionCallbacksNamespace::onDoCollisionWithTerrain: shipObject == nullptr"));
CollisionCallbackManager::Result result;
if (CollisionCallbackManager::intersectAndReflectWithTerrain(object, result))