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/game/AI/SmartScripts/SmartScript.cpp
+5 -5
View File
@@ -72,7 +72,7 @@ void SmartScript::OnReset()
(*i).runOnce = false;
}
ProcessEventsFor(SMART_EVENT_RESET);
mLastInvoker = NULL;
mLastInvoker = 0;
}
void SmartScript::ProcessEventsFor(SMART_EVENT e, Unit* unit, uint32 var0, uint32 var1, bool bvar, const SpellEntry* spell, GameObject* gob)
@@ -152,7 +152,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
mLastTextID = e.action.talk.textGroupID;
mTextTimer = e.action.talk.duration;
mTextGUID = IsPlayer(GetLastInvoker()) ? GetLastInvoker()->GetGUID() : NULL;//invoker, used for $vars in texts
mTextGUID = IsPlayer(GetLastInvoker()) ? GetLastInvoker()->GetGUID() : 0;//invoker, used for $vars in texts
mUseTextTimer = true;
sCreatureTextMgr->SendChat(talker, uint8(e.action.talk.textGroupID), mTextGUID);
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_TALK: talker: %s (GuidLow: %u), textGuid: %u",
@@ -167,11 +167,11 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr)
{
if (IsCreature((*itr)))
sCreatureTextMgr->SendChat((*itr)->ToCreature(), uint8(e.action.talk.textGroupID), IsPlayer(GetLastInvoker())? GetLastInvoker()->GetGUID() : NULL);
sCreatureTextMgr->SendChat((*itr)->ToCreature(), uint8(e.action.talk.textGroupID), IsPlayer(GetLastInvoker())? GetLastInvoker()->GetGUID() : 0);
else if (IsPlayer((*itr)))
{
Unit* templastInvoker = GetLastInvoker();
sCreatureTextMgr->SendChat(me, uint8(e.action.talk.textGroupID), IsPlayer(templastInvoker) ? templastInvoker->GetGUID() : NULL, CHAT_TYPE_END, LANG_ADDON, TEXT_RANGE_NORMAL, NULL, TEAM_OTHER, false, (*itr)->ToPlayer());
sCreatureTextMgr->SendChat(me, uint8(e.action.talk.textGroupID), IsPlayer(templastInvoker) ? templastInvoker->GetGUID() : 0, CHAT_TYPE_END, LANG_ADDON, TEXT_RANGE_NORMAL, 0, TEAM_OTHER, false, (*itr)->ToPlayer());
}
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SIMPLE_TALK: talker: %s (GuidLow: %u), textGroupId: %u",
(*itr)->GetName(), (*itr)->GetGUIDLow(), uint8(e.action.talk.textGroupID));
@@ -207,7 +207,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
{
if (IsCreature((*itr)))
{
sCreatureTextMgr->SendSound((*itr)->ToCreature(), e.action.sound.sound, CHAT_TYPE_SAY, 0, TextRange(e.action.sound.range), Team(NULL), false);
sCreatureTextMgr->SendSound((*itr)->ToCreature(), e.action.sound.sound, CHAT_TYPE_SAY, 0, TextRange(e.action.sound.range), Team(0), false);
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SOUND: source: %s (GuidLow: %u), sound: %u, range: %u",
(*itr)->GetName(), (*itr)->GetGUIDLow(), e.action.sound.sound, e.action.sound.range);
}
src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
+2 -2
View File
@@ -369,7 +369,7 @@ void BattlegroundSA::Update(uint32 diff)
RoundScores[1].winner = (Attackers == TEAM_ALLIANCE) ? TEAM_HORDE : TEAM_ALLIANCE;
if (RoundScores[0].time == RoundScores[1].time)
EndBattleground(NULL);
EndBattleground(0);
else if (RoundScores[0].time < RoundScores[1].time)
EndBattleground(RoundScores[0].winner == TEAM_ALLIANCE ? ALLIANCE : HORDE);
else
@@ -829,7 +829,7 @@ void BattlegroundSA::EventPlayerUsedGO(Player* Source, GameObject* object)
}
if (RoundScores[0].time == RoundScores[1].time)
EndBattleground(NULL);
EndBattleground(0);
else if (RoundScores[0].time < RoundScores[1].time)
EndBattleground(RoundScores[0].winner == TEAM_ALLIANCE ? ALLIANCE : HORDE);
else
src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp
+1 -1
View File
@@ -73,7 +73,7 @@ void BattlegroundWS::Update(uint32 diff)
if (GetTeamScore(ALLIANCE) == 0)
{
if (GetTeamScore(HORDE) == 0) // No one scored - result is tie
EndBattleground(NULL);
EndBattleground(0);
else // Horde has more points and thus wins
EndBattleground(HORDE);
}
src/server/game/Entities/Pet/Pet.cpp
+2 -2
View File
@@ -1293,8 +1293,8 @@ void Pet::_SaveAuras(SQLTransaction& trans)
}
else
{
baseDamage[i] = NULL;
damage[i] = NULL;
baseDamage[i] = 0;
damage[i] = 0;
}
}
src/server/game/Entities/Unit/Unit.cpp
+2 -2
View File
@@ -3703,8 +3703,8 @@ void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, uint64 casterGUID, Unit
}
else
{
baseDamage[i] = NULL;
damage[i] = NULL;
baseDamage[i] = 0;
damage[i] = 0;
}
}
src/server/game/Entities/Unit/Unit.h
+3 -3
View File
@@ -1645,15 +1645,15 @@ class Unit : public WorldObject
void RemoveAura(AuraApplication * aurApp, AuraRemoveMode mode = AURA_REMOVE_BY_DEFAULT);
void RemoveAura(Aura * aur, AuraRemoveMode mode = AURA_REMOVE_BY_DEFAULT);
void RemoveAurasDueToSpell(uint32 spellId, uint64 caster = NULL, uint8 reqEffMask = 0, AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT);
void RemoveAuraFromStack(uint32 spellId, uint64 caster = NULL, AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT);
void RemoveAurasDueToSpell(uint32 spellId, uint64 caster = 0, uint8 reqEffMask = 0, AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT);
void RemoveAuraFromStack(uint32 spellId, uint64 caster = 0, AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT);
inline void RemoveAuraFromStack(AuraMap::iterator &iter,AuraRemoveMode removeMode);
void RemoveAurasDueToSpellByDispel(uint32 spellId, uint64 casterGUID, Unit *dispeller);
void RemoveAurasDueToSpellBySteal(uint32 spellId, uint64 casterGUID, Unit *stealer);
void RemoveAurasDueToItemSpell(Item* castItem,uint32 spellId);
void RemoveAurasByType(AuraType auraType, uint64 casterGUID = 0, Aura * except = NULL, bool negative = true, bool positive = true);
void RemoveNotOwnSingleTargetAuras(uint32 newPhase = 0x0);
void RemoveAurasWithInterruptFlags(uint32 flag, uint32 except = NULL);
void RemoveAurasWithInterruptFlags(uint32 flag, uint32 except = 0);
void RemoveAurasWithAttribute(uint32 flags);
void RemoveAurasWithFamily(SpellFamilyNames family, uint32 familyFlag1, uint32 familyFlag2, uint32 familyFlag3, uint64 casterGUID);
void RemoveAurasWithMechanic(uint32 mechanic_mask, AuraRemoveMode removemode = AURA_REMOVE_BY_DEFAULT, uint32 except=0);
src/server/game/Entities/Vehicle/Vehicle.cpp
+1 -1
View File
@@ -294,7 +294,7 @@ bool Vehicle::AddPassenger(Unit *unit, int8 seatId)
if (Unit* passenger = ObjectAccessor::GetUnit(*GetBase(), seat->second.passenger))
passenger->ExitVehicle();
else
seat->second.passenger = NULL;
seat->second.passenger = 0;
}
ASSERT(!seat->second.passenger);
src/server/game/Entities/Vehicle/Vehicle.h
+1 -1
View File
@@ -79,7 +79,7 @@ enum VehicleSpells
struct VehicleSeat
{
explicit VehicleSeat(VehicleSeatEntry const *_seatInfo) : seatInfo(_seatInfo), passenger(NULL) {}
explicit VehicleSeat(VehicleSeatEntry const *_seatInfo) : seatInfo(_seatInfo), passenger(0) {}
VehicleSeatEntry const *seatInfo;
uint64 passenger;
};
src/server/game/Globals/ObjectMgr.cpp
+1 -1
View File
@@ -4184,7 +4184,7 @@ void ObjectMgr::LoadQuests()
// 142 143
"StartScript, CompleteScript"
" FROM quest_template");
if (result == NULL)
if (!result)
{
sLog->outErrorDb(">> Loaded 0 quests definitions. DB table `quest_template` is empty.");
sLog->outString();
src/server/game/Maps/MapManager.cpp
+2 -2
View File
@@ -328,7 +328,7 @@ void MapManager::UnloadAll()
uint32 MapManager::GetNumInstances()
{
ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, NULL);
ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, 0);
uint32 ret = 0;
for (MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr)
@@ -345,7 +345,7 @@ uint32 MapManager::GetNumInstances()
uint32 MapManager::GetNumPlayersInInstances()
{
ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, NULL);
ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, 0);
uint32 ret = 0;
for (MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr)
src/server/game/Server/WorldSession.cpp
+1 -1
View File
@@ -702,7 +702,7 @@ void WorldSession::SaveTutorialsData(SQLTransaction &trans)
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_GET_HAS_TUTORIALS);
stmt->setUInt32(0, GetAccountId());
bool hasTutorials = (CharacterDatabase.Query(stmt) != NULL);
bool hasTutorials = CharacterDatabase.Query(stmt).null();
// Modify data in DB
stmt = CharacterDatabase.GetPreparedStatement(hasTutorials ? CHAR_SET_TUTORIALS : CHAR_ADD_TUTORIALS);
for (uint8 i = 0; i < MAX_ACCOUNT_TUTORIAL_VALUES; ++i)
src/server/game/Spells/Auras/SpellAuraEffects.cpp
+2 -3
View File
@@ -4525,9 +4525,8 @@ void AuraEffect::HandleAuraModStateImmunity(AuraApplication const * aurApp, uint
Unit * target = aurApp->GetTarget();
if ((apply) && GetSpellProto()->AttributesEx & SPELL_ATTR1_DISPEL_AURAS_ON_IMMUNITY)
{
target->RemoveAurasByType(AuraType(GetMiscValue()), NULL , GetBase());
}
target->RemoveAurasByType(AuraType(GetMiscValue()), 0 , GetBase());
// stop handling the effect if it was removed by linked event
if (apply && aurApp->GetRemoveMode())
return;
src/server/game/Spells/SpellMgr.h
+1 -1
View File
@@ -1371,7 +1371,7 @@ class SpellMgr
SpellRequiredMap::const_iterator itr = mSpellReq.find(spell_id);
if (itr == mSpellReq.end())
return NULL;
return 0;
return itr->second;
}
src/server/game/Spells/SpellScript.cpp
+2 -2
View File
@@ -348,7 +348,7 @@ int32 SpellScript::GetHitDamage()
if (!IsInHitPhase())
{
sLog->outError("TSCR: Script: `%s` Spell: `%u`: function SpellScript::GetHitDamage was called while spell not in hit phase!", m_scriptName->c_str(), m_scriptSpellId);
return NULL;
return 0;
}
return m_spell->m_damage;
}
@@ -368,7 +368,7 @@ int32 SpellScript::GetHitHeal()
if (!IsInHitPhase())
{
sLog->outError("TSCR: Script: `%s` Spell: `%u`: function SpellScript::GetHitHeal was called while spell not in hit phase!", m_scriptName->c_str(), m_scriptSpellId);
return NULL;
return 0;
}
return m_spell->m_healing;
}
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;
src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
+1 -1
View File
@@ -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)
src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
+1 -1
View File
@@ -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;
}
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
+4 -4
View File
@@ -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;
}
}
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
+6 -6
View File
@@ -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;
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
+7 -7
View File
@@ -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;
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+1 -1
View File
@@ -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)
src/server/scripts/Kalimdor/silithus.cpp
+39 -39
View File
@@ -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:
src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
+1 -1
View File
@@ -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();
src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
+2 -2
View File
@@ -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;
}
}
src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
+4 -4
View File
@@ -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();
src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp
+1 -1
View File
@@ -231,7 +231,7 @@ public:
{
SlagPotTarget->ExitVehicle();
SlagPotTarget = NULL;
SlagPotGUID = NULL;
SlagPotGUID = 0;
events.CancelEvent(EVENT_END_POT);
}
break;
src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
+1 -1
View File
@@ -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();
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
+11 -11
View File
@@ -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;
}
}
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp
+3 -3
View File
@@ -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;
src/server/scripts/Northrend/borean_tundra.cpp
+2 -2
View File
@@ -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*/)
src/server/scripts/Northrend/zuldrak.cpp
+1 -1
View File
@@ -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;
src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+9 -9
View File
@@ -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
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+1 -1
View File
@@ -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);
}
}
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+1 -1
View File
@@ -305,7 +305,7 @@ public:
{
if (MarkOfHydross_Count <= 5)
{
uint32 mark_spell = NULL;
uint32 mark_spell = 0;
switch(MarkOfHydross_Count)
{
src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
+1 -1
View File
@@ -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;
}
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+1 -1
View File
@@ -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)
{
src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+1 -1
View File
@@ -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
src/server/scripts/Outland/shadowmoon_valley.cpp
+3 -3
View File
@@ -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
src/server/scripts/Spells/spell_generic.cpp
+1 -1
View File
@@ -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);