Merge branch 'smartcmd:main' into main

1 files changed, 13 insertions, 13 deletions

diff --git a/Minecraft.World/StructureFeature.cpp b/Minecraft.World/StructureFeature.cpp
index dfb214a5..8de619ca 100644
--- a/Minecraft.World/StructureFeature.cpp
+++ b/Minecraft.World/StructureFeature.cpp
@@ -109,7 +109,7 @@ bool StructureFeature::isIntersection(int cellX, int cellZ)
 bool StructureFeature::isInsideFeature(int cellX, int cellY, int cellZ)
 {
 	restoreSavedData(level);
-	return getStructureAt(cellX, cellY, cellZ) != NULL;
+	return getStructureAt(cellX, cellY, cellZ) != nullptr;
 }
 
 StructureStart *StructureFeature::getStructureAt(int cellX, int cellY, int cellZ)
@@ -142,7 +142,7 @@ StructureStart *StructureFeature::getStructureAt(int cellX, int cellY, int cellZ
 			}
 		}
 	}
-	return NULL;
+	return nullptr;
 }
 
 bool StructureFeature::isInsideBoundingFeature(int cellX, int cellY, int cellZ)
@@ -169,16 +169,16 @@ TilePos *StructureFeature::getNearestGeneratedFeature(Level *level, int cellX, i
 	restoreSavedData(level);
 
 	random->setSeed(level->getSeed());
-	__int64 xScale = random->nextLong();
-	__int64 zScale = random->nextLong();
-	__int64 xx = (cellX >> 4) * xScale;
-	__int64 zz = (cellZ >> 4) * zScale;
+	int64_t xScale = random->nextLong();
+	int64_t zScale = random->nextLong();
+	int64_t xx = (cellX >> 4) * xScale;
+	int64_t zz = (cellZ >> 4) * zScale;
 	random->setSeed(xx ^ zz ^ level->getSeed());
 
 	addFeature(level, cellX >> 4, cellZ >> 4, 0, 0, byteArray());
 
 	double minDistance = DBL_MAX;
-	TilePos *selected = NULL;
+	TilePos *selected = nullptr;
 
 	for(auto& it : cachedStructures)
 	{
@@ -203,14 +203,14 @@ TilePos *StructureFeature::getNearestGeneratedFeature(Level *level, int cellX, i
 			}
 		}
 	}
-	if (selected != NULL)
+	if (selected != nullptr)
 	{
 		return selected;
 	}
 	else
 	{
 		vector<TilePos> *guesstimatedFeaturePositions = getGuesstimatedFeaturePositions();
-		if (guesstimatedFeaturePositions != NULL)
+		if (guesstimatedFeaturePositions != nullptr)
 		{
 			TilePos *pSelectedPos = new TilePos(0,0,0);
 
@@ -233,22 +233,22 @@ TilePos *StructureFeature::getNearestGeneratedFeature(Level *level, int cellX, i
 			return pSelectedPos;
 		}
 	}
-	return NULL;
+	return nullptr;
 }
 
 vector<TilePos> *StructureFeature::getGuesstimatedFeaturePositions()
 {
-	return NULL;
+	return nullptr;
 }
 
 void StructureFeature::restoreSavedData(Level *level)
 {
 #ifdef ENABLE_STRUCTURE_SAVING
-	if (savedData == NULL)
+	if (savedData == nullptr)
 	{
 		savedData = dynamic_pointer_cast<StructureFeatureSavedData>( level->getSavedData(typeid(StructureFeatureSavedData), getFeatureName()) );
 
-		if (savedData == NULL)
+		if (savedData == nullptr)
 		{
 			savedData = shared_ptr<StructureFeatureSavedData>( new StructureFeatureSavedData(getFeatureName()) );
 			level->setSavedData(getFeatureName(), savedData);