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.
This commit is contained in:
@@ -11,13 +11,13 @@ class TileItem : public Item
|
||||
public: static const int _class = 0;
|
||||
using Item::getColor;
|
||||
|
||||
private:
|
||||
private:
|
||||
int tileId;
|
||||
Icon *itemIcon;
|
||||
|
||||
public:
|
||||
TileItem(int id);
|
||||
|
||||
TileItem(int id);
|
||||
|
||||
virtual int getTileId();
|
||||
|
||||
//@Override
|
||||
@@ -26,18 +26,18 @@ public:
|
||||
//@Override
|
||||
Icon *getIcon(int auxValue);
|
||||
|
||||
virtual bool useOn(shared_ptr<ItemInstance> instance, shared_ptr<Player> player, Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly=false);
|
||||
virtual unsigned int getDescriptionId(shared_ptr<ItemInstance> instance);
|
||||
virtual bool useOn(std::shared_ptr<ItemInstance> instance, 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 unsigned int getDescriptionId(std::shared_ptr<ItemInstance> instance);
|
||||
virtual unsigned int getDescriptionId(int iData = -1);
|
||||
|
||||
// 4J Added
|
||||
virtual int getColor(int itemAuxValue, int spriteLayer);
|
||||
|
||||
// 4J Added
|
||||
virtual unsigned int getUseDescriptionId(shared_ptr<ItemInstance> instance);
|
||||
virtual unsigned int getUseDescriptionId(std::shared_ptr<ItemInstance> instance);
|
||||
virtual unsigned int getUseDescriptionId();
|
||||
|
||||
virtual bool mayPlace(Level *level, int x, int y, int z, int face, shared_ptr<Player> player, shared_ptr<ItemInstance> item);
|
||||
virtual bool mayPlace(Level *level, int x, int y, int z, int face, std::shared_ptr<Player> player, std::shared_ptr<ItemInstance> item);
|
||||
|
||||
//@Override
|
||||
virtual void registerIcons(IconRegister *iconRegister);
|
||||
|
||||
Reference in New Issue
Block a user