From 3137a82c7cedb71f4a8ef06cb2d6e5741af65c9b Mon Sep 17 00:00:00 2001 From: QAston Date: Thu, 23 Jun 2011 13:28:52 +0200 Subject: 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 --- .../CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/server/scripts/Outland') 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; } } -- cgit v1.2.3