Created
October 14, 2010 20:08
-
-
Save DasBlub/626932 to your computer and use it in GitHub Desktop.
SD2: fix compile for [10610]
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: base/escort_ai.cpp | |
=================================================================== | |
--- base/escort_ai.cpp (revision 1841) | |
+++ base/escort_ai.cpp (working copy) | |
@@ -123,7 +123,7 @@ | |
if (!m_creature->CanInitiateAttack()) | |
return; | |
- if (!m_creature->canFly() && m_creature->GetDistanceZ(pWho) > CREATURE_Z_ATTACK_RANGE) | |
+ if (!m_creature->CanFly() && m_creature->GetDistanceZ(pWho) > CREATURE_Z_ATTACK_RANGE) | |
return; | |
if (m_creature->IsHostileTo(pWho)) | |
@@ -270,7 +270,7 @@ | |
if (m_bCanInstantRespawn) | |
{ | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
m_creature->Respawn(); | |
} | |
else | |
@@ -304,7 +304,7 @@ | |
if (m_bCanInstantRespawn) | |
{ | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
m_creature->Respawn(); | |
} | |
else | |
Index: base/follower_ai.cpp | |
=================================================================== | |
--- base/follower_ai.cpp (revision 1841) | |
+++ base/follower_ai.cpp (working copy) | |
@@ -96,7 +96,7 @@ | |
if (!m_creature->CanInitiateAttack()) | |
return; | |
- if (!m_creature->canFly() && m_creature->GetDistanceZ(pWho) > CREATURE_Z_ATTACK_RANGE) | |
+ if (!m_creature->CanFly() && m_creature->GetDistanceZ(pWho) > CREATURE_Z_ATTACK_RANGE) | |
return; | |
if (m_creature->IsHostileTo(pWho)) | |
Index: base/guard_ai.cpp | |
=================================================================== | |
--- base/guard_ai.cpp (revision 1841) | |
+++ base/guard_ai.cpp (working copy) | |
@@ -49,7 +49,7 @@ | |
} | |
} | |
- if (const SpellEntry *pSpellInfo = m_creature->reachWithSpellAttack(pWho)) | |
+ if (const SpellEntry *pSpellInfo = m_creature->ReachWithSpellAttack(pWho)) | |
DoCastSpell(pWho, pSpellInfo); | |
} | |
Index: include/sc_creature.cpp | |
=================================================================== | |
--- include/sc_creature.cpp (revision 1841) | |
+++ include/sc_creature.cpp (working copy) | |
@@ -33,7 +33,7 @@ | |
if (m_creature->CanInitiateAttack() && pWho->isTargetableForAttack() && | |
m_creature->IsHostileTo(pWho) && pWho->isInAccessablePlaceFor(m_creature)) | |
{ | |
- if (!m_creature->canFly() && m_creature->GetDistanceZ(pWho) > CREATURE_Z_ATTACK_RANGE) | |
+ if (!m_creature->CanFly() && m_creature->GetDistanceZ(pWho) > CREATURE_Z_ATTACK_RANGE) | |
return; | |
if (m_creature->IsWithinDistInMap(pWho, m_creature->GetAttackDistance(pWho)) && m_creature->IsWithinLOSInMap(pWho)) | |
@@ -97,7 +97,7 @@ | |
m_creature->RemoveAllAuras(); | |
m_creature->DeleteThreatList(); | |
m_creature->CombatStop(true); | |
- m_creature->LoadCreaturesAddon(); | |
+ m_creature->LoadCreatureAddon(); | |
if (m_creature->isAlive()) | |
m_creature->GetMotionMaster()->MoveTargetedHome(); | |
Index: scripts/eastern_kingdoms/burning_steppes.cpp | |
=================================================================== | |
--- scripts/eastern_kingdoms/burning_steppes.cpp (revision 1841) | |
+++ scripts/eastern_kingdoms/burning_steppes.cpp (working copy) | |
@@ -50,7 +50,7 @@ | |
if (!m_creature->getVictim() && who->isTargetableForAttack() && (m_creature->IsHostileTo(who)) && who->isInAccessablePlaceFor(m_creature)) | |
{ | |
- if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) | |
+ if (!m_creature->CanFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) | |
return; | |
float attackRadius = m_creature->GetAttackDistance(who); | |
Index: scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp | |
=================================================================== | |
--- scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp (revision 1841) | |
+++ scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp (working copy) | |
@@ -249,7 +249,7 @@ | |
if (pInfernal && pInfernal->isAlive()) | |
{ | |
pInfernal->SetVisibility(VISIBILITY_OFF); | |
- pInfernal->setDeathState(JUST_DIED); | |
+ pInfernal->SetDeathState(JUST_DIED); | |
} | |
} | |
infernals.clear(); | |
Index: scripts/eastern_kingdoms/karazhan/bosses_opera.cpp | |
=================================================================== | |
--- scripts/eastern_kingdoms/karazhan/bosses_opera.cpp (revision 1841) | |
+++ scripts/eastern_kingdoms/karazhan/bosses_opera.cpp (working copy) | |
@@ -1164,7 +1164,7 @@ | |
{ | |
Romulo->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); | |
Romulo->GetMotionMaster()->Clear(); | |
- Romulo->setDeathState(JUST_DIED); | |
+ Romulo->SetDeathState(JUST_DIED); | |
Romulo->CombatStop(true); | |
Romulo->DeleteThreatList(); | |
Romulo->SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); | |
@@ -1227,7 +1227,7 @@ | |
{ | |
Julianne->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); | |
Julianne->GetMotionMaster()->Clear(); | |
- Julianne->setDeathState(JUST_DIED); | |
+ Julianne->SetDeathState(JUST_DIED); | |
Julianne->CombatStop(true); | |
Julianne->DeleteThreatList(); | |
Julianne->SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); | |
Index: scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp | |
=================================================================== | |
--- scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp (revision 1841) | |
+++ scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp (working copy) | |
@@ -497,7 +497,7 @@ | |
if (Death_Timer < diff) | |
{ | |
m_creature->SummonCreature(CREATURE_PHOENIX_EGG, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000); | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
m_creature->RemoveCorpse(); | |
Rebirth = false; | |
}else Death_Timer -= diff; | |
Index: scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp | |
=================================================================== | |
--- scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp (revision 1841) | |
+++ scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp (working copy) | |
@@ -309,7 +309,7 @@ | |
Creature* CrystalChosen = m_creature->GetMap()->GetCreature(CrystalGUID); | |
if (CrystalChosen && CrystalChosen->isAlive()) | |
- // Use Deal Damage to kill it, not setDeathState. | |
+ // Use Deal Damage to kill it, not SetDeathState. | |
CrystalChosen->DealDamage(CrystalChosen, CrystalChosen->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); | |
CrystalGUID = 0; | |
Index: scripts/eastern_kingdoms/molten_core/boss_garr.cpp | |
=================================================================== | |
--- scripts/eastern_kingdoms/molten_core/boss_garr.cpp (revision 1841) | |
+++ scripts/eastern_kingdoms/molten_core/boss_garr.cpp (working copy) | |
@@ -101,7 +101,7 @@ | |
if (m_creature->GetHealthPercent() <= 10.0f) | |
{ | |
DoCastSpellIfCan(m_creature->getVictim(),SPELL_ERUPTION); | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
m_creature->RemoveCorpse(); | |
} | |
Index: scripts/eastern_kingdoms/scarlet_enclave/ebon_hold.cpp | |
=================================================================== | |
--- scripts/eastern_kingdoms/scarlet_enclave/ebon_hold.cpp (revision 1841) | |
+++ scripts/eastern_kingdoms/scarlet_enclave/ebon_hold.cpp (working copy) | |
@@ -210,7 +210,7 @@ | |
case 10: DoScriptText(SAY_EXEC_WAITING, m_creature, pPlayer); break; | |
case 11: | |
DoScriptText(EMOTE_DIES, m_creature); | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
m_creature->SetHealth(0); | |
return; | |
} | |
@@ -238,7 +238,7 @@ | |
case 10: DoScriptText(SAY_EXEC_WAITING, m_creature, pPlayer); break; | |
case 11: | |
DoScriptText(EMOTE_DIES, m_creature); | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
m_creature->SetHealth(0); | |
return; | |
} | |
@@ -266,7 +266,7 @@ | |
case 10: DoScriptText(SAY_EXEC_WAITING, m_creature, pPlayer); break; | |
case 11: | |
DoScriptText(EMOTE_DIES, m_creature); | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
m_creature->SetHealth(0); | |
return; | |
} | |
@@ -294,7 +294,7 @@ | |
case 10: DoScriptText(SAY_EXEC_WAITING, m_creature, pPlayer); break; | |
case 11: | |
DoScriptText(EMOTE_DIES, m_creature); | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
m_creature->SetHealth(0); | |
return; | |
} | |
@@ -322,7 +322,7 @@ | |
case 10: DoScriptText(SAY_EXEC_WAITING, m_creature, pPlayer); break; | |
case 11: | |
DoScriptText(EMOTE_DIES, m_creature); | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
m_creature->SetHealth(0); | |
return; | |
} | |
@@ -350,7 +350,7 @@ | |
case 10: DoScriptText(SAY_EXEC_WAITING, m_creature, pPlayer); break; | |
case 11: | |
DoScriptText(EMOTE_DIES, m_creature); | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
m_creature->SetHealth(0); | |
return; | |
} | |
@@ -378,7 +378,7 @@ | |
case 10: DoScriptText(SAY_EXEC_WAITING, m_creature, pPlayer); break; | |
case 11: | |
DoScriptText(EMOTE_DIES, m_creature); | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
m_creature->SetHealth(0); | |
return; | |
} | |
@@ -406,7 +406,7 @@ | |
case 10: DoScriptText(SAY_EXEC_WAITING, m_creature, pPlayer); break; | |
case 11: | |
DoScriptText(EMOTE_DIES, m_creature); | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
m_creature->SetHealth(0); | |
return; | |
} | |
@@ -434,7 +434,7 @@ | |
case 10: DoScriptText(SAY_EXEC_WAITING, m_creature, pPlayer); break; | |
case 11: | |
DoScriptText(EMOTE_DIES, m_creature); | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
m_creature->SetHealth(0); | |
return; | |
} | |
@@ -462,7 +462,7 @@ | |
case 10: DoScriptText(SAY_EXEC_WAITING, m_creature, pPlayer); break; | |
case 11: | |
DoScriptText(EMOTE_DIES, m_creature); | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
m_creature->SetHealth(0); | |
return; | |
} | |
Index: scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp | |
=================================================================== | |
--- scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp (revision 1841) | |
+++ scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp (working copy) | |
@@ -39,7 +39,7 @@ | |
Immolate_Timer = 7000; | |
VeilofShadow_Timer = 15000; | |
- m_creature->LoadCreaturesAddon(); | |
+ m_creature->LoadCreatureAddon(); | |
} | |
void JustDied(Unit *killer) | |
Index: scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp | |
=================================================================== | |
--- scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp (revision 1841) | |
+++ scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp (working copy) | |
@@ -375,7 +375,7 @@ | |
m_creature->RemoveAllAuras(); | |
m_creature->DeleteThreatList(); | |
m_creature->CombatStop(true); | |
- m_creature->LoadCreaturesAddon(); | |
+ m_creature->LoadCreatureAddon(); | |
m_creature->SetLootRecipient(NULL); | |
@@ -889,7 +889,7 @@ | |
m_creature->RemoveAllAuras(); | |
m_creature->DeleteThreatList(); | |
m_creature->CombatStop(true); | |
- m_creature->LoadCreaturesAddon(); | |
+ m_creature->LoadCreatureAddon(); | |
m_creature->SetLootRecipient(NULL); | |
Index: scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp | |
=================================================================== | |
--- scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp (revision 1841) | |
+++ scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp (working copy) | |
@@ -110,7 +110,7 @@ | |
{ | |
if (Creature* pWarden = instance->GetCreature(*itr)) | |
{ | |
- pWarden->setDeathState(JUST_DIED); | |
+ pWarden->SetDeathState(JUST_DIED); | |
pWarden->Respawn(); | |
pWarden->SetNoCallAssistance(true); | |
} | |
@@ -218,7 +218,7 @@ | |
{ | |
if (Creature* pKeeper = instance->GetCreature(itr->first)) | |
{ | |
- pKeeper->setDeathState(JUST_DIED); | |
+ pKeeper->SetDeathState(JUST_DIED); | |
pKeeper->Respawn(); | |
pKeeper->CastSpell(pKeeper, SPELL_STONED, true); | |
pKeeper->SetNoCallAssistance(true); | |
Index: scripts/eastern_kingdoms/zulaman/boss_janalai.cpp | |
=================================================================== | |
--- scripts/eastern_kingdoms/zulaman/boss_janalai.cpp (revision 1841) | |
+++ scripts/eastern_kingdoms/zulaman/boss_janalai.cpp (working copy) | |
@@ -179,14 +179,14 @@ | |
if (Creature* pHatcher = m_creature->GetMap()->GetCreature(m_uiHatcher1GUID)) | |
{ | |
pHatcher->AI()->EnterEvadeMode(); | |
- pHatcher->setDeathState(JUST_DIED); | |
+ pHatcher->SetDeathState(JUST_DIED); | |
m_uiHatcher1GUID = 0; | |
} | |
if (Creature* pHatcher = m_creature->GetMap()->GetCreature(m_uiHatcher2GUID)) | |
{ | |
pHatcher->AI()->EnterEvadeMode(); | |
- pHatcher->setDeathState(JUST_DIED); | |
+ pHatcher->SetDeathState(JUST_DIED); | |
m_uiHatcher2GUID = 0; | |
} | |
Index: scripts/eastern_kingdoms/zulaman/boss_malacrass.cpp | |
=================================================================== | |
--- scripts/eastern_kingdoms/zulaman/boss_malacrass.cpp (revision 1841) | |
+++ scripts/eastern_kingdoms/zulaman/boss_malacrass.cpp (working copy) | |
@@ -252,7 +252,7 @@ | |
if (Creature* pAdd = m_creature->GetMap()->GetCreature(m_auiAddGUIDs[i])) | |
{ | |
pAdd->AI()->EnterEvadeMode(); | |
- pAdd->setDeathState(JUST_DIED); | |
+ pAdd->SetDeathState(JUST_DIED); | |
} | |
} | |
Index: scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp | |
=================================================================== | |
--- scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp (revision 1841) | |
+++ scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp (working copy) | |
@@ -247,7 +247,7 @@ | |
{ | |
if (m_pInstance->GetData(TYPE_JEKLIK) == DONE) | |
{ | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
m_creature->RemoveCorpse(); | |
return; | |
} | |
Index: scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp | |
=================================================================== | |
--- scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp (revision 1841) | |
+++ scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp (working copy) | |
@@ -344,7 +344,7 @@ | |
return; | |
debug_log("SD2: npc_time_rift: not casting anylonger, i need to die."); | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
if (m_pInstance->GetData(TYPE_RIFT) == IN_PROGRESS) | |
m_pInstance->SetData(TYPE_RIFT, SPECIAL); | |
Index: scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp | |
=================================================================== | |
--- scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp (revision 1841) | |
+++ scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp (working copy) | |
@@ -138,7 +138,7 @@ | |
m_creature->RemoveAllAuras(); | |
m_creature->DeleteThreatList(); | |
m_creature->CombatStop(true); | |
- m_creature->LoadCreaturesAddon(); | |
+ m_creature->LoadCreatureAddon(); | |
if (m_creature->isAlive()) | |
m_creature->GetMotionMaster()->MoveTargetedHome(); | |
@@ -223,7 +223,7 @@ | |
} | |
// Check if creature is a boss. | |
- if (pSummoned->isWorldBoss()) | |
+ if (pSummoned->IsWorldBoss()) | |
{ | |
if (!m_bIsFirstBossDead) | |
m_uiBossGUID[0] = pSummoned->GetGUID(); | |
Index: scripts/kalimdor/desolace.cpp | |
=================================================================== | |
--- scripts/kalimdor/desolace.cpp (revision 1841) | |
+++ scripts/kalimdor/desolace.cpp (working copy) | |
@@ -98,7 +98,7 @@ | |
if (!m_creature->getVictim() && m_creature->isAlive()) | |
{ | |
Reset(); | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
m_creature->Respawn(); | |
return; | |
} | |
Index: scripts/kalimdor/dustwallow_marsh.cpp | |
=================================================================== | |
--- scripts/kalimdor/dustwallow_marsh.cpp (revision 1841) | |
+++ scripts/kalimdor/dustwallow_marsh.cpp (working copy) | |
@@ -293,7 +293,7 @@ | |
DoScriptText(SAY_MOR_SCARED, m_creature); | |
else | |
{ | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
m_creature->Respawn(); | |
} | |
break; | |
Index: scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp | |
=================================================================== | |
--- scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp (revision 1841) | |
+++ scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp (working copy) | |
@@ -91,7 +91,7 @@ | |
m_creature->SetVisibility(VISIBILITY_ON); | |
if (IsImage) | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
} | |
void KilledUnit(Unit* victim) | |
Index: scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp | |
=================================================================== | |
--- scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp (revision 1841) | |
+++ scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp (working copy) | |
@@ -115,7 +115,7 @@ | |
pOtherBoss->SetHealth(ohealth > 0 ? ohealth : 0); | |
if (ohealth <= 0) | |
{ | |
- pOtherBoss->setDeathState(JUST_DIED); | |
+ pOtherBoss->SetDeathState(JUST_DIED); | |
pOtherBoss->SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); | |
} | |
} | |
@@ -126,7 +126,7 @@ | |
if (Creature* pOtherBoss = GetOtherBoss()) | |
{ | |
pOtherBoss->SetHealth(0); | |
- pOtherBoss->setDeathState(JUST_DIED); | |
+ pOtherBoss->SetDeathState(JUST_DIED); | |
pOtherBoss->SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); | |
if (boss_twinemperorsAI* pOtherAI = dynamic_cast<boss_twinemperorsAI*>(pOtherBoss->AI())) | |
Index: scripts/northrend/azjol-nerub/azjol-nerub/azjol-nerub.h | |
=================================================================== | |
--- scripts/northrend/azjol-nerub/azjol-nerub/azjol-nerub.h (revision 1841) | |
+++ scripts/northrend/azjol-nerub/azjol-nerub/azjol-nerub.h (working copy) | |
@@ -45,7 +45,7 @@ | |
void SetData(uint32 uiType, uint32 uiData); | |
const char* Save() { return strInstData.c_str(); } | |
void Load(const char* chrIn); | |
- void Update(const uint32 uiDiff); | |
+ void Update(uint32 uiDiff); | |
void DoSendWatcherOrKrikthir(); | |
protected: | |
Index: scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp | |
=================================================================== | |
--- scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp (revision 1841) | |
+++ scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp (working copy) | |
@@ -90,7 +90,7 @@ | |
DoScriptText(SAY_INTRO, m_creature); | |
} | |
- if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) | |
+ if (!m_creature->CanFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) | |
return; | |
float attackRadius = m_creature->GetAttackDistance(who); | |
Index: scripts/outland/black_temple/boss_illidan.cpp | |
=================================================================== | |
--- scripts/outland/black_temple/boss_illidan.cpp (revision 1841) | |
+++ scripts/outland/black_temple/boss_illidan.cpp (working copy) | |
@@ -347,7 +347,7 @@ | |
IllidanGUID = m_pInstance->GetData64(DATA_ILLIDANSTORMRAGE); | |
if (!pIllidan->HasSplineFlag(SPLINEFLAG_NO_SPLINE)) | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
} | |
} | |
CheckTimer = 2000; | |
@@ -360,7 +360,7 @@ | |
}else DemonFireTimer -= diff; | |
if (DespawnTimer < diff) | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
else DespawnTimer -= diff; | |
DoMeleeAttackIfReady(); | |
@@ -470,7 +470,7 @@ | |
Unit* pUnit = m_creature->GetMap()->GetUnit((*itr)->getUnitGuid()); | |
if (pUnit && pUnit->GetTypeId() == TYPEID_UNIT && pUnit->GetEntry() == ILLIDARI_ELITE) | |
- pUnit->setDeathState(JUST_DIED); | |
+ pUnit->SetDeathState(JUST_DIED); | |
} | |
} | |
@@ -731,7 +731,7 @@ | |
{ | |
Creature* ChannelTarget = m_creature->GetMap()->GetCreature(ChannelGUID); | |
if (ChannelTarget) | |
- ChannelTarget->setDeathState(JUST_DIED); | |
+ ChannelTarget->SetDeathState(JUST_DIED); | |
ChannelGUID = 0; | |
} | |
for(uint8 i = 0; i < 2; ++i) | |
@@ -740,7 +740,7 @@ | |
{ | |
Creature* Spirit = m_creature->GetMap()->GetCreature(SpiritGUID[i]); | |
if (Spirit) | |
- Spirit->setDeathState(JUST_DIED); | |
+ Spirit->SetDeathState(JUST_DIED); | |
} | |
} | |
ChannelTimer = 6000; | |
@@ -908,7 +908,7 @@ | |
if (Creature* Flame = m_creature->GetMap()->GetCreature(FlameGUID[i])) | |
{ | |
if (Flame->isAlive()) | |
- Flame->setDeathState(JUST_DIED); | |
+ Flame->SetDeathState(JUST_DIED); | |
FlameGUID[i] = 0; | |
} | |
@@ -916,7 +916,7 @@ | |
if (Creature* Glaive = m_creature->GetMap()->GetCreature(GlaiveGUID[i])) | |
{ | |
if (Glaive->isAlive()) | |
- Glaive->setDeathState(JUST_DIED); | |
+ Glaive->SetDeathState(JUST_DIED); | |
GlaiveGUID[i] = 0; | |
} | |
@@ -1017,7 +1017,7 @@ | |
if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who)) | |
{ | |
- if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) | |
+ if (!m_creature->CanFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) | |
return; | |
float attackRadius = m_creature->GetAttackDistance(who); | |
@@ -1507,7 +1507,7 @@ | |
{ | |
// Make Maiev leave | |
Maiev->CastSpell(Maiev, SPELL_TELEPORT_VISUAL, true); | |
- Maiev->setDeathState(JUST_DIED); | |
+ Maiev->SetDeathState(JUST_DIED); | |
} | |
} | |
IsTalking = false; | |
@@ -1691,7 +1691,7 @@ | |
// Make it look like the Glaive flies back up to us | |
Glaive->CastSpell(m_creature, SPELL_GLAIVE_RETURNS, true); | |
// Despawn the Glaive | |
- Glaive->setDeathState(JUST_DIED); | |
+ Glaive->SetDeathState(JUST_DIED); | |
} | |
GlaiveGUID[i] = 0; | |
} | |
Index: scripts/outland/blades_edge_mountains.cpp | |
=================================================================== | |
--- scripts/outland/blades_edge_mountains.cpp (revision 1841) | |
+++ scripts/outland/blades_edge_mountains.cpp (working copy) | |
@@ -118,7 +118,7 @@ | |
if (id == 0) | |
{ | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
m_creature->RemoveCorpse(); | |
m_creature->SetHealth(0); | |
} | |
Index: scripts/outland/coilfang_reservoir/serpent_shrine/boss_fathomlord_karathress.cpp | |
=================================================================== | |
--- scripts/outland/coilfang_reservoir/serpent_shrine/boss_fathomlord_karathress.cpp (revision 1841) | |
+++ scripts/outland/coilfang_reservoir/serpent_shrine/boss_fathomlord_karathress.cpp (working copy) | |
@@ -356,7 +356,7 @@ | |
void JustSummoned(Creature* pSummoned) | |
{ | |
- if (pSummoned->isPet()) | |
+ if (pSummoned->IsPet()) | |
{ | |
m_uiPet_Timer = 10000; | |
m_bIsPetCheckNeeded = false; | |
@@ -365,7 +365,7 @@ | |
void SummonedCreatureDespawn(Creature* pDespawned) | |
{ | |
- if (pDespawned->isPet()) | |
+ if (pDespawned->IsPet()) | |
m_bIsPetCheckNeeded = true; | |
} | |
Index: scripts/outland/coilfang_reservoir/serpent_shrine/boss_lady_vashj.cpp | |
=================================================================== | |
--- scripts/outland/coilfang_reservoir/serpent_shrine/boss_lady_vashj.cpp (revision 1841) | |
+++ scripts/outland/coilfang_reservoir/serpent_shrine/boss_lady_vashj.cpp (working copy) | |
@@ -179,7 +179,7 @@ | |
if (Creature* pTemp = m_creature->GetMap()->GetCreature(m_auiShieldGeneratorChannel[i])) | |
{ | |
if (pTemp->isAlive()) | |
- pTemp->setDeathState(JUST_DIED); | |
+ pTemp->SetDeathState(JUST_DIED); | |
m_auiShieldGeneratorChannel[i] = 0; | |
} | |
@@ -515,7 +515,7 @@ | |
if (pVashj->isAlive() && pVashj->isInCombat()) | |
m_creature->CastSpell(pVashj, SPELL_SURGE, false, 0, 0, pVashj->GetGUID()); | |
else | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
} | |
} | |
} | |
@@ -611,7 +611,7 @@ | |
if (!pVashj || !pVashj->isAlive()) | |
{ | |
//remove | |
- m_creature->setDeathState(DEAD); | |
+ m_creature->SetDeathState(DEAD); | |
m_creature->RemoveCorpse(); | |
m_creature->setFaction(35); | |
} | |
@@ -698,7 +698,7 @@ | |
//get and remove channel | |
if (Creature* pChannel = pVashj->GetMap()->GetCreature(pVashjAI->m_auiShieldGeneratorChannel[uiChannelIdentifier])) | |
- pChannel->setDeathState(JUST_DIED); //calls Unsummon() | |
+ pChannel->SetDeathState(JUST_DIED); //calls Unsummon() | |
pInstance->SetData(uiIdentifier, DONE); | |
Index: scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp | |
=================================================================== | |
--- scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp (revision 1841) | |
+++ scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp (working copy) | |
@@ -79,7 +79,7 @@ | |
{ | |
if (!m_creature->getVictim() && who->isTargetableForAttack() && (m_creature->IsHostileTo(who)) && who->isInAccessablePlaceFor(m_creature)) | |
{ | |
- if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) | |
+ if (!m_creature->CanFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) | |
return; | |
float attackRadius = m_creature->GetAttackDistance(who); | |
Index: scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp | |
=================================================================== | |
--- scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp (revision 1841) | |
+++ scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp (working copy) | |
@@ -125,7 +125,7 @@ | |
{ | |
DoScriptText(YELL_DIE_R, m_creature); | |
m_uiDeath_Timer = false; | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
}else m_uiDeath_Timer -= uiDiff; | |
} | |
}; | |
@@ -168,13 +168,13 @@ | |
{ | |
if (Creature* pLeftHead = m_creature->GetMap()->GetCreature(m_uiLeftHeadGUID)) | |
{ | |
- pLeftHead->setDeathState(JUST_DIED); | |
+ pLeftHead->SetDeathState(JUST_DIED); | |
m_uiLeftHeadGUID = 0; | |
} | |
if (Creature* pRightHead = m_creature->GetMap()->GetCreature(m_uiRightHeadGUID)) | |
{ | |
- pRightHead->setDeathState(JUST_DIED); | |
+ pRightHead->SetDeathState(JUST_DIED); | |
m_uiRightHeadGUID = 0; | |
} | |
@@ -280,7 +280,7 @@ | |
return; | |
DoScriptText(YELL_DIE_L, pLeftHead); | |
- pLeftHead->setDeathState(JUST_DIED); | |
+ pLeftHead->SetDeathState(JUST_DIED); | |
if (mob_omrogg_headsAI* pHeadAI = dynamic_cast<mob_omrogg_headsAI*>(pRightHead->AI())) | |
pHeadAI->DoDeathYell(); | |
Index: scripts/outland/nagrand.cpp | |
=================================================================== | |
--- scripts/outland/nagrand.cpp (revision 1841) | |
+++ scripts/outland/nagrand.cpp (working copy) | |
@@ -61,7 +61,7 @@ | |
Hitter->SummonCreature(18181,x+(0.7 * (rand()%30)),y+(rand()%5),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); | |
Hitter->SummonCreature(18181,x+(rand()%5),y-(rand()%5),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); | |
Hitter->SummonCreature(18181,x-(rand()%5),y+(0.5 *(rand()%60)),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); | |
- m_creature->setDeathState(CORPSE); | |
+ m_creature->SetDeathState(CORPSE); | |
Spawn = true; | |
} | |
return; | |
@@ -561,7 +561,7 @@ | |
if (pSummoned->GetEntry() == NPC_MURK_BRUTE) | |
DoScriptText(SAY_MAG_NO_ESCAPE, pSummoned); | |
- if (pSummoned->isTotem()) | |
+ if (pSummoned->IsTotem()) | |
return; | |
pSummoned->RemoveSplineFlag(SPLINEFLAG_WALKMODE); | |
Index: scripts/outland/tempest_keep/arcatraz/arcatraz.cpp | |
=================================================================== | |
--- scripts/outland/tempest_keep/arcatraz/arcatraz.cpp (revision 1841) | |
+++ scripts/outland/tempest_keep/arcatraz/arcatraz.cpp (working copy) | |
@@ -281,7 +281,7 @@ | |
if (!m_creature->getVictim() && who->isTargetableForAttack() && (m_creature->IsHostileTo(who)) && who->isInAccessablePlaceFor(m_creature)) | |
{ | |
- if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) | |
+ if (!m_creature->CanFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) | |
return; | |
if (who->GetTypeId() != TYPEID_PLAYER) | |
Index: scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp | |
=================================================================== | |
--- scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp (revision 1841) | |
+++ scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp (working copy) | |
@@ -161,7 +161,7 @@ | |
if (Creature *mellic = m_creature->GetMap()->GetCreature(m_pInstance->GetData64(DATA_MELLICHAR))) | |
{ | |
//should have a better way to do this. possibly spell exist. | |
- mellic->setDeathState(JUST_DIED); | |
+ mellic->SetDeathState(JUST_DIED); | |
mellic->SetHealth(0); | |
} | |
++Intro_Phase; | |
Index: scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp | |
=================================================================== | |
--- scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp (revision 1841) | |
+++ scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp (working copy) | |
@@ -414,7 +414,7 @@ | |
if (pWho->isTargetableForAttack() && | |
m_creature->IsHostileTo(pWho) && pWho->isInAccessablePlaceFor(m_creature)) | |
{ | |
- if (!m_creature->canFly() && m_creature->GetDistanceZ(pWho) > CREATURE_Z_ATTACK_RANGE) | |
+ if (!m_creature->CanFly() && m_creature->GetDistanceZ(pWho) > CREATURE_Z_ATTACK_RANGE) | |
return; | |
float attackRadius = m_creature->GetAttackDistance(pWho); | |
Index: scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp | |
=================================================================== | |
--- scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp (revision 1841) | |
+++ scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp (working copy) | |
@@ -215,7 +215,7 @@ | |
if (m_pInstance->GetData(TYPE_SEPETHREA) == DONE) | |
{ | |
//remove | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
m_creature->RemoveCorpse(); | |
return; | |
} | |
Index: scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp | |
=================================================================== | |
--- scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp (revision 1841) | |
+++ scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp (working copy) | |
@@ -211,7 +211,7 @@ | |
{ | |
if (Die_Timer < diff) | |
{ | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
m_creature->RemoveCorpse(); | |
}else Die_Timer -= diff; | |
} | |
Index: scripts/world/npcs_special.cpp | |
=================================================================== | |
--- scripts/world/npcs_special.cpp (revision 1841) | |
+++ scripts/world/npcs_special.cpp (working copy) | |
@@ -616,7 +616,7 @@ | |
{ | |
m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT); | |
m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); | |
- m_creature->setDeathState(JUST_DIED); | |
+ m_creature->SetDeathState(JUST_DIED); | |
m_creature->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD); | |
if (Doctorguid) | |
@@ -707,7 +707,7 @@ | |
for(itr = Patients.begin(); itr != Patients.end(); ++itr) | |
{ | |
if (Creature* Patient = m_creature->GetMap()->GetCreature(*itr)) | |
- Patient->setDeathState(JUST_DIED); | |
+ Patient->SetDeathState(JUST_DIED); | |
} | |
} | |
@@ -1321,7 +1321,7 @@ | |
if (pCreature->isTrainer()) | |
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); | |
- if (pCreature->isCanTrainingAndResetTalentsOf(pPlayer)) | |
+ if (pCreature->CanTrainAndResetTalentsOf(pPlayer)) | |
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "I wish to unlearn my talents", GOSSIP_SENDER_MAIN, GOSSIP_OPTION_UNLEARNTALENTS); | |
if (pPlayer->getClass() == CLASS_ROGUE && pPlayer->getLevel() >= 24 && !pPlayer->HasItemCount(17126,1) && !pPlayer->GetQuestRewardStatus(6681)) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment