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
This commit is contained in:
@@ -63,7 +63,7 @@ wstring StructureFeatureIO::getEncodeId(StructurePiece *piece)
|
||||
|
||||
StructureStart *StructureFeatureIO::loadStaticStart(CompoundTag *tag, Level *level)
|
||||
{
|
||||
StructureStart *start = NULL;
|
||||
StructureStart *start = nullptr;
|
||||
|
||||
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 != NULL)
|
||||
if (start != nullptr)
|
||||
{
|
||||
start->load(level, tag);
|
||||
}
|
||||
@@ -84,7 +84,7 @@ StructureStart *StructureFeatureIO::loadStaticStart(CompoundTag *tag, Level *lev
|
||||
|
||||
StructurePiece *StructureFeatureIO::loadStaticPiece(CompoundTag *tag, Level *level)
|
||||
{
|
||||
StructurePiece *piece = NULL;
|
||||
StructurePiece *piece = nullptr;
|
||||
|
||||
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 != NULL)
|
||||
if (piece != nullptr)
|
||||
{
|
||||
piece->load(level, tag);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user