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:
@@ -26,10 +26,10 @@ public:
|
||||
virtual void aiStep();
|
||||
|
||||
protected:
|
||||
virtual void checkHurtTarget(shared_ptr<Entity> target, float d);
|
||||
virtual void checkHurtTarget(std::shared_ptr<Entity> target, float d);
|
||||
|
||||
private:
|
||||
virtual void breedWith(shared_ptr<Animal> target);
|
||||
virtual void breedWith(std::shared_ptr<Animal> target);
|
||||
|
||||
public:
|
||||
virtual float getWalkTargetValue(int x, int y, int z);
|
||||
@@ -40,7 +40,7 @@ public:
|
||||
virtual void readAdditionalSaveData(CompoundTag *tag);
|
||||
|
||||
protected:
|
||||
virtual shared_ptr<Entity> findAttackTarget();
|
||||
virtual std::shared_ptr<Entity> findAttackTarget();
|
||||
|
||||
public:
|
||||
virtual bool canSpawn();
|
||||
@@ -48,22 +48,22 @@ public:
|
||||
|
||||
protected:
|
||||
virtual bool removeWhenFarAway();
|
||||
virtual int getExperienceReward(shared_ptr<Player> killedBy);
|
||||
virtual int getExperienceReward(std::shared_ptr<Player> killedBy);
|
||||
|
||||
public:
|
||||
virtual bool isFood(shared_ptr<ItemInstance> itemInstance);
|
||||
virtual bool interact(shared_ptr<Player> player);
|
||||
virtual bool isFood(std::shared_ptr<ItemInstance> itemInstance);
|
||||
virtual bool interact(std::shared_ptr<Player> player);
|
||||
|
||||
protected:
|
||||
int getInLoveValue(); // 4J added
|
||||
|
||||
public:
|
||||
void setInLoveValue(int value); // 4J added
|
||||
void setInLove(shared_ptr<Player> player); // 4J added, then modified to match latest Java for XboxOne achievements
|
||||
shared_ptr<Player> getLoveCause();
|
||||
void setInLove(std::shared_ptr<Player> player); // 4J added, then modified to match latest Java for XboxOne achievements
|
||||
std::shared_ptr<Player> getLoveCause();
|
||||
bool isInLove();
|
||||
void resetLove();
|
||||
virtual bool canMate(shared_ptr<Animal> partner);
|
||||
virtual bool canMate(std::shared_ptr<Animal> partner);
|
||||
|
||||
// 4J added for determining whether animals are enclosed or not
|
||||
private:
|
||||
|
||||
Reference in New Issue
Block a user