aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitchesD <majklprofik@seznam.cz>2015-04-04 19:52:53 +0200
committerMitchesD <majklprofik@seznam.cz>2015-04-04 19:52:53 +0200
commite7e940db2255bdc06647cd4e81ec2ef3d2fbaa28 (patch)
tree1171211001970c6583e30beddb21a8dd4536ecf9
parent786834600f0fe17f8876f6bec958c6ce9813a49f (diff)
Core/Packets: rename classes to match standards
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp2
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp4
-rw-r--r--src/server/game/Server/Packets/CombatPackets.cpp4
-rw-r--r--src/server/game/Server/Packets/CombatPackets.h6
-rw-r--r--src/server/game/Server/Packets/MiscPackets.cpp2
-rw-r--r--src/server/game/Server/Packets/MiscPackets.h4
6 files changed, 11 insertions, 11 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 73a05bd410e..5ee5e64a7b2 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -2147,7 +2147,7 @@ bool Creature::LoadCreaturesAddon(bool reload)
void Creature::SendZoneUnderAttackMessage(Player* attacker)
{
uint32 enemy_team = attacker->GetTeam();
- WorldPackets::Misc::ZoneUpdate packet;
+ WorldPackets::Misc::ZoneUnderAttack packet;
packet.AreaID = GetAreaId();
sWorld->SendGlobalMessage(packet.Write(), NULL, (enemy_team == ALLIANCE ? HORDE : ALLIANCE));
}
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index c099d8903f5..f384a42ff28 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -15656,8 +15656,8 @@ void Unit::SendChangeCurrentVictimOpcode(HostileReference* pHostileReference)
void Unit::SendClearThreatListOpcode()
{
TC_LOG_DEBUG("entities.unit", "WORLD: Send SMSG_THREAT_CLEAR Message");
- WorldPackets::Combat::ClearThreatList packet;
- packet.GUID = GetGUID();
+ WorldPackets::Combat::ThreatClear packet;
+ packet.UnitGUID = GetGUID();
SendMessageToSet(packet.Write(), false);
}
diff --git a/src/server/game/Server/Packets/CombatPackets.cpp b/src/server/game/Server/Packets/CombatPackets.cpp
index 482df865a99..e5100450b55 100644
--- a/src/server/game/Server/Packets/CombatPackets.cpp
+++ b/src/server/game/Server/Packets/CombatPackets.cpp
@@ -192,8 +192,8 @@ WorldPacket const* WorldPackets::Combat::HealthUpdate::Write()
return &_worldPacket;
}
-WorldPacket const* WorldPackets::Combat::ClearThreatList::Write()
+WorldPacket const* WorldPackets::Combat::ThreatClear::Write()
{
- _worldPacket << GUID;
+ _worldPacket << UnitGUID;
return &_worldPacket;
}
diff --git a/src/server/game/Server/Packets/CombatPackets.h b/src/server/game/Server/Packets/CombatPackets.h
index 0ee11da0dff..0cab58044eb 100644
--- a/src/server/game/Server/Packets/CombatPackets.h
+++ b/src/server/game/Server/Packets/CombatPackets.h
@@ -237,14 +237,14 @@ namespace WorldPackets
int32 Health = 0;
};
- class ClearThreatList final : public ServerPacket
+ class ThreatClear final : public ServerPacket
{
public:
- ClearThreatList() : ServerPacket(SMSG_THREAT_CLEAR, 16) { }
+ ThreatClear() : ServerPacket(SMSG_THREAT_CLEAR, 16) { }
WorldPacket const* Write() override;
- ObjectGuid GUID;
+ ObjectGuid UnitGUID;
};
}
}
diff --git a/src/server/game/Server/Packets/MiscPackets.cpp b/src/server/game/Server/Packets/MiscPackets.cpp
index 8fd6b403c53..a67a0669b35 100644
--- a/src/server/game/Server/Packets/MiscPackets.cpp
+++ b/src/server/game/Server/Packets/MiscPackets.cpp
@@ -407,7 +407,7 @@ WorldPacket const* WorldPackets::Misc::PhaseShift::Write()
return &_worldPacket;
}
-WorldPacket const* WorldPackets::Misc::ZoneUpdate::Write()
+WorldPacket const* WorldPackets::Misc::ZoneUnderAttack::Write()
{
_worldPacket << int32(AreaID);
diff --git a/src/server/game/Server/Packets/MiscPackets.h b/src/server/game/Server/Packets/MiscPackets.h
index 45ba59a56f6..4d21b8a3285 100644
--- a/src/server/game/Server/Packets/MiscPackets.h
+++ b/src/server/game/Server/Packets/MiscPackets.h
@@ -554,10 +554,10 @@ namespace WorldPackets
std::set<uint32> VisibleMapIDs;
};
- class ZoneUpdate final : public ServerPacket
+ class ZoneUnderAttack final : public ServerPacket
{
public:
- ZoneUpdate() : ServerPacket(SMSG_ZONE_UNDER_ATTACK, 4) { }
+ ZoneUnderAttack() : ServerPacket(SMSG_ZONE_UNDER_ATTACK, 4) { }
WorldPacket const* Write() override;