aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/TrackedEntity.h
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.Client/TrackedEntity.h')
-rw-r--r--Minecraft.Client/TrackedEntity.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/Minecraft.Client/TrackedEntity.h b/Minecraft.Client/TrackedEntity.h
index 9fb564a4..1efd169b 100644
--- a/Minecraft.Client/TrackedEntity.h
+++ b/Minecraft.Client/TrackedEntity.h
@@ -15,7 +15,7 @@ private:
static const int TOLERANCE_LEVEL = 4;
public:
- shared_ptr<Entity> e;
+ std::shared_ptr<Entity> e;
int range, updateInterval;
int xp, yp, zp, yRotp, xRotp, yHeadRotp;
@@ -27,23 +27,23 @@ private:
bool updatedPlayerVisibility;
bool trackDelta;
int teleportDelay;
- shared_ptr<Entity> wasRiding;
+ std::shared_ptr<Entity> wasRiding;
public:
bool moved;
- unordered_set<shared_ptr<ServerPlayer> , PlayerKeyHash, PlayerKeyEq > seenBy;
+ unordered_set<std::shared_ptr<ServerPlayer> , PlayerKeyHash, PlayerKeyEq > seenBy;
- TrackedEntity(shared_ptr<Entity> e, int range, int updateInterval, bool trackDelta);
+ TrackedEntity(std::shared_ptr<Entity> e, int range, int updateInterval, bool trackDelta);
- void tick(EntityTracker *tracker, vector<shared_ptr<Player> > *players);
- void broadcast(shared_ptr<Packet> packet);
- void broadcastAndSend(shared_ptr<Packet> packet);
+ void tick(EntityTracker *tracker, vector<std::shared_ptr<Player> > *players);
+ void broadcast(std::shared_ptr<Packet> packet);
+ void broadcastAndSend(std::shared_ptr<Packet> packet);
void broadcastRemoved();
- void removePlayer(shared_ptr<ServerPlayer> sp);
+ void removePlayer(std::shared_ptr<ServerPlayer> sp);
private:
- bool canBySeenBy(shared_ptr<ServerPlayer> player);
+ bool canBySeenBy(std::shared_ptr<ServerPlayer> player);
enum eVisibility
{
@@ -52,14 +52,14 @@ private:
eVisibility_SeenAndVisible = 2,
};
- eVisibility isVisible(EntityTracker *tracker, shared_ptr<ServerPlayer> sp, bool forRider = false); // 4J Added forRider
-
+ eVisibility isVisible(EntityTracker *tracker, std::shared_ptr<ServerPlayer> sp, bool forRider = false); // 4J Added forRider
+
public:
- void updatePlayer(EntityTracker *tracker, shared_ptr<ServerPlayer> sp);
- void updatePlayers(EntityTracker *tracker, vector<shared_ptr<Player> > *players);
+ void updatePlayer(EntityTracker *tracker, std::shared_ptr<ServerPlayer> sp);
+ void updatePlayers(EntityTracker *tracker, vector<std::shared_ptr<Player> > *players);
private:
- void sendEntityData(shared_ptr<PlayerConnection> conn);
- shared_ptr<Packet> getAddEntityPacket();
+ void sendEntityData(std::shared_ptr<PlayerConnection> conn);
+ std::shared_ptr<Packet> getAddEntityPacket();
public:
- void clear(shared_ptr<ServerPlayer> sp);
+ void clear(std::shared_ptr<ServerPlayer> sp);
};