shared_ptr -> std::shared_ptr

This is one of the first commits in a plan to remove all `using namespace std;` lines in the entire codebase as it is considered anti-pattern today.

1 files changed, 41 insertions, 41 deletions

diff --git a/Minecraft.World/Item.h b/Minecraft.World/Item.h
index 727fc661..3e3f7e27 100644
--- a/Minecraft.World/Item.h
+++ b/Minecraft.World/Item.h
@@ -68,8 +68,8 @@ public:
 		eMaterial_stoneSmooth,
 		eMaterial_netherbrick,
 		eMaterial_ender,
-		eMaterial_glass,		
-		eMaterial_blaze,		
+		eMaterial_glass,
+		eMaterial_blaze,
 		eMaterial_magic,
 		eMaterial_melon,
 		eMaterial_setfire,
@@ -394,13 +394,13 @@ public:
 	static const int bow_Id					= 261;
 	static const int arrow_Id				= 262;
 	static const int coal_Id				= 263;
-	static const int diamond_Id				= 264;	
+	static const int diamond_Id				= 264;
 	static const int ironIngot_Id			= 265;
 	static const int goldIngot_Id			= 266;
 	static const int sword_iron_Id			= 267;
-	static const int sword_wood_Id			= 268;	
+	static const int sword_wood_Id			= 268;
 	static const int shovel_wood_Id			= 269;
-	static const int pickAxe_wood_Id		= 270;	
+	static const int pickAxe_wood_Id		= 270;
 	static const int hatchet_wood_Id		= 271;
 	static const int sword_stone_Id			= 272;
 	static const int shovel_stone_Id		= 273;
@@ -410,7 +410,7 @@ public:
 	static const int shovel_diamond_Id		= 277;
 	static const int pickAxe_diamond_Id		= 278;
 	static const int hatchet_diamond_Id		= 279;
-	static const int stick_Id				= 280;	
+	static const int stick_Id				= 280;
 	static const int bowl_Id				= 281;
 	static const int mushroomStew_Id		= 282;
 	static const int sword_gold_Id			= 283;
@@ -425,7 +425,7 @@ public:
 	static const int hoe_iron_Id			= 292;
 	static const int hoe_diamond_Id			= 293;
 	static const int hoe_gold_Id			= 294;
-	static const int seeds_wheat_Id			= 295;	
+	static const int seeds_wheat_Id			= 295;
 	static const int wheat_Id				= 296;
 	static const int bread_Id				= 297;
 
@@ -458,7 +458,7 @@ public:
 	static const int porkChop_raw_Id		= 319;
 	static const int porkChop_cooked_Id		= 320;
 	static const int painting_Id			= 321;
-	static const int apple_gold_Id			= 322;	
+	static const int apple_gold_Id			= 322;
 	static const int sign_Id				= 323;
 	static const int door_wood_Id			= 324;
 	static const int bucket_empty_Id		= 325;
@@ -474,7 +474,7 @@ public:
 	static const int milk_Id				= 335;
 	static const int brick_Id				= 336;
 	static const int clay_Id				= 337;
-	static const int reeds_Id				= 338;	
+	static const int reeds_Id				= 338;
 	static const int paper_Id				= 339;
 	static const int book_Id				= 340;
 	static const int slimeBall_Id			= 341;
@@ -487,7 +487,7 @@ public:
 	static const int yellowDust_Id			= 348;
 	static const int fish_raw_Id			= 349;
 	static const int fish_cooked_Id			= 350;
-	static const int dye_powder_Id			= 351;	
+	static const int dye_powder_Id			= 351;
 	static const int bone_Id				= 352;
 	static const int sugar_Id				= 353;
 	static const int cake_Id				= 354;
@@ -547,7 +547,7 @@ public:
 	static const int record_12_Id			= 2266;
 
 	// 4J-PB - this one isn't playable in the PC game, but is fine in ours
-	static const int record_08_Id			= 2267;		
+	static const int record_08_Id			= 2267;
 
 	// TU9
 	static const int fireball_Id			 = 385;
@@ -618,15 +618,15 @@ public:
 
 	virtual int getIconType();
 	virtual Icon *getIcon(int auxValue);
-	Icon *getIcon(shared_ptr<ItemInstance> itemInstance);
+	Icon *getIcon(std::shared_ptr<ItemInstance> itemInstance);
 
-	const bool useOn(shared_ptr<ItemInstance> itemInstance, Level *level, int x, int y, int z, int face, bool bTestUseOnOnly=false);
+	const bool useOn(std::shared_ptr<ItemInstance> itemInstance, Level *level, int x, int y, int z, int face, bool bTestUseOnOnly=false);
 
-	virtual bool useOn(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> player, Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly=false);
-	virtual float getDestroySpeed(shared_ptr<ItemInstance> itemInstance, Tile *tile);
-	virtual bool TestUse(Level *level, shared_ptr<Player> player);
-	virtual shared_ptr<ItemInstance> use(shared_ptr<ItemInstance> itemInstance, Level *level, shared_ptr<Player> player);
-	virtual shared_ptr<ItemInstance> useTimeDepleted(shared_ptr<ItemInstance> itemInstance, Level *level, shared_ptr<Player> player);
+	virtual bool useOn(std::shared_ptr<ItemInstance> itemInstance, std::shared_ptr<Player> player, Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly=false);
+	virtual float getDestroySpeed(std::shared_ptr<ItemInstance> itemInstance, Tile *tile);
+	virtual bool TestUse(Level *level, std::shared_ptr<Player> player);
+	virtual std::shared_ptr<ItemInstance> use(std::shared_ptr<ItemInstance> itemInstance, Level *level, std::shared_ptr<Player> player);
+	virtual std::shared_ptr<ItemInstance> useTimeDepleted(std::shared_ptr<ItemInstance> itemInstance, Level *level, std::shared_ptr<Player> player);
 	virtual int getMaxStackSize();
 	virtual int getLevelDataForAuxValue(int auxValue);
 	bool isStackedByData();
@@ -645,17 +645,17 @@ public:
 
 	/**
 	* Returns true when the item was used to deal more than default damage
-	* 
+	*
 	* @param itemInstance
 	* @param mob
 	* @param attacker
 	* @return
 	*/
-	virtual bool hurtEnemy(shared_ptr<ItemInstance> itemInstance, shared_ptr<Mob> mob, shared_ptr<Mob> attacker);
+	virtual bool hurtEnemy(std::shared_ptr<ItemInstance> itemInstance, std::shared_ptr<Mob> mob, std::shared_ptr<Mob> attacker);
 
 	/**
 	* Returns true when the item was used to mine more efficiently
-	* 
+	*
 	* @param itemInstance
 	* @param tile
 	* @param x
@@ -664,35 +664,35 @@ public:
 	* @param owner
 	* @return
 	*/
-	virtual bool mineBlock(shared_ptr<ItemInstance> itemInstance, Level *level, int tile, int x, int y, int z, shared_ptr<Mob> owner);
-	virtual int getAttackDamage(shared_ptr<Entity> entity);
+	virtual bool mineBlock(std::shared_ptr<ItemInstance> itemInstance, Level *level, int tile, int x, int y, int z, std::shared_ptr<Mob> owner);
+	virtual int getAttackDamage(std::shared_ptr<Entity> entity);
 	virtual bool canDestroySpecial(Tile *tile);
-	virtual bool interactEnemy(shared_ptr<ItemInstance> itemInstance, shared_ptr<Mob> mob);
+	virtual bool interactEnemy(std::shared_ptr<ItemInstance> itemInstance, std::shared_ptr<Mob> mob);
 	Item *handEquipped();
 	virtual bool isHandEquipped();
 	virtual bool isMirroredArt();
 	Item *setDescriptionId(unsigned int id);
 	LPCWSTR getDescription();
-	LPCWSTR getDescription(shared_ptr<ItemInstance> instance);
+	LPCWSTR getDescription(std::shared_ptr<ItemInstance> instance);
 	virtual unsigned int getDescriptionId(int iData = -1);
-	virtual unsigned int getDescriptionId(shared_ptr<ItemInstance> instance);
+	virtual unsigned int getDescriptionId(std::shared_ptr<ItemInstance> instance);
 	Item *setUseDescriptionId(unsigned int id);
 	virtual unsigned int getUseDescriptionId();
-	virtual unsigned int getUseDescriptionId(shared_ptr<ItemInstance> instance);
+	virtual unsigned int getUseDescriptionId(std::shared_ptr<ItemInstance> instance);
 	Item *setCraftingRemainingItem(Item *craftingRemainingItem);
-	virtual bool shouldMoveCraftingResultToInventory(shared_ptr<ItemInstance> instance);
+	virtual bool shouldMoveCraftingResultToInventory(std::shared_ptr<ItemInstance> instance);
 	virtual bool shouldOverrideMultiplayerNBT();
 	Item *getCraftingRemainingItem();
 	bool hasCraftingRemainingItem();
 	std::wstring getName();
-	virtual int getColor(shared_ptr<ItemInstance> item, int spriteLayer);
-	virtual void inventoryTick(shared_ptr<ItemInstance> itemInstance, Level *level, shared_ptr<Entity> owner, int slot, bool selected);
-	virtual void onCraftedBy(shared_ptr<ItemInstance> itemInstance, Level *level, shared_ptr<Player> player);
+	virtual int getColor(std::shared_ptr<ItemInstance> item, int spriteLayer);
+	virtual void inventoryTick(std::shared_ptr<ItemInstance> itemInstance, Level *level, std::shared_ptr<Entity> owner, int slot, bool selected);
+	virtual void onCraftedBy(std::shared_ptr<ItemInstance> itemInstance, Level *level, std::shared_ptr<Player> player);
 	virtual bool isComplex();
 
-	virtual UseAnim getUseAnimation(shared_ptr<ItemInstance> itemInstance);
-	virtual int getUseDuration(shared_ptr<ItemInstance> itemInstance);
-	virtual void releaseUsing(shared_ptr<ItemInstance> itemInstance, Level *level, shared_ptr<Player> player, int durationLeft);
+	virtual UseAnim getUseAnimation(std::shared_ptr<ItemInstance> itemInstance);
+	virtual int getUseDuration(std::shared_ptr<ItemInstance> itemInstance);
+	virtual void releaseUsing(std::shared_ptr<ItemInstance> itemInstance, Level *level, std::shared_ptr<Player> player, int durationLeft);
 
 protected:
 	virtual Item *setPotionBrewingFormula(const wstring &potionBrewingFormula);
@@ -700,19 +700,19 @@ protected:
 public:
 	virtual wstring getPotionBrewingFormula();
 	virtual bool hasPotionBrewingFormula();
-	virtual void appendHoverText(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> player, vector<wstring> *lines, bool advanced, vector<wstring> &unformattedStrings); // 4J Added unformattedStrings
-	virtual wstring getHoverName(shared_ptr<ItemInstance> itemInstance);
-	virtual bool isFoil(shared_ptr<ItemInstance> itemInstance);
-	virtual const Rarity *getRarity(shared_ptr<ItemInstance> itemInstance);
-	virtual bool isEnchantable(shared_ptr<ItemInstance> itemInstance);
+	virtual void appendHoverText(std::shared_ptr<ItemInstance> itemInstance, std::shared_ptr<Player> player, vector<wstring> *lines, bool advanced, vector<wstring> &unformattedStrings); // 4J Added unformattedStrings
+	virtual wstring getHoverName(std::shared_ptr<ItemInstance> itemInstance);
+	virtual bool isFoil(std::shared_ptr<ItemInstance> itemInstance);
+	virtual const Rarity *getRarity(std::shared_ptr<ItemInstance> itemInstance);
+	virtual bool isEnchantable(std::shared_ptr<ItemInstance> itemInstance);
 
 protected:
-	HitResult *getPlayerPOVHitResult(Level *level, shared_ptr<Player> player, bool alsoPickLiquid);
+	HitResult *getPlayerPOVHitResult(Level *level, std::shared_ptr<Player> player, bool alsoPickLiquid);
 
 public:
 	virtual int getEnchantmentValue();
 	virtual bool hasMultipleSpriteLayers();
 	virtual Icon *getLayerIcon(int auxValue, int spriteLayer);
-	virtual bool isValidRepairItem(shared_ptr<ItemInstance> source, shared_ptr<ItemInstance> repairItem);
+	virtual bool isValidRepairItem(std::shared_ptr<ItemInstance> source, std::shared_ptr<ItemInstance> repairItem);
 	virtual void registerIcons(IconRegister *iconRegister);
 };