Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Project modernization (#630)"

Browse Source 
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 a9be52c41a.
This commit is contained in:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Minecraft.World/BiomeDecorator.cpp
View File

@@ -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++)
{