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-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/application/PlanetServer/src/shared/PlanetProxyObject.cpp
+4 -4
View File
@@ -41,9 +41,9 @@ PlanetProxyObject::PlanetProxyObject (const NetworkId &objectId) :
m_authoritativeServer(0),
m_lastReportedServer(0),
m_interestRadius(0),
m_quadtreeNode(NULL),
m_quadtreeNode(nullptr),
m_authTransferTimeMs(Clock::timeMs()),
m_contents(NULL),
m_contents(nullptr),
m_level(0),
m_hibernating(false),
m_templateCrc(0),
@@ -137,9 +137,9 @@ void PlanetProxyObject::update(int x, int y, int z, NetworkId containedBy, uint3
if (ConfigPlanetServer::getEnableContentsChecking() && (m_containedBy!=containedBy))
updateContentsTracking(containedBy);
bool const firstUpdate = (m_quadtreeNode == NULL);
bool const firstUpdate = (m_quadtreeNode == nullptr);
if (m_quadtreeNode!=NULL) // if this is the first update for this object, m_quadtreeNode will be NULL because it hasn't been placed anywhere yet
if (m_quadtreeNode!=nullptr) // if this is the first update for this object, m_quadtreeNode will be nullptr because it hasn't been placed anywhere yet
{
removeServerStatistics();