diff options
| author | QAston <none@none> | 2009-04-07 20:40:00 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-04-07 20:40:00 +0200 |
| commit | 741b51cc471d8a3f897b7ded51e1d3122e3d8300 (patch) | |
| tree | 3c579933847679c780be6b672e00d636a32690dd /src/game/Player.cpp | |
| parent | 26b856a5135f51372cb1b15de21a0e995cdb6435 (diff) | |
| parent | c6b6a72956efdc10da8fac982db734b054984d08 (diff) | |
*Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/Player.cpp')
| -rw-r--r-- | src/game/Player.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 832ac28c793..2eeb5d3548c 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -6273,6 +6273,8 @@ void Player::DuelComplete(DuelCompleteType type) if(!duel) return; + sLog.outDebug("Dual Complete %s %s", GetName(), duel->opponent->GetName()); + WorldPacket data(SMSG_DUEL_COMPLETE, (1)); data << (uint8)((type != DUEL_INTERUPTED) ? 1 : 0); GetSession()->SendPacket(&data); @@ -6309,8 +6311,8 @@ void Player::DuelComplete(DuelCompleteType type) duel->initiator->RemoveGameObject(obj,true); /* remove auras */ - AuraMap & vAuras = duel->opponent->GetAuras(); - for(AuraMap::iterator i = vAuras.begin(); i != vAuras.end();) + AuraMap &itsAuras = duel->opponent->GetAuras(); + for(AuraMap::iterator i = itsAuras.begin(); i != itsAuras.end();) { if (!i->second->IsPositive() && i->second->GetCasterGUID() == GetGUID() && i->second->GetAuraApplyTime() >= duel->startTime) { @@ -6320,7 +6322,8 @@ void Player::DuelComplete(DuelCompleteType type) ++i; } - for(AuraMap::iterator i = m_Auras.begin(); i != m_Auras.end();) + AuraMap &myAuras = GetAuras(); + for(AuraMap::iterator i = myAuras.begin(); i != myAuras.end();) { if (!i->second->IsPositive() && i->second->GetCasterGUID() == duel->opponent->GetGUID() && i->second->GetAuraApplyTime() >= duel->startTime) { @@ -15523,7 +15526,7 @@ bool Player::Satisfy(AccessRequirement const *ar, uint32 target_map, bool report missingItem = ar->item2; uint32 missingKey = 0; - uint32 missingHeroicQuest = 0; + uint32 missingHeroicQuest = 0; if(GetDifficulty() == DIFFICULTY_HEROIC) { if(ar->heroicKey) @@ -15535,7 +15538,7 @@ bool Player::Satisfy(AccessRequirement const *ar, uint32 target_map, bool report else if(ar->heroicKey2 && !HasItemCount(ar->heroicKey2, 1)) missingKey = ar->heroicKey2; - if(ar->heroicQuest && !GetQuestRewardStatus(ar->heroicQuest)) + if(ar->heroicQuest && !GetQuestRewardStatus(ar->heroicQuest)) missingHeroicQuest = ar->heroicQuest; } |