swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-09-25 10:12:52 -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/serverGame/src/shared/object/ObjectFactory.cpp
+3 -3
View File
@@ -53,14 +53,14 @@ ServerObject * ServerWorld::createObjectFromTemplate(uint32 templateCrc, const N
WARNING(!objectTemplate, ("Missing Template! Can't create object from "
"template crc %lu(%s), file not found", templateCrc,
ObjectTemplateList::lookUp(templateCrc).getString()));
Object *object = NULL;
Object *object = nullptr;
if (objectTemplate)
{
ServerObjectTemplate const * serverObjectTemplate = objectTemplate->asServerObjectTemplate();
if ( (serverObjectTemplate == NULL)
|| ((serverObjectTemplate != NULL) && (ObjectTemplateList::lookUp(serverObjectTemplate->getSharedTemplate().c_str()).getCrc() != 0)))
if ( (serverObjectTemplate == nullptr)
|| ((serverObjectTemplate != nullptr) && (ObjectTemplateList::lookUp(serverObjectTemplate->getSharedTemplate().c_str()).getCrc() != 0)))
{
PROFILER_AUTO_BLOCK_DEFINE("ObjectTemplate::createObject");
object = objectTemplate->createObject();