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

18
Minecraft.World/StructureFeature.cpp
View File

@@ -109,7 +109,7 @@ bool StructureFeature::isIntersection(int cellX, int cellZ)
bool StructureFeature::isInsideFeature(int cellX, int cellY, int cellZ)
{
restoreSavedData(level);
return getStructureAt(cellX, cellY, cellZ) != nullptr;
return getStructureAt(cellX, cellY, cellZ) != NULL;
}
StructureStart *StructureFeature::getStructureAt(int cellX, int cellY, int cellZ)
@@ -142,7 +142,7 @@ StructureStart *StructureFeature::getStructureAt(int cellX, int cellY, int cellZ
}
}
}
return nullptr;
return NULL;
}
bool StructureFeature::isInsideBoundingFeature(int cellX, int cellY, int cellZ)
@@ -178,7 +178,7 @@ TilePos *StructureFeature::getNearestGeneratedFeature(Level *level, int cellX, i
addFeature(level, cellX >> 4, cellZ >> 4, 0, 0, byteArray());
double minDistance = DBL_MAX;
TilePos *selected = nullptr;
TilePos *selected = NULL;
for(auto& it : cachedStructures)
{
@@ -203,14 +203,14 @@ TilePos *StructureFeature::getNearestGeneratedFeature(Level *level, int cellX, i
}
}
}
if (selected != nullptr)
if (selected != NULL)
{
return selected;
}
else
{
vector<TilePos> *guesstimatedFeaturePositions = getGuesstimatedFeaturePositions();
if (guesstimatedFeaturePositions != nullptr)
if (guesstimatedFeaturePositions != NULL)
{
TilePos *pSelectedPos = new TilePos(0,0,0);
@@ -233,22 +233,22 @@ TilePos *StructureFeature::getNearestGeneratedFeature(Level *level, int cellX, i
return pSelectedPos;
}
}
return nullptr;
return NULL;
}
vector<TilePos> *StructureFeature::getGuesstimatedFeaturePositions()
{
return nullptr;
return NULL;
}
void StructureFeature::restoreSavedData(Level *level)
{
#ifdef ENABLE_STRUCTURE_SAVING
if (savedData == nullptr)
if (savedData == NULL)
{
savedData = dynamic_pointer_cast<StructureFeatureSavedData>( level->getSavedData(typeid(StructureFeatureSavedData), getFeatureName()) );
if (savedData == nullptr)
if (savedData == NULL)
{
savedData = shared_ptr<StructureFeatureSavedData>( new StructureFeatureSavedData(getFeatureName()) );
level->setSavedData(getFeatureName(), savedData);