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:
@@ -8,7 +8,7 @@
|
||||
|
||||
|
||||
|
||||
void AddEntityPacket::_init(shared_ptr<Entity> e, int type, int data, int xp, int yp, int zp, int yRotp, int xRotp)
|
||||
void AddEntityPacket::_init(std::shared_ptr<Entity> e, int type, int data, int xp, int yp, int zp, int yRotp, int xRotp)
|
||||
{
|
||||
id = e->entityId;
|
||||
// 4J Stu - We should add entities at their "last sent" position so that the relative update packets
|
||||
@@ -38,16 +38,16 @@ void AddEntityPacket::_init(shared_ptr<Entity> e, int type, int data, int xp, in
|
||||
}
|
||||
}
|
||||
|
||||
AddEntityPacket::AddEntityPacket()
|
||||
AddEntityPacket::AddEntityPacket()
|
||||
{
|
||||
}
|
||||
|
||||
AddEntityPacket::AddEntityPacket(shared_ptr<Entity> e, int type, int yRotp, int xRotp, int xp, int yp, int zp )
|
||||
AddEntityPacket::AddEntityPacket(std::shared_ptr<Entity> e, int type, int yRotp, int xRotp, int xp, int yp, int zp )
|
||||
{
|
||||
_init(e, type, -1, xp, yp, zp, yRotp, xRotp); // 4J - changed "no data" value to be -1, we can have a valid entity id of 0
|
||||
}
|
||||
|
||||
AddEntityPacket::AddEntityPacket(shared_ptr<Entity> e, int type, int data, int yRotp, int xRotp, int xp, int yp, int zp )
|
||||
AddEntityPacket::AddEntityPacket(std::shared_ptr<Entity> e, int type, int data, int yRotp, int xRotp, int xp, int yp, int zp )
|
||||
{
|
||||
_init(e, type, data, xp, yp, zp, yRotp, xRotp);
|
||||
}
|
||||
@@ -100,12 +100,12 @@ void AddEntityPacket::write(DataOutputStream *dos) // throws IOException TODO 4J
|
||||
}
|
||||
}
|
||||
|
||||
void AddEntityPacket::handle(PacketListener *listener)
|
||||
void AddEntityPacket::handle(PacketListener *listener)
|
||||
{
|
||||
listener->handleAddEntity(shared_from_this());
|
||||
}
|
||||
|
||||
int AddEntityPacket::getEstimatedSize()
|
||||
int AddEntityPacket::getEstimatedSize()
|
||||
{
|
||||
return 11 + data > -1 ? 6 : 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user