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:
@@ -117,7 +117,7 @@ void PistonPieceEntity::moveCollidedEntities(float progress, float amount)
|
||||
}
|
||||
|
||||
AABB *aabb = Tile::pistonMovingPiece->getAABB(level, x, y, z, id, progress, facing);
|
||||
if (aabb != NULL)
|
||||
if (aabb != nullptr)
|
||||
{
|
||||
vector<shared_ptr<Entity> > *entities = level->getEntities(nullptr, aabb);
|
||||
if (!entities->empty())
|
||||
@@ -140,7 +140,7 @@ void PistonPieceEntity::moveCollidedEntities(float progress, float amount)
|
||||
|
||||
void PistonPieceEntity::finalTick()
|
||||
{
|
||||
if (progressO < 1 && level != NULL)
|
||||
if (progressO < 1 && level != nullptr)
|
||||
{
|
||||
progressO = progress = 1;
|
||||
level->removeTileEntity(x, y, z);
|
||||
@@ -207,7 +207,7 @@ void PistonPieceEntity::save(CompoundTag *tag)
|
||||
// 4J Added
|
||||
shared_ptr<TileEntity> PistonPieceEntity::clone()
|
||||
{
|
||||
shared_ptr<PistonPieceEntity> result = shared_ptr<PistonPieceEntity>( new PistonPieceEntity() );
|
||||
shared_ptr<PistonPieceEntity> result = std::make_shared<PistonPieceEntity>();
|
||||
TileEntity::clone(result);
|
||||
|
||||
result->id = id;
|
||||
|
||||
Reference in New Issue
Block a user