aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/BiomeDecorator.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/BiomeDecorator.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/BiomeDecorator.cpp')
-rw-r--r--Minecraft.World/BiomeDecorator.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/Minecraft.World/BiomeDecorator.cpp b/Minecraft.World/BiomeDecorator.cpp
index add156e8..a3cbf546 100644
--- a/Minecraft.World/BiomeDecorator.cpp
+++ b/Minecraft.World/BiomeDecorator.cpp
@@ -9,8 +9,8 @@ BiomeDecorator::BiomeDecorator(Biome *biome)
_init();
// 4J inits
- level = nullptr;
- random = nullptr;
+ level = NULL;
+ random = NULL;
xo = 0;
zo = 0;
@@ -19,7 +19,7 @@ BiomeDecorator::BiomeDecorator(Biome *biome)
void BiomeDecorator::decorate(Level *level, Random *random, int xo, int zo)
{
- if (this->level != nullptr)
+ if (this->level != NULL)
{
app.DebugPrintf("BiomeDecorator::decorate - Already decorating!!\n");
#ifndef _CONTENT_PACKAGE
@@ -34,8 +34,8 @@ void BiomeDecorator::decorate(Level *level, Random *random, int xo, int zo)
decorate();
- this->level = nullptr;
- this->random = nullptr;
+ this->level = NULL;
+ this->random = NULL;
}
@@ -164,7 +164,7 @@ void BiomeDecorator::decorate()
// 4J Stu - For some reason this was created each time round in the loop
// I assume there is a case where deadBushCount could be 0
- DeadBushFeature *deadBushFeature = nullptr;
+ DeadBushFeature *deadBushFeature = NULL;
if(deadBushCount > 0) deadBushFeature = new DeadBushFeature(Tile::deadBush_Id);
for (int i = 0; i < deadBushCount; i++)
{
@@ -174,7 +174,7 @@ void BiomeDecorator::decorate()
//new DeadBushFeature(Tile::deadBush_Id)->place(level, random, x, y, z);
deadBushFeature->place(level, random, x, y, z);
}
- if(deadBushFeature != nullptr)delete deadBushFeature;
+ if(deadBushFeature != NULL)delete deadBushFeature;
for (int i = 0; i < waterlilyCount; i++)
{