From d4ca8f6eee973f38dc3779aa1322596e93409c87 Mon Sep 17 00:00:00 2001 From: Spp Date: Mon, 18 Jan 2010 17:18:15 +0100 Subject: Backout 8f186e3cc3 (Remove unnecesary checks) --HG-- branch : trunk --- src/bindings/scripts/scripts/northrend/zuldrak.cpp | 24 ++++++++-------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/bindings/scripts/scripts/northrend/zuldrak.cpp b/src/bindings/scripts/scripts/northrend/zuldrak.cpp index a1e397718e5..ea306279bf9 100644 --- a/src/bindings/scripts/scripts/northrend/zuldrak.cpp +++ b/src/bindings/scripts/scripts/northrend/zuldrak.cpp @@ -475,8 +475,7 @@ struct TRINITY_DLL_DECL npc_orinoko_tuskbreakerAI : public ScriptedAI if (m_creature->isSummon()) if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner()) - if (pSummoner) - CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->RemoveSummons(); + CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->RemoveSummons(); } void MovementInform(uint32 uiType, uint32 uiId) @@ -548,8 +547,7 @@ struct TRINITY_DLL_DECL npc_orinoko_tuskbreakerAI : public ScriptedAI if (m_creature->isSummon()) if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner()) - if (pSummoner) - CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->bEventInProgress = false; + CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->bEventInProgress = false; } }; @@ -596,8 +594,7 @@ struct TRINITY_DLL_DECL npc_korrak_bloodragerAI : public npc_escortAI { if (m_creature->isSummon()) if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner()) - if (pSummoner) - CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->RemoveSummons(); + CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->RemoveSummons(); } void WaypointReached(uint32 uiI) @@ -653,8 +650,7 @@ struct TRINITY_DLL_DECL npc_korrak_bloodragerAI : public npc_escortAI if (m_creature->isSummon()) if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner()) - if (pSummoner) - CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->bEventInProgress = false; + CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->bEventInProgress = false; } }; @@ -691,8 +687,7 @@ struct TRINITY_DLL_DECL npc_yggdrasAI : public ScriptedAI { if (m_creature->isSummon()) if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner()) - if (pSummoner) - CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->RemoveSummons(); + CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->RemoveSummons(); } void EnterCombat(Unit* pWho) @@ -733,8 +728,7 @@ struct TRINITY_DLL_DECL npc_yggdrasAI : public ScriptedAI if (m_creature->isSummon()) if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner()) - if (pSummoner) - CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->bEventInProgress = false; + CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->bEventInProgress = false; } }; @@ -785,8 +779,7 @@ struct TRINITY_DLL_DECL npc_stinkbeardAI : public npc_escortAI { if (m_creature->isSummon()) if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner()) - if (pSummoner) - CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->RemoveSummons(); + CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->RemoveSummons(); } void WaypointReached(uint32 uiI) @@ -846,8 +839,7 @@ struct TRINITY_DLL_DECL npc_stinkbeardAI : public npc_escortAI { if (m_creature->isSummon()) if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner()) - if (pSummoner) - CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->bEventInProgress = false; + CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->bEventInProgress = false; if (pKiller->GetTypeId() == TYPEID_PLAYER) CAST_PLR(pKiller)->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_MAGNATAUR, CAST_PLR(pKiller)); -- cgit v1.2.3