swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-08-04 05:15:51 -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/GroupObject.cpp
+1 -1
View File
@@ -1412,7 +1412,7 @@ unsigned int GroupObject::getSecondsLeftOnGroupPickup() const
std::pair<int32, int32> const & groupPickupTimer = m_groupPickupTimer.get();
if ((groupPickupTimer.first > 0) && (groupPickupTimer.second > 0))
{
time_t const timeNow = ::time(NULL);
time_t const timeNow = ::time(nullptr);
if (groupPickupTimer.second > timeNow)
return (groupPickupTimer.second - (int)timeNow);
}