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-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/serverScript/src/shared/ScriptMethodsChat.cpp
+6 -6
View File
@@ -218,7 +218,7 @@ jstring JNICALL ScriptMethodsChatNamespace::chatPackOutOfBandWaypointData(JNIEnv
Unicode::String n; //name
StringId nid; //nameId
//-- target may be null, we'll just start a new string
//-- target may be nullptr, we'll just start a new string
if (target)
{
const JavaStringParam jtarget(target);
@@ -229,7 +229,7 @@ jstring JNICALL ScriptMethodsChatNamespace::chatPackOutOfBandWaypointData(JNIEnv
}
}
//-- if planet is null, just use the current sceneId
//-- if planet is nullptr, just use the current sceneId
if (planet)
{
const JavaStringParam jplanet(planet);
@@ -304,7 +304,7 @@ jstring JNICALL ScriptMethodsChatNamespace::chatPackOutOfBandWaypoint(JNIEnv * e
if (!source)
{
DEBUG_WARNING (true, ("ScriptMethodsChat JavaLibrary::chatPackOutOfBandWaypoint failed null source"));
DEBUG_WARNING (true, ("ScriptMethodsChat JavaLibrary::chatPackOutOfBandWaypoint failed nullptr source"));
return 0;
}
@@ -340,7 +340,7 @@ jstring JNICALL ScriptMethodsChatNamespace::packOutOfBandProsePackage(JNIEnv * e
if (!stringId)
{
DEBUG_WARNING (true, ("JavaLibrary::packOutOfBandProsePackage attempt to pack prose package with null stringId"));
DEBUG_WARNING (true, ("JavaLibrary::packOutOfBandProsePackage attempt to pack prose package with nullptr stringId"));
return 0;
}
@@ -644,10 +644,10 @@ void JNICALL ScriptMethodsChatNamespace::chatSendSystemMessageObjId(JNIEnv * env
if(!JavaLibrary::getObject(_to, player))
{
DEBUG_WARNING (true, ("ScriptMethodsChat JavaLibrary::chatSendSystemMessageObjId failed bad source object (not null)"));
DEBUG_WARNING (true, ("ScriptMethodsChat JavaLibrary::chatSendSystemMessageObjId failed bad source object (not nullptr)"));
if (ConfigServerScript::allowDebugConsoleMessages())
{
fprintf(stderr, "WARNING: JavaLibrary::chatSendSystemMessageObjId: failed bad source object (not null)\n");
fprintf(stderr, "WARNING: JavaLibrary::chatSendSystemMessageObjId: failed bad source object (not nullptr)\n");
JavaLibrary::printJavaStack();
}
return;