swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-09-23 08:13:30 -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/objectTemplate/ServerGroupObjectTemplate.cpp
+5 -5
View File
@@ -95,10 +95,10 @@ Tag ServerGroupObjectTemplate::getTemplateVersion(void) const
*/
Tag ServerGroupObjectTemplate::getHighestTemplateVersion(void) const
{
if (m_baseData == NULL)
if (m_baseData == nullptr)
return m_templateVersion;
const ServerGroupObjectTemplate * base = dynamic_cast<const ServerGroupObjectTemplate *>(m_baseData);
if (base == NULL)
if (base == nullptr)
return m_templateVersion;
return std::max(m_templateVersion, base->getHighestTemplateVersion());
} // ServerGroupObjectTemplate::getHighestTemplateVersion
@@ -151,12 +151,12 @@ char paramName[MAX_NAME_SIZE];
file.read_string(baseFilename);
file.exitChunk();
const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
if (m_baseData == base && base != NULL)
DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str()));
if (m_baseData == base && base != nullptr)
base->releaseReference();
else
{
if (m_baseData != NULL)
if (m_baseData != nullptr)
m_baseData->releaseReference();
m_baseData = base;
}