Revert "Project modernization (#630)"
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:
@@ -63,7 +63,7 @@ wstring StructureFeatureIO::getEncodeId(StructurePiece *piece)
|
||||
|
||||
StructureStart *StructureFeatureIO::loadStaticStart(CompoundTag *tag, Level *level)
|
||||
{
|
||||
StructureStart *start = nullptr;
|
||||
StructureStart *start = NULL;
|
||||
|
||||
auto it = startIdClassMap.find(tag->getString(L"id"));
|
||||
if(it != startIdClassMap.end())
|
||||
@@ -71,7 +71,7 @@ StructureStart *StructureFeatureIO::loadStaticStart(CompoundTag *tag, Level *lev
|
||||
start = (it->second)();
|
||||
}
|
||||
|
||||
if (start != nullptr)
|
||||
if (start != NULL)
|
||||
{
|
||||
start->load(level, tag);
|
||||
}
|
||||
@@ -84,7 +84,7 @@ StructureStart *StructureFeatureIO::loadStaticStart(CompoundTag *tag, Level *lev
|
||||
|
||||
StructurePiece *StructureFeatureIO::loadStaticPiece(CompoundTag *tag, Level *level)
|
||||
{
|
||||
StructurePiece *piece = nullptr;
|
||||
StructurePiece *piece = NULL;
|
||||
|
||||
auto it = pieceIdClassMap.find(tag->getString(L"id"));
|
||||
if(it != pieceIdClassMap.end())
|
||||
@@ -92,7 +92,7 @@ StructurePiece *StructureFeatureIO::loadStaticPiece(CompoundTag *tag, Level *lev
|
||||
piece = (it->second)();
|
||||
}
|
||||
|
||||
if (piece != nullptr)
|
||||
if (piece != NULL)
|
||||
{
|
||||
piece->load(level, tag);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user