diff options
Diffstat (limited to 'src/server/scripts')
42 files changed, 190 insertions, 190 deletions
diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp index 1f86bf40786..8b683215bed 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp @@ -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: diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp index 602103b61a6..884c9ecc731 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -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; } } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index 6f69aac9c55..d4d8b8d67d5 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -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]); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 98d69488478..92a63a37b3e 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -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); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 81fd7c1e9f4..ec2f0f097b4 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -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; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index 95550f70f4e..825f115b973 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -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])) diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 902541b3223..9e9d6ecb287 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -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; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index 8ee630a0125..5dc95e3eba7 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -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; } } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp index fb88c066c2a..cdd0f8fee01 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp @@ -56,7 +56,7 @@ public: { if (!HasYelled) { - me->MonsterYell(SAY_SPAWN,LANG_UNIVERSAL,NULL); + me->MonsterYell(SAY_SPAWN,LANG_UNIVERSAL,0); HasYelled = true; } } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 7d5bc8e9936..17d7ba173b8 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -751,7 +751,7 @@ public: } else { - me->MonsterTextEmote(EMOTE_UNABLE_TO_FIND, NULL); + me->MonsterTextEmote(EMOTE_UNABLE_TO_FIND, 0); EnterEvadeMode(); return; } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index 2eca32975b0..f127bc761fb 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -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; } diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp index f67db60618b..66d3ac557fb 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp @@ -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; } diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index d7eb7d91e7b..0add39a3f6e 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -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; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 8580e9c4491..56acd4abd7d 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -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; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index cf5809a1c77..f7d1b3f5ead 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -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); } }; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index d005c85434f..b9b5253c511 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -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 diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index bab2c9cdc6c..846e2179822 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -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) diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index 9518d768f8f..87d79ba7121 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -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; diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 4833827755c..c66eb20f3c7 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -233,7 +233,7 @@ public: { DoScriptText(SAY_MORRIDUNE_1,pCreature); me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - Start(false,false,NULL); + Start(false,false,0); } void WaypointReached(uint32 uiPoint) diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index 418cc5a8fad..c1fb711e5fd 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -135,7 +135,7 @@ public: break; case GO_AKU_MAI_DOOR: if (m_auiEncounter[2] == DONE) - HandleGameObject(NULL,true,go); + HandleGameObject(0,true,go); m_uiMainDoorGUID = go->GetGUID(); break; } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 417d875da83..3959337bc49 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -94,7 +94,7 @@ public: if (pInstance && IsEvent) pInstance->SetData(DATA_AZGALOREVENT, IN_PROGRESS); DoPlaySoundToSet(me, SOUND_ONAGGRO); - me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, NULL); + me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); } void KilledUnit(Unit * /*victim*/) @@ -103,15 +103,15 @@ public: { case 0: DoPlaySoundToSet(me, SOUND_ONSLAY1); - me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, NULL); + me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, 0); break; case 1: DoPlaySoundToSet(me, SOUND_ONSLAY2); - me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, NULL); + me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, 0); break; case 2: DoPlaySoundToSet(me, SOUND_ONSLAY3); - me->MonsterYell(SAY_ONSLAY3, LANG_UNIVERSAL, NULL); + me->MonsterYell(SAY_ONSLAY3, LANG_UNIVERSAL, 0); break; } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 377ca4c2e25..fc3abbaab9f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -89,7 +89,7 @@ public: if (pInstance && IsEvent) pInstance->SetData(DATA_KAZROGALEVENT, IN_PROGRESS); DoPlaySoundToSet(me, SOUND_ONAGGRO); - me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, NULL); + me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); } void KilledUnit(Unit * /*victim*/) @@ -98,15 +98,15 @@ public: { case 0: DoPlaySoundToSet(me, SOUND_ONSLAY1); - me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, NULL); + me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, 0); break; case 1: DoPlaySoundToSet(me, SOUND_ONSLAY2); - me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, NULL); + me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, 0); break; case 2: DoPlaySoundToSet(me, SOUND_ONSLAY3); - me->MonsterYell(SAY_ONSLAY3, LANG_UNIVERSAL, NULL); + me->MonsterYell(SAY_ONSLAY3, LANG_UNIVERSAL, 0); break; } } @@ -195,11 +195,11 @@ public: { case 0: DoPlaySoundToSet(me, SOUND_MARK1); - me->MonsterYell(SAY_MARK1, LANG_UNIVERSAL, NULL); + me->MonsterYell(SAY_MARK1, LANG_UNIVERSAL, 0); break; case 1: DoPlaySoundToSet(me, SOUND_MARK2); - me->MonsterYell(SAY_MARK2, LANG_UNIVERSAL, NULL); + me->MonsterYell(SAY_MARK2, LANG_UNIVERSAL, 0); break; } } else MarkTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index f46b374b2e8..295727c44ac 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -98,11 +98,11 @@ public: { case 0: DoPlaySoundToSet(me, SOUND_ONSLAY1); - me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, NULL); + me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, 0); break; case 1: DoPlaySoundToSet(me, SOUND_ONSLAY2); - me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, NULL); + me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, 0); break; } } @@ -124,7 +124,7 @@ public: if (pInstance && IsEvent) pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, DONE); DoPlaySoundToSet(me, SOUND_ONDEATH); - me->MonsterYell(SAY_ONDEATH, LANG_UNIVERSAL, NULL); + me->MonsterYell(SAY_ONDEATH, LANG_UNIVERSAL, 0); } void UpdateAI(const uint32 diff) @@ -169,11 +169,11 @@ public: { case 0: DoPlaySoundToSet(me, SOUND_DECAY1); - me->MonsterYell(SAY_DECAY1, LANG_UNIVERSAL, NULL); + me->MonsterYell(SAY_DECAY1, LANG_UNIVERSAL, 0); break; case 1: DoPlaySoundToSet(me, SOUND_DECAY2); - me->MonsterYell(SAY_DECAY2, LANG_UNIVERSAL, NULL); + me->MonsterYell(SAY_DECAY2, LANG_UNIVERSAL, 0); break; } } else DecayTimer -= diff; @@ -185,11 +185,11 @@ public: { case 0: DoPlaySoundToSet(me, SOUND_NOVA1); - me->MonsterYell(SAY_NOVA1, LANG_UNIVERSAL, NULL); + me->MonsterYell(SAY_NOVA1, LANG_UNIVERSAL, 0); break; case 1: DoPlaySoundToSet(me, SOUND_NOVA2); - me->MonsterYell(SAY_NOVA2, LANG_UNIVERSAL, NULL); + me->MonsterYell(SAY_NOVA2, LANG_UNIVERSAL, 0); break; } } else NovaTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index bfdf0d28f41..38ffeeed042 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -929,7 +929,7 @@ void hyjalAI::JustDied(Unit* /*killer*/) pInstance->SetData(DATA_KAZROGALEVENT, NOT_STARTED); if (pInstance->GetData(DATA_AZGALOREVENT) == IN_PROGRESS) pInstance->SetData(DATA_AZGALOREVENT, NOT_STARTED); - pInstance->SetData(DATA_RESET_RAIDDAMAGE, NULL);//reset damage on die + pInstance->SetData(DATA_RESET_RAIDDAMAGE, 0);//reset damage on die } } void hyjalAI::HideNearPos(float x, float y) diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp index 4f26073d50b..9a9fba3aec0 100644 --- a/src/server/scripts/Kalimdor/silithus.cpp +++ b/src/server/scripts/Kalimdor/silithus.cpp @@ -310,41 +310,41 @@ static QuestCinematic EventAnim[]= {ARYGOS_EMOTE_1, 2, 2000}, {CAELESTRASZ_SAY_1, 4, 8000}, {MERITHRA_SAY_2, 3, 6000}, - {NULL,3,2000}, + {0,3,2000}, {MERITHRA_YELL_1, 3, 2500}, - {NULL, 3, 3000},//Morph - {NULL,3,4000},//EmoteLiftoff - {NULL, 3, 4000},// spell - {NULL, 3, 1250},//fly - {NULL, 3, 250},//remove flags + {0, 3, 3000},//Morph + {0,3,4000},//EmoteLiftoff + {0, 3, 4000},// spell + {0, 3, 1250},//fly + {0, 3, 250},//remove flags {ARYGOS_SAY_1, 2, 3000}, - {NULL,3,2000}, + {0,3,2000}, {ARYGOS_YELL_1, 2, 3000}, - {NULL, 3, 3000},//Morph - {NULL,3,4000},//EmoteLiftoff - {NULL, 3, 4000},// spell - {NULL, 3, 1000},//fly - {NULL, 3, 1000},//remove flags + {0, 3, 3000},//Morph + {0,3,4000},//EmoteLiftoff + {0, 3, 4000},// spell + {0, 3, 1000},//fly + {0, 3, 1000},//remove flags {CAELESTRASZ_SAY_2, 4, 5000}, - {NULL,3,3000}, + {0,3,3000}, {CAELESTRASZ_YELL_1, 4, 3000}, - {NULL, 3, 3000},//Morph - {NULL,3,4000},//EmoteLiftoff - {NULL, 3, 2500},// spell + {0, 3, 3000},//Morph + {0,3,4000},//EmoteLiftoff + {0, 3, 2500},// spell {ANACHRONOS_SAY_2, 0, 2000}, - {NULL, 3, 250},//fly - {NULL, 3, 25},//remove flags + {0, 3, 250},//fly + {0, 3, 25},//remove flags {FANDRAL_SAY_2, 1, 3000}, {ANACHRONOS_SAY_3, 0, 10000},//Both run through the armies - {NULL,3,2000},// Sands will stop - {NULL,3,8000},// Summon Gate + {0,3,2000},// Sands will stop + {0,3,8000},// Summon Gate {ANACHRONOS_SAY_4, 0, 4000}, - {NULL, 0, 2000},//spell 1-> Arcane cosmetic (Mobs freeze) - {NULL, 0, 5000}, //Spell 2-> Arcane long cosmetic (barrier appears) (Barrier -> Glyphs) - {NULL, 0, 7000},//BarrieR - {NULL, 0, 4000},//Glyphs + {0, 0, 2000},//spell 1-> Arcane cosmetic (Mobs freeze) + {0, 0, 5000}, //Spell 2-> Arcane long cosmetic (barrier appears) (Barrier -> Glyphs) + {0, 0, 7000},//BarrieR + {0, 0, 4000},//Glyphs {ANACHRONOS_SAY_5, 0, 2000}, - {NULL, 0, 4000},// Roots + {0, 0, 4000},// Roots {FANDRAL_SAY_3, 1, 3000},//Root Text {FANDRAL_EMOTE_1, 1, 3000},//falls knee {ANACHRONOS_SAY_6, 0, 3000}, @@ -358,19 +358,19 @@ static QuestCinematic EventAnim[]= {FANDRAL_SAY_6, 1, 3000}, //fandral goes away {ANACHRONOS_EMOTE_2, 0, 3000}, {ANACHRONOS_EMOTE_3, 0, 3000}, - {NULL, 0, 2000}, - {NULL, 0, 2000}, - {NULL, 0, 4000}, + {0, 0, 2000}, + {0, 0, 2000}, + {0, 0, 4000}, {ANACHRONOS_SAY_10, 0, 3000}, - {NULL, 0, 2000}, - {NULL, 0, 3000}, - {NULL, 0, 15000}, - {NULL, 0, 5000}, - {NULL, 0, 3500}, - {NULL, 0, 5000}, - {NULL, 0, 3500}, - {NULL, 0, 5000}, - {NULL, 0, NULL} + {0, 0, 2000}, + {0, 0, 3000}, + {0, 0, 15000}, + {0, 0, 5000}, + {0, 0, 3500}, + {0, 0, 5000}, + {0, 0, 3500}, + {0, 0, 5000}, + {0, 0, 0} }; //Cordinates for Spawns @@ -548,7 +548,7 @@ public: DoScriptText(FANDRAL_SAY_1, Fandral,me); break; case 2: - Fandral->SetUInt64Value(UNIT_FIELD_TARGET,NULL); + Fandral->SetUInt64Value(UNIT_FIELD_TARGET, 0); DoScriptText(MERITHRA_EMOTE_1,Merithra); break; case 3: @@ -565,7 +565,7 @@ public: DoScriptText(MERITHRA_SAY_2, Merithra); break; case 7: - Caelestrasz->SetUInt64Value(UNIT_FIELD_TARGET, NULL); + Caelestrasz->SetUInt64Value(UNIT_FIELD_TARGET, 0); Merithra->GetMotionMaster()->MoveCharge(-8065,1530,2.61f,10); break; case 8: diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index a81098a8821..1b9e978ac01 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -89,7 +89,7 @@ public: case 192395: uiKrikthirDoor = go->GetGUID(); if (auiEncounter[0] == DONE) - HandleGameObject(NULL,true,go); + HandleGameObject(0,true,go); break; case 192396: uiAnubarakDoor[0] = go->GetGUID(); diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp index 82945aa89e1..f693c7aad16 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp @@ -112,7 +112,7 @@ public: switch(go->GetEntry()) { case 193564: Prince_TaldaramPlatform = go->GetGUID(); - if (m_auiEncounter[1] == DONE) HandleGameObject(NULL,true,go); break; + if (m_auiEncounter[1] == DONE) HandleGameObject(0,true,go); break; case 193093: Prince_TaldaramSpheres[0] = go->GetGUID(); if (spheres[0] == IN_PROGRESS) { @@ -130,7 +130,7 @@ public: else go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); break; case 192236: Prince_TaldaramGate = go->GetGUID(); // Web gate past Prince Taldaram - if (m_auiEncounter[1] == DONE)HandleGameObject(NULL,true,go);break; + if (m_auiEncounter[1] == DONE)HandleGameObject(0,true,go);break; } } diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index 84e2ea26d81..e25f9b900a4 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -220,21 +220,21 @@ public: case 192632: uiEckTheFerociousDoor = go->GetGUID(); if (bHeroicMode && m_auiEncounter[1] == DONE) - HandleGameObject(NULL,true,go); + HandleGameObject(0,true,go); break; case 192569: uiEckTheFerociousDoorBehind = go->GetGUID(); if (bHeroicMode && m_auiEncounter[4] == DONE) - HandleGameObject(NULL,true,go); + HandleGameObject(0,true,go); case 193208: uiGalDarahDoor1 = go->GetGUID(); if (m_auiEncounter[3] == DONE) - HandleGameObject(NULL,true,go); + HandleGameObject(0,true,go); break; case 193209: uiGalDarahDoor2 = go->GetGUID(); if (m_auiEncounter[3] == DONE) - HandleGameObject(NULL,true,go); + HandleGameObject(0,true,go); break; case 193188: uiBridge = go->GetGUID(); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp index 8a60dfd0e96..6fc96c8dd7f 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp @@ -231,7 +231,7 @@ public: { SlagPotTarget->ExitVehicle(); SlagPotTarget = NULL; - SlagPotGUID = NULL; + SlagPotGUID = 0; events.CancelEvent(EVENT_END_POT); } break; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp index 561df2d00d2..671a8c72574 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp @@ -238,7 +238,7 @@ public: break; case GO_VEZAX_DOOR: uiVezaxDoorGUID = go->GetGUID(); - HandleGameObject(NULL, false, go); + HandleGameObject(0, false, go); break; case GO_RAZOR_HARPOON_1: uiRazorHarpoonGUIDs[0] = go->GetGUID(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index afa587f9e4b..92972d67469 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -139,27 +139,27 @@ public: { //door and object id case ENTRY_BELLOW_1: forge_bellow[0] = go->GetGUID(); - if (forge_event[0] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + if (forge_event[0] != NOT_STARTED)HandleGameObject(0,true,go);break; case ENTRY_BELLOW_2: forge_bellow[1] = go->GetGUID(); - if (forge_event[1] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + if (forge_event[1] != NOT_STARTED)HandleGameObject(0,true,go);break; case ENTRY_BELLOW_3: forge_bellow[2] = go->GetGUID(); - if (forge_event[2] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + if (forge_event[2] != NOT_STARTED)HandleGameObject(0,true,go);break; case ENTRY_FORGEFIRE_1: forge_fire[0] = go->GetGUID(); - if (forge_event[0] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + if (forge_event[0] != NOT_STARTED)HandleGameObject(0,true,go);break; case ENTRY_FORGEFIRE_2: forge_fire[1] = go->GetGUID(); - if (forge_event[1] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + if (forge_event[1] != NOT_STARTED)HandleGameObject(0,true,go);break; case ENTRY_FORGEFIRE_3: forge_fire[2] = go->GetGUID(); - if (forge_event[2] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + if (forge_event[2] != NOT_STARTED)HandleGameObject(0,true,go);break; case ENTRY_GLOWING_ANVIL_1: forge_anvil[0] = go->GetGUID(); - if (forge_event[0] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + if (forge_event[0] != NOT_STARTED)HandleGameObject(0,true,go);break; case ENTRY_GLOWING_ANVIL_2: forge_anvil[1] = go->GetGUID(); - if (forge_event[1] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + if (forge_event[1] != NOT_STARTED)HandleGameObject(0,true,go);break; case ENTRY_GLOWING_ANVIL_3: forge_anvil[2] = go->GetGUID(); - if (forge_event[2] != NOT_STARTED)HandleGameObject(NULL,true,go);break; + if (forge_event[2] != NOT_STARTED)HandleGameObject(0,true,go);break; case ENTRY_GIANT_PORTCULLIS_1: portcullis[0] = go->GetGUID(); - if (m_auiEncounter[2] == DONE)HandleGameObject(NULL,true,go);break; + if (m_auiEncounter[2] == DONE)HandleGameObject(0,true,go);break; case ENTRY_GIANT_PORTCULLIS_2: portcullis[1] = go->GetGUID(); - if (m_auiEncounter[2] == DONE)HandleGameObject(NULL,true,go);break; + if (m_auiEncounter[2] == DONE)HandleGameObject(0,true,go);break; } } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp index db6bdeebdf3..60259a8c413 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp @@ -125,17 +125,17 @@ public: { case ENTRY_SKADI_THE_RUTHLESS_DOOR: uiSkadiTheRuthlessDoor = go->GetGUID(); - if (m_auiEncounter[2] == DONE) HandleGameObject(NULL, true, go); + if (m_auiEncounter[2] == DONE) HandleGameObject(0, true, go); break; case ENTRY_KING_YMIRON_DOOR: uiKingYmironDoor = go->GetGUID(); - if (m_auiEncounter[3] == DONE) HandleGameObject(NULL, true, go); + if (m_auiEncounter[3] == DONE) HandleGameObject(0, true, go); break; case ENTRY_GORK_PALEHOOF_SPHERE: uiGortokPalehoofSphere = go->GetGUID(); if (m_auiEncounter[1] == DONE) { - HandleGameObject(NULL, true, go); + HandleGameObject(0, true, go); go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); } break; diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index 6b1ca242309..7b0c5de36d2 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -1628,7 +1628,7 @@ public: { EnterEvadeMode(); //We make sure that the npc is not attacking the player! me->SetReactState(REACT_PASSIVE); - StartFollow(CAST_PLR(pCaster), NULL, NULL); + StartFollow(pCaster->ToPlayer(), 0, NULL); me->UpdateEntry(NPC_CAPTURED_BERLY_SORCERER, TEAM_NEUTRAL); DoCast(me, SPELL_COSMETIC_ENSLAVE_CHAINS_SELF, true); CAST_PLR(pCaster)->KilledMonsterCredit(NPC_CAPTURED_BERLY_SORCERER, 0); @@ -1699,7 +1699,7 @@ public: { uiStep = 1; uiPhase = 0; - CasterGUID = NULL; + CasterGUID = 0; } void EnterCombat(Unit* /*pWho*/) diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index 568b9e848a9..2bf418a2130 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -159,7 +159,7 @@ public: me->setFaction(me->GetCreatureInfo()->faction_H); DoCast(me, SPELL_UNSHACKLED, true); - me->MonsterSay(SAY_RAGECLAW, LANG_UNIVERSAL, NULL); + me->MonsterSay(SAY_RAGECLAW, LANG_UNIVERSAL, 0); me->GetMotionMaster()->MoveRandom(10); DespawnTimer = 10000; diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index 0785d9d5607..1a7d30baa65 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -164,24 +164,24 @@ public: switch(go->GetEntry()) { case 185483: NajentusGate = go->GetGUID();// Gate past Naj'entus (at the entrance to Supermoose's courtyards) - if (m_auiEncounter[0] == DONE)HandleGameObject(NULL,true,go);break; + if (m_auiEncounter[0] == DONE)HandleGameObject(0,true,go);break; case 185882: MainTempleDoors = go->GetGUID();// Main Temple Doors - right past Supermoose (Supremus) - if (m_auiEncounter[1] == DONE)HandleGameObject(NULL,true,go);break; + if (m_auiEncounter[1] == DONE)HandleGameObject(0,true,go);break; case 185478: ShadeOfAkamaDoor = go->GetGUID();break; case 185480: CommonDoor = go->GetGUID(); - if (m_auiEncounter[3] == DONE)HandleGameObject(NULL,true,go);break; + if (m_auiEncounter[3] == DONE)HandleGameObject(0,true,go);break; case 186153: TeronDoor = go->GetGUID(); - if (m_auiEncounter[3] == DONE)HandleGameObject(NULL,true,go);break; + if (m_auiEncounter[3] == DONE)HandleGameObject(0,true,go);break; case 185892: GuurtogDoor = go->GetGUID(); - if (m_auiEncounter[4] == DONE)HandleGameObject(NULL,true,go);break; + if (m_auiEncounter[4] == DONE)HandleGameObject(0,true,go);break; case 185479: TempleDoor = go->GetGUID(); - if (m_auiEncounter[5] == DONE)HandleGameObject(NULL,true,go);break; + if (m_auiEncounter[5] == DONE)HandleGameObject(0,true,go);break; case 185482: MotherDoor = go->GetGUID(); - if (m_auiEncounter[6] == DONE)HandleGameObject(NULL,true,go);break; + if (m_auiEncounter[6] == DONE)HandleGameObject(0,true,go);break; case 185481: CouncilDoor = go->GetGUID(); - if (m_auiEncounter[7] == DONE)HandleGameObject(NULL,true,go);break; + if (m_auiEncounter[7] == DONE)HandleGameObject(0,true,go);break; case 186152: SimpleDoor = go->GetGUID(); - if (m_auiEncounter[7] == DONE)HandleGameObject(NULL,true,go);break; + if (m_auiEncounter[7] == DONE)HandleGameObject(0,true,go);break; case 185905: IllidanGate = go->GetGUID(); break; // Gate leading to Temple Summit case 186261: IllidanDoor[0] = go->GetGUID(); break; // Right door at Temple Summit case 186262: IllidanDoor[1] = go->GetGUID(); break; // Left door at Temple Summit diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index 6705f4dda01..201fa46bb02 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -293,7 +293,7 @@ public: if (continueTriggering) { DoCast(me, SPELL_BLESSING_OF_THE_TIDES); - me->MonsterYell(SAY_GAIN_BLESSING_OF_TIDES, LANG_UNIVERSAL, NULL); + me->MonsterYell(SAY_GAIN_BLESSING_OF_TIDES, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_GAIN_BLESSING_OF_TIDES); } } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index d5a6f0d177c..153bb9e5a66 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -305,7 +305,7 @@ public: { if (MarkOfHydross_Count <= 5) { - uint32 mark_spell = NULL; + uint32 mark_spell = 0; switch(MarkOfHydross_Count) { diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp index bbb13b5bf15..20159b41a58 100644 --- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp +++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp @@ -100,7 +100,7 @@ public: { case 184468: MaulgarDoor = go->GetGUID(); - if (m_auiEncounter[0] == DONE) HandleGameObject(NULL, true, go); + if (m_auiEncounter[0] == DONE) HandleGameObject(0, true, go); break; case 184662: GruulDoor = go->GetGUID(); break; } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index efb99e41278..f2cdce78903 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -158,7 +158,7 @@ class boss_kelidan_the_breaker : public CreatureScript uint64 GetChanneled(Creature *channeler1) { SummonChannelers(); - if (!channeler1) return NULL; + if (!channeler1) return 0; uint8 i; for (i=0; i<5; ++i) { diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index 4b459b6ab77..b463952f508 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -141,7 +141,7 @@ class boss_void_reaver : public CreatureScript pTarget = me->getVictim(); if (pTarget) - me->CastSpell(pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(), SPELL_ARCANE_ORB, false, NULL, NULL, NULL, pTarget); + me->CastSpell(pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(), SPELL_ARCANE_ORB, false, NULL, NULL, 0, pTarget); ArcaneOrb_Timer = 3000; } else diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp index 8468bce657c..60d1baa0281 100644 --- a/src/server/scripts/Outland/shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/shadowmoon_valley.cpp @@ -1090,10 +1090,10 @@ static TorlothCinematic TorlothAnim[]= {-1000367, 0, 2000}, {-1000368, 1, 7000}, {-1000369, 0, 3000}, - {NULL, 0, 2000}, // Torloth stand + {0, 0, 2000}, // Torloth stand {-1000370, 0, 1000}, - {NULL, 0, 3000}, - {NULL, 0, NULL} + {0, 0, 3000}, + {0, 0, 0} }; struct Location diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 8d4fb27fd23..28e38fbaac9 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -511,7 +511,7 @@ class spell_pvp_trinket_wotf_shared_cd : public SpellScriptLoader return; SpellEntry const* spellInfo = GetSpellInfo(); - caster->AddSpellCooldown(spellInfo->Id, NULL, time(NULL) + GetSpellRecoveryTime(sSpellStore.LookupEntry(SPELL_WILL_OF_THE_FORSAKEN_COOLDOWN_TRIGGER)) / IN_MILLISECONDS); + caster->AddSpellCooldown(spellInfo->Id, 0, time(NULL) + GetSpellRecoveryTime(sSpellStore.LookupEntry(SPELL_WILL_OF_THE_FORSAKEN_COOLDOWN_TRIGGER)) / IN_MILLISECONDS); WorldPacket data(SMSG_SPELL_COOLDOWN, 8+1+4); data << uint64(caster->GetGUID()); data << uint8(0); |