diff options
| author | QAston <qaston@gmail.com> | 2011-06-23 13:28:52 +0200 |
|---|---|---|
| committer | QAston <qaston@gmail.com> | 2011-06-23 13:28:52 +0200 |
| commit | 3137a82c7cedb71f4a8ef06cb2d6e5741af65c9b (patch) | |
| tree | 2c2345632592f55129ddd931e8b97391b0e2efb8 /src/server/scripts/Outland | |
| parent | 9d9472e5cc2f761fbc93f8f0e87903898bf48b91 (diff) | |
Core/Spells: Cleanup in Spell.h:
- Codestyle (fix function naming) and cleanup changes in SpellCastTargets class, also access variables of this class by getters/setters
- Move IsQuestTameSpell function to SpellMgr.h
- Move UnitList typedef to Unit.h
Additionally - add missing copyright notice to SpellAuraEffects.h
Diffstat (limited to 'src/server/scripts/Outland')
| -rw-r--r-- | src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index 45b8b5d3590..93903e4f297 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -988,11 +988,11 @@ public: Vashj = (Unit::GetCreature((*pPlayer), pInstance->GetData64(DATA_LADYVASHJ))); if (Vashj && (CAST_AI(boss_lady_vashj::boss_lady_vashjAI, Vashj->AI())->Phase == 2)) { - if (targets.getGOTarget() && targets.getGOTarget()->GetTypeId() == TYPEID_GAMEOBJECT) + if (GameObject* gObj = targets.GetGOTarget()) { uint32 identifier; uint8 channel_identifier; - switch(targets.getGOTarget()->GetEntry()) + switch(gObj->GetEntry()) { case 185052: identifier = DATA_SHIELDGENERATOR1; @@ -1035,12 +1035,12 @@ public: pPlayer->DestroyItemCount(31088, 1, true); return true; } - else if (targets.getUnitTarget()->GetTypeId() == TYPEID_UNIT) + else if (targets.GetUnitTarget()->GetTypeId() == TYPEID_UNIT) return false; - else if (targets.getUnitTarget()->GetTypeId() == TYPEID_PLAYER) + else if (targets.GetUnitTarget()->GetTypeId() == TYPEID_PLAYER) { pPlayer->DestroyItemCount(31088, 1, true); - pPlayer->CastSpell(targets.getUnitTarget(), 38134, true); + pPlayer->CastSpell(targets.GetUnitTarget(), 38134, true); return true; } } |
