diff options
| author | QAston <none@none> | 2009-04-06 13:31:14 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-04-06 13:31:14 +0200 |
| commit | 20c02ef7606557a3932d2a3ca052242224a53b4a (patch) | |
| tree | 8b7718b7938184f9c0d0aa3dba70a46316786bfa /src/game/GroupHandler.cpp | |
| parent | 850537ece97dde9ee788ebc6e2c8edd7285b0d00 (diff) | |
*Update of aura system.
--HG--
branch : trunk
Diffstat (limited to 'src/game/GroupHandler.cpp')
| -rw-r--r-- | src/game/GroupHandler.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/game/GroupHandler.cpp b/src/game/GroupHandler.cpp index df9f0fc0a1a..b0094989e19 100644 --- a/src/game/GroupHandler.cpp +++ b/src/game/GroupHandler.cpp @@ -30,6 +30,9 @@ #include "Group.h" #include "SocialMgr.h" #include "Util.h" +#include "SpellAuras.h" + +class Aura; /* differeces from off: -you can uninvite yourself - is is useful @@ -713,8 +716,8 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke { if(auramask & (uint64(1) << i)) { - AuraSlotEntry * pAura = player->GetVisibleAura(i); - *data << uint32(pAura ? pAura->m_spellId : 0); + Aura * pAura = player->GetVisibleAura(i); + *data << uint32(pAura ? pAura->GetId() : 0); *data << uint8(1); } } @@ -795,8 +798,8 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke { if(auramask & (uint64(1) << i)) { - AuraSlotEntry * pAura = pet->GetVisibleAura(i); - *data << uint32(pAura ? pAura->m_spellId : 0); + Aura * pAura = pet->GetVisibleAura(i); + *data << uint32(pAura ? pAura->GetId() : 0); *data << uint8(1); } } @@ -855,10 +858,10 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode( WorldPacket &recv_data ) data << (uint64) auramask; // placeholder for(uint8 i = 0; i < MAX_AURAS; ++i) { - if(AuraSlotEntry * pAura = player->GetVisibleAura(i)) + if(Aura * pAura = player->GetVisibleAura(i)) { auramask |= (uint64(1) << i); - data << (uint32) pAura->m_spellId; + data << (uint32) pAura->GetId(); data << (uint8) 1; } } @@ -881,10 +884,10 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode( WorldPacket &recv_data ) data << (uint64) petauramask; // placeholder for(uint8 i = 0; i < MAX_AURAS; ++i) { - if(AuraSlotEntry * pAura = pet->GetVisibleAura(i)) + if(Aura * pAura = pet->GetVisibleAura(i)) { petauramask |= (uint64(1) << i); - data << (uint32) pAura->m_spellId; + data << (uint32) pAura->GetId(); data << (uint8) 1; } } |