aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/MegaTreeFeature.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/MegaTreeFeature.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/MegaTreeFeature.cpp')
-rw-r--r--Minecraft.World/MegaTreeFeature.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.World/MegaTreeFeature.cpp b/Minecraft.World/MegaTreeFeature.cpp
index db4a336a..09195fb4 100644
--- a/Minecraft.World/MegaTreeFeature.cpp
+++ b/Minecraft.World/MegaTreeFeature.cpp
@@ -15,7 +15,7 @@ bool MegaTreeFeature::place(Level *level, Random *random, int x, int y, int z)
if (y < 1 || y + treeHeight + 1 > Level::maxBuildHeight) return false;
// 4J Stu Added to stop tree features generating areas previously place by game rule generation
- if(app.getLevelGenerationOptions() != nullptr)
+ if(app.getLevelGenerationOptions() != NULL)
{
PIXBeginNamedEvent(0, "MegaTreeFeature Checking intersects");
LevelGenerationOptions *levelGenOptions = app.getLevelGenerationOptions();
@@ -69,14 +69,14 @@ bool MegaTreeFeature::place(Level *level, Random *random, int x, int y, int z)
while (branchHeight > y + treeHeight / 2)
{
float angle = random->nextFloat() * PI * 2.0f;
- int bx = x + static_cast<int>(0.5f + Mth::cos(angle) * 4.0f);
- int bz = z + static_cast<int>(0.5f + Mth::sin(angle) * 4.0f);
+ int bx = x + (int) (0.5f + Mth::cos(angle) * 4.0f);
+ int bz = z + (int) (0.5f + Mth::sin(angle) * 4.0f);
placeLeaves(level, bx, bz, branchHeight, 0, random);
for (int b = 0; b < 5; b++)
{
- bx = x + static_cast<int>(1.5f + Mth::cos(angle) * b);
- bz = z + static_cast<int>(1.5f + Mth::sin(angle) * b);
+ bx = x + (int) (1.5f + Mth::cos(angle) * b);
+ bz = z + (int) (1.5f + Mth::sin(angle) * b);
placeBlock(level, bx, branchHeight - 3 + b / 2, bz, Tile::treeTrunk_Id, trunkType);
}