aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/RandomScatteredLargeFeature.cpp
diff options
context:
space:
mode:
authorLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
committerLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
commit087b7e7abfe81dd7f0fdcdea36ac9f245950df1a (patch)
tree69454763e73ca764af4e682d3573080b13138a0e /Minecraft.World/RandomScatteredLargeFeature.cpp
parenta9be52c41a02d207233199e98898fe7483d7e817 (diff)
Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore functionality of the nightly. All in-game menus do not work and generating a world crashes. This reverts commit a9be52c41a02d207233199e98898fe7483d7e817.
Diffstat (limited to 'Minecraft.World/RandomScatteredLargeFeature.cpp')
-rw-r--r--Minecraft.World/RandomScatteredLargeFeature.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Minecraft.World/RandomScatteredLargeFeature.cpp b/Minecraft.World/RandomScatteredLargeFeature.cpp
index 3b03dba6..bd0b70bb 100644
--- a/Minecraft.World/RandomScatteredLargeFeature.cpp
+++ b/Minecraft.World/RandomScatteredLargeFeature.cpp
@@ -67,7 +67,7 @@ bool RandomScatteredLargeFeature::isFeatureChunk(int x, int z, bool bIsSuperflat
bool forcePlacement = false;
LevelGenerationOptions *levelGenOptions = app.getLevelGenerationOptions();
- if( levelGenOptions != nullptr )
+ if( levelGenOptions != NULL )
{
forcePlacement = levelGenOptions->isFeatureChunk(x,z,eFeature_Temples);
}
@@ -123,14 +123,14 @@ RandomScatteredLargeFeature::ScatteredFeatureStart::ScatteredFeatureStart(Level
bool RandomScatteredLargeFeature::isSwamphut(int cellX, int cellY, int cellZ)
{
StructureStart *structureAt = getStructureAt(cellX, cellY, cellZ);
- if (structureAt == nullptr || !( dynamic_cast<ScatteredFeatureStart *>( structureAt ) ) || structureAt->pieces.empty())
+ if (structureAt == NULL || !( dynamic_cast<ScatteredFeatureStart *>( structureAt ) ) || structureAt->pieces.empty())
{
return false;
}
- StructurePiece *first = nullptr;
+ StructurePiece *first = NULL;
auto it = structureAt->pieces.begin();
if(it != structureAt->pieces.end() ) first = *it;
- return dynamic_cast<ScatteredFeaturePieces::SwamplandHut *>(first) != nullptr;
+ return dynamic_cast<ScatteredFeaturePieces::SwamplandHut *>(first) != NULL;
}
vector<Biome::MobSpawnerData *> *RandomScatteredLargeFeature::getSwamphutEnemies()