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

10
Minecraft.World/Sapling.cpp
View File

@@ -17,7 +17,7 @@ const wstring Sapling::TEXTURE_NAMES[] = {L"sapling", L"sapling_spruce", L"sapli
Sapling::Sapling(int id) : Bush( id )
{
this->updateDefaultShape();
icons = nullptr;
icons = NULL;
}
// 4J Added override
@@ -65,7 +65,7 @@ void Sapling::growTree(Level *level, int x, int y, int z, Random *random)
{
int data = level->getData(x, y, z) & TYPE_MASK;
Feature *f = nullptr;
Feature *f = NULL;
int ox = 0, oz = 0;
bool multiblock = false;
@@ -93,12 +93,12 @@ void Sapling::growTree(Level *level, int x, int y, int z, Random *random)
break;
}
}
if (f != nullptr)
if (f != NULL)
{
break;
}
}
if (f == nullptr)
if (f == NULL)
{
ox = oz = 0;
f = new TreeFeature(true, 4 + random->nextInt(7), TreeTile::JUNGLE_TRUNK, LeafTile::JUNGLE_LEAF, false);
@@ -138,7 +138,7 @@ void Sapling::growTree(Level *level, int x, int y, int z, Random *random)
level->setTileAndData(x, y, z, id, data, Tile::UPDATE_NONE);
}
}
if( f != nullptr )
if( f != NULL )
delete f;
}