aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/StairTile.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/StairTile.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/StairTile.cpp')
-rw-r--r--Minecraft.World/StairTile.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.World/StairTile.cpp b/Minecraft.World/StairTile.cpp
index 094ebf6f..de2cc865 100644
--- a/Minecraft.World/StairTile.cpp
+++ b/Minecraft.World/StairTile.cpp
@@ -66,7 +66,7 @@ void StairTile::setBaseShape(LevelSource *level, int x, int y, int z)
bool StairTile::isStairs(int id)
{
StairTile *st = dynamic_cast<StairTile *>(Tile::tiles[id]);
- return id > 0 && st != nullptr; //Tile::tiles[id] instanceof StairTile;
+ return id > 0 && st != NULL; //Tile::tiles[id] instanceof StairTile;
}
bool StairTile::isLockAttached(LevelSource *level, int x, int y, int z, int data)
@@ -476,7 +476,7 @@ HitResult *StairTile::clip(Level *level, int xt, int yt, int zt, Vec3 *a, Vec3 *
HitResult *results[8];
for(unsigned int i = 0; i < 8; ++i)
{
- results[i] = nullptr;
+ results[i] = NULL;
}
int data = level->getData(xt, yt, zt);
int dir = data & 0x3;
@@ -498,16 +498,16 @@ HitResult *StairTile::clip(Level *level, int xt, int yt, int zt, Vec3 *a, Vec3 *
for(unsigned int j = 0; j < DEAD_SPACE_COLUMN_COUNT; ++j)
{
- results[deadSpaces[j]] = nullptr;
+ results[deadSpaces[j]] = NULL;
}
- HitResult *closest = nullptr;
+ HitResult *closest = NULL;
double closestDist = 0;
for (unsigned int i = 0; i < 8; ++i)
{
HitResult *result = results[i];
- if (result != nullptr)
+ if (result != NULL)
{
double dist = result->pos->distanceToSqr(b);