swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-31 01:15:48 -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/ScriptMethodsMission.cpp
+52 -52
View File
@@ -170,17 +170,17 @@ void JNICALL ScriptMethodsMissionNamespace::abortMission(JNIEnv * env, jobject s
}
else
{
DEBUG_WARNING(true, ("[designer bug] abortMission() missionObject is NULL"));
DEBUG_WARNING(true, ("[designer bug] abortMission() missionObject is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] abortMission() self is NULL"));
DEBUG_WARNING(true, ("[programmer bug] abortMission() self is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] abortMission() JNIEnv is NULL"));
DEBUG_WARNING(true, ("[programmer bug] abortMission() JNIEnv is nullptr"));
}
}
@@ -283,17 +283,17 @@ jstring JNICALL ScriptMethodsMissionNamespace::getMissionCreator(JNIEnv * env, j
}
else
{
DEBUG_WARNING(true, ("[designer bug] getMissionCreator() missionObject (parameter 1) is NULL"));
DEBUG_WARNING(true, ("[designer bug] getMissionCreator() missionObject (parameter 1) is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] getMissionCreator() self is NULL"));
DEBUG_WARNING(true, ("[programmer bug] getMissionCreator() self is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] getMissionCreator() JNIEnv is NULL"));
DEBUG_WARNING(true, ("[programmer bug] getMissionCreator() JNIEnv is nullptr"));
}
return result;
}
@@ -304,13 +304,13 @@ jobject JNICALL ScriptMethodsMissionNamespace::getMissionDescription(JNIEnv * en
{
if(! env)
{
DEBUG_WARNING(true, ("[programmer bug] getMissionDescription() JNIEnv is NULL"));
DEBUG_WARNING(true, ("[programmer bug] getMissionDescription() JNIEnv is nullptr"));
return 0;
}
if(! missionObject)
{
DEBUG_WARNING(true, ("[designer bug] getMissionDescription() missionObject (parameter 1) is NULL"));
DEBUG_WARNING(true, ("[designer bug] getMissionDescription() missionObject (parameter 1) is nullptr"));
return 0;
}
@@ -352,17 +352,17 @@ jint JNICALL ScriptMethodsMissionNamespace::getMissionDifficulty(JNIEnv * env, j
}
else
{
DEBUG_WARNING(true, ("[designer bug] getMissionDifficulty() missionObject (parameter 1) is NULL"));
DEBUG_WARNING(true, ("[designer bug] getMissionDifficulty() missionObject (parameter 1) is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] getMissionDifficulty() self is NULL"));
DEBUG_WARNING(true, ("[programmer bug] getMissionDifficulty() self is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] getMissionDifficulty() JNIEnv is NULL"));
DEBUG_WARNING(true, ("[programmer bug] getMissionDifficulty() JNIEnv is nullptr"));
}
return result;
}
@@ -390,7 +390,7 @@ jobject JNICALL ScriptMethodsMissionNamespace::getMissionEndLocation(JNIEnv * en
}
else
{
DEBUG_WARNING(true, ("[designer bug] getMissionEndLocation() missionObject (parameter1) is NULL"));
DEBUG_WARNING(true, ("[designer bug] getMissionEndLocation() missionObject (parameter1) is nullptr"));
}
return 0;
}
@@ -418,17 +418,17 @@ jint JNICALL ScriptMethodsMissionNamespace::getMissionReward(JNIEnv * env, jobje
}
else
{
DEBUG_WARNING(true, ("[designer bug] getMissionReward() missionObject (parameter 1) is NULL"));
DEBUG_WARNING(true, ("[designer bug] getMissionReward() missionObject (parameter 1) is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] getMissionReward() self is NULL"));
DEBUG_WARNING(true, ("[programmer bug] getMissionReward() self is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] getMissionReward() JNIEnv is NULL"));
DEBUG_WARNING(true, ("[programmer bug] getMissionReward() JNIEnv is nullptr"));
}
return result;
}
@@ -454,7 +454,7 @@ jobject JNICALL ScriptMethodsMissionNamespace::getMissionStartLocation(JNIEnv *
}
else
{
DEBUG_WARNING(true, ("[designer bug] getMissionStartLocation() missionObject (parameter 1) is NULL"));
DEBUG_WARNING(true, ("[designer bug] getMissionStartLocation() missionObject (parameter 1) is nullptr"));
}
return 0;
}
@@ -483,7 +483,7 @@ jstring JNICALL ScriptMethodsMissionNamespace::getMissionTargetName(JNIEnv * env
}
else
{
DEBUG_WARNING(true, ("[designer bug] getMissionTargetName() missionObject (parameter 1) is NULL"));
DEBUG_WARNING(true, ("[designer bug] getMissionTargetName() missionObject (parameter 1) is nullptr"));
}
return 0;
}
@@ -494,7 +494,7 @@ jobject JNICALL ScriptMethodsMissionNamespace::getMissionTitle(JNIEnv * env, job
{
if(! missionObject)
{
DEBUG_WARNING(true, ("[designer bug] getMissionTitle() missionObject (parameter 1) is NULL"));
DEBUG_WARNING(true, ("[designer bug] getMissionTitle() missionObject (parameter 1) is nullptr"));
return 0;
}
@@ -537,7 +537,7 @@ jstring JNICALL ScriptMethodsMissionNamespace::getMissionType(JNIEnv * env, jobj
}
else
{
DEBUG_WARNING(true, ("[designer bug] getMissionType() missionObject (parameter 1) is NULL"));
DEBUG_WARNING(true, ("[designer bug] getMissionType() missionObject (parameter 1) is nullptr"));
}
return 0;
}
@@ -556,7 +556,7 @@ jlong JNICALL ScriptMethodsMissionNamespace::getMissionHolder(JNIEnv * env, jobj
MissionObject * mo = 0;
if(JavaLibrary::getObject(missionObject, mo))
{
if (mo != NULL && mo->getMissionHolderId() != NetworkId::cms_invalid)
if (mo != nullptr && mo->getMissionHolderId() != NetworkId::cms_invalid)
{
result = (mo->getMissionHolderId()).getValue();
}
@@ -572,17 +572,17 @@ jlong JNICALL ScriptMethodsMissionNamespace::getMissionHolder(JNIEnv * env, jobj
}
else
{
DEBUG_WARNING(true, ("[designer bug] getMissionHolder() missionObject (parameter 1) is NULL"));
DEBUG_WARNING(true, ("[designer bug] getMissionHolder() missionObject (parameter 1) is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] getMissionHolder() self is NULL"));
DEBUG_WARNING(true, ("[programmer bug] getMissionHolder() self is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] getMissionHolder() JNIEnv is NULL"));
DEBUG_WARNING(true, ("[programmer bug] getMissionHolder() JNIEnv is nullptr"));
}
return result;
}
@@ -609,7 +609,7 @@ jstring JNICALL ScriptMethodsMissionNamespace::getMissionRootScriptName(JNIEnv *
}
else
{
DEBUG_WARNING(true, ("[designer bug] getMissionRootScriptName() missionObject (parameter 1) is NULL"));
DEBUG_WARNING(true, ("[designer bug] getMissionRootScriptName() missionObject (parameter 1) is nullptr"));
}
return 0;
}
@@ -641,22 +641,22 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionCreator(JNIEnv *env, jobje
}
else
{
DEBUG_WARNING(true, ("[designer bug] setMissionCreator() creator (parameter 2) is NULL"));
DEBUG_WARNING(true, ("[designer bug] setMissionCreator() creator (parameter 2) is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[designer bug] setMissionCreator() missionObject (parameter 1) is NULL"));
DEBUG_WARNING(true, ("[designer bug] setMissionCreator() missionObject (parameter 1) is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] setMissionCreator() self is NULL"));
DEBUG_WARNING(true, ("[programmer bug] setMissionCreator() self is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] setMissionCreator() JNIEnv is NULL"));
DEBUG_WARNING(true, ("[programmer bug] setMissionCreator() JNIEnv is nullptr"));
}
}
@@ -686,7 +686,7 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionDescription(JNIEnv * env,
}
else
{
DEBUG_WARNING(true, ("[designer bug] setMissionDescription() missionObject (parameter 1) is NULL"));
DEBUG_WARNING(true, ("[designer bug] setMissionDescription() missionObject (parameter 1) is nullptr"));
}
}
@@ -708,7 +708,7 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionDifficulty(JNIEnv * env, j
}
else
{
DEBUG_WARNING(true, ("[designer bug] setMissionDifficulty() missionObject (parameter 1) is NULL"));
DEBUG_WARNING(true, ("[designer bug] setMissionDifficulty() missionObject (parameter 1) is nullptr"));
}
}
@@ -764,17 +764,17 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionReward(JNIEnv * env, jobje
}
else
{
DEBUG_WARNING(true, ("[designer bug] setMissionProfessionRank() missionObject (parameter 1) is NULL"));
DEBUG_WARNING(true, ("[designer bug] setMissionProfessionRank() missionObject (parameter 1) is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] setMissionProfessionRank() self is NULL"));
DEBUG_WARNING(true, ("[programmer bug] setMissionProfessionRank() self is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] setMissionProfessionRank() JNIEnv is NULL"));
DEBUG_WARNING(true, ("[programmer bug] setMissionProfessionRank() JNIEnv is nullptr"));
}
}
@@ -806,7 +806,7 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionStartLocation(JNIEnv * env
}
else
{
DEBUG_WARNING(true, ("[designer bug] setMissionStartLocation() location (parameter 2) is NULL"));
DEBUG_WARNING(true, ("[designer bug] setMissionStartLocation() location (parameter 2) is nullptr"));
}
}
else
@@ -816,17 +816,17 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionStartLocation(JNIEnv * env
}
else
{
DEBUG_WARNING(true, ("[designer bug] setMissionStartLocation() missionObject (parameter 1) is NULL"));
DEBUG_WARNING(true, ("[designer bug] setMissionStartLocation() missionObject (parameter 1) is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] setMissionStartLocation() self is NULL"));
DEBUG_WARNING(true, ("[programmer bug] setMissionStartLocation() self is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] setMissionStartLocation() JNIEnv is NULL"));
DEBUG_WARNING(true, ("[programmer bug] setMissionStartLocation() JNIEnv is nullptr"));
}
}
@@ -856,17 +856,17 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionTargetAppearance(JNIEnv *
}
else
{
DEBUG_WARNING(true, ("[designer bug] setMissionTarget() missionObject (parameter 1) is NULL"));
DEBUG_WARNING(true, ("[designer bug] setMissionTarget() missionObject (parameter 1) is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] setMissionTarget() self is NULL"));
DEBUG_WARNING(true, ("[programmer bug] setMissionTarget() self is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] setMissionTarget() JNIEnv is NULL"));
DEBUG_WARNING(true, ("[programmer bug] setMissionTarget() JNIEnv is nullptr"));
}
}
@@ -896,17 +896,17 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionTargetName(JNIEnv * env, j
}
else
{
DEBUG_WARNING(true, ("[designer bug] setMissionTarget() missionObject (parameter 1) is NULL"));
DEBUG_WARNING(true, ("[designer bug] setMissionTarget() missionObject (parameter 1) is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] setMissionTarget() self is NULL"));
DEBUG_WARNING(true, ("[programmer bug] setMissionTarget() self is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] setMissionTarget() JNIEnv is NULL"));
DEBUG_WARNING(true, ("[programmer bug] setMissionTarget() JNIEnv is nullptr"));
}
}
@@ -936,7 +936,7 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionTitle(JNIEnv * env, jobjec
}
else
{
DEBUG_WARNING(true, ("[designer bug] setMissionTitle() missionObject (parameter 1) is NULL"));
DEBUG_WARNING(true, ("[designer bug] setMissionTitle() missionObject (parameter 1) is nullptr"));
}
}
@@ -969,22 +969,22 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionType(JNIEnv *env, jobject
}
else
{
DEBUG_WARNING(true, ("[designer bug] setMissionType() typeName (parameter 2) is NULL"));
DEBUG_WARNING(true, ("[designer bug] setMissionType() typeName (parameter 2) is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[designer bug] setMissionType() missionObject (parameter 1) is NULL"));
DEBUG_WARNING(true, ("[designer bug] setMissionType() missionObject (parameter 1) is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] setMissionType() self is NULL"));
DEBUG_WARNING(true, ("[programmer bug] setMissionType() self is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] setMissionType() JNIEnv is NULL"));
DEBUG_WARNING(true, ("[programmer bug] setMissionType() JNIEnv is nullptr"));
}
}
@@ -1022,22 +1022,22 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionRootScriptName(JNIEnv *env
}
else
{
DEBUG_WARNING(true, ("[designer bug] setMissionRootScriptName() rootScriptName (parameter 2) is NULL"));
DEBUG_WARNING(true, ("[designer bug] setMissionRootScriptName() rootScriptName (parameter 2) is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[designer bug] setMissionRootScriptName() missionObject (parameter 1) is NULL"));
DEBUG_WARNING(true, ("[designer bug] setMissionRootScriptName() missionObject (parameter 1) is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] setMissionRootScriptName() self is NULL"));
DEBUG_WARNING(true, ("[programmer bug] setMissionRootScriptName() self is nullptr"));
}
}
else
{
DEBUG_WARNING(true, ("[programmer bug] setMissionRootScriptName() JNIEnv is NULL"));
DEBUG_WARNING(true, ("[programmer bug] setMissionRootScriptName() JNIEnv is nullptr"));
}
}