aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/LiquidTile.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/LiquidTile.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/LiquidTile.cpp')
-rw-r--r--Minecraft.World/LiquidTile.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Minecraft.World/LiquidTile.cpp b/Minecraft.World/LiquidTile.cpp
index c31b6466..be6c582d 100644
--- a/Minecraft.World/LiquidTile.cpp
+++ b/Minecraft.World/LiquidTile.cpp
@@ -131,7 +131,7 @@ bool LiquidTile::shouldRenderFace(LevelSource *level, int x, int y, int z, int f
AABB *LiquidTile::getAABB(Level *level, int x, int y, int z)
{
- return NULL;
+ return nullptr;
}
int LiquidTile::getRenderShape()
@@ -317,7 +317,7 @@ void LiquidTile::animateTick(Level *level, int x, int y, int z, Random *random)
{
if (random->nextInt(100) == 0)
{
- ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
+ ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
double xx = x + random->nextFloat();
double yy = y + tls->yy1;
double zz = z + random->nextFloat();
@@ -349,7 +349,7 @@ void LiquidTile::animateTick(Level *level, int x, int y, int z, Random *random)
double LiquidTile::getSlopeAngle(LevelSource *level, int x, int y, int z, Material *m)
{
- Vec3 *flow = NULL;
+ Vec3 *flow = nullptr;
if (m == Material::water) flow = ((LiquidTile *) Tile::water)->getFlow(level, x, y, z);
if (m == Material::lava) flow = ((LiquidTile *) Tile::lava)->getFlow(level, x, y, z);
if (flow->x == 0 && flow->z == 0) return -1000;
@@ -425,5 +425,5 @@ Icon *LiquidTile::getTexture(const wstring &name)
if (name.compare(TEXTURE_WATER_FLOW)==0) return Tile::water->icons[1];
if (name.compare(TEXTURE_LAVA_STILL)==0) return Tile::lava->icons[0];
if (name.compare(TEXTURE_LAVA_FLOW)==0) return Tile::lava->icons[1];
- return NULL;
+ return nullptr;
}