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:
@@ -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 != nullptr && entity->survives())
|
||||
if (entity != NULL && 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 = std::make_shared<Painting>(level, x, y, z, dir);
|
||||
shared_ptr<Painting> painting = shared_ptr<Painting>(new 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 = std::make_shared<ItemFrame>(level, x, y, z, dir);
|
||||
shared_ptr<ItemFrame> itemFrame = shared_ptr<ItemFrame>(new ItemFrame(level, x, y, z, dir));
|
||||
|
||||
return dynamic_pointer_cast<HangingEntity> (itemFrame);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user