Skip to content

Commit f7e252a

Browse files
DasBlubReve
DasBlub
authored and
Reve
committed
[1842] Fixed build with MaNGOS 10610. Patch by DasBlub.
Fixed build with MaNGOS 10610. Patch by DasBlub. git-svn-id: https://scriptdev2.svn.sourceforge.net/svnroot/scriptdev2@1842 5f9c896b-1e26-0410-94da-f77f675e2462
1 parent 0c412f6 commit f7e252a

41 files changed

Lines changed: 79 additions & 77 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎base/escort_ai.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void npc_escortAI::MoveInLineOfSight(Unit* pWho)
123123
if (!m_creature->CanInitiateAttack())
124124
return;
125125

126-
if (!m_creature->canFly() && m_creature->GetDistanceZ(pWho) > CREATURE_Z_ATTACK_RANGE)
126+
if (!m_creature->CanFly() && m_creature->GetDistanceZ(pWho) > CREATURE_Z_ATTACK_RANGE)
127127
return;
128128

129129
if (m_creature->IsHostileTo(pWho))
@@ -270,7 +270,7 @@ void npc_escortAI::UpdateAI(const uint32 uiDiff)
270270

271271
if (m_bCanInstantRespawn)
272272
{
273-
m_creature->setDeathState(JUST_DIED);
273+
m_creature->SetDeathState(JUST_DIED);
274274
m_creature->Respawn();
275275
}
276276
else
@@ -304,7 +304,7 @@ void npc_escortAI::UpdateAI(const uint32 uiDiff)
304304

305305
if (m_bCanInstantRespawn)
306306
{
307-
m_creature->setDeathState(JUST_DIED);
307+
m_creature->SetDeathState(JUST_DIED);
308308
m_creature->Respawn();
309309
}
310310
else

‎base/follower_ai.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ void FollowerAI::MoveInLineOfSight(Unit* pWho)
9696
if (!m_creature->CanInitiateAttack())
9797
return;
9898

99-
if (!m_creature->canFly() && m_creature->GetDistanceZ(pWho) > CREATURE_Z_ATTACK_RANGE)
99+
if (!m_creature->CanFly() && m_creature->GetDistanceZ(pWho) > CREATURE_Z_ATTACK_RANGE)
100100
return;
101101

102102
if (m_creature->IsHostileTo(pWho))

‎base/guard_ai.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void guardAI::Aggro(Unit *pWho)
4949
}
5050
}
5151

52-
if (const SpellEntry *pSpellInfo = m_creature->reachWithSpellAttack(pWho))
52+
if (const SpellEntry *pSpellInfo = m_creature->ReachWithSpellAttack(pWho))
5353
DoCastSpell(pWho, pSpellInfo);
5454
}
5555

‎include/sc_creature.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void ScriptedAI::MoveInLineOfSight(Unit* pWho)
3333
if (m_creature->CanInitiateAttack() && pWho->isTargetableForAttack() &&
3434
m_creature->IsHostileTo(pWho) && pWho->isInAccessablePlaceFor(m_creature))
3535
{
36-
if (!m_creature->canFly() && m_creature->GetDistanceZ(pWho) > CREATURE_Z_ATTACK_RANGE)
36+
if (!m_creature->CanFly() && m_creature->GetDistanceZ(pWho) > CREATURE_Z_ATTACK_RANGE)
3737
return;
3838

3939
if (m_creature->IsWithinDistInMap(pWho, m_creature->GetAttackDistance(pWho)) && m_creature->IsWithinLOSInMap(pWho))
@@ -97,7 +97,7 @@ void ScriptedAI::EnterEvadeMode()
9797
m_creature->RemoveAllAuras();
9898
m_creature->DeleteThreatList();
9999
m_creature->CombatStop(true);
100-
m_creature->LoadCreaturesAddon();
100+
m_creature->LoadCreatureAddon();
101101

102102
if (m_creature->isAlive())
103103
m_creature->GetMotionMaster()->MoveTargetedHome();

‎scripts/eastern_kingdoms/burning_steppes.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ struct MANGOS_DLL_DECL npc_ragged_johnAI : public ScriptedAI
5050

5151
if (!m_creature->getVictim() && who->isTargetableForAttack() && (m_creature->IsHostileTo(who)) && who->isInAccessablePlaceFor(m_creature))
5252
{
53-
if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)
53+
if (!m_creature->CanFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)
5454
return;
5555

5656
float attackRadius = m_creature->GetAttackDistance(who);

‎scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ struct MANGOS_DLL_DECL boss_malchezaarAI : public ScriptedAI
249249
if (pInfernal && pInfernal->isAlive())
250250
{
251251
pInfernal->SetVisibility(VISIBILITY_OFF);
252-
pInfernal->setDeathState(JUST_DIED);
252+
pInfernal->SetDeathState(JUST_DIED);
253253
}
254254
}
255255
infernals.clear();

‎scripts/eastern_kingdoms/karazhan/bosses_opera.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@ void boss_julianneAI::DamageTaken(Unit* done_by, uint32 &damage)
11641164
{
11651165
Romulo->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
11661166
Romulo->GetMotionMaster()->Clear();
1167-
Romulo->setDeathState(JUST_DIED);
1167+
Romulo->SetDeathState(JUST_DIED);
11681168
Romulo->CombatStop(true);
11691169
Romulo->DeleteThreatList();
11701170
Romulo->SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
@@ -1227,7 +1227,7 @@ void boss_romuloAI::DamageTaken(Unit* done_by, uint32 &damage)
12271227
{
12281228
Julianne->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
12291229
Julianne->GetMotionMaster()->Clear();
1230-
Julianne->setDeathState(JUST_DIED);
1230+
Julianne->SetDeathState(JUST_DIED);
12311231
Julianne->CombatStop(true);
12321232
Julianne->DeleteThreatList();
12331233
Julianne->SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);

‎scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ struct MANGOS_DLL_DECL mob_felkael_phoenixAI : public ScriptedAI
497497
if (Death_Timer < diff)
498498
{
499499
m_creature->SummonCreature(CREATURE_PHOENIX_EGG, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000);
500-
m_creature->setDeathState(JUST_DIED);
500+
m_creature->SetDeathState(JUST_DIED);
501501
m_creature->RemoveCorpse();
502502
Rebirth = false;
503503
}else Death_Timer -= diff;

‎scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ struct MANGOS_DLL_DECL boss_selin_fireheartAI : public ScriptedAI
309309

310310
Creature* CrystalChosen = m_creature->GetMap()->GetCreature(CrystalGUID);
311311
if (CrystalChosen && CrystalChosen->isAlive())
312-
// Use Deal Damage to kill it, not setDeathState.
312+
// Use Deal Damage to kill it, not SetDeathState.
313313
CrystalChosen->DealDamage(CrystalChosen, CrystalChosen->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
314314

315315
CrystalGUID = 0;

‎scripts/eastern_kingdoms/molten_core/boss_garr.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ struct MANGOS_DLL_DECL mob_fireswornAI : public ScriptedAI
101101
if (m_creature->GetHealthPercent() <= 10.0f)
102102
{
103103
DoCastSpellIfCan(m_creature->getVictim(),SPELL_ERUPTION);
104-
m_creature->setDeathState(JUST_DIED);
104+
m_creature->SetDeathState(JUST_DIED);
105105
m_creature->RemoveCorpse();
106106
}
107107

0 commit comments

Comments
 (0)