aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/HellFlatLevelSource.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-07 21:56:03 -0500
committerGitHub <noreply@github.com>2026-03-08 09:56:03 +0700
commita9be52c41a02d207233199e98898fe7483d7e817 (patch)
tree71dfaec3a86b05e9ca409b97d8eb9d7f993bfdd0 /Minecraft.World/HellFlatLevelSource.cpp
parent1be5faaea781402e7de06b263eeca4c688b7712c (diff)
Project modernization (#630)
* 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
Diffstat (limited to 'Minecraft.World/HellFlatLevelSource.cpp')
-rw-r--r--Minecraft.World/HellFlatLevelSource.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/Minecraft.World/HellFlatLevelSource.cpp b/Minecraft.World/HellFlatLevelSource.cpp
index 95144627..c4ba062c 100644
--- a/Minecraft.World/HellFlatLevelSource.cpp
+++ b/Minecraft.World/HellFlatLevelSource.cpp
@@ -8,7 +8,7 @@ HellFlatLevelSource::HellFlatLevelSource(Level *level, int64_t seed)
{
int xzSize = level->getLevelData()->getXZSize();
int hellScale = level->getLevelData()->getHellScale();
- m_XZSize = ceil((float)xzSize / hellScale);
+ m_XZSize = ceil(static_cast<float>(xzSize) / hellScale);
this->level = level;
@@ -38,7 +38,7 @@ void HellFlatLevelSource::prepareHeights(int xOffs, int zOffs, byteArray blocks)
block = Tile::netherRack_Id;
}
- blocks[xc << 11 | zc << 7 | yc] = (byte) block;
+ blocks[xc << 11 | zc << 7 | yc] = static_cast<byte>(block);
}
}
}
@@ -60,7 +60,7 @@ void HellFlatLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks)
{
if( z - random->nextInt( 4 ) <= 0 || xOffs < -(m_XZSize/2) )
{
- blocks[offs] = (byte) Tile::unbreakable_Id;
+ blocks[offs] = static_cast<byte>(Tile::unbreakable_Id);
blockSet = true;
}
}
@@ -68,7 +68,7 @@ void HellFlatLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks)
{
if( x - random->nextInt( 4 ) <= 0 || zOffs < -(m_XZSize/2))
{
- blocks[offs] = (byte) Tile::unbreakable_Id;
+ blocks[offs] = static_cast<byte>(Tile::unbreakable_Id);
blockSet = true;
}
}
@@ -76,7 +76,7 @@ void HellFlatLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks)
{
if( z + random->nextInt(4) >= 15 || xOffs > (m_XZSize/2))
{
- blocks[offs] = (byte) Tile::unbreakable_Id;
+ blocks[offs] = static_cast<byte>(Tile::unbreakable_Id);
blockSet = true;
}
}
@@ -84,7 +84,7 @@ void HellFlatLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks)
{
if( x + random->nextInt(4) >= 15 || zOffs > (m_XZSize/2) )
{
- blocks[offs] = (byte) Tile::unbreakable_Id;
+ blocks[offs] = static_cast<byte>(Tile::unbreakable_Id);
blockSet = true;
}
}
@@ -93,11 +93,11 @@ void HellFlatLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks)
if (y >= Level::genDepthMinusOne - random->nextInt(5))
{
- blocks[offs] = (byte) Tile::unbreakable_Id;
+ blocks[offs] = static_cast<byte>(Tile::unbreakable_Id);
}
else if (y <= 0 + random->nextInt(5))
{
- blocks[offs] = (byte) Tile::unbreakable_Id;
+ blocks[offs] = static_cast<byte>(Tile::unbreakable_Id);
}
}
}
@@ -115,7 +115,7 @@ LevelChunk *HellFlatLevelSource::getChunk(int xOffs, int zOffs)
// 4J - now allocating this with a physical alloc & bypassing general memory management so that it will get cleanly freed
int chunksSize = Level::genDepth * 16 * 16;
- byte *tileData = (byte *)XPhysicalAlloc(chunksSize, MAXULONG_PTR, 4096, PAGE_READWRITE);
+ byte *tileData = static_cast<byte *>(XPhysicalAlloc(chunksSize, MAXULONG_PTR, 4096, PAGE_READWRITE));
XMemSet128(tileData,0,chunksSize);
byteArray blocks = byteArray(tileData,chunksSize);
// byteArray blocks = byteArray(16 * level->depth * 16);
@@ -211,16 +211,16 @@ wstring HellFlatLevelSource::gatherStats()
vector<Biome::MobSpawnerData *> *HellFlatLevelSource::getMobsAt(MobCategory *mobCategory, int x, int y, int z)
{
Biome *biome = level->getBiome(x, z);
- if (biome == NULL)
+ if (biome == nullptr)
{
- return NULL;
+ return nullptr;
}
return biome->getMobs(mobCategory);
}
TilePos *HellFlatLevelSource::findNearestMapFeature(Level *level, const wstring& featureName, int x, int y, int z)
{
- return NULL;
+ return nullptr;
}
void HellFlatLevelSource::recreateLogicStructuresForChunk(int chunkX, int chunkZ)