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/ScriptMethodsDebug.cpp
+6 -6
View File
@@ -188,7 +188,7 @@ void JNICALL ScriptMethodsDebugNamespace::debugServerConsoleMsg(JNIEnv *env, job
ServerObject * object = 0;
JavaLibrary::getObject(objId, object);
if (object == NULL)
if (object == nullptr)
{
DEBUG_REPORT_LOG(true, ("debugServerConsoleMsg from <unknown>: %s\n",
msgString.c_str()));
@@ -212,8 +212,8 @@ void JNICALL ScriptMethodsDebugNamespace::debugServerConsoleMsg(JNIEnv *env, job
* @param channel the channel to log to
* @param msg the message to log
* @param logger id of the object where the log is coming from
* @param player1 the 1st player for the message (may be null)
* @param player2 the 2nd player for the message (may be null)
* @param player1 the 1st player for the message (may be nullptr)
* @param player2 the 2nd player for the message (may be nullptr)
* @param alwaysLog flag to ignore the disableScriptLogs flag and always log this message
*/
void JNICALL ScriptMethodsDebugNamespace::log(JNIEnv *env, jobject self, jstring channel, jstring msg, jlong logger, jlong player1, jlong player2, jboolean alwaysLog)
@@ -222,7 +222,7 @@ void JNICALL ScriptMethodsDebugNamespace::log(JNIEnv *env, jobject self, jstring
if (channel == 0 || msg == 0)
{
JavaLibrary::throwInternalScriptError("[designer bug] JavaLibrary::log called with null channel or message");
JavaLibrary::throwInternalScriptError("[designer bug] JavaLibrary::log called with nullptr channel or message");
return;
}
@@ -248,7 +248,7 @@ void JNICALL ScriptMethodsDebugNamespace::log(JNIEnv *env, jobject self, jstring
if (player1 != 0)
{
const ServerObject * playerObject = NULL;
const ServerObject * playerObject = nullptr;
if (JavaLibrary::getObject(player1, playerObject))
{
std::string::size_type p = msgStr.find("%TU");
@@ -264,7 +264,7 @@ void JNICALL ScriptMethodsDebugNamespace::log(JNIEnv *env, jobject self, jstring
if (player2 != 0)
{
const ServerObject * playerObject = NULL;
const ServerObject * playerObject = nullptr;
if (JavaLibrary::getObject(player2, playerObject))
{
std::string::size_type p = msgStr.find("%TT");