josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some crashes linked to gurgthock summon

Browse Source 
Fixes issue #440.
Fixes issue #441.

--HG--
branch : trunk
This commit is contained in:
Trazom62
2010-01-23 18:48:06 +01:00
parent fd5390c4c1
commit 171e7b70a5
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scripts/northrend/zuldrak.cpp
+24 -16
View File
@@ -474,8 +474,9 @@ struct TRINITY_DLL_DECL npc_orinoko_tuskbreakerAI : public ScriptedAI
pWhisker->RemoveFromWorld(); pWhisker->RemoveFromWorld();
if (m_creature->isSummon()) if (m_creature->isSummon())
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner()) if (Creature* pSummoner = CAST_CRE(CAST_SUM(m_creature)->GetSummoner()))
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->RemoveSummons(); if (npc_gurgthockAI* pAI = CAST_AI(npc_gurgthockAI,pSummoner->AI()))
pAI->RemoveSummons();
} }
void MovementInform(uint32 uiType, uint32 uiId) void MovementInform(uint32 uiType, uint32 uiId)
@@ -546,8 +547,9 @@ struct TRINITY_DLL_DECL npc_orinoko_tuskbreakerAI : public ScriptedAI
CAST_PLR(pKiller)->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_TUSKARRMAGEDDON, CAST_PLR(pKiller)); CAST_PLR(pKiller)->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_TUSKARRMAGEDDON, CAST_PLR(pKiller));
if (m_creature->isSummon()) if (m_creature->isSummon())
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner()) if (Creature* pSummoner = CAST_CRE(CAST_SUM(m_creature)->GetSummoner()))
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->bEventInProgress = false; if (npc_gurgthockAI* pAI = CAST_AI(npc_gurgthockAI,pSummoner->AI()))
pAI->bEventInProgress = false;
} }
}; };
@@ -593,8 +595,9 @@ struct TRINITY_DLL_DECL npc_korrak_bloodragerAI : public npc_escortAI
void EnterEvadeMode() void EnterEvadeMode()
{ {
if (m_creature->isSummon()) if (m_creature->isSummon())
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner()) if (Creature* pSummoner = CAST_CRE(CAST_SUM(m_creature)->GetSummoner()))
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->RemoveSummons(); if (npc_gurgthockAI* pAI = CAST_AI(npc_gurgthockAI,pSummoner->AI()))
pAI->RemoveSummons();
} }
void WaypointReached(uint32 uiI) void WaypointReached(uint32 uiI)
@@ -649,8 +652,9 @@ struct TRINITY_DLL_DECL npc_korrak_bloodragerAI : public npc_escortAI
CAST_PLR(pKiller)->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_KORRAK_BLOODRAGER, CAST_PLR(pKiller)); CAST_PLR(pKiller)->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_KORRAK_BLOODRAGER, CAST_PLR(pKiller));
if (m_creature->isSummon()) if (m_creature->isSummon())
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner()) if (Creature* pSummoner = CAST_CRE(CAST_SUM(m_creature)->GetSummoner()))
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->bEventInProgress = false; if (npc_gurgthockAI* pAI = CAST_AI(npc_gurgthockAI,pSummoner->AI()))
pAI->bEventInProgress = false;
} }
}; };
@@ -686,8 +690,9 @@ struct TRINITY_DLL_DECL npc_yggdrasAI : public ScriptedAI
void EnterEvadeMode() //If you lose the combat, then the npc go away void EnterEvadeMode() //If you lose the combat, then the npc go away
{ {
if (m_creature->isSummon()) if (m_creature->isSummon())
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner()) if (Creature* pSummoner = CAST_CRE(CAST_SUM(m_creature)->GetSummoner()))
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->RemoveSummons(); if (npc_gurgthockAI* pAI = CAST_AI(npc_gurgthockAI,pSummoner->AI()))
pAI->RemoveSummons();
} }
void EnterCombat(Unit* pWho) void EnterCombat(Unit* pWho)
@@ -727,8 +732,9 @@ struct TRINITY_DLL_DECL npc_yggdrasAI : public ScriptedAI
DoCast(pKiller, SPELL_JORMUNGAR_SPAWN, true); DoCast(pKiller, SPELL_JORMUNGAR_SPAWN, true);
if (m_creature->isSummon()) if (m_creature->isSummon())
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner()) if (Creature* pSummoner = CAST_CRE(CAST_SUM(m_creature)->GetSummoner()))
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->bEventInProgress = false; if (npc_gurgthockAI* pAI = CAST_AI(npc_gurgthockAI,pSummoner->AI()))
pAI->bEventInProgress = false;
} }
}; };
@@ -778,8 +784,9 @@ struct TRINITY_DLL_DECL npc_stinkbeardAI : public npc_escortAI
void EnterEvadeMode() void EnterEvadeMode()
{ {
if (m_creature->isSummon()) if (m_creature->isSummon())
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner()) if (Creature* pSummoner = CAST_CRE(CAST_SUM(m_creature)->GetSummoner()))
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->RemoveSummons(); if (npc_gurgthockAI* pAI = CAST_AI(npc_gurgthockAI,pSummoner->AI()))
pAI->RemoveSummons();
} }
void WaypointReached(uint32 uiI) void WaypointReached(uint32 uiI)
@@ -838,8 +845,9 @@ struct TRINITY_DLL_DECL npc_stinkbeardAI : public npc_escortAI
void JustDied(Unit* pKiller) void JustDied(Unit* pKiller)
{ {
if (m_creature->isSummon()) if (m_creature->isSummon())
if (Unit* pSummoner = CAST_SUM(m_creature)->GetSummoner()) if (Creature* pSummoner = CAST_CRE(CAST_SUM(m_creature)->GetSummoner()))
CAST_AI(npc_gurgthockAI,CAST_CRE(pSummoner)->AI())->bEventInProgress = false; if (npc_gurgthockAI* pAI = CAST_AI(npc_gurgthockAI,pSummoner->AI()))
pAI->bEventInProgress = false;
if (pKiller->GetTypeId() == TYPEID_PLAYER) if (pKiller->GetTypeId() == TYPEID_PLAYER)
CAST_PLR(pKiller)->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_MAGNATAUR, CAST_PLR(pKiller)); CAST_PLR(pKiller)->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_MAGNATAUR, CAST_PLR(pKiller));