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/ScriptMethodsForm.cpp
+2 -2
View File
@@ -48,7 +48,7 @@ const JNINativeMethod NATIVES[] = {
jboolean JNICALL ScriptMethodsFormNamespace::editFormData(JNIEnv * env, jobject self, jlong player, jlong jObjectToEdit, jobjectArray jKeys, jobjectArray jValues)
{
UNREF(self);
ServerObject * playerServerObject = NULL;
ServerObject * playerServerObject = nullptr;
if (!JavaLibrary::getObject(player, playerServerObject) || !playerServerObject)
{
JAVA_THROW_SCRIPT_EXCEPTION(true, ("[script bug] can't get player in editFormData"));
@@ -62,7 +62,7 @@ jboolean JNICALL ScriptMethodsFormNamespace::editFormData(JNIEnv * env, jobject
return JNI_FALSE;
}
ServerObject * objectToEditServerObject = NULL;
ServerObject * objectToEditServerObject = nullptr;
if (!JavaLibrary::getObject(jObjectToEdit, objectToEditServerObject) || !objectToEditServerObject)
{
JAVA_THROW_SCRIPT_EXCEPTION(true, ("[script bug] objectToEdit is not a ServerObject in editFormData"));