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:
@@ -4,7 +4,7 @@ class Village
|
||||
{
|
||||
private:
|
||||
Level *level;
|
||||
vector<shared_ptr<DoorInfo> > doorInfos;
|
||||
vector<std::shared_ptr<DoorInfo> > doorInfos;
|
||||
|
||||
Pos *accCenter;
|
||||
Pos *center;
|
||||
@@ -19,10 +19,10 @@ private:
|
||||
class Aggressor
|
||||
{
|
||||
public:
|
||||
shared_ptr<Mob> mob;
|
||||
std::shared_ptr<Mob> mob;
|
||||
int timeStamp;
|
||||
|
||||
Aggressor(shared_ptr<Mob> mob, int timeStamp);
|
||||
Aggressor(std::shared_ptr<Mob> mob, int timeStamp);
|
||||
};
|
||||
|
||||
vector<Aggressor *> aggressors;
|
||||
@@ -50,16 +50,16 @@ public:
|
||||
int getStableAge();
|
||||
int getPopulationSize();
|
||||
bool isInside(int xx, int yy, int zz);
|
||||
vector<shared_ptr<DoorInfo> > *getDoorInfos();
|
||||
shared_ptr<DoorInfo> getClosestDoorInfo(int x, int y, int z);
|
||||
shared_ptr<DoorInfo> getBestDoorInfo(int x, int y, int z);
|
||||
vector<std::shared_ptr<DoorInfo> > *getDoorInfos();
|
||||
std::shared_ptr<DoorInfo> getClosestDoorInfo(int x, int y, int z);
|
||||
std::shared_ptr<DoorInfo> getBestDoorInfo(int x, int y, int z);
|
||||
bool hasDoorInfo(int x, int y, int z);
|
||||
shared_ptr<DoorInfo> getDoorInfo(int x, int y, int z);
|
||||
void addDoorInfo(shared_ptr<DoorInfo> di);
|
||||
std::shared_ptr<DoorInfo> getDoorInfo(int x, int y, int z);
|
||||
void addDoorInfo(std::shared_ptr<DoorInfo> di);
|
||||
bool canRemove();
|
||||
void addAggressor(shared_ptr<Mob> mob);
|
||||
shared_ptr<Mob> getClosestAggressor(shared_ptr<Mob> from);
|
||||
shared_ptr<Player> getClosestBadStandingPlayer(shared_ptr<Mob> from); // 4J Stu - Should be LivingEntity when we add that
|
||||
void addAggressor(std::shared_ptr<Mob> mob);
|
||||
std::shared_ptr<Mob> getClosestAggressor(std::shared_ptr<Mob> from);
|
||||
std::shared_ptr<Player> getClosestBadStandingPlayer(std::shared_ptr<Mob> from); // 4J Stu - Should be LivingEntity when we add that
|
||||
|
||||
private:
|
||||
void updateAggressors();
|
||||
|
||||
Reference in New Issue
Block a user