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:
@@ -5,7 +5,7 @@
|
||||
|
||||
ThinFenceTile::ThinFenceTile(int id, const wstring &tex, const wstring &edgeTex, Material *material, bool dropsResources) : Tile(id, material,isSolidRender())
|
||||
{
|
||||
iconSide = nullptr;
|
||||
iconSide = NULL;
|
||||
edgeTexture = edgeTex;
|
||||
this->dropsResources = dropsResources;
|
||||
this->texture = tex;
|
||||
@@ -144,7 +144,7 @@ bool ThinFenceTile::isSilkTouchable()
|
||||
|
||||
shared_ptr<ItemInstance> ThinFenceTile::getSilkTouchItemInstance(int data)
|
||||
{
|
||||
return std::make_shared<ItemInstance>(id, 1, data);
|
||||
return shared_ptr<ItemInstance>(new ItemInstance(id, 1, data));
|
||||
}
|
||||
|
||||
void ThinFenceTile::registerIcons(IconRegister *iconRegister)
|
||||
|
||||
Reference in New Issue
Block a user