swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-09-28 13:12:56 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 3e4cc36e7e.
This commit is contained in:
DarthArgus
2016-02-11 19:44:31 -06:00
parent 3e4cc36e7e
commit 8e2160f33e
937 changed files with 14983 additions and 14983 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverScript/src/shared/ScriptMethodsHyperspace.cpp
+18 -18
View File
@@ -131,10 +131,10 @@ void JNICALL ScriptMethodsHyperspaceNamespace::hyperspacePlayerToLocation(JNIEnv
// Make sure the ship is not docking
Controller const * const controller = (shipObject != nullptr) ? shipObject->getController() : nullptr;
ShipController const * const shipController = (controller != nullptr) ? controller->asShipController() : nullptr;
Controller const * const controller = (shipObject != NULL) ? shipObject->getController() : NULL;
ShipController const * const shipController = (controller != NULL) ? controller->asShipController() : NULL;
if ( (shipController != nullptr)
if ( (shipController != NULL)
&& shipController->isDocking())
{
JAVA_THROW_SCRIPT_EXCEPTION(true, ("hyperspacePlayerToLocation - Hyperspacing is not allowed on ships that are currently docking: %s", shipObject->getDebugInformation().c_str()));
@@ -211,10 +211,10 @@ void JNICALL ScriptMethodsHyperspaceNamespace::hyperspacePlayerToLocationCellNam
// Make sure the ship is not docking
Controller const * const controller = (shipObject != nullptr) ? shipObject->getController() : nullptr;
ShipController const * const shipController = (controller != nullptr) ? controller->asShipController() : nullptr;
Controller const * const controller = (shipObject != NULL) ? shipObject->getController() : NULL;
ShipController const * const shipController = (controller != NULL) ? controller->asShipController() : NULL;
if ( (shipController != nullptr)
if ( (shipController != NULL)
&& shipController->isDocking())
{
JAVA_THROW_SCRIPT_EXCEPTION(true, ("hyperspacePlayerToLocation - Hyperspacing is not allowed on ships that are currently docking: %s", shipObject->getDebugInformation().c_str()));
@@ -272,7 +272,7 @@ void JNICALL ScriptMethodsHyperspaceNamespace::hyperspacePlayerToHyperspacePoint
return;
}
CreatureObject * const playerCreature = playerObject ? playerObject->asCreatureObject() : nullptr;
CreatureObject * const playerCreature = playerObject ? playerObject->asCreatureObject() : NULL;
if(!playerCreature)
{
JAVA_THROW_SCRIPT_EXCEPTION(true, ("hyperspacePlayerToHyperspacePoint - player is not a creature"));
@@ -309,10 +309,10 @@ void JNICALL ScriptMethodsHyperspaceNamespace::hyperspacePlayerToHyperspacePoint
// Make sure the ship is not docking
Controller const * const controller = (shipObject != nullptr) ? shipObject->getController() : nullptr;
ShipController const * const shipController = (controller != nullptr) ? controller->asShipController() : nullptr;
Controller const * const controller = (shipObject != NULL) ? shipObject->getController() : NULL;
ShipController const * const shipController = (controller != NULL) ? controller->asShipController() : NULL;
if ( (shipController != nullptr)
if ( (shipController != NULL)
&& shipController->isDocking())
{
JAVA_THROW_SCRIPT_EXCEPTION(true, ("hyperspacePlayerToHyperspacePoint - Hyperspacing is not allowed on ships that are currently docking: %s", shipObject->getDebugInformation().c_str()));
@@ -395,7 +395,7 @@ void JNICALL ScriptMethodsHyperspaceNamespace::hyperspacePrepareShipOnClient(JNI
return;
}
CreatureObject * const playerCreature = playerObject ? playerObject->asCreatureObject() : nullptr;
CreatureObject * const playerCreature = playerObject ? playerObject->asCreatureObject() : NULL;
if(playerCreature == 0)
{
JAVA_THROW_SCRIPT_EXCEPTION(true, ("hyperspacePlayerToHyperspacePoint - player is not a creature"));
@@ -425,8 +425,8 @@ void JNICALL ScriptMethodsHyperspaceNamespace::hyperspacePrepareShipOnClient(JNI
if (HyperspaceManager::getHyperspacePoint(hyperspacePoint, location))
{
Controller const * const controller = (shipObject != nullptr) ? shipObject->getController() : nullptr;
ShipController const * const shipController = (controller != nullptr) ? controller->asShipController() : nullptr;
Controller const * const controller = (shipObject != NULL) ? shipObject->getController() : NULL;
ShipController const * const shipController = (controller != NULL) ? controller->asShipController() : NULL;
if (shipController != 0)
{
@@ -467,7 +467,7 @@ void JNICALL ScriptMethodsHyperspaceNamespace::hyperspaceRestoreShipOnClientFrom
return;
}
CreatureObject * const playerCreature = playerObject ? playerObject->asCreatureObject() : nullptr;
CreatureObject * const playerCreature = playerObject ? playerObject->asCreatureObject() : NULL;
if(playerCreature == 0)
{
JAVA_THROW_SCRIPT_EXCEPTION(true, ("hyperspacePlayerToHyperspacePoint - player is not a creature"));
@@ -482,8 +482,8 @@ void JNICALL ScriptMethodsHyperspaceNamespace::hyperspaceRestoreShipOnClientFrom
return;
}
Controller const * const controller = (shipObject != nullptr) ? shipObject->getController() : nullptr;
ShipController const * const shipController = (controller != nullptr) ? controller->asShipController() : nullptr;
Controller const * const controller = (shipObject != NULL) ? shipObject->getController() : NULL;
ShipController const * const shipController = (controller != NULL) ? controller->asShipController() : NULL;
if (shipController != 0)
{
@@ -514,7 +514,7 @@ jstring JNICALL ScriptMethodsHyperspaceNamespace::getSceneForHyperspacePoint(JNI
if (!JavaLibrary::convert(localHyperspacePoint, hyperspacePoint))
{
JAVA_THROW_SCRIPT_EXCEPTION(true, ("getSceneForHyperspacePoint - could not get hyperspace point name"));
return nullptr;
return NULL;
}
if(HyperspaceManager::isValidHyperspacePoint(hyperspacePoint))
@@ -528,7 +528,7 @@ jstring JNICALL ScriptMethodsHyperspaceNamespace::getSceneForHyperspacePoint(JNI
return str.getReturnValue();
}
}
return nullptr;
return NULL;
}
//------------------------------------------------------------------------------------------------