araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-18 06:00:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: changed WorldPacket pointers to const

Browse Source 
- Packet update sync with master
This commit is contained in:
ariel-
2017-02-20 16:43:16 -03:00
parent ae9d01a324
commit c274ea8a98
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Object/Object.cpp
+3 -3
View File
@@ -1771,19 +1771,19 @@ void Unit::BuildHeartBeatMsg(WorldPacket* data) const
BuildMovementPacket(data);
}
void WorldObject::SendMessageToSet(WorldPacket* data, bool self)
void WorldObject::SendMessageToSet(WorldPacket const* data, bool self)
{
if (IsInWorld())
SendMessageToSetInRange(data, GetVisibilityRange(), self);
}
void WorldObject::SendMessageToSetInRange(WorldPacket* data, float dist, bool /*self*/)
void WorldObject::SendMessageToSetInRange(WorldPacket const* data, float dist, bool /*self*/)
{
Trinity::MessageDistDeliverer notifier(this, data, dist);
VisitNearbyWorldObject(dist, notifier);
}
void WorldObject::SendMessageToSet(WorldPacket* data, Player const* skipped_rcvr)
void WorldObject::SendMessageToSet(WorldPacket const* data, Player const* skipped_rcvr)
{
Trinity::MessageDistDeliverer notifier(this, data, GetVisibilityRange(), false, skipped_rcvr);
VisitNearbyWorldObject(GetVisibilityRange(), notifier);
src/server/game/Entities/Object/Object.h
+3 -3
View File
@@ -506,9 +506,9 @@ class TC_GAME_API WorldObject : public Object, public WorldLocation
virtual void CleanupsBeforeDelete(bool finalCleanup = true); // used in destructor or explicitly before mass creature delete to remove cross-references to already deleted units
virtual void SendMessageToSet(WorldPacket* data, bool self);
virtual void SendMessageToSetInRange(WorldPacket* data, float dist, bool self);
virtual void SendMessageToSet(WorldPacket* data, Player const* skipped_rcvr);
virtual void SendMessageToSet(WorldPacket const* data, bool self);
virtual void SendMessageToSetInRange(WorldPacket const* data, float dist, bool self);
virtual void SendMessageToSet(WorldPacket const* data, Player const* skipped_rcvr);
virtual uint8 getLevelForTarget(WorldObject const* /*target*/) const { return 1; }
src/server/game/Entities/Player/Player.cpp
+3 -3
View File
@@ -6422,7 +6422,7 @@ bool Player::UpdatePosition(float x, float y, float z, float orientation, bool t
return true;
}
void Player::SendMessageToSetInRange(WorldPacket* data, float dist, bool self)
void Player::SendMessageToSetInRange(WorldPacket const* data, float dist, bool self)
{
if (self)
GetSession()->SendPacket(data);
@@ -6431,7 +6431,7 @@ void Player::SendMessageToSetInRange(WorldPacket* data, float dist, bool self)
VisitNearbyWorldObject(dist, notifier);
}
void Player::SendMessageToSetInRange(WorldPacket* data, float dist, bool self, bool own_team_only)
void Player::SendMessageToSetInRange(WorldPacket const* data, float dist, bool self, bool own_team_only)
{
if (self)
GetSession()->SendPacket(data);
@@ -6440,7 +6440,7 @@ void Player::SendMessageToSetInRange(WorldPacket* data, float dist, bool self, b
VisitNearbyWorldObject(dist, notifier);
}
void Player::SendMessageToSet(WorldPacket* data, Player const* skipped_rcvr)
void Player::SendMessageToSet(WorldPacket const* data, Player const* skipped_rcvr)
{
if (skipped_rcvr != this)
GetSession()->SendPacket(data);
src/server/game/Entities/Player/Player.h
+4 -4
View File
@@ -1803,10 +1803,10 @@ class TC_GAME_API Player : public Unit, public GridObject<Player>
bool UpdatePosition(const Position &pos, bool teleport = false) override { return UpdatePosition(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation(), teleport); }
void UpdateUnderwaterState(Map* m, float x, float y, float z) override;
void SendMessageToSet(WorldPacket* data, bool self) override { SendMessageToSetInRange(data, GetVisibilityRange(), self); }
void SendMessageToSetInRange(WorldPacket* data, float dist, bool self) override;
void SendMessageToSetInRange(WorldPacket* data, float dist, bool self, bool own_team_only);
void SendMessageToSet(WorldPacket* data, Player const* skipped_rcvr) override;
void SendMessageToSet(WorldPacket const* data, bool self) override { SendMessageToSetInRange(data, GetVisibilityRange(), self); }
void SendMessageToSetInRange(WorldPacket const* data, float dist, bool self) override;
void SendMessageToSetInRange(WorldPacket const* data, float dist, bool self, bool own_team_only);
void SendMessageToSet(WorldPacket const* data, Player const* skipped_rcvr) override;
void SendTeleportAckPacket();
src/server/game/Grids/Notifiers/GridNotifiers.h
+4 -4
View File
@@ -123,12 +123,12 @@ namespace Trinity
struct TC_GAME_API MessageDistDeliverer
{
WorldObject* i_source;
WorldPacket* i_message;
WorldPacket const* i_message;
uint32 i_phaseMask;
float i_distSq;
uint32 team;
Player const* skipped_receiver;
MessageDistDeliverer(WorldObject* src, WorldPacket* msg, float dist, bool own_team_only = false, Player const* skipped = NULL)
MessageDistDeliverer(WorldObject* src, WorldPacket const* msg, float dist, bool own_team_only = false, Player const* skipped = NULL)
: i_source(src), i_message(msg), i_phaseMask(src->GetPhaseMask()), i_distSq(dist * dist)
, team(0)
, skipped_receiver(skipped)
@@ -160,11 +160,11 @@ namespace Trinity
struct TC_GAME_API MessageDistDelivererToHostile
{
Unit* i_source;
WorldPacket* i_message;
WorldPacket const* i_message;
uint32 i_phaseMask;
float i_distSq;
MessageDistDelivererToHostile(Unit* src, WorldPacket* msg, float dist)
MessageDistDelivererToHostile(Unit* src, WorldPacket const* msg, float dist)
: i_source(src), i_message(msg), i_phaseMask(src->GetPhaseMask()), i_distSq(dist * dist)
{
}