diff options
| author | maximius <none@none> | 2009-11-21 17:59:24 -0800 |
|---|---|---|
| committer | maximius <none@none> | 2009-11-21 17:59:24 -0800 |
| commit | c767576d929dff04ea3f2d59624a612cc6fb934c (patch) | |
| tree | 1db1cb2744d1c73c930a397596b5f6b618105f37 /src/game/GameObject.cpp | |
| parent | b039a7586e76ad5cdb7d128ff9bcc3b8946e50b9 (diff) | |
*Cleanup, more consistant HandleDummyAuraProc code (added basepoints1 and basepoints2 and edited some spell cases to use these instead of more hacky custom methods..)
--HG--
branch : trunk
Diffstat (limited to 'src/game/GameObject.cpp')
| -rw-r--r-- | src/game/GameObject.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index 2c4229a9a26..00299792a5a 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -787,23 +787,23 @@ void GameObject::Respawn() } } -bool GameObject::ActivateToQuest( Player *pTarget)const +bool GameObject::ActivateToQuest(Player *pTarget) const { - if(!objmgr.IsGameObjectForQuests(GetEntry())) + if (!objmgr.IsGameObjectForQuests(GetEntry())) return false; - switch(GetGoType()) + switch (GetGoType()) { // scan GO chest with loot including quest items case GAMEOBJECT_TYPE_CHEST: { - if(LootTemplates_Gameobject.HaveQuestLootForPlayer(GetGOInfo()->GetLootId(), pTarget)) + if (LootTemplates_Gameobject.HaveQuestLootForPlayer(GetGOInfo()->GetLootId(), pTarget)) { //TODO: fix this hack //look for battlegroundAV for some objects which are only activated after mine gots captured by own team - if(GetEntry() == BG_AV_OBJECTID_MINE_N || GetEntry() == BG_AV_OBJECTID_MINE_S) - if(BattleGround *bg = pTarget->GetBattleGround()) - if(bg->GetTypeID() == BATTLEGROUND_AV && !(((BattleGroundAV*)bg)->PlayerCanDoMineQuest(GetEntry(),pTarget->GetTeam()))) + if (GetEntry() == BG_AV_OBJECTID_MINE_N || GetEntry() == BG_AV_OBJECTID_MINE_S) + if (BattleGround *bg = pTarget->GetBattleGround()) + if (bg->GetTypeID() == BATTLEGROUND_AV && !(((BattleGroundAV*)bg)->PlayerCanDoMineQuest(GetEntry(),pTarget->GetTeam()))) return false; return true; } @@ -811,7 +811,7 @@ bool GameObject::ActivateToQuest( Player *pTarget)const } case GAMEOBJECT_TYPE_GOOBER: { - if(pTarget->GetQuestStatus(GetGOInfo()->goober.questId) == QUEST_STATUS_INCOMPLETE) + if (pTarget->GetQuestStatus(GetGOInfo()->goober.questId) == QUEST_STATUS_INCOMPLETE) return true; break; } @@ -822,10 +822,10 @@ bool GameObject::ActivateToQuest( Player *pTarget)const return false; } -void GameObject::TriggeringLinkedGameObject( uint32 trapEntry, Unit* target) +void GameObject::TriggeringLinkedGameObject(uint32 trapEntry, Unit* target) { GameObjectInfo const* trapInfo = sGOStorage.LookupEntry<GameObjectInfo>(trapEntry); - if(!trapInfo || trapInfo->type!=GAMEOBJECT_TYPE_TRAP) + if (!trapInfo || trapInfo->type != GAMEOBJECT_TYPE_TRAP) return; SpellEntry const* trapSpell = sSpellStore.LookupEntry(trapInfo->trap.spellId); @@ -839,8 +839,7 @@ void GameObject::TriggeringLinkedGameObject( uint32 trapEntry, Unit* target) range = GetSpellMaxRangeForHostile(srentry); else { - Unit * owner=GetOwner(); - if (owner) + if (Unit *owner = GetOwner()) range = owner->GetSpellMaxRangeForTarget(target, srentry); else //if no owner assume that object is hostile to target |