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:
@@ -35,7 +35,7 @@ bool HangingEntityItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Play
|
||||
|
||||
if (!player->mayUseItemAt(xt, yt, zt, face, instance)) return false;
|
||||
|
||||
if (entity != NULL && entity->survives())
|
||||
if (entity != nullptr && entity->survives())
|
||||
{
|
||||
if (!level->isClientSide)
|
||||
{
|
||||
@@ -66,7 +66,7 @@ shared_ptr<HangingEntity> HangingEntityItem::createEntity(Level *level, int x, i
|
||||
{
|
||||
if (eType == eTYPE_PAINTING)
|
||||
{
|
||||
shared_ptr<Painting> painting = shared_ptr<Painting>(new Painting(level, x, y, z, dir));
|
||||
shared_ptr<Painting> painting = std::make_shared<Painting>(level, x, y, z, dir);
|
||||
|
||||
#ifndef _CONTENT_PACKAGE
|
||||
if (app.DebugArtToolsOn() && auxValue > 0)
|
||||
@@ -83,7 +83,7 @@ shared_ptr<HangingEntity> HangingEntityItem::createEntity(Level *level, int x, i
|
||||
}
|
||||
else if (eType == eTYPE_ITEM_FRAME)
|
||||
{
|
||||
shared_ptr<ItemFrame> itemFrame = shared_ptr<ItemFrame>(new ItemFrame(level, x, y, z, dir));
|
||||
shared_ptr<ItemFrame> itemFrame = std::make_shared<ItemFrame>(level, x, y, z, dir);
|
||||
|
||||
return dynamic_pointer_cast<HangingEntity> (itemFrame);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user