aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/CaveFeature.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/CaveFeature.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/CaveFeature.cpp')
-rw-r--r--Minecraft.World/CaveFeature.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Minecraft.World/CaveFeature.cpp b/Minecraft.World/CaveFeature.cpp
index 8183fbdf..edd81788 100644
--- a/Minecraft.World/CaveFeature.cpp
+++ b/Minecraft.World/CaveFeature.cpp
@@ -35,7 +35,7 @@ bool CaveFeature::place(Level *level, Random *random, int x, int y, int z)
double hr = (Mth::sin(d / 16.0f * PI) * radius + 1) * ss + 1;
// 4J Stu Added to stop cave features generating areas previously place by game rule generation
- if(app.getLevelGenerationOptions() != NULL)
+ if(app.getLevelGenerationOptions() != nullptr)
{
LevelGenerationOptions *levelGenOptions = app.getLevelGenerationOptions();
bool intersects = levelGenOptions->checkIntersects((xx - r / 2), (yy - hr / 2), (zz - r / 2), (xx + r / 2), (yy + hr / 2), (zz + r / 2));
@@ -46,9 +46,9 @@ bool CaveFeature::place(Level *level, Random *random, int x, int y, int z)
}
}
- for (int x2 = (int) (xx - r / 2); x2 <= (int) (xx + r / 2); x2++)
- for (int y2 = (int) (yy - hr / 2); y2 <= (int) (yy + hr / 2); y2++)
- for (int z2 = (int) (zz - r / 2); z2 <= (int) (zz + r / 2); z2++)
+ for (int x2 = static_cast<int>(xx - r / 2); x2 <= static_cast<int>(xx + r / 2); x2++)
+ for (int y2 = static_cast<int>(yy - hr / 2); y2 <= static_cast<int>(yy + hr / 2); y2++)
+ for (int z2 = static_cast<int>(zz - r / 2); z2 <= static_cast<int>(zz + r / 2); z2++)
{
double xd = ((x2 + 0.5) - xx) / (r / 2);
double yd = ((y2 + 0.5) - yy) / (hr / 2);