aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/MegaTreeFeature.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-08 19:08:36 -0400
committerGitHub <noreply@github.com>2026-03-08 18:08:36 -0500
commit28614b922fb77149a54da1a87bebfbc98736f296 (patch)
tree7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.World/MegaTreeFeature.cpp
parent88798b501d0cf6287b6f87acb2592676e3cec58d (diff)
Modernize project codebase (#906)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides * Add safety checks and fix a issue with vector going OOR
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 09195fb4..db4a336a 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() != NULL)
+ if(app.getLevelGenerationOptions() != nullptr)
{
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 + (int) (0.5f + Mth::cos(angle) * 4.0f);
- int bz = z + (int) (0.5f + Mth::sin(angle) * 4.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);
placeLeaves(level, bx, bz, branchHeight, 0, random);
for (int b = 0; b < 5; b++)
{
- bx = x + (int) (1.5f + Mth::cos(angle) * b);
- bz = z + (int) (1.5f + Mth::sin(angle) * b);
+ bx = x + static_cast<int>(1.5f + Mth::cos(angle) * b);
+ bz = z + static_cast<int>(1.5f + Mth::sin(angle) * b);
placeBlock(level, bx, branchHeight - 3 + b / 2, bz, Tile::treeTrunk_Id, trunkType);
}