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

Core: Corrected NULL usage, it should only be used with pointers, not integers

Browse Source
This commit is contained in:
Shauren
2011-04-23 15:53:48 +02:00
parent a2a751b9d6
commit 8898db8b27
56 changed files with 216 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
+6 -6
View File
@@ -190,11 +190,11 @@ public:
{
if (pInstance)
if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT)))
pInstance->HandleGameObject(NULL,false,pGo);
pInstance->HandleGameObject(0,false,pGo);
}else
if (pInstance)
if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_LEFT)))
pInstance->HandleGameObject(NULL,false,pGo);
pInstance->HandleGameObject(0,false,pGo);
}
void SetInFace(bool bBool)
@@ -217,10 +217,10 @@ public:
return;
if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT)))
pInstance->HandleGameObject(NULL,false,pGo);
pInstance->HandleGameObject(0,false,pGo);
if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_LEFT)))
pInstance->HandleGameObject(NULL,false,pGo);
pInstance->HandleGameObject(0,false,pGo);
if (!GoSummonList.empty())
for (std::list<uint64>::const_iterator itr = GoSummonList.begin(); itr != GoSummonList.end(); ++itr)
@@ -446,7 +446,7 @@ public:
Summon(1);
if (pInstance)
if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT)))
pInstance->HandleGameObject(NULL,true,pGo);
pInstance->HandleGameObject(0,true,pGo);
NextStep(3000,true);
break;
case 7:
@@ -492,7 +492,7 @@ public:
SetInFace(false);
if (pInstance)
if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_LEFT)))
pInstance->HandleGameObject(NULL,true,pGo);
pInstance->HandleGameObject(0,true,pGo);
NextStep(2000,true);
break;
case 17:
src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
+2 -2
View File
@@ -90,12 +90,12 @@ public:
case GO_CAVE_IN_LEFT:
uiCaveInLeftGUID = go->GetGUID();
if (m_auiEncounter[0] == DONE || m_auiEncounter[0] == NOT_STARTED)
HandleGameObject(NULL,false,go);
HandleGameObject(0,false,go);
break;
case GO_CAVE_IN_RIGHT:
uiCaveInRightGUID = go->GetGUID();
if (m_auiEncounter[0] == DONE || m_auiEncounter[0] == NOT_STARTED)
HandleGameObject(NULL,false,go);
HandleGameObject(0,false,go);
break;
}
}
src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
+3 -3
View File
@@ -160,7 +160,7 @@ public:
pInstance->SetData(TYPE_NIGHTBANE, IN_PROGRESS);
HandleTerraceDoors(false);
me->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, 0);
}
void AttackStart(Unit* who)
@@ -236,7 +236,7 @@ public:
void TakeOff()
{
me->MonsterYell(YELL_FLY_PHASE, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_FLY_PHASE, LANG_UNIVERSAL, 0);
me->InterruptSpell(CURRENT_GENERIC_SPELL);
me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF);
@@ -402,7 +402,7 @@ public:
if (FlyTimer <= diff) //landing
{
me->MonsterYell(RAND(*YELL_LAND_PHASE_1,*YELL_LAND_PHASE_2), LANG_UNIVERSAL, NULL);
me->MonsterYell(RAND(*YELL_LAND_PHASE_1,*YELL_LAND_PHASE_2), LANG_UNIVERSAL, 0);
me->GetMotionMaster()->Clear(false);
me->GetMotionMaster()->MovePoint(3,IntroWay[3][0],IntroWay[3][1],IntroWay[3][2]);
src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+8 -8
View File
@@ -542,25 +542,25 @@ public:
{
case 0: return 9999999;
case 1:
me->MonsterYell(SAY_DIALOG_MEDIVH_1,LANG_UNIVERSAL,NULL);
me->MonsterYell(SAY_DIALOG_MEDIVH_1, LANG_UNIVERSAL, 0);
return 10000;
case 2:
if (arca)
CAST_CRE(arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_2,LANG_UNIVERSAL,NULL);
CAST_CRE(arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_2, LANG_UNIVERSAL, 0);
return 20000;
case 3:
me->MonsterYell(SAY_DIALOG_MEDIVH_3,LANG_UNIVERSAL,NULL);
me->MonsterYell(SAY_DIALOG_MEDIVH_3, LANG_UNIVERSAL, 0);
return 10000;
case 4:
if (arca)
CAST_CRE(arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_4, LANG_UNIVERSAL, NULL);
CAST_CRE(arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_4, LANG_UNIVERSAL, 0);
return 20000;
case 5:
me->MonsterYell(SAY_DIALOG_MEDIVH_5, LANG_UNIVERSAL, NULL);
me->MonsterYell(SAY_DIALOG_MEDIVH_5, LANG_UNIVERSAL, 0);
return 20000;
case 6:
if (arca)
CAST_CRE(arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_6, LANG_UNIVERSAL, NULL);
CAST_CRE(arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_6, LANG_UNIVERSAL, 0);
return 10000;
case 7:
FireArcanagosTimer = 500;
@@ -578,7 +578,7 @@ public:
return 1000;
case 11:
if (arca)
CAST_CRE(arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_8, LANG_UNIVERSAL, NULL);
CAST_CRE(arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_8, LANG_UNIVERSAL, 0);
return 5000;
case 12:
arca->GetMotionMaster()->MovePoint(0, -11010.82f,-1761.18f, 156.47f);
@@ -587,7 +587,7 @@ public:
arca->SetSpeed(MOVE_FLIGHT, 2.0f);
return 10000;
case 13:
me->MonsterYell(SAY_DIALOG_MEDIVH_9, LANG_UNIVERSAL, NULL);
me->MonsterYell(SAY_DIALOG_MEDIVH_9, LANG_UNIVERSAL, 0);
return 10000;
case 14:
me->SetVisible(false);
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+2 -2
View File
@@ -995,7 +995,7 @@ public:
me->SetInFront(car);
me->SendMovementFlagUpdate();
}
me->MonsterSay(SAY_SCARLET_MINER1,LANG_UNIVERSAL,NULL);
me->MonsterSay(SAY_SCARLET_MINER1,LANG_UNIVERSAL,0);
SetRun(true);
IntroTimer = 4000;
IntroPhase = 1;
@@ -1009,7 +1009,7 @@ public:
car->SendMonsterStop();
car->RemoveAura(SPELL_CART_DRAG);
}
me->MonsterSay(SAY_SCARLET_MINER2,LANG_UNIVERSAL,NULL);
me->MonsterSay(SAY_SCARLET_MINER2,LANG_UNIVERSAL,0);
break;
default:
break;
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+9 -9
View File
@@ -406,11 +406,11 @@ public:
if (Creature* pTemp = Unit::GetCreature(*me, uiRayneGUID))
pTemp->setDeathState(JUST_DIED);
uiTirionGUID = NULL;
uiKorfaxGUID = NULL;
uiMaxwellGUID = NULL;
uiEligorGUID = NULL;
uiRayneGUID = NULL;
uiTirionGUID = 0;
uiKorfaxGUID = 0;
uiMaxwellGUID = 0;
uiEligorGUID = 0;
uiRayneGUID = 0;
for (uint8 i = 0; i < ENCOUNTER_DEFENDER_NUMBER; ++i)
{
@@ -434,10 +434,10 @@ public:
if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID))
pTemp->Respawn();
uiKoltiraGUID = NULL;
uiOrbazGUID = NULL;
uiThassarianGUID = NULL;
uiLichKingGUID = NULL;
uiKoltiraGUID = 0;
uiOrbazGUID = 0;
uiThassarianGUID = 0;
uiLichKingGUID = 0;
for (uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
{
if (Creature* pTemp = Unit::GetCreature(*me, uiAbominationGUID[i]))
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+2 -2
View File
@@ -333,7 +333,7 @@ public:
Creature *speaker = DoSpawnCreature(HELPER,0,0,0,0,TEMPSUMMON_TIMED_DESPAWN,1000);
if (speaker)
speaker->CastSpell(speaker,SPELL_HEAD_SPEAKS,false);
me->MonsterTextEmote(EMOTE_LAUGHS,NULL);
me->MonsterTextEmote(EMOTE_LAUGHS,0);
} else laugh -= diff;
}
else
@@ -690,7 +690,7 @@ public:
if (laugh <= diff)
{
laugh = urand(11000,22000);
me->MonsterTextEmote(EMOTE_LAUGHS,NULL);
me->MonsterTextEmote(EMOTE_LAUGHS,0);
DoPlaySoundToSet(me, RandomLaugh[rand()%3]);
} else laugh -= diff;
src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
+3 -3
View File
@@ -115,17 +115,17 @@ public:
case GO_COURTYARD_DOOR:
DoorCourtyardGUID = go->GetGUID();
if (m_auiEncounter[0] == DONE)
HandleGameObject(NULL, true, go);
HandleGameObject(0, true, go);
break;
case GO_SORCERER_DOOR:
DoorSorcererGUID = go->GetGUID();
if (m_auiEncounter[2] == DONE)
HandleGameObject(NULL, true, go);
HandleGameObject(0, true, go);
break;
case GO_ARUGAL_DOOR:
DoorArugalGUID = go->GetGUID();
if (m_auiEncounter[3] == DONE)
HandleGameObject(NULL, true, go);
HandleGameObject(0, true, go);
break;
}
}
src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp
+1 -1
View File
@@ -56,7 +56,7 @@ public:
{
if (!HasYelled)
{
me->MonsterYell(SAY_SPAWN,LANG_UNIVERSAL,NULL);
me->MonsterYell(SAY_SPAWN,LANG_UNIVERSAL,0);
HasYelled = true;
}
}
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+1 -1
View File
@@ -751,7 +751,7 @@ public:
}
else
{
me->MonsterTextEmote(EMOTE_UNABLE_TO_FIND, NULL);
me->MonsterTextEmote(EMOTE_UNABLE_TO_FIND, 0);
EnterEvadeMode();
return;
}
src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+2 -2
View File
@@ -167,13 +167,13 @@ public:
case 188524: KalecgosWall[0] = go->GetGUID(); break;
case 188075:
if (m_auiEncounter[2] == DONE)
HandleGameObject(NULL, true, go);
HandleGameObject(0, true, go);
FireBarrier = go->GetGUID();
break;
case 187990: MurusGate[0] = go->GetGUID(); break;
case 188118:
if (m_auiEncounter[4] == DONE)
HandleGameObject(NULL, true, go);
HandleGameObject(0, true, go);
MurusGate[1]= go->GetGUID();
break;
}
src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
+5 -5
View File
@@ -88,7 +88,7 @@ class boss_archaedas : public CreatureScript
bVaultWalkersAwake = false;
if (pInstance)
pInstance->SetData(NULL, 5); // respawn any dead minions
pInstance->SetData(0, 5); // respawn any dead minions
me->setFaction(35);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);
@@ -117,7 +117,7 @@ class boss_archaedas : public CreatureScript
// Being woken up from the altar, start the awaken sequence
if (spell == GetSpellStore()->LookupEntry(SPELL_ARCHAEDAS_AWAKEN))
{
me->MonsterYell(SAY_AGGRO,LANG_UNIVERSAL,NULL);
me->MonsterYell(SAY_AGGRO, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me,SOUND_AGGRO);
iAwakenTimer = 4000;
bWakingUp = true;
@@ -126,7 +126,7 @@ class boss_archaedas : public CreatureScript
void KilledUnit(Unit * /*victim*/)
{
me->MonsterYell(SAY_KILL,LANG_UNIVERSAL, NULL);
me->MonsterYell(SAY_KILL, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_KILL);
}
@@ -167,7 +167,7 @@ class boss_archaedas : public CreatureScript
ActivateMinion(pInstance->GetData64(8),true); // EarthenGuardian4
ActivateMinion(pInstance->GetData64(9),true); // EarthenGuardian5
ActivateMinion(pInstance->GetData64(10),false); // EarthenGuardian6
me->MonsterYell(SAY_SUMMON,LANG_UNIVERSAL, NULL);
me->MonsterYell(SAY_SUMMON, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_SUMMON);
bGuardiansAwake = true;
}
@@ -179,7 +179,7 @@ class boss_archaedas : public CreatureScript
ActivateMinion(pInstance->GetData64(2),true); // VaultWalker2
ActivateMinion(pInstance->GetData64(3),true); // VaultWalker3
ActivateMinion(pInstance->GetData64(4),false); // VaultWalker4
me->MonsterYell(SAY_SUMMON2, LANG_UNIVERSAL, NULL);
me->MonsterYell(SAY_SUMMON2, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_SUMMON2);
bVaultWalkersAwake = true;
}
src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
+5 -5
View File
@@ -106,14 +106,14 @@ class instance_uldaman : public InstanceMapScript
uiAltarOfTheKeeperTempleDoor = go->GetGUID();
if(m_auiEncounter[0] == DONE)
HandleGameObject(NULL, true, go);
HandleGameObject(0, true, go);
break;
case GO_ARCHAEDAS_TEMPLE_DOOR:
uiArchaedasTempleDoor = go->GetGUID();
if(m_auiEncounter[0] == DONE)
HandleGameObject(NULL, true, go);
HandleGameObject(0, true, go);
break;
case GO_ANCIENT_VAULT_DOOR:
@@ -122,14 +122,14 @@ class instance_uldaman : public InstanceMapScript
uiAncientVaultDoor = go->GetGUID();
if(m_auiEncounter[1] == DONE)
HandleGameObject(NULL, true, go);
HandleGameObject(0, true, go);
break;
case GO_IRONAYA_SEAL_DOOR:
uiIronayaSealDoor = go->GetGUID();
if (m_auiEncounter[2] == DONE)
HandleGameObject(NULL, true, go);
HandleGameObject(0, true, go);
break;
case GO_KEYSTONE:
@@ -137,7 +137,7 @@ class instance_uldaman : public InstanceMapScript
if (m_auiEncounter[2] == DONE)
{
HandleGameObject(NULL, true, go);
HandleGameObject(0, true, go);
go->SetUInt32Value(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND);
}
break;
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+6 -6
View File
@@ -128,7 +128,7 @@ class boss_akilzon : public CreatureScript
void EnterCombat(Unit * /*who*/)
{
me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, NULL);
me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_ONAGGRO);
//DoZoneInCombat();
if (pInstance)
@@ -137,7 +137,7 @@ class boss_akilzon : public CreatureScript
void JustDied(Unit* /*Killer*/)
{
me->MonsterYell(SAY_ONDEATH,LANG_UNIVERSAL,NULL);
me->MonsterYell(SAY_ONDEATH, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_ONDEATH);
if (pInstance)
pInstance->SetData(DATA_AKILZONEVENT, DONE);
@@ -149,11 +149,11 @@ class boss_akilzon : public CreatureScript
switch (urand(0,1))
{
case 0:
me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, NULL);
me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_ONSLAY1);
break;
case 1:
me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, NULL);
me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_ONSLAY2);
break;
}
@@ -277,7 +277,7 @@ class boss_akilzon : public CreatureScript
if (Enrage_Timer <= diff)
{
me->MonsterYell(SAY_ONENRAGE, LANG_UNIVERSAL, NULL);
me->MonsterYell(SAY_ONENRAGE, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_ONENRAGE);
DoCast(me, SPELL_BERSERK, true);
Enrage_Timer = 600000;
@@ -351,7 +351,7 @@ class boss_akilzon : public CreatureScript
if (SummonEagles_Timer <= diff)
{
me->MonsterYell(SAY_ONSUMMON, LANG_UNIVERSAL, NULL);
me->MonsterYell(SAY_ONSUMMON, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_ONSUMMON);
float x, y, z;
src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
+7 -7
View File
@@ -128,7 +128,7 @@ class boss_halazzi : public CreatureScript
if (pInstance)
pInstance->SetData(DATA_HALAZZIEVENT, IN_PROGRESS);
me->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_AGGRO);
EnterPhase(PHASE_LYNX);
@@ -180,7 +180,7 @@ class boss_halazzi : public CreatureScript
TotemTimer = 12000;
break;
case PHASE_SPLIT:
me->MonsterYell(YELL_SPLIT, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_SPLIT, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_SPLIT);
DoCast(me, SPELL_TRANSFORM_SPLIT, true);
break;
@@ -195,7 +195,7 @@ class boss_halazzi : public CreatureScript
case PHASE_MERGE:
if (Unit *pLynx = Unit::GetUnit(*me, LynxGUID))
{
me->MonsterYell(YELL_MERGE, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_MERGE, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_MERGE);
pLynx->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
pLynx->GetMotionMaster()->Clear();
@@ -218,7 +218,7 @@ class boss_halazzi : public CreatureScript
if (BerserkTimer <= diff)
{
me->MonsterYell(YELL_BERSERK, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_BERSERK, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_BERSERK);
DoCast(me, SPELL_BERSERK, true);
BerserkTimer = 60000;
@@ -318,12 +318,12 @@ class boss_halazzi : public CreatureScript
switch (urand(0,1))
{
case 0:
me->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_KILL_ONE);
break;
case 1:
me->MonsterYell(YELL_KILL_TWO, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_KILL_TWO, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_KILL_TWO);
break;
}
@@ -334,7 +334,7 @@ class boss_halazzi : public CreatureScript
if (pInstance)
pInstance->SetData(DATA_HALAZZIEVENT, DONE);
me->MonsterYell(YELL_DEATH, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_DEATH, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_DEATH);
}
};
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
+6 -6
View File
@@ -259,7 +259,7 @@ class boss_hexlord_malacrass : public CreatureScript
pInstance->SetData(DATA_HEXLORDEVENT, IN_PROGRESS);
DoZoneInCombat();
me->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_YELL_AGGRO);
for (uint8 i = 0; i < 4; ++i)
@@ -280,11 +280,11 @@ class boss_hexlord_malacrass : public CreatureScript
switch (urand(0,1))
{
case 0:
me->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_YELL_KILL_ONE);
break;
case 1:
me->MonsterYell(YELL_KILL_TWO, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_KILL_TWO, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_YELL_KILL_TWO);
break;
}
@@ -295,7 +295,7 @@ class boss_hexlord_malacrass : public CreatureScript
if (pInstance)
pInstance->SetData(DATA_HEXLORDEVENT, DONE);
me->MonsterYell(YELL_DEATH, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_DEATH, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_YELL_DEATH);
for (uint8 i = 0; i < 4 ; ++i)
@@ -369,7 +369,7 @@ class boss_hexlord_malacrass : public CreatureScript
if (DrainPower_Timer <= diff)
{
DoCast(me, SPELL_DRAIN_POWER, true);
me->MonsterYell(YELL_DRAIN_POWER, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_DRAIN_POWER, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_YELL_DRAIN_POWER);
DrainPower_Timer = urand(40000,55000); // must cast in 60 sec, or buff/debuff will disappear
} else DrainPower_Timer -= diff;
@@ -381,7 +381,7 @@ class boss_hexlord_malacrass : public CreatureScript
else
{
DoCast(me, SPELL_SPIRIT_BOLTS, false);
me->MonsterYell(YELL_SPIRIT_BOLTS, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_SPIRIT_BOLTS, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_YELL_SPIRIT_BOLTS);
SpiritBolts_Timer = 40000;
SiphonSoul_Timer = 10000; // ready to drain
src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
+12 -12
View File
@@ -211,7 +211,7 @@ class boss_nalorakk : public CreatureScript
case 0:
if (me->IsWithinDistInMap(who, 50))
{
me->MonsterYell(YELL_NALORAKK_WAVE1, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_NALORAKK_WAVE1, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_NALORAKK_WAVE1);
(*me).GetMotionMaster()->MovePoint(1,NalorakkWay[1][0],NalorakkWay[1][1],NalorakkWay[1][2]);
@@ -224,7 +224,7 @@ class boss_nalorakk : public CreatureScript
case 2:
if (me->IsWithinDistInMap(who, 40))
{
me->MonsterYell(YELL_NALORAKK_WAVE2, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_NALORAKK_WAVE2, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_NALORAKK_WAVE2);
(*me).GetMotionMaster()->MovePoint(3,NalorakkWay[3][0],NalorakkWay[3][1],NalorakkWay[3][2]);
@@ -237,7 +237,7 @@ class boss_nalorakk : public CreatureScript
case 5:
if (me->IsWithinDistInMap(who, 40))
{
me->MonsterYell(YELL_NALORAKK_WAVE3, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_NALORAKK_WAVE3, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_NALORAKK_WAVE3);
(*me).GetMotionMaster()->MovePoint(6,NalorakkWay[6][0],NalorakkWay[6][1],NalorakkWay[6][2]);
@@ -252,7 +252,7 @@ class boss_nalorakk : public CreatureScript
{
SendAttacker(who);
me->MonsterYell(YELL_NALORAKK_WAVE4, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_NALORAKK_WAVE4, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_NALORAKK_WAVE4);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -272,7 +272,7 @@ class boss_nalorakk : public CreatureScript
if (pInstance)
pInstance->SetData(DATA_NALORAKKEVENT, IN_PROGRESS);
me->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_YELL_AGGRO);
DoZoneInCombat();
}
@@ -282,7 +282,7 @@ class boss_nalorakk : public CreatureScript
if (pInstance)
pInstance->SetData(DATA_NALORAKKEVENT, DONE);
me->MonsterYell(YELL_DEATH,LANG_UNIVERSAL,NULL);
me->MonsterYell(YELL_DEATH, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_YELL_DEATH);
}
@@ -291,11 +291,11 @@ class boss_nalorakk : public CreatureScript
switch (urand(0,1))
{
case 0:
me->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_YELL_KILL_ONE);
break;
case 1:
me->MonsterYell(YELL_KILL_TWO, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_KILL_TWO, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_YELL_KILL_TWO);
break;
}
@@ -359,7 +359,7 @@ class boss_nalorakk : public CreatureScript
if (Berserk_Timer <= diff)
{
DoCast(me, SPELL_BERSERK, true);
me->MonsterYell(YELL_BERSERK, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_BERSERK, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_YELL_BERSERK);
Berserk_Timer = 600000;
} else Berserk_Timer -= diff;
@@ -369,7 +369,7 @@ class boss_nalorakk : public CreatureScript
if (inBearForm)
{
// me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 1, 5122);
me->MonsterYell(YELL_SHIFTEDTOTROLL, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_SHIFTEDTOTROLL, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_YELL_TOTROLL);
me->RemoveAurasDueToSpell(SPELL_BEARFORM);
Surge_Timer = 15000 + rand()%5000;
@@ -381,7 +381,7 @@ class boss_nalorakk : public CreatureScript
else
{
// me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 1, 0);
me->MonsterYell(YELL_SHIFTEDTOBEAR, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_SHIFTEDTOBEAR, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_YELL_TOBEAR);
DoCast(me, SPELL_BEARFORM, true);
LaceratingSlash_Timer = 2000; // dur 18s
@@ -412,7 +412,7 @@ class boss_nalorakk : public CreatureScript
if (Surge_Timer <= diff)
{
me->MonsterYell(YELL_SURGE, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_SURGE, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_YELL_SURGE);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 45, true);
if (pTarget)
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
+7 -7
View File
@@ -228,7 +228,7 @@ class boss_zuljin : public CreatureScript
DoZoneInCombat();
me->MonsterYell(YELL_INTRO,LANG_UNIVERSAL,NULL);
me->MonsterYell(YELL_INTRO, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_INTRO);
SpawnAdds();
EnterPhase(0);
@@ -242,11 +242,11 @@ class boss_zuljin : public CreatureScript
switch (urand(0,1))
{
case 0:
me->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_KILL_ONE);
break;
case 1:
me->MonsterYell(YELL_KILL_TWO, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_KILL_TWO, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_KILL_TWO);
break;
}
@@ -257,7 +257,7 @@ class boss_zuljin : public CreatureScript
if (pInstance)
pInstance->SetData(DATA_ZULJINEVENT, DONE);
me->MonsterYell(YELL_DEATH, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_DEATH, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_DEATH);
Summons.DespawnEntry(CREATURE_COLUMN_OF_FIRE);
@@ -353,7 +353,7 @@ class boss_zuljin : public CreatureScript
me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, 0);
me->RemoveAurasDueToSpell(Transform[Phase].unaura);
DoCast(me, Transform[Phase].spell);
me->MonsterYell(Transform[Phase].text.c_str(), LANG_UNIVERSAL, NULL);
me->MonsterYell(Transform[Phase].text.c_str(), LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, Transform[Phase].sound);
if (Phase > 0)
{
@@ -409,7 +409,7 @@ class boss_zuljin : public CreatureScript
if (Berserk_Timer <= diff)
{
DoCast(me, SPELL_BERSERK, true);
me->MonsterYell(YELL_BERSERK, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_BERSERK, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_BERSERK);
Berserk_Timer = 60000;
} else Berserk_Timer -= diff;
@@ -421,7 +421,7 @@ class boss_zuljin : public CreatureScript
{
if (Intro_Timer <= diff)
{
me->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, NULL);
me->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_AGGRO);
Intro_Timer = 0;
} else Intro_Timer -= diff;