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:
@@ -13,24 +13,24 @@ class EntityTracker
|
||||
{
|
||||
private:
|
||||
ServerLevel *level;
|
||||
unordered_set<shared_ptr<TrackedEntity> > entities;
|
||||
unordered_map<int, shared_ptr<TrackedEntity> , IntKeyHash2, IntKeyEq> entityMap; // was IntHashMap
|
||||
unordered_set<std::shared_ptr<TrackedEntity> > entities;
|
||||
unordered_map<int, std::shared_ptr<TrackedEntity> , IntKeyHash2, IntKeyEq> entityMap; // was IntHashMap
|
||||
int maxRange;
|
||||
|
||||
public:
|
||||
EntityTracker(ServerLevel *level);
|
||||
void addEntity(shared_ptr<Entity> e);
|
||||
void addEntity(shared_ptr<Entity> e, int range, int updateInterval);
|
||||
void addEntity(shared_ptr<Entity> e, int range, int updateInterval, bool trackDeltas);
|
||||
void removeEntity(shared_ptr<Entity> e);
|
||||
void removePlayer(shared_ptr<Entity> e); // 4J added
|
||||
void addEntity(std::shared_ptr<Entity> e);
|
||||
void addEntity(std::shared_ptr<Entity> e, int range, int updateInterval);
|
||||
void addEntity(std::shared_ptr<Entity> e, int range, int updateInterval, bool trackDeltas);
|
||||
void removeEntity(std::shared_ptr<Entity> e);
|
||||
void removePlayer(std::shared_ptr<Entity> e); // 4J added
|
||||
void tick();
|
||||
void broadcast(shared_ptr<Entity> e, shared_ptr<Packet> packet);
|
||||
void broadcastAndSend(shared_ptr<Entity> e, shared_ptr<Packet> packet);
|
||||
void clear(shared_ptr<ServerPlayer> serverPlayer);
|
||||
void broadcast(std::shared_ptr<Entity> e, std::shared_ptr<Packet> packet);
|
||||
void broadcastAndSend(std::shared_ptr<Entity> e, std::shared_ptr<Packet> packet);
|
||||
void clear(std::shared_ptr<ServerPlayer> serverPlayer);
|
||||
void updateMaxRange(); // AP added for Vita
|
||||
|
||||
|
||||
// 4J-JEV: Added, needed access to tracked entity of a riders mount.
|
||||
shared_ptr<TrackedEntity> getTracker(shared_ptr<Entity> entity);
|
||||
std::shared_ptr<TrackedEntity> getTracker(std::shared_ptr<Entity> entity);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user