Revert "shared_ptr -> std::shared_ptr"

This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5.

1 files changed, 16 insertions, 16 deletions

diff --git a/Minecraft.World/MobSpawnerTileEntity.cpp b/Minecraft.World/MobSpawnerTileEntity.cpp
index 31240a40..ce7ae1dc 100644
--- a/Minecraft.World/MobSpawnerTileEntity.cpp
+++ b/Minecraft.World/MobSpawnerTileEntity.cpp
@@ -35,7 +35,7 @@ MobSpawnerTileEntity::MobSpawnerTileEntity() : TileEntity()
 	displayEntity = nullptr;
 }
 
-wstring MobSpawnerTileEntity::getEntityId()
+wstring MobSpawnerTileEntity::getEntityId() 
 {
 	return entityId;
 }
@@ -81,18 +81,18 @@ void MobSpawnerTileEntity::tick()
 
 		if (spawnDelay == -1) delay();
 
-		if (spawnDelay > 0)
+		if (spawnDelay > 0) 
 		{
 			spawnDelay--;
 			return;
 		}
 
-		for (int c = 0; c < spawnCount; c++)
+		for (int c = 0; c < spawnCount; c++) 
 		{
-			std::shared_ptr<Mob> entity = dynamic_pointer_cast<Mob> (EntityIO::newEntity(entityId, level));
+			shared_ptr<Mob> entity = dynamic_pointer_cast<Mob> (EntityIO::newEntity(entityId, level));
 			if (entity == NULL) return;
 
-			vector<std::shared_ptr<Entity> > *vecNearby = level->getEntitiesOfClass(typeid(*entity), AABB::newTemp(x, y, z, x + 1, y + 1, z + 1)->grow(8, 4, 8));
+			vector<shared_ptr<Entity> > *vecNearby = level->getEntitiesOfClass(typeid(*entity), AABB::newTemp(x, y, z, x + 1, y + 1, z + 1)->grow(8, 4, 8));
 			int nearBy = (int)vecNearby->size(); //4J - IB, TODO, Mob contains no getClass
 			delete vecNearby;
 
@@ -110,16 +110,16 @@ void MobSpawnerTileEntity::tick()
 				return;
 			}
 
-			if (entity != NULL)
+			if (entity != NULL) 
 			{
 				double xp = x + (level->random->nextDouble() - level->random->nextDouble()) * 4;
 				double yp = y + level->random->nextInt(3) - 1;
 				double zp = z + (level->random->nextDouble() - level->random->nextDouble()) * 4;
-				std::shared_ptr<Mob> mob = dynamic_pointer_cast<Mob>( entity );
+				shared_ptr<Mob> mob = dynamic_pointer_cast<Mob>( entity );
 
 				entity->moveTo(xp, yp, zp, level->random->nextFloat() * 360, 0);
 
-				if (mob == NULL || mob->canSpawn())
+				if (mob == NULL || mob->canSpawn()) 
 				{
 					fillExtraData(entity);
 
@@ -137,7 +137,7 @@ void MobSpawnerTileEntity::tick()
 	TileEntity::tick();
 }
 
-void MobSpawnerTileEntity::fillExtraData(std::shared_ptr<Entity> entity)
+void MobSpawnerTileEntity::fillExtraData(shared_ptr<Entity> entity)
 {
 	if (spawnData != NULL)
 	{
@@ -156,7 +156,7 @@ void MobSpawnerTileEntity::fillExtraData(std::shared_ptr<Entity> entity)
 	}
 }
 
-void MobSpawnerTileEntity::delay()
+void MobSpawnerTileEntity::delay() 
 {
 	spawnDelay = minSpawnDelay + level->random->nextInt(maxSpawnDelay - minSpawnDelay);
 }
@@ -201,11 +201,11 @@ void MobSpawnerTileEntity::save(CompoundTag *tag)
 	}
 }
 
-std::shared_ptr<Entity> MobSpawnerTileEntity::getDisplayEntity()
+shared_ptr<Entity> MobSpawnerTileEntity::getDisplayEntity()
 {
 	if (displayEntity == NULL || m_bEntityIdUpdated)
 	{
-		std::shared_ptr<Entity> e = EntityIO::newEntity(getEntityId(), NULL);
+		shared_ptr<Entity> e = EntityIO::newEntity(getEntityId(), NULL);
 		fillExtraData(e);
 		displayEntity = e;
 		m_bEntityIdUpdated = false;
@@ -214,17 +214,17 @@ std::shared_ptr<Entity> MobSpawnerTileEntity::getDisplayEntity()
 	return displayEntity;
 }
 
-std::shared_ptr<Packet> MobSpawnerTileEntity::getUpdatePacket()
+shared_ptr<Packet> MobSpawnerTileEntity::getUpdatePacket()
 {
 	CompoundTag *tag = new CompoundTag();
 	save(tag);
-	return std::shared_ptr<TileEntityDataPacket>( new TileEntityDataPacket(x, y, z, TileEntityDataPacket::TYPE_MOB_SPAWNER, tag) );
+	return shared_ptr<TileEntityDataPacket>( new TileEntityDataPacket(x, y, z, TileEntityDataPacket::TYPE_MOB_SPAWNER, tag) );
 }
 
 // 4J Added
-std::shared_ptr<TileEntity> MobSpawnerTileEntity::clone()
+shared_ptr<TileEntity> MobSpawnerTileEntity::clone()
 {
-	std::shared_ptr<MobSpawnerTileEntity> result = std::shared_ptr<MobSpawnerTileEntity>( new MobSpawnerTileEntity() );
+	shared_ptr<MobSpawnerTileEntity> result = shared_ptr<MobSpawnerTileEntity>( new MobSpawnerTileEntity() );
 	TileEntity::clone(result);
 
 	result->entityId = entityId;