swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-09-21 06:12:56 -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/ScriptMethodsMount.cpp
+3 -3
View File
@@ -235,7 +235,7 @@ void JNICALL ScriptMethodsMountNamespace::dismountCreature(JNIEnv *env, jobject
CreatureObject *const mountObject = riderObject->getMountedCreature();
if (!mountObject)
{
LOG(LOCAL_LOG_CHANNEL, ("JavaLibrary::dismountCreature(): server id=[%d],rider id=[%s] has RidingMount state but CreatureObject::getMountedCreature() returns NULL, skipping dismount.", GameServer::getInstance().getProcessId(), riderObject->getNetworkId().getValueString().c_str()));
LOG(LOCAL_LOG_CHANNEL, ("JavaLibrary::dismountCreature(): server id=[%d],rider id=[%s] has RidingMount state but CreatureObject::getMountedCreature() returns nullptr, skipping dismount.", GameServer::getInstance().getProcessId(), riderObject->getNetworkId().getValueString().c_str()));
return;
}
@@ -393,7 +393,7 @@ void JNICALL JNICALL ScriptMethodsMountNamespace::makeContainerStateInconsistent
//-- Get the ServerObject from the object id.
if (!containedObjectId)
{
LOG("script-bug", ("makeContainerStateInconsistentTestOnly(): containedObjectId is NULL"));
LOG("script-bug", ("makeContainerStateInconsistentTestOnly(): containedObjectId is nullptr"));
return;
}
@@ -428,7 +428,7 @@ void JNICALL JNICALL ScriptMethodsMountNamespace::makeContainerStateInconsistent
Container* container = ContainerInterface::getContainer(*containerObject);
if (!container)
{
LOG("script-bug", ("makeContainerStateInconsistentTestOnly(): containerObject [%s] returned a NULL container", containerObject->getNetworkId().getValueString().c_str()));
LOG("script-bug", ("makeContainerStateInconsistentTestOnly(): containerObject [%s] returned a nullptr container", containerObject->getNetworkId().getValueString().c_str()));
return;
}