Revert "shared_ptr -> std::shared_ptr"

This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5.

1 files changed, 22 insertions, 22 deletions

diff --git a/Minecraft.World/DispenserTileEntity.cpp b/Minecraft.World/DispenserTileEntity.cpp
index f06bc4c2..2c4705ea 100644
--- a/Minecraft.World/DispenserTileEntity.cpp
+++ b/Minecraft.World/DispenserTileEntity.cpp
@@ -25,32 +25,32 @@ DispenserTileEntity::~DispenserTileEntity()
 	delete random;
 }
 
-unsigned int DispenserTileEntity::getContainerSize()
+unsigned int DispenserTileEntity::getContainerSize() 
 {
 	return 9;
 }
 
-std::shared_ptr<ItemInstance> DispenserTileEntity::getItem(unsigned int slot)
+shared_ptr<ItemInstance> DispenserTileEntity::getItem(unsigned int slot)
 {
 	return items->data[slot];
 }
 
-std::shared_ptr<ItemInstance> DispenserTileEntity::removeItem(unsigned int slot, int count)
+shared_ptr<ItemInstance> DispenserTileEntity::removeItem(unsigned int slot, int count) 
 {
 	if (items->data[slot] != NULL)
 	{
 		if (items->data[slot]->count <= count)
 		{
-			std::shared_ptr<ItemInstance> item = items->data[slot];
+			shared_ptr<ItemInstance> item = items->data[slot];
 			items->data[slot] = nullptr;
 			this->setChanged();
 			// 4J Stu - Fix for duplication glitch
 			if(item->count <= 0) return nullptr;
 			return item;
-		}
-		else
+		} 
+		else 
 		{
-			std::shared_ptr<ItemInstance> i = items->data[slot]->remove(count);
+			shared_ptr<ItemInstance> i = items->data[slot]->remove(count);
 			if (items->data[slot]->count == 0) items->data[slot] = nullptr;
 			this->setChanged();
 			// 4J Stu - Fix for duplication glitch
@@ -61,11 +61,11 @@ std::shared_ptr<ItemInstance> DispenserTileEntity::removeItem(unsigned int slot,
 	return nullptr;
 }
 
-std::shared_ptr<ItemInstance> DispenserTileEntity::removeItemNoUpdate(int slot)
+shared_ptr<ItemInstance> DispenserTileEntity::removeItemNoUpdate(int slot)
 {
 	if (items->data[slot] != NULL)
 	{
-		std::shared_ptr<ItemInstance> item = items->data[slot];
+		shared_ptr<ItemInstance> item = items->data[slot];
 		items->data[slot] = nullptr;
 		return item;
 	}
@@ -73,7 +73,7 @@ std::shared_ptr<ItemInstance> DispenserTileEntity::removeItemNoUpdate(int slot)
 }
 
 // 4J-PB added for spawn eggs not being useable due to limits, so add them in again
-void DispenserTileEntity::AddItemBack(std::shared_ptr<ItemInstance>item, unsigned int slot)
+void DispenserTileEntity::AddItemBack(shared_ptr<ItemInstance>item, unsigned int slot) 
 {
 	if (items->data[slot] != NULL)
 	{
@@ -82,7 +82,7 @@ void DispenserTileEntity::AddItemBack(std::shared_ptr<ItemInstance>item, unsigne
 		{
 			items->data[slot]->count++;
 			this->setChanged();
-		}
+		}	
 	}
 	else
 	{
@@ -93,7 +93,7 @@ void DispenserTileEntity::AddItemBack(std::shared_ptr<ItemInstance>item, unsigne
 }
 /**
 * Removes an item with the given id and returns true if one was found.
-*
+* 
 * @param itemId
 * @return
 */
@@ -103,7 +103,7 @@ bool DispenserTileEntity::removeProjectile(int itemId)
 	{
 		if (items->data[i] != NULL && items->data[i]->id == itemId)
 		{
-			std::shared_ptr<ItemInstance> removedItem = removeItem(i, 1);
+			shared_ptr<ItemInstance> removedItem = removeItem(i, 1);
 			return removedItem != NULL;
 		}
 	}
@@ -116,7 +116,7 @@ int DispenserTileEntity::getRandomSlot()
 	int replaceOdds = 1;
 	for (unsigned int i = 0; i < items->length; i++)
 	{
-		if (items->data[i] != NULL && random->nextInt(replaceOdds++) == 0)
+		if (items->data[i] != NULL && random->nextInt(replaceOdds++) == 0) 
 		{
 			replaceSlot = i;
 		}
@@ -125,14 +125,14 @@ int DispenserTileEntity::getRandomSlot()
 	return replaceSlot;
 }
 
-void DispenserTileEntity::setItem(unsigned int slot, std::shared_ptr<ItemInstance> item)
+void DispenserTileEntity::setItem(unsigned int slot, shared_ptr<ItemInstance> item) 
 {
 	items->data[slot] = item;
 	if (item != NULL && item->count > getMaxStackSize()) item->count = getMaxStackSize();
 	this->setChanged();
 }
 
-int DispenserTileEntity::addItem(std::shared_ptr<ItemInstance> item)
+int DispenserTileEntity::addItem(shared_ptr<ItemInstance> item)
 {
 	for (int i = 0; i < items->length; i++)
 	{
@@ -146,7 +146,7 @@ int DispenserTileEntity::addItem(std::shared_ptr<ItemInstance> item)
 	return -1;
 }
 
-int DispenserTileEntity::getName()
+int DispenserTileEntity::getName() 
 {
 	return IDS_TILE_DISPENSER;
 }
@@ -169,7 +169,7 @@ void DispenserTileEntity::save(CompoundTag *base)
 	TileEntity::save(base);
 	ListTag<CompoundTag> *listTag = new ListTag<CompoundTag>;
 
-	for (unsigned int i = 0; i < items->length; i++)
+	for (unsigned int i = 0; i < items->length; i++) 
 	{
 		if (items->data[i] != NULL)
 		{
@@ -182,12 +182,12 @@ void DispenserTileEntity::save(CompoundTag *base)
 	base->put(L"Items", listTag);
 }
 
-int DispenserTileEntity::getMaxStackSize()
+int DispenserTileEntity::getMaxStackSize() 
 {
 	return Container::LARGE_MAX_STACK_SIZE;
 }
 
-bool DispenserTileEntity::stillValid(std::shared_ptr<Player> player)
+bool DispenserTileEntity::stillValid(shared_ptr<Player> player)
 {
 	if (level->getTileEntity(x, y, z) != shared_from_this() ) return false;
 	if (player->distanceToSqr(x + 0.5, y + 0.5, z + 0.5) > 8 * 8) return false;
@@ -208,9 +208,9 @@ void DispenserTileEntity::stopOpen()
 }
 
 // 4J Added
-std::shared_ptr<TileEntity> DispenserTileEntity::clone()
+shared_ptr<TileEntity> DispenserTileEntity::clone()
 {
-	std::shared_ptr<DispenserTileEntity> result = std::shared_ptr<DispenserTileEntity>( new DispenserTileEntity() );
+	shared_ptr<DispenserTileEntity> result = shared_ptr<DispenserTileEntity>( new DispenserTileEntity() );
 	TileEntity::clone(result);
 
 	for (unsigned int i = 0; i < items->length; i++)