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

13
Minecraft.World/LevelData.cpp
View File

@@ -18,7 +18,7 @@ LevelData::LevelData(CompoundTag *tag)
{
wstring generatorName = tag->getString(L"generatorName");
m_pGenerator = LevelType::getLevelType(generatorName);
if (m_pGenerator == nullptr)
if (m_pGenerator == NULL)
{
m_pGenerator = LevelType::lvl_normal;
}
@@ -188,13 +188,8 @@ LevelData::LevelData(CompoundTag *tag)
dimension = loadedPlayerTag->getInt(L"Dimension");
}
else
<<<<<<< HEAD
{
this->loadedPlayerTag = nullptr;
=======
{
this->loadedPlayerTag = NULL;
>>>>>>> origin/main
}
*/
dimension = 0;
@@ -220,7 +215,7 @@ LevelData::LevelData(LevelSettings *levelSettings, const wstring& levelName)
gameTime = -1;
lastPlayed = 0;
sizeOnDisk = 0;
// this->loadedPlayerTag = nullptr; // 4J - we don't store this anymore
// this->loadedPlayerTag = NULL; // 4J - we don't store this anymore
dimension = 0;
version = 0;
rainTime = 0;
@@ -437,7 +432,7 @@ int64_t LevelData::getSizeOnDisk()
CompoundTag *LevelData::getLoadedPlayerTag()
{
return nullptr; // 4J - we don't store this anymore
return NULL; // 4J - we don't store this anymore
}
// 4J Removed TU9 as it's never accurate due to the dimension never being set
@@ -717,7 +712,7 @@ void LevelData::getMoatFlags(bool* bClassicEdgeMoat, bool* bSmallEdgeMoat, bool*
int LevelData::getXZHellSizeOld()
{
int hellXZSizeOld = ceil(static_cast<float>(m_xzSizeOld) / m_hellScaleOld);
int hellXZSizeOld = ceil((float)m_xzSizeOld / m_hellScaleOld);
while(hellXZSizeOld > HELL_LEVEL_MAX_WIDTH && m_hellScaleOld < HELL_LEVEL_MAX_SCALE)
{