swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-08-01 02:15:54 -04:00
Code Issues Projects Releases Wiki Activity

Revert "Revert "newer standards prefer nullptr over NULL - this is most of them but there are others too""

Browse Source 
This reverts commit 8e2160f33e.
This commit is contained in:
DarthArgus
2016-02-11 21:19:18 -06:00
parent 8e2160f33e
commit dd9db6d350
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/ScriptMethodsWaypoint.cpp
+1 -1
View File
@@ -306,7 +306,7 @@ jobject JNICALL ScriptMethodsWaypointNamespace::getWaypointRegion(JNIEnv * env,
if(w.isValid())
{
const Region * region = RegionMaster::getSmallestVisibleRegionAtPoint(w.getLocation().getSceneId(), w.getLocation().getCoordinates().x, w.getLocation().getCoordinates().z);
if (region != NULL)
if (region != nullptr)
{
LocalRefPtr result;
if (ScriptConversion::convert(*region, result))