swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-08-01 02:15:54 -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/serverScript/src/shared/ScriptMethodsInteriors.cpp
+28 -28
View File
@@ -137,7 +137,7 @@ jlong JNICALL ScriptMethodsInteriorsNamespace::createObjectInCell(JNIEnv *env, j
return 0;
std::string templateName;
ServerObject* sourceObject = NULL;
ServerObject* sourceObject = nullptr;
if (!JavaLibrary::getObject(source, sourceObject))
return 0;
templateName = sourceObject->getTemplateName();
@@ -149,7 +149,7 @@ jlong JNICALL ScriptMethodsInteriorsNamespace::_createObjectInCellInternal(JNIEn
{
JavaStringParam localCellName(cellName);
ServerObject * portallizedObject = NULL;
ServerObject * portallizedObject = nullptr;
if (!JavaLibrary::getObject(building, portallizedObject))
return 0;
@@ -183,7 +183,7 @@ jlong JNICALL ScriptMethodsInteriorsNamespace::_createObjectInCellInternal(JNIEn
Transform tr;
tr.setPosition_p(newPos);
ServerObject *newObject = ServerWorld::createNewObject(templateName, tr, cellObject, false);
if (newObject == NULL)
if (newObject == nullptr)
return 0;
//@todo do we need to snap to floor or something?
@@ -226,7 +226,7 @@ jlong JNICALL ScriptMethodsInteriorsNamespace::createObjectInCellAnywhere(JNIEnv
return 0;
std::string templateName;
ServerObject* sourceObject = NULL;
ServerObject* sourceObject = nullptr;
if (!JavaLibrary::getObject(source, sourceObject))
return 0;
templateName = sourceObject->getTemplateName();
@@ -261,7 +261,7 @@ jlong JNICALL ScriptMethodsInteriorsNamespace::_createObjectInCellAnywhereIntern
//@todo need to find a way to get a good location in a cell. For now just use the coordinates of the cell?
JavaStringParam localCellName(cellName);
ServerObject *portallizedObject = NULL;
ServerObject *portallizedObject = nullptr;
if (!JavaLibrary::getObject(building, portallizedObject))
return 0;
@@ -289,7 +289,7 @@ jlong JNICALL ScriptMethodsInteriorsNamespace::_createObjectInCellAnywhereIntern
Transform tr;
tr.setPosition_p(createPosition);
ServerObject *newObject = ServerWorld::createNewObject(templateName, tr, cellObject, false);
if (newObject == NULL)
if (newObject == nullptr)
return 0;
// create an networkId to return
@@ -306,7 +306,7 @@ jlong JNICALL ScriptMethodsInteriorsNamespace::_createObjectInCellAnywhereIntern
jobjectArray JNICALL ScriptMethodsInteriorsNamespace::getCellNames(JNIEnv *env, jobject self, jlong target)
{
ServerObject const *portallizedObject = NULL;
ServerObject const *portallizedObject = nullptr;
if (!JavaLibrary::getObject(target, portallizedObject))
return 0;
@@ -329,7 +329,7 @@ jobjectArray JNICALL ScriptMethodsInteriorsNamespace::getCellNames(JNIEnv *env,
jstring JNICALL ScriptMethodsInteriorsNamespace::getCellName(JNIEnv *env, jobject self, jlong target)
{
CellObject const *cellObject = NULL;
CellObject const *cellObject = nullptr;
if (!JavaLibrary::getObject(target, cellObject))
return 0;
@@ -342,7 +342,7 @@ jstring JNICALL ScriptMethodsInteriorsNamespace::getCellName(JNIEnv *env, jobjec
}
ServerObject const * const portallizedObject = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*cellObject));
if (portallizedObject == NULL)
if (portallizedObject == nullptr)
return 0;
PortalProperty const * const cellProp = portallizedObject->getPortalProperty();
@@ -370,7 +370,7 @@ jstring JNICALL ScriptMethodsInteriorsNamespace::getCellName(JNIEnv *env, jobjec
jlongArray JNICALL ScriptMethodsInteriorsNamespace::getCellIds(JNIEnv *env, jobject self, jlong target)
{
ServerObject const *portallizedObject = NULL;
ServerObject const *portallizedObject = nullptr;
if (!JavaLibrary::getObject(target, portallizedObject))
return 0;
@@ -387,11 +387,11 @@ jlongArray JNICALL ScriptMethodsInteriorsNamespace::getCellIds(JNIEnv *env, jobj
cellIds.reserve(count);
for (int i = 0; i < count; ++i)
{
ServerObject const * cellObject = NULL;
ServerObject const * cellObject = nullptr;
CellProperty const * const cellProp = portalProp->getCell(nameList[i]);
if (cellProp != NULL)
if (cellProp != nullptr)
cellObject = cellProp->getOwner().asServerObject();
if (cellObject != NULL)
if (cellObject != nullptr)
{
cellIds.push_back(cellObject->getNetworkId());
}
@@ -412,7 +412,7 @@ jboolean JNICALL ScriptMethodsInteriorsNamespace::hasCell(JNIEnv *env, jobject s
{
JavaStringParam localCellName(cellName);
ServerObject const * serverObject = NULL;
ServerObject const * serverObject = nullptr;
if (!JavaLibrary::getObject(portallizedObject, serverObject))
{
JAVA_THROW_SCRIPT_EXCEPTION(true, ("JavaLibrary::hasCell passed invalid object"));
@@ -448,7 +448,7 @@ jlong JNICALL ScriptMethodsInteriorsNamespace::getCellId(JNIEnv *env, jobject se
{
JavaStringParam localCellName(cellName);
ServerObject const * serverObject = NULL;
ServerObject const * serverObject = nullptr;
if (!JavaLibrary::getObject(portallizedObject, serverObject))
{
JAVA_THROW_SCRIPT_EXCEPTION(true, ("[script bug] JavaLibrary::getCellId passed invalid object"));
@@ -571,7 +571,7 @@ jobject JNICALL ScriptMethodsInteriorsNamespace::getBuildingEjectLocation(JNIEnv
if (building == 0)
{
DEBUG_WARNING(true, ("[designer bug] getBuildingEjectLocation was passed a NULL building objid"));
DEBUG_WARNING(true, ("[designer bug] getBuildingEjectLocation was passed a nullptr building objid"));
return 0;
}
@@ -598,7 +598,7 @@ jobject JNICALL ScriptMethodsInteriorsNamespace::getBuildingEjectLocation(JNIEnv
CellProperty const *worldCell = CellProperty::getWorldCellProperty();
if (!worldCell)
{
DEBUG_WARNING(true, ("getBuildingEjectLocation get a NULL worldCell back from CellProperty::getWorldCellProperty()"));
DEBUG_WARNING(true, ("getBuildingEjectLocation get a nullptr worldCell back from CellProperty::getWorldCellProperty()"));
return 0;
}
@@ -666,7 +666,7 @@ jlong JNICALL ScriptMethodsInteriorsNamespace::moveHouseItemToPlayer(JNIEnv * /*
{
if (building == 0)
{
DEBUG_WARNING(true, ("[designer bug] moveHouseItemToPlayer was passed a NULL building objid"));
DEBUG_WARNING(true, ("[designer bug] moveHouseItemToPlayer was passed a nullptr building objid"));
return 0;
}
@@ -693,7 +693,7 @@ jlong JNICALL ScriptMethodsInteriorsNamespace::moveHouseItemToPlayer2(JNIEnv * /
{
if (building == 0)
{
DEBUG_WARNING(true, ("[designer bug] moveHouseItemToPlayer2 was passed a NULL building objid"));
DEBUG_WARNING(true, ("[designer bug] moveHouseItemToPlayer2 was passed a nullptr building objid"));
return 0;
}
@@ -721,7 +721,7 @@ void JNICALL ScriptMethodsInteriorsNamespace::deleteAllHouseItems(JNIEnv * /*env
{
if (building == 0)
{
DEBUG_WARNING(true, ("[designer bug] deleteAllHouseItems was passed a NULL building objid"));
DEBUG_WARNING(true, ("[designer bug] deleteAllHouseItems was passed a nullptr building objid"));
return ;
}
@@ -747,11 +747,11 @@ jboolean JNICALL ScriptMethodsInteriorsNamespace::areAllContentsLoaded(JNIEnv *
{
if (building == 0)
{
DEBUG_WARNING(true, ("[designer bug] areAllContentsLoaded was passed a NULL building objid"));
DEBUG_WARNING(true, ("[designer bug] areAllContentsLoaded was passed a nullptr building objid"));
return JNI_FALSE;
}
const BuildingObject * buildingObject = NULL;
const BuildingObject * buildingObject = nullptr;
if (!JavaLibrary::getObject(building, buildingObject))
{
DEBUG_WARNING(true, ("[designer bug] areAllContentsLoaded was passed a non-ServerObject objid"));
@@ -767,11 +767,11 @@ void JNICALL ScriptMethodsInteriorsNamespace::loadBuildingContents(JNIEnv * /*en
{
if (building == 0)
{
DEBUG_WARNING(true, ("[designer bug] loadBuildingContents was passed a NULL building objid"));
DEBUG_WARNING(true, ("[designer bug] loadBuildingContents was passed a nullptr building objid"));
return;
}
BuildingObject * buildingObject = NULL;
BuildingObject * buildingObject = nullptr;
if (!JavaLibrary::getObject(building, buildingObject))
{
DEBUG_WARNING(true, ("[designer bug] loadBuildingContents was passed a non-ServerObject objid"));
@@ -815,9 +815,9 @@ jboolean JNICALL ScriptMethodsInteriorsNamespace::isAtPendingLoadRequestLimit(JN
jstring JNICALL ScriptMethodsInteriorsNamespace::getCellLabel(JNIEnv * env, jobject self, jlong target)
{
CellObject const *cellObject = NULL;
CellObject const *cellObject = nullptr;
if (!JavaLibrary::getObject(target, cellObject))
return NULL;
return nullptr;
JavaString cellLabel(cellObject->getCellLabel());
return cellLabel.getReturnValue();
@@ -833,7 +833,7 @@ jboolean JNICALL ScriptMethodsInteriorsNamespace::setCellLabel(JNIEnv * env, job
if (!JavaLibrary::convert(localCellLabel, cellLabelString))
return JNI_FALSE;
CellObject * cellObject = NULL;
CellObject * cellObject = nullptr;
if (!JavaLibrary::getObject(target, cellObject))
return JNI_FALSE;
@@ -846,7 +846,7 @@ jboolean JNICALL ScriptMethodsInteriorsNamespace::setCellLabel(JNIEnv * env, job
jboolean JNICALL ScriptMethodsInteriorsNamespace::setCellLabelOffset(JNIEnv * env, jobject self, jlong target, jfloat x, jfloat y, jfloat z)
{
CellObject * cellObject = NULL;
CellObject * cellObject = nullptr;
if (!JavaLibrary::getObject(target, cellObject))
return JNI_FALSE;