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, 14 insertions, 14 deletions

diff --git a/Minecraft.Client/MultiPlayerGameMode.h b/Minecraft.Client/MultiPlayerGameMode.h
index c84410fa..8fc88df8 100644
--- a/Minecraft.Client/MultiPlayerGameMode.h
+++ b/Minecraft.Client/MultiPlayerGameMode.h
@@ -24,10 +24,10 @@ protected:
 public:
 	MultiPlayerGameMode(Minecraft *minecraft, ClientConnection *connection);
 	static void creativeDestroyBlock(Minecraft *minecraft, MultiPlayerGameMode *gameMode, int x, int y, int z, int face);
-	void adjustPlayer(shared_ptr<Player> player);
+	void adjustPlayer(std::shared_ptr<Player> player);
 	bool isCutScene();
 	void setLocalMode(GameType *mode);
-    virtual void initPlayer(shared_ptr<Player> player);
+    virtual void initPlayer(std::shared_ptr<Player> player);
 	virtual bool canHurtPlayer();
     virtual bool destroyBlock(int x, int y, int z, int face);
     virtual void startDestroyBlock(int x, int y, int z, int face);
@@ -41,24 +41,24 @@ private:
 private:
 	void ensureHasSentCarriedItem();
 public:
-    virtual bool useItemOn(shared_ptr<Player> player, Level *level, shared_ptr<ItemInstance> item, int x, int y, int z, int face, Vec3 *hit, bool bTestUseOnly=false, bool *pbUsedItem=NULL);
-    virtual bool useItem(shared_ptr<Player> player, Level *level, shared_ptr<ItemInstance> item, bool bTestUseOnly=false);
-    virtual shared_ptr<MultiplayerLocalPlayer> createPlayer(Level *level);
-    virtual void attack(shared_ptr<Player> player, shared_ptr<Entity> entity);
-    virtual bool interact(shared_ptr<Player> player, shared_ptr<Entity> entity);
-    virtual shared_ptr<ItemInstance> handleInventoryMouseClick(int containerId, int slotNum, int buttonNum, bool quickKeyHeld, shared_ptr<Player> player);
+    virtual bool useItemOn(std::shared_ptr<Player> player, Level *level, std::shared_ptr<ItemInstance> item, int x, int y, int z, int face, Vec3 *hit, bool bTestUseOnly=false, bool *pbUsedItem=NULL);
+    virtual bool useItem(std::shared_ptr<Player> player, Level *level, std::shared_ptr<ItemInstance> item, bool bTestUseOnly=false);
+    virtual std::shared_ptr<MultiplayerLocalPlayer> createPlayer(Level *level);
+    virtual void attack(std::shared_ptr<Player> player, std::shared_ptr<Entity> entity);
+    virtual bool interact(std::shared_ptr<Player> player, std::shared_ptr<Entity> entity);
+    virtual std::shared_ptr<ItemInstance> handleInventoryMouseClick(int containerId, int slotNum, int buttonNum, bool quickKeyHeld, std::shared_ptr<Player> player);
 	virtual void handleInventoryButtonClick(int containerId, int buttonId);
-	virtual void handleCreativeModeItemAdd(shared_ptr<ItemInstance> clicked, int slot);
-	virtual void handleCreativeModeItemDrop(shared_ptr<ItemInstance> clicked);
-	virtual void releaseUsingItem(shared_ptr<Player> player);
+	virtual void handleCreativeModeItemAdd(std::shared_ptr<ItemInstance> clicked, int slot);
+	virtual void handleCreativeModeItemDrop(std::shared_ptr<ItemInstance> clicked);
+	virtual void releaseUsingItem(std::shared_ptr<Player> player);
 	virtual bool hasExperience();
 	virtual bool hasMissTime();
 	virtual bool hasInfiniteItems();
 	virtual bool hasFarPickRange();
-	
+
 	// 4J Stu - Added so we can send packets for this in the network game
-	virtual bool handleCraftItem(int recipe, shared_ptr<Player> player);
-	virtual void handleDebugOptions(unsigned int uiVal, shared_ptr<Player> player);
+	virtual bool handleCraftItem(int recipe, std::shared_ptr<Player> player);
+	virtual void handleDebugOptions(unsigned int uiVal, std::shared_ptr<Player> player);
 
 	// 4J Stu - Added for tutorial checks
 	virtual bool isInputAllowed(int mapping) { return true; }