Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Project modernization (#630)"

Browse Source 
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 a9be52c41a.
This commit is contained in:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Minecraft.World/StairTile.cpp
View File

@@ -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);