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

8
Minecraft.World/LiquidTile.cpp
View File

@@ -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 nullptr;
return NULL;
}
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 = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
ThreadStorage *tls = (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 = nullptr;
Vec3 *flow = NULL;
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 nullptr;
return NULL;
}