aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/TheEndPortal.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.World/TheEndPortal.cpp')
-rw-r--r--Minecraft.World/TheEndPortal.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.World/TheEndPortal.cpp b/Minecraft.World/TheEndPortal.cpp
index 19d95b1f..78e154f4 100644
--- a/Minecraft.World/TheEndPortal.cpp
+++ b/Minecraft.World/TheEndPortal.cpp
@@ -26,12 +26,12 @@ TheEndPortal::TheEndPortal(int id, Material *material) : EntityTile(id, material
this->setLightEmission(1.0f);
}
-shared_ptr<TileEntity> TheEndPortal::newTileEntity(Level *level)
+std::shared_ptr<TileEntity> TheEndPortal::newTileEntity(Level *level)
{
- return shared_ptr<TileEntity>(new TheEndPortalTileEntity());
+ return std::shared_ptr<TileEntity>(new TheEndPortalTileEntity());
}
-void TheEndPortal::updateShape(LevelSource *level, int x, int y, int z, int forceData, shared_ptr<TileEntity> forceEntity) // 4J added forceData, forceEntity param
+void TheEndPortal::updateShape(LevelSource *level, int x, int y, int z, int forceData, std::shared_ptr<TileEntity> forceEntity) // 4J added forceData, forceEntity param
{
float r = 1 / 16.0f;
this->setShape(0, 0, 0, 1, r, 1);
@@ -43,7 +43,7 @@ bool TheEndPortal::shouldRenderFace(LevelSource *level, int x, int y, int z, int
return EntityTile::shouldRenderFace(level, x, y, z, face);
}
-void TheEndPortal::addAABBs(Level *level, int x, int y, int z, AABB *box, AABBList *boxes, shared_ptr<Entity> source)
+void TheEndPortal::addAABBs(Level *level, int x, int y, int z, AABB *box, AABBList *boxes, std::shared_ptr<Entity> source)
{
}
@@ -62,7 +62,7 @@ int TheEndPortal::getResourceCount(Random *random)
return 0;
}
-void TheEndPortal::entityInside(Level *level, int x, int y, int z, shared_ptr<Entity> entity)
+void TheEndPortal::entityInside(Level *level, int x, int y, int z, std::shared_ptr<Entity> entity)
{
if (entity->riding == NULL && entity->rider.lock() == NULL)
{